diff options
| author |   Matteo Bernardini | 2019-02-21 09:10:42 +0100 |
|---|---|---|
| committer | Matteo Bernardini | 2019-08-10 07:12:01 +0200 |
| commit | e04c0a9b6adae824b1069aba74ae37d9d29b0db2 (patch) | |
| tree | 593ee463425ff840c78056e001b65db5b5effc92 | |
| parent | 4b75a86e141dc33934610bafa3feef16dd33e1b3 (diff) | |
| download | slackbuilds-gtkglext.tar.gz | |
libraries/gtkglext: Patch for a conflicting definition.gtkglext
Avoid problems with the newer gtk-doc
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
| -rw-r--r-- | libraries/gtkglext/0002-GCC-8-fixes.patch | 34 | ||||
| -rw-r--r-- | libraries/gtkglext/gtkglext.SlackBuild | 3 |
2 files changed, 36 insertions, 1 deletions
diff --git a/libraries/gtkglext/0002-GCC-8-fixes.patch b/libraries/gtkglext/0002-GCC-8-fixes.patch new file mode 100644 index 0000000000..266f5fefc1 --- /dev/null +++ b/libraries/gtkglext/0002-GCC-8-fixes.patch @@ -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 + diff --git a/libraries/gtkglext/gtkglext.SlackBuild b/libraries/gtkglext/gtkglext.SlackBuild index 4aa77fbbfe..b95332a485 100644 --- a/libraries/gtkglext/gtkglext.SlackBuild +++ b/libraries/gtkglext/gtkglext.SlackBuild @@ -72,6 +72,8 @@ find -L . \ # Don't disable deprecated stuff patch -p1 < $CWD/gtkglext-no-deprecated-flags.patch +# From fedora - conflicting definition +patch -p1 < $CWD/0002-GCC-8-fixes.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -79,7 +81,6 @@ CXXFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --disable-static \ - --enable-gtk-doc \ --enable-debug=no \ --build=$ARCH-slackware-linux |