aboutsummaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2015-08-03 21:53:52 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commit3526bbc2b2b14e6bb68d210ebaa2064c4078ada0 (patch)
treeaa6864e1259c891e45d5e28be1e709fb76cab285 /games
parentcfe23600aa66f0de03eca388dab566551231f71b (diff)
games/supermariowar: Patched SlackBuild.
Fixes build failure due to libpng16 (-current). Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'games')
-rw-r--r--games/supermariowar/libpng.patch29
-rw-r--r--games/supermariowar/supermariowar.SlackBuild3
2 files changed, 32 insertions, 0 deletions
diff --git a/games/supermariowar/libpng.patch b/games/supermariowar/libpng.patch
new file mode 100644
index 0000000000000..1348cc548fc5c
--- /dev/null
+++ b/games/supermariowar/libpng.patch
@@ -0,0 +1,29 @@
+Index: _src/savepng.cpp
+===================================================================
+--- _src/savepng.cpp (revision 6)
++++ _src/savepng.cpp (working copy)
+@@ -94,7 +94,11 @@
+ }
+
+ /* Set error handling. */
++#if PNG_LIBPNG_VER > 10399
++ if (setjmp(png_jmpbuf(png_ptr)))
++#else
+ if (setjmp(png_ptr->jmpbuf))
++#endif
+ {
+ /* If we get here, we had a problem reading the file */
+ IMG_SetError("Error writing the PNG file");
+@@ -142,10 +146,10 @@
+ done:
+ if (row_pointers)
+ delete [] row_pointers;
+-
++#if PNG_LIBPNG_VER <= 10399
+ if (info_ptr->palette)
+ delete info_ptr->palette;
+-
++#endif
+ png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+
+
diff --git a/games/supermariowar/supermariowar.SlackBuild b/games/supermariowar/supermariowar.SlackBuild
index 416831766edad..e5dce1fd6196e 100644
--- a/games/supermariowar/supermariowar.SlackBuild
+++ b/games/supermariowar/supermariowar.SlackBuild
@@ -58,6 +58,9 @@ find -L . \
# Makefile hadn't been (so I had to parse the VC++ project file, ugh).
zcat $CWD/compilefixes.diff.gz | patch -p1
+# Patch for libpng16 (-current) thanks to Arch Linux
+patch -p0 < $CWD/libpng.patch
+
# the configure script isn't autoconf (yay), but it has CRLFs (boo)
sed -i 's,\r,,g' configure