Fix building with libpng15 wrt #388255 by Roman Dobosz. Fix building with zlib >= 1.2.5.1-r1 (OF).

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

4 files changed, 35 insertions, 9 deletions

diff --git a/games-emulation/raine/ChangeLog b/games-emulation/raine/ChangeLog
index d684cbd84160..4cbd07e270a7 100644
--- a/games-emulation/raine/ChangeLog
+++ b/games-emulation/raine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/raine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/raine/ChangeLog,v 1.30 2011/06/16 10:11:03 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/raine/ChangeLog,v 1.31 2011/10/23 19:33:31 ssuominen Exp $
+
+  23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> raine-0.51.9.ebuild,
+  +files/raine-0.51.9-libpng15.patch:
+  Fix building with libpng15 wrt #388255 by Roman Dobosz. Fix building with
+  zlib >= 1.2.5.1-r1 (OF).
 
   16 Jun 2011; Tupone Alfredo <tupone@gentoo.org> raine-0.51.9.ebuild,
   +files/raine-0.51.9-underlink.patch:
diff --git a/games-emulation/raine/Manifest b/games-emulation/raine/Manifest
index 4269dc4627b2..2198ead20f3d 100644
--- a/games-emulation/raine/Manifest
+++ b/games-emulation/raine/Manifest
@@ -2,15 +2,20 @@
 Hash: SHA1
 
 AUX raine-0.51.9-ldflags.patch 436 RMD160 0cf6977551da16d352ccb3864e9657d73d67ec95 SHA1 d8d90f1b9a3f1eaa75df38e7b0f3a875ab711bbf SHA256 00a22c6a2c32f49dc1a5a68b167b7e12a76c9859a29ef4c1a0e8bc07bba23417
+AUX raine-0.51.9-libpng15.patch 296 RMD160 bb1787346229445ded3bf4d69d59a3dc49ff91a6 SHA1 91b35b49b43c711a9a8affe8ee7cf1228f9935a0 SHA256 36e0445bbf2874466a241fb48199a6df89e73b05d3f8adae964e96acdb7918e6
 AUX raine-0.51.9-underlink.patch 483 RMD160 f4db2e8011d5644984b06f85e3777757a12b32ab SHA1 1769b1eb6159205e44496aeda03025b92efd439a SHA256 dd87703c0c47064ca32f0bec652e61f8f03dd185ccf17c81e31e8e1def8085c7
 DIST raines-0.51.9.tar.bz2 2095980 RMD160 1b9bc3ac9488552549da45e19645f32f85ab6af2 SHA1 5bb7bce2e9bfb9a0fb4a89d35ca6fbb1ac719bf1 SHA256 6d58f36790025e53aa0897f21cef845b9355081fd75c9a5ce4ef96f275dd0427
-EBUILD raine-0.51.9.ebuild 1393 RMD160 69726c7a26cb61f1d3168a2d759428f66bd9120c SHA1 fb4cb156822ccde3a4fc57ba352a911929702644 SHA256 4801d301e4dbcd47dd5d5bb027335ba1b53e86e614fa24dcc06c4e89d0674120
-MISC ChangeLog 3639 RMD160 142b802b362a5a0719ca588bd37254d91589dccd SHA1 4954c6bd530c5f40de60ca0b3a1b0d957cbbece7 SHA256 168fcb7fdcedcc2e920cecc5c91388a5cf3a7e5b23c838ba4af0498148d275f7
+EBUILD raine-0.51.9.ebuild 1539 RMD160 fbedce02a7665a9f552f3b8f8386f9a9c0d0a999 SHA1 bd6334c1359fa0543f8f5f86e4838b2a20f76f7a SHA256 459caed1f16df87d9b8d8099c23f8fdb12abd1bfab6a98c525fcaa8f893df806
+MISC ChangeLog 3859 RMD160 6d500e1454277f2faed766a98b797a1b20b705a4 SHA1 9f5ad199d907984508cf5c3d8712ea4f06610abb SHA256 84fb773a47ec4baab3b4525918498101d740a295fac70e99290c6a8f6b5d8c8f
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk351sIACgkQIY77eQFFFC2N8ACfcZ7+R2CSdMSH08CQDoydb82k
-AScAn2/z5qWRkHIpmb9porduhnK+1V4m
-=ymT2
+iQEcBAEBAgAGBQJOpGvdAAoJEEdUh39IaPFNL9YIAI02AzaMk62hkdG+mRxrRzNU
+522IbtdmTHhIrvIzfxHDAbpYYoDI8KTYmSaJR6WPpfzMPU897EE+PA26wwQjsTjy
+3u+5yud1VKtWs7HiYIQH7kFv/GMqr+SAbdRCHnsjpCAUqghzXszMuKyq7+lTU30c
+LnVfPd3Q2ZBvPhdFxpMjAW7FdmfqhZ6DQH+5EEAX+K0Is53MTagMd1q95OXWLT/S
+xY/8Xt2yommezwIB/VbErnwAIJuAUIJ9BeEL8lxd31jnqgLXtkjTSZaHyxWp+uZJ
+XB7zL6yebqIB0vxIoivPZT5fbvibcwQGSyRE17pzV+fI9DiUA4Oc8tz7+Ko8frE=
+=Hvw4
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/raine/files/raine-0.51.9-libpng15.patch b/games-emulation/raine/files/raine-0.51.9-libpng15.patch
new file mode 100644
index 000000000000..675df24801dc
--- /dev/null
+++ b/games-emulation/raine/files/raine-0.51.9-libpng15.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/388255
+
+--- source/savepng.c
++++ source/savepng.c
+@@ -203,7 +203,7 @@
+ 	goto Error;
+ 
+     /* Set error handling. */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	/* If we get here, we had a problem reading the file. */
+ 	goto Error;
+     }
diff --git a/games-emulation/raine/raine-0.51.9.ebuild b/games-emulation/raine/raine-0.51.9.ebuild
index 39451b94bf99..bbf2b288e41e 100644
--- a/games-emulation/raine/raine-0.51.9.ebuild
+++ b/games-emulation/raine/raine-0.51.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/raine/raine-0.51.9.ebuild,v 1.4 2011/06/16 10:11:03 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/raine/raine-0.51.9.ebuild,v 1.5 2011/10/23 19:33:31 ssuominen Exp $
 
 EAPI=2
 inherit flag-o-matic eutils games
@@ -35,7 +35,10 @@ src_prepare() {
 		makefile \
 		|| die "sed failed"
 	epatch "${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-underlink.patch
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
+	has_version '>=sys-libs/zlib-1.2.5.1-r1' && \
+		sed -i -e '1i#define OF(x) x' source/mini-unzip/ioapi.h
 	append-ldflags -Wl,-z,noexecstack
 }