[arch-commits] Commit in gtkglext/trunk (PKGBUILD gtkglext-gcc8.patch)
Antonio Rojas
arojas at archlinux.org
Tue Jun 5 20:51:07 UTC 2018
Date: Tuesday, June 5, 2018 @ 20:51:06
Author: arojas
Revision: 325954
BUILDINFO rebuild
Added:
gtkglext/trunk/gtkglext-gcc8.patch
Modified:
gtkglext/trunk/PKGBUILD
---------------------+
PKGBUILD | 25 ++++++++++++++++---------
gtkglext-gcc8.patch | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 50 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-05 20:42:33 UTC (rev 325953)
+++ PKGBUILD 2018-06-05 20:51:06 UTC (rev 325954)
@@ -4,25 +4,32 @@
pkgname=gtkglext
pkgver=1.2.0
-pkgrel=10
+pkgrel=11
pkgdesc="opengl extensions for gtk2"
arch=('x86_64')
url="http://gtkglext.sourceforge.net/"
license=('LGPL')
depends=('gtk2' 'glu' 'libxmu' 'pangox-compat')
-makedepends=('mesa')
+makedepends=('python')
source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
- 'gtk2.20.patch')
+ 'gtk2.20.patch' gtkglext-gcc8.patch)
md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4'
- 'e5a87ec3f2d0e616c6f32f90c3f7237f')
+ 'e5a87ec3f2d0e616c6f32f90c3f7237f'
+ '9f116d557167dabf4fcbe765f5c784b2')
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+ cd $pkgname-$pkgver
patch -Np1 -i "${srcdir}/gtk2.20.patch"
- sed '/AC_PATH_XTRA/d' -i configure.in
+ sed '/AC_PATH_XTRA/d' -i configure.in
+ patch -p1 -i ../gtkglext-gcc8.patch # Fix build with GCC 8
- autoreconf --force --install
+ autoreconf -vi
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
./configure --prefix=/usr \
--disable-static
make
@@ -29,6 +36,6 @@
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
}
Added: gtkglext-gcc8.patch
===================================================================
--- gtkglext-gcc8.patch (rev 0)
+++ gtkglext-gcc8.patch 2018-06-05 20:51:06 UTC (rev 325954)
@@ -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