summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2016-01-14 17:43:09 -0500
committerMichael Sterrett <mr_bones_@gentoo.org>2016-01-15 14:33:30 -0500
commit3274f359229667e7774af70e956cac3a81b58920 (patch)
treee67d1bef95a45ef6213ba003296b123eb9c29ee3 /games-sports
parentdev-lang/cilk: add -std=gnu89 to CFLAGS to restore pre-GCC5 semantics (diff)
downloadgentoo-3274f359229667e7774af70e956cac3a81b58920.tar.gz
gentoo-3274f359229667e7774af70e956cac3a81b58920.tar.bz2
gentoo-3274f359229667e7774af70e956cac3a81b58920.zip
games-sports/gracer: fix building against latest giflib (bug #571936)
Package-Manager: portage-2.2.26
Diffstat (limited to 'games-sports')
-rw-r--r--games-sports/gracer/files/gracer-0.1.5-giflib.patch14
-rw-r--r--games-sports/gracer/files/gracer-0.1.5-warnings.patch21
-rw-r--r--games-sports/gracer/gracer-0.1.5.ebuild4
3 files changed, 38 insertions, 1 deletions
diff --git a/games-sports/gracer/files/gracer-0.1.5-giflib.patch b/games-sports/gracer/files/gracer-0.1.5-giflib.patch
new file mode 100644
index 00000000000..2d62b8c2082
--- /dev/null
+++ b/games-sports/gracer/files/gracer-0.1.5-giflib.patch
@@ -0,0 +1,14 @@
+--- gracer-0.1.5.orig/common/gr_texture.c
++++ gracer-0.1.5/common/gr_texture.c
+@@ -274,7 +274,11 @@
+ int index;
+ int width, height;
+
++#if (GIFLIB_MAJOR >= 5&& !(GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0))
++ file = DGifOpenFileName (filename, &i);
++#else
+ file = DGifOpenFileName (filename);
++#endif
+ if (!file)
+ return -1;
+
diff --git a/games-sports/gracer/files/gracer-0.1.5-warnings.patch b/games-sports/gracer/files/gracer-0.1.5-warnings.patch
new file mode 100644
index 00000000000..5886ef763f3
--- /dev/null
+++ b/games-sports/gracer/files/gracer-0.1.5-warnings.patch
@@ -0,0 +1,21 @@
+--- gracer-0.1.5.orig/src/glbind.c
++++ gracer-0.1.5/src/glbind.c
+@@ -142,7 +142,7 @@
+ return NULL;
+
+ entry = Tcl_FindHashEntry (&cache_hash, key);
+- if (&entry)
++ if (!entry)
+ return NULL;
+
+ return Tcl_GetHashValue (entry);
+--- gracer-0.1.5.orig/src/joystick.c
++++ gracer-0.1.5/src/joystick.c
+@@ -20,6 +20,7 @@
+ */
+
+ #include <unistd.h>
++#include <string.h>
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
diff --git a/games-sports/gracer/gracer-0.1.5.ebuild b/games-sports/gracer/gracer-0.1.5.ebuild
index 46a3f671882..4fa9e7a4220 100644
--- a/games-sports/gracer/gracer-0.1.5.ebuild
+++ b/games-sports/gracer/gracer-0.1.5.ebuild
@@ -34,7 +34,9 @@ src_prepare() {
"${FILESDIR}/${P}"-gcc41.patch \
"${FILESDIR}"/${P}-as-needed.patch \
"${FILESDIR}"/${P}-libpng14.patch \
- "${FILESDIR}"/${P}-png15.patch
+ "${FILESDIR}"/${P}-png15.patch \
+ "${FILESDIR}"/${P}-giflib.patch \
+ "${FILESDIR}"/${P}-warnings.patch
}
src_configure() {