diff options
| author | David Spencer <baildon.research@googlemail.com> | 2015-08-03 21:53:52 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-17 09:40:16 +0700 |
| commit | 3526bbc2b2b14e6bb68d210ebaa2064c4078ada0 (patch) | |
| tree | aa6864e1259c891e45d5e28be1e709fb76cab285 | |
| parent | cfe23600aa66f0de03eca388dab566551231f71b (diff) | |
| download | slackbuilds-3526bbc2b2b14e6bb68d210ebaa2064c4078ada0.tar.gz | |
games/supermariowar: Patched SlackBuild.
Fixes build failure due to libpng16 (-current).
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | games/supermariowar/libpng.patch | 29 | ||||
| -rw-r--r-- | games/supermariowar/supermariowar.SlackBuild | 3 |
2 files changed, 32 insertions, 0 deletions
diff --git a/games/supermariowar/libpng.patch b/games/supermariowar/libpng.patch new file mode 100644 index 0000000000..1348cc548f --- /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 416831766e..e5dce1fd61 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 |