aboutsummaryrefslogtreecommitdiff
path: root/games/supermariowar
diff options
context:
space:
mode:
authorDavid Spencer <idlemoor@slackbuilds.org>2016-01-24 23:44:02 +0000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-26 18:58:51 +0700
commitb996d855ce15548f534707471aeea4b57423a7f5 (patch)
tree92ad151702fe7a2096e5e74f13335ec3d14e183f /games/supermariowar
parent70a05a4e1f7ace4b8a42dbb19a3411bc8f4caece (diff)
games/supermariowar: Fixed patch.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'games/supermariowar')
-rw-r--r--games/supermariowar/libpng.patch29
-rw-r--r--games/supermariowar/libpng.patch.gzbin0 -> 391 bytes
-rw-r--r--games/supermariowar/supermariowar.SlackBuild3
3 files changed, 2 insertions, 30 deletions
diff --git a/games/supermariowar/libpng.patch b/games/supermariowar/libpng.patch
deleted file mode 100644
index 1348cc548fc5..000000000000
--- a/games/supermariowar/libpng.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/libpng.patch.gz b/games/supermariowar/libpng.patch.gz
new file mode 100644
index 000000000000..84c6a45a334f
--- /dev/null
+++ b/games/supermariowar/libpng.patch.gz
Binary files differ
diff --git a/games/supermariowar/supermariowar.SlackBuild b/games/supermariowar/supermariowar.SlackBuild
index e5dce1fd6196..1e6ed1f61f0f 100644
--- a/games/supermariowar/supermariowar.SlackBuild
+++ b/games/supermariowar/supermariowar.SlackBuild
@@ -59,7 +59,8 @@ find -L . \
zcat $CWD/compilefixes.diff.gz | patch -p1
# Patch for libpng16 (-current) thanks to Arch Linux
-patch -p0 < $CWD/libpng.patch
+# (this is gzipped to preserve CRLF line endings)
+zcat $CWD/libpng.patch.gz | patch -p0
# the configure script isn't autoconf (yay), but it has CRLFs (boo)
sed -i 's,\r,,g' configure