wok-next rev 7425

Added patch to gtkglext to fix it with gtk 2.20+.
author Christopher Rogers <slaxemulator@gmail.com>
date Sun Nov 28 10:17:05 2010 +0000 (2010-11-28)
parents f6264d81e17a
children e14a2085bbee
files gtkglext/receipt gtkglext/stuff/gtk2.20.patch
line diff
     1.1 --- a/gtkglext/receipt	Sun Nov 28 08:49:45 2010 +0000
     1.2 +++ b/gtkglext/receipt	Sun Nov 28 10:17:05 2010 +0000
     1.3 @@ -7,7 +7,7 @@
     1.4  MAINTAINER="pankso@slitaz.org"
     1.5  DEPENDS="gtk+ mesa libglu-mesa"
     1.6  SUGGESTED="nvidia"
     1.7 -BUILD_DEPENDS="gtk+-dev mesa-dev"
     1.8 +BUILD_DEPENDS="gtk+-dev libglu-mesa mesa-dev util-linux-ng-uuid-dev autoconf"
     1.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.10  WEB_SITE="http://gtkglext.sourceforge.net/"
    1.11  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    1.12 @@ -16,6 +16,8 @@
    1.13  compile_rules()
    1.14  {
    1.15  	cd $src
    1.16 +	patch -Np1 -i ../stuff/gtk2.20.patch
    1.17 +	autoconf --force
    1.18  	./configure \
    1.19      	--prefix=/usr \
    1.20      	$CONFIGURE_ARGS &&
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/gtkglext/stuff/gtk2.20.patch	Sun Nov 28 10:17:05 2010 +0000
     2.3 @@ -0,0 +1,77 @@
     2.4 +diff -Nur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c
     2.5 +--- gtkglext-1.2.0.orig/gtk/gtkglwidget.c	2004-02-20 11:38:36.000000000 +0200
     2.6 ++++ gtkglext-1.2.0/gtk/gtkglwidget.c	2010-04-20 19:29:42.941917275 +0300
     2.7 +@@ -127,7 +127,7 @@
     2.8 +    * Synchronize OpenGL and window resizing request streams.
     2.9 +    */
    2.10 + 
    2.11 +-  if (GTK_WIDGET_REALIZED (widget) && private->is_realized)
    2.12 ++  if (gtk_widget_get_realized (widget) && private->is_realized)
    2.13 +     {
    2.14 +       gldrawable = gdk_window_get_gl_drawable (widget->window);
    2.15 +       gdk_gl_drawable_wait_gdk (gldrawable);
    2.16 +@@ -154,7 +154,7 @@
    2.17 +    * Remove OpenGL-capability from widget->window.
    2.18 +    */
    2.19 + 
    2.20 +-  if (GTK_WIDGET_REALIZED (widget))
    2.21 ++  if (gtk_widget_get_realized (widget))
    2.22 +     gdk_window_unset_gl_capability (widget->window);
    2.23 + 
    2.24 +   private->is_realized = FALSE;
    2.25 +@@ -174,7 +174,7 @@
    2.26 +    */
    2.27 + 
    2.28 +   toplevel = gtk_widget_get_toplevel (widget);
    2.29 +-  if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel))
    2.30 ++  if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel))
    2.31 +     {
    2.32 +       GTK_GL_NOTE (MISC,
    2.33 +         g_message (" - Install colormap to the top-level window."));
    2.34 +@@ -194,7 +194,7 @@
    2.35 +    * Set a background of "None" on window to avoid AIX X server crash.
    2.36 +    */
    2.37 + 
    2.38 +-  if (GTK_WIDGET_REALIZED (widget))
    2.39 ++  if (gtk_widget_get_realized (widget))
    2.40 +     {
    2.41 +       GTK_GL_NOTE (MISC,
    2.42 +         g_message (" - window->bg_pixmap = %p",
    2.43 +@@ -250,8 +250,8 @@
    2.44 +   GTK_GL_NOTE_FUNC ();
    2.45 + 
    2.46 +   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
    2.47 +-  g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE);
    2.48 +-  g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE);
    2.49 ++  g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE);
    2.50 ++  g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE);
    2.51 +   g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE);
    2.52 + 
    2.53 +   /* 
    2.54 +@@ -432,7 +432,7 @@
    2.55 +   GTK_GL_NOTE_FUNC ();
    2.56 + 
    2.57 +   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
    2.58 +-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
    2.59 ++  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
    2.60 + 
    2.61 +   gldrawable = gdk_window_get_gl_drawable (widget->window);
    2.62 +   if (gldrawable == NULL)
    2.63 +@@ -474,7 +474,7 @@
    2.64 +   GLWidgetPrivate *private;
    2.65 + 
    2.66 +   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
    2.67 +-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
    2.68 ++  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
    2.69 + 
    2.70 +   private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private);
    2.71 +   if (private == NULL)
    2.72 +@@ -501,7 +501,7 @@
    2.73 + gtk_widget_get_gl_window (GtkWidget *widget)
    2.74 + {
    2.75 +   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
    2.76 +-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
    2.77 ++  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
    2.78 + 
    2.79 +   return gdk_window_get_gl_window (widget->window);
    2.80 + }