Revision: 70945 http://trac.macports.org/changeset/70945 Author: jmr@macports.org Date: 2010-08-26 23:10:24 -0700 (Thu, 26 Aug 2010) Log Message: ----------- gtkglext: fix build with current gtk2 (#25782) Modified Paths: -------------- trunk/dports/devel/gtkglext/Portfile Added Paths: ----------- trunk/dports/devel/gtkglext/files/patch-examples-pixmap-mixed.c.diff trunk/dports/devel/gtkglext/files/patch-examples-pixmap.c.diff trunk/dports/devel/gtkglext/files/patch-gtk-gtkglwidget.c.diff Modified: trunk/dports/devel/gtkglext/Portfile =================================================================== --- trunk/dports/devel/gtkglext/Portfile 2010-08-27 06:09:02 UTC (rev 70944) +++ trunk/dports/devel/gtkglext/Portfile 2010-08-27 06:10:24 UTC (rev 70945) @@ -4,7 +4,7 @@ PortGroup muniversal 1.0 name gtkglext version 1.2.0 -revision 4 +revision 5 categories devel maintainers lifehertz.com:jd description OpenGL Extension to GTK @@ -18,9 +18,13 @@ checksums md5 5c3240bfc1b21becd33ce35c5abe6f8d depends_lib port:gtk2 +patchfiles patch-examples-pixmap-mixed.c.diff \ + patch-examples-pixmap.c.diff \ + patch-gtk-gtkglwidget.c.diff + if {[variant_isset quartz]} { configure.args --without-x - patchfiles patch-configure.diff \ + patchfiles-append patch-configure.diff \ patch-makefile.in.diff \ patch-gdk-makefile.in.diff \ patch-gtk-makefile.in.diff \ Added: trunk/dports/devel/gtkglext/files/patch-examples-pixmap-mixed.c.diff =================================================================== --- trunk/dports/devel/gtkglext/files/patch-examples-pixmap-mixed.c.diff (rev 0) +++ trunk/dports/devel/gtkglext/files/patch-examples-pixmap-mixed.c.diff 2010-08-27 06:10:24 UTC (rev 70945) @@ -0,0 +1,11 @@ +--- examples/pixmap-mixed.c.orig 2003-09-14 02:23:33.000000000 -0700 ++++ examples/pixmap-mixed.c 2010-07-26 22:28:55.000000000 -0700 +@@ -154,7 +154,7 @@ + gpointer data) + { + gdk_draw_drawable (widget->window, +- widget->style->fg_gc[GTK_WIDGET_STATE (widget)], ++ widget->style->fg_gc[gtk_widget_get_state (widget)], + pixmap, + event->area.x, event->area.y, + event->area.x, event->area.y, Added: trunk/dports/devel/gtkglext/files/patch-examples-pixmap.c.diff =================================================================== --- trunk/dports/devel/gtkglext/files/patch-examples-pixmap.c.diff (rev 0) +++ trunk/dports/devel/gtkglext/files/patch-examples-pixmap.c.diff 2010-08-27 06:10:24 UTC (rev 70945) @@ -0,0 +1,11 @@ +--- examples/pixmap.c.orig 2003-09-14 02:23:33.000000000 -0700 ++++ examples/pixmap.c 2010-07-26 22:29:22.000000000 -0700 +@@ -137,7 +137,7 @@ + gpointer data) + { + gdk_draw_drawable (widget->window, +- widget->style->fg_gc[GTK_WIDGET_STATE (widget)], ++ widget->style->fg_gc[gtk_widget_get_state (widget)], + pixmap, + event->area.x, event->area.y, + event->area.x, event->area.y, Added: trunk/dports/devel/gtkglext/files/patch-gtk-gtkglwidget.c.diff =================================================================== --- trunk/dports/devel/gtkglext/files/patch-gtk-gtkglwidget.c.diff (rev 0) +++ trunk/dports/devel/gtkglext/files/patch-gtk-gtkglwidget.c.diff 2010-08-27 06:10:24 UTC (rev 70945) @@ -0,0 +1,76 @@ +--- gtk/gtkglwidget.c.orig 2004-02-20 01:38:36.000000000 -0800 ++++ gtk/gtkglwidget.c 2010-07-26 22:42:45.000000000 -0700 +@@ -127,7 +127,7 @@ + * Synchronize OpenGL and window resizing request streams. + */ + +- if (GTK_WIDGET_REALIZED (widget) && private->is_realized) ++ if (gtk_widget_get_realized (widget) && private->is_realized) + { + gldrawable = gdk_window_get_gl_drawable (widget->window); + gdk_gl_drawable_wait_gdk (gldrawable); +@@ -154,7 +154,7 @@ + * Remove OpenGL-capability from widget->window. + */ + +- if (GTK_WIDGET_REALIZED (widget)) ++ if (gtk_widget_get_realized (widget)) + gdk_window_unset_gl_capability (widget->window); + + private->is_realized = FALSE; +@@ -174,7 +174,7 @@ + */ + + toplevel = gtk_widget_get_toplevel (widget); +- if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel)) ++ if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel)) + { + GTK_GL_NOTE (MISC, + g_message (" - Install colormap to the top-level window.")); +@@ -194,7 +194,7 @@ + * Set a background of "None" on window to avoid AIX X server crash. + */ + +- if (GTK_WIDGET_REALIZED (widget)) ++ if (gtk_widget_get_realized (widget)) + { + GTK_GL_NOTE (MISC, + g_message (" - window->bg_pixmap = %p", +@@ -250,8 +250,8 @@ + GTK_GL_NOTE_FUNC (); + + g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); +- g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE); +- g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE); ++ g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE); ++ g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE); + g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE); + + /* +@@ -432,7 +432,7 @@ + GTK_GL_NOTE_FUNC (); + + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); +- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); ++ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); + + gldrawable = gdk_window_get_gl_drawable (widget->window); + if (gldrawable == NULL) +@@ -474,7 +474,7 @@ + GLWidgetPrivate *private; + + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); +- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); ++ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); + + private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private); + if (private == NULL) +@@ -501,7 +501,7 @@ + gtk_widget_get_gl_window (GtkWidget *widget) + { + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); +- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); ++ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); + + return gdk_window_get_gl_window (widget->window); + }