Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=dd2645dfd245fb5116946050b910281a5065c207
commit dd2645dfd245fb5116946050b910281a5065c207
Author: bouleetbil <bouleet...@frogdev.info>
Date: Tue Apr 27 22:32:13 2010 +0200
gtkglext-1.2.0-6-x86_64
*rebuild with new libs.
diff --git a/source/xlib-extra/gtkglext/FrugalBuild
b/source/xlib-extra/gtkglext/FrugalBuild
index 6f042ba..ec93275 100644
--- a/source/xlib-extra/gtkglext/FrugalBuild
+++ b/source/xlib-extra/gtkglext/FrugalBuild
@@ -3,18 +3,19 @@
pkgname=gtkglext
pkgver=1.2.0
-pkgrel=5
+pkgrel=6
pkgdesc="GL extensions for Gtk+ 2.0"
-depends=('libgl>=7.4.2-4' 'freeglut>=2.4.0-3' 'libx11>=1.2.1'
'gtk+2>=2.16.2-2')
+depends=('libgl>=7.4.2-4' 'freeglut>=2.4.0-3' 'libx11>=1.2.1'
'gtk+2>=2.20.0-2')
makedepends=('intltool' 'gtk-doc')
groups=('xlib-extra')
archs=('i686' 'x86_64' 'ppc')
options=('scriptlet')
Finclude sourceforge
url="http://gtkglext.sourceforge.net/";
-source=(${sour...@]} 01_gdk-linking.patch)
+source=(${sour...@]} 01_gdk-linking.patch gtk_deprecated.diff)
sha1sums=('db9ce38ee555fd14f55083ec7f4ae30e5338d5cc' \
- 'c4b743027a89bfd56dd537020fb18a6faaa89791')
+ 'c4b743027a89bfd56dd537020fb18a6faaa89791' \
+ '5c13ce7ff82df5f89a376ab6cbb059557e257688')
Fconfopts="$Fconfopts --enable-gtk-doc"
# optimization OK
diff --git a/source/xlib-extra/gtkglext/gtk_deprecated.diff
b/source/xlib-extra/gtkglext/gtk_deprecated.diff
new file mode 100644
index 0000000..54b34c1
--- /dev/null
+++ b/source/xlib-extra/gtkglext/gtk_deprecated.diff
@@ -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);
+ }
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
