[arch-commits] Commit in gtkglext/repos/extra-x86_64 (5 files)
Antonio Rojas
arojas at archlinux.org
Tue Jun 5 20:51:41 UTC 2018
Date: Tuesday, June 5, 2018 @ 20:51:39
Author: arojas
Revision: 325955
archrelease: copy trunk to extra-x86_64
Added:
gtkglext/repos/extra-x86_64/PKGBUILD
(from rev 325954, gtkglext/trunk/PKGBUILD)
gtkglext/repos/extra-x86_64/gtk2.20.patch
(from rev 325954, gtkglext/trunk/gtk2.20.patch)
gtkglext/repos/extra-x86_64/gtkglext-gcc8.patch
(from rev 325954, gtkglext/trunk/gtkglext-gcc8.patch)
Deleted:
gtkglext/repos/extra-x86_64/PKGBUILD
gtkglext/repos/extra-x86_64/gtk2.20.patch
---------------------+
PKGBUILD | 75 +++++++++++++-----------
gtk2.20.patch | 154 +++++++++++++++++++++++++-------------------------
gtkglext-gcc8.patch | 34 +++++++++++
3 files changed, 152 insertions(+), 111 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-05 20:51:06 UTC (rev 325954)
+++ PKGBUILD 2018-06-05 20:51:39 UTC (rev 325955)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Ben <ben at benmazer.net>
-
-pkgname=gtkglext
-pkgver=1.2.0
-pkgrel=10
-pkgdesc="opengl extensions for gtk2"
-arch=('i686' 'x86_64')
-url="http://gtkglext.sourceforge.net/"
-license=('LGPL')
-depends=('gtk2' 'glu' 'libxmu' 'pangox-compat')
-makedepends=('mesa')
-source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
- 'gtk2.20.patch')
-md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4'
- 'e5a87ec3f2d0e616c6f32f90c3f7237f')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -Np1 -i "${srcdir}/gtk2.20.patch"
- sed '/AC_PATH_XTRA/d' -i configure.in
-
- autoreconf --force --install
- ./configure --prefix=/usr \
- --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: gtkglext/repos/extra-x86_64/PKGBUILD (from rev 325954, gtkglext/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-06-05 20:51:39 UTC (rev 325955)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Ben <ben at benmazer.net>
+
+pkgname=gtkglext
+pkgver=1.2.0
+pkgrel=11
+pkgdesc="opengl extensions for gtk2"
+arch=('x86_64')
+url="http://gtkglext.sourceforge.net/"
+license=('LGPL')
+depends=('gtk2' 'glu' 'libxmu' 'pangox-compat')
+makedepends=('python')
+source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
+ 'gtk2.20.patch' gtkglext-gcc8.patch)
+md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4'
+ 'e5a87ec3f2d0e616c6f32f90c3f7237f'
+ '9f116d557167dabf4fcbe765f5c784b2')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ patch -Np1 -i "${srcdir}/gtk2.20.patch"
+ sed '/AC_PATH_XTRA/d' -i configure.in
+ patch -p1 -i ../gtkglext-gcc8.patch # Fix build with GCC 8
+
+ autoreconf -vi
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr \
+ --disable-static
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: gtk2.20.patch
===================================================================
--- gtk2.20.patch 2018-06-05 20:51:06 UTC (rev 325954)
+++ gtk2.20.patch 2018-06-05 20:51:39 UTC (rev 325955)
@@ -1,77 +0,0 @@
-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);
- }
Copied: gtkglext/repos/extra-x86_64/gtk2.20.patch (from rev 325954, gtkglext/trunk/gtk2.20.patch)
===================================================================
--- gtk2.20.patch (rev 0)
+++ gtk2.20.patch 2018-06-05 20:51:39 UTC (rev 325955)
@@ -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);
+ }
Copied: gtkglext/repos/extra-x86_64/gtkglext-gcc8.patch (from rev 325954, gtkglext/trunk/gtkglext-gcc8.patch)
===================================================================
--- gtkglext-gcc8.patch (rev 0)
+++ gtkglext-gcc8.patch 2018-06-05 20:51:39 UTC (rev 325955)
@@ -0,0 +1,34 @@
+From 1fe275cd7dfa9f3a6db771b0cb945d96787e72cf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
+Date: Thu, 15 Mar 2018 15:56:20 +0100
+Subject: [PATCH 2/2] GCC-8 fixes.
+
+---
+ gdk/gdkglshapes.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdk/gdkglshapes.c b/gdk/gdkglshapes.c
+index f72abba..9d1197f 100644
+--- a/gdk/gdkglshapes.c
++++ b/gdk/gdkglshapes.c
+@@ -544,7 +544,7 @@ static GLfloat idata[12][3] =
+ {-Z, -X, 0}
+ };
+
+-static int index[20][3] =
++static int iindex[20][3] =
+ {
+ {0, 4, 1},
+ {0, 9, 4},
+@@ -574,7 +574,7 @@ icosahedron(GLenum shadeType)
+ int i;
+
+ for (i = 19; i >= 0; i--) {
+- drawtriangle(i, idata, index, shadeType);
++ drawtriangle(i, idata, iindex, shadeType);
+ }
+ }
+
+--
+2.14.3
+
More information about the arch-commits
mailing list