[arch-commits] Commit in gtkglext/trunk (PKGBUILD gtk2.20.patch)

[Ionut Biru]

    Date: Tuesday, April 20, 2010 @ 14:29:15
  Author: ibiru
Revision: 78318

upgpkg: gtkglext 1.2.0-4
fixed deprecated macros introduced by previous rebuild using gtk2 2.20

Added:
  gtkglext/trunk/gtk2.20.patch
Modified:
  gtkglext/trunk/PKGBUILD

---------------+
 PKGBUILD      |   13 +++++----
 gtk2.20.patch |   77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-20 12:20:10 UTC (rev 78317)
+++ PKGBUILD	2010-04-20 18:29:15 UTC (rev 78318)
@@ -4,21 +4,22 @@
 
 pkgname=gtkglext
 pkgver=1.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="opengl extensions for gtk2"
 arch=('i686' 'x86_64')
 url="http://gtkglext.sourceforge.net/"
 license=('LGPL')
 depends=('gtk2' 'mesa' 'libxmu')
-makedepends=('gcc>=4.0.3')
+makedepends=('gcc')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2") # ${pkgname}-${pkgver}-pangox.patch)
-md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4')
+source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
+	gtk2.20.patch)
+md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4'
+         '6f1347f8048bf3d233c311ca8ddeb2a4')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  # fix "undefined reference to `pango_x_font*" trouble
-  #cat ${srcdir}/${pkgname}-${pkgver}-pangox.patch | patch -p1 || return 1
+  patch -Np1 -i ${srcdir}/gtk2.20.patch || return 1
   autoconf --force || return 1
   ./configure --prefix=/usr || return 1
   make || return 1

Added: gtk2.20.patch
===================================================================
--- gtk2.20.patch	                        (rev 0)
+++ gtk2.20.patch	2010-04-20 18:29:15 UTC (rev 78318)
@@ -0,0 +1,77 @@
+diff -Nur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c
+--- gtkglext-1.2.0.orig/gtk/gtkglwidget.c	2004-02-20 11:38:36.000000000 +0200
++++ gtkglext-1.2.0/gtk/gtkglwidget.c	2010-04-20 19:29:42.941917275 +0300
+@@ -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);
+ }