1
0
forked from ports/contrib

gtkglext: ->

This commit is contained in:
Danny Rawlins 2018-08-07 23:46:16 +10:00
parent 2e432cae1c
commit eabc6e64c7
4 changed files with 45 additions and 9 deletions

View File

@ -1,2 +0,0 @@
e5a87ec3f2d0e616c6f32f90c3f7237f gtk2.20.patch
5c3240bfc1b21becd33ce35c5abe6f8d gtkglext-1.2.0.tar.gz

View File

@ -1,6 +1,7 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3ws6zXVS4oK/IkESjAMH10feidQJUXZmBFbb/eRW9ZJ+Sg+Zk8+1ORZYsDcX15CIYjzfJWSSCDIrr3ZAD+r1mwM=
SHA256 (Pkgfile) = ec871deb1d545ae713c5251369484bdd558ac7d1f6758ae7054cf44cf404090e
RWSagIOpLGJF34X9pRXxsECDQbYqm7YBI8rhJ+G7UAklzLml5OCMPmKmw0B9NZ/PutFbRgnZfvufZC2F3eK9+ULydzfmkIA9JAc=
SHA256 (Pkgfile) = 709d60d68ccede9b168a0c0306f8fdc38495d3fbe5e58393a6dc11d4a1bcac09
SHA256 (.footprint) = 622c3704b31ae9ab61cdafb37336b39c5b715f034ef67a8ecf16d5bb5fd68aad
SHA256 (gtkglext-1.2.0.tar.gz) = e5073f3c6b816e7fa67d359d9745a5bb5de94a628ac85f624c992925a46844f9
SHA256 (gtk2.20.patch) = 864c6963c4a2f4f69f1f028ecee6c821a4f4d5aba142f2e07898aede825ce9ea
SHA256 (gtkglext-gcc8.patch) = 0ec0c22b15054b0684f9a9015ff05920af0c00dae5409e76321f683dcc17cff9

View File

@ -1,20 +1,23 @@
# Description: OpenGL extension to GTK 2.0.
# URL: https://projects.gnome.org/gtkglext/
# Maintainer: Danny Rawlins, crux at romster dot me
# Packager: Jay Dolan, jdolan at jdolan dot dyndns dot org
# Depends on: glu gtk pangox-compat xorg-libxmu
name=gtkglext
version=1.2.0
release=2
source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz
gtk2.20.patch)
release=3
source=(https://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz
gtk2.20.patch
gtkglext-gcc8.patch)
build() {
cd $name-$version
patch -Np1 -i $SRC/gtk2.20.patch
patch -p1 -i $SRC/gtk2.20.patch
sed '/AC_PATH_XTRA/d' -i configure.in
patch -p1 -i $SRC/gtkglext-gcc8.patch
autoreconf -vi
./configure \
--prefix=/usr \

View File

@ -0,0 +1,34 @@
From 1fe275cd7dfa9f3a6db771b0cb945d96787e72cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@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