testing/gtkglext: don't use deprecated GTK functions

2 files changed, 81 insertions, 3 deletions

diff --git a/testing/gtkglext/APKBUILD b/testing/gtkglext/APKBUILD
index 0973522b7..3a5284c42 100644
--- a/testing/gtkglext/APKBUILD
+++ b/testing/gtkglext/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=gtkglext
 pkgver=1.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="GTK+ OpenGL Extension"
 url="http://projects.gnome.org/gtkglext/"
 arch="all"
@@ -12,7 +12,8 @@ depends_dev="gtk+-dev mesa-dev libice-dev libxxf86vm-dev libxi-dev libx11-dev li
 makedepends="$depends_dev"
 install=
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+	gtkglext-deprecated.patch"
 
 _builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
@@ -36,4 +37,5 @@ package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="5c3240bfc1b21becd33ce35c5abe6f8d  gtkglext-1.2.0.tar.gz"
+md5sums="5c3240bfc1b21becd33ce35c5abe6f8d  gtkglext-1.2.0.tar.gz
+db914d28d6d4db4573361717ced19aea  gtkglext-deprecated.patch"
diff --git a/testing/gtkglext/gtkglext-deprecated.patch b/testing/gtkglext/gtkglext-deprecated.patch
new file mode 100644
index 000000000..10c448449
--- /dev/null
+++ b/testing/gtkglext/gtkglext-deprecated.patch
@@ -0,0 +1,76 @@
+--- gtkglext-1.2.0.orig/gtk/gtkglwidget.c
++++ gtkglext-1.2.0/gtk/gtkglwidget.c
+@@ -127,7 +127,7 @@
+    * Synchronize OpenGL and window resizing request streams.
+    */
+ 
+-  if (GTK_WIDGET_REALIZED (widget) && private->is_realized)
++  if (gtk_widget_is_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_is_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_is_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_is_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_is_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_is_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_is_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_is_realized (widget), NULL);
+ 
+   return gdk_window_get_gl_window (widget->window);
+ }