Fix building with libpng15 wrt #380145 by Diego Elio Pettenò

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

4 files changed, 52 insertions, 7 deletions

diff --git a/games-engines/exult/ChangeLog b/games-engines/exult/ChangeLog
index a44c2160f4ff..f5d519641924 100644
--- a/games-engines/exult/ChangeLog
+++ b/games-engines/exult/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/exult
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.28 2011/01/20 21:21:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.29 2011/09/15 02:44:46 ssuominen Exp $
+
+  15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> exult-1.2.ebuild,
+  +files/exult-1.2-libpng15.patch:
+  Fix building with libpng15 wrt #380145 by Diego Elio Pettenò
 
 *exult-1.4.9_rc1 (20 Jan 2011)
 
diff --git a/games-engines/exult/Manifest b/games-engines/exult/Manifest
index 569eb5d95bd5..54194b1082d5 100644
--- a/games-engines/exult/Manifest
+++ b/games-engines/exult/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX exult-1.2-64bits.patch 591 RMD160 8674319c38bb9f06975e52494e00f8a4b5c47a96 SHA1 1a5d1db8212be32ed20cf0e41edbb137d6ed19ea SHA256 723cd3a9cc76909db45429192fb88c0cbb941eb10822a8acba7da87a370a5675
 AUX exult-1.2-gcc41.patch 1357 RMD160 c18a2bf589d106e265a543821502be55a9cdbe60 SHA1 7ad3d82641f1e3f355c7085cc3c7349e5687b008 SHA256 cee50e50c21e00d832552d659d08e4b985b84cbeb6ed07e32e0af8b71eee5c04
 AUX exult-1.2-gcc43.patch 3741 RMD160 b513b8e88f476b06aa2ecbbdd40d082996d8eb54 SHA1 e0542298b8136edf1666882804f3eee8bf3f27ff SHA256 4a4f224cd44c3250ac43ffaae1d0fae0a8a8a2d291ddcd9e4a053bceda36bf6a
 AUX exult-1.2-gcc44.patch 508 RMD160 7974d2f85a700c03f30943618f06bc68d4f8c087 SHA1 733a4f5be2b0db89191e130f73ebff0f35ddd4d8 SHA256 14148f3d74fb6e491bff4de7e8341e6c948765731f6c77b1ebdb98ac777953e4
 AUX exult-1.2-libpng14.patch 735 RMD160 ee989730f18baca4a66ebbdf9af337319e300a74 SHA1 37bbed12b3d7bd11ff781605fcc61ca787e5a828 SHA256 a2a2d6c97528d7cafa9cab4fe5e2aeadd92e9e1e35c6c6c26adbd8e641f6ca5c
+AUX exult-1.2-libpng15.patch 834 RMD160 e61246f2165d05a2032f1e86b2a0963e9d883e0e SHA1 09fa61a25f047778fa8fb4598cea57f891b6c5c4 SHA256 536105b801eb23b3f67742b91d569efeee8e8fd2ec4693ecca1521c0b1ce9d76
 AUX exult-1.2-x11link.patch 286 RMD160 426eb039f9becfbcad6d87cacef4b489e423d45b SHA1 bc76419d4a86d88fa3f3f26da29ae0c03ef4757b SHA256 c0b971e64fb04e8ec91fea77b530755aa9c448d1421bca176f56b5561c2ab308
 AUX exult-1.4.9_rc1-desktop.patch 485 RMD160 f0b58056fe28c916c94ad243de515ac173b31cb2 SHA1 e20c59b4f5ccaa6e81defcb2c7397b0424441a00 SHA256 3485ba9ba1834cd0d821474e4d7a728092d8b595f5603b493c0e8555aa1b3642
 DIST U7MusicOGG_1of2.zip 12614413 RMD160 2818c026664f6c8ef79201ea34a507091340fbb8 SHA1 50684766f3ca3eb33a777b752e904939a1470bd8 SHA256 ccf748b346345986b08355ae3bf21c72e3bfffe30ecf9f70fe10fdc8c573a503
@@ -11,7 +15,14 @@ DIST exult-1.2.tar.gz 1722259 RMD160 339231edf84507f05115ab3189875cb15be9c04f SH
 DIST exult-1.4.9rc1.tar.gz 5452640 RMD160 8c6fce2bc17ff59709c5827c5dd70f2e2a473914 SHA1 259f778d6b8b5e9c9466e2f4967b6352435b6792 SHA256 edadf2edb08595bdb7752adaae42b4d46c444be1a419102c22d04439a8500328
 DIST jmsfx.zip 4778572 RMD160 6998abd6cf42e2011c71bb4c39f651b3ccd103c4 SHA1 933678416679b8fd42240f8fe38fa3474dd65267 SHA256 6932a70e999a203fb478edc6c009ad331709b9d1a760316244b82b60f93b41b2
 DIST jmsfxsi.zip 6194646 RMD160 3d1badcda304c12d738f49bc9f559465620248eb SHA1 a8d546b44c81c49f0560f97a2e43d55c6444fd6b SHA256 be842ae046453ff969bd68516638cf9b66fc0395013c0b0350688f9dcb0e7f42
-EBUILD exult-1.2.ebuild 2925 RMD160 f880bc1b36b443d752b9ac0d083f15b18771b476 SHA1 311b93b6084cc732a4ba5c755519740617fd3e45 SHA256 2ec1d7b4deb47f674bae94425ee78a7d5d95c4ba87c4c526378b7b88ee0038b1
+EBUILD exult-1.2.ebuild 2955 RMD160 d10cf138e74c06f58dc460d22d5f9e9b03f4b404 SHA1 0f51eff87e39732970a067f0982ae9ef50d8f349 SHA256 047cd42859c3503d0008209b208904e426f5fb97bc6e5199a37e6a3448627211
 EBUILD exult-1.4.9_rc1.ebuild 2116 RMD160 63dbfdb9b18d3a1b7b9e07eb4583df44fd06e52e SHA1 9b19acb0d403373e481d190ac8230db3c0481576 SHA256 5099892d7e8e89eaebb87b587b8bbbfd07f8de7c2985f945518d5968c87b4d27
-MISC ChangeLog 3762 RMD160 200840bfc2af3cdd404358b4171ecff0372aef38 SHA1 7e1c73d32d2fdf510122f46a9adebceb9054be20 SHA256 eba37d16b2a18469f26d8e07a99bbfbd88a1c45adb57853b5735e1bd803e05fd
+MISC ChangeLog 3934 RMD160 c783bead43b4c7780417bf8144b7db2ce60d616d SHA1 0863fb9a1144d5c4cdf5fdce6c840acf2a5e5051 SHA256 4e13d6929ea4ef1c7e665e629562c81137ff9f172f517ce1bc648e797f1aa12d
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk5xZtYACgkQXkR9YqOcLPEdDQD/bvOUeX8EsE5rb0Tnz/edGaPF
+xHig+oD7puDyA+Ga3gsA/A/4OPUsFyAp4bMVbLRZlZ/mA9S7rn9BnvmVMNtvPvat
+=IOSE
+-----END PGP SIGNATURE-----
diff --git a/games-engines/exult/exult-1.2.ebuild b/games-engines/exult/exult-1.2.ebuild
index a911761463a3..1885043e7a93 100644
--- a/games-engines/exult/exult-1.2.ebuild
+++ b/games-engines/exult/exult-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.22 2010/05/17 10:36:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.23 2011/09/15 02:44:46 ssuominen Exp $
 
 EAPI=2
 inherit eutils autotools multilib games
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE="timidity zlib"
 
-RDEPEND=">=media-libs/libpng-1.2.43-r2:0
+RDEPEND=">=media-libs/libpng-1.4
 	media-libs/libsdl[audio,video,X]
 	media-libs/sdl-mixer[vorbis,timidity?]
 	timidity? ( >=media-sound/timidity++-2 )
@@ -48,7 +48,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-x11link.patch \
 		"${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
+		"${FILESDIR}"/${P}-libpng14.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
 	sed -i \
 		-e "s/u7siinstrics.data/u7siintrinsics.data/" \
 		usecode/ucxt/data/Makefile.am \
diff --git a/games-engines/exult/files/exult-1.2-libpng15.patch b/games-engines/exult/files/exult-1.2-libpng15.patch
new file mode 100644
index 000000000000..1577658ce6d6
--- /dev/null
+++ b/games-engines/exult/files/exult-1.2-libpng15.patch
@@ -0,0 +1,29 @@
+--- shapes/pngio.cc
++++ shapes/pngio.cc
+@@ -79,7 +79,7 @@
+ 		}
+ 					// Allocate info. structure.
+ 	png_infop info = png_create_info_struct(png);
+-	if (setjmp(png->jmpbuf))	// Handle errors.
++	if (setjmp(png_jmpbuf(png)))	// Handle errors.
+ 		{
+ 		png_destroy_read_struct(&png, &info, 0);
+ 		fclose(fp);
+@@ -208,7 +208,7 @@
+ 		}
+ 					// Allocate info. structure.
+ 	png_infop info = png_create_info_struct(png);
+-	if (setjmp(png->jmpbuf))	// Handle errors.
++	if (setjmp(png_jmpbuf(png)))	// Handle errors.
+ 		{
+ 		png_destroy_write_struct(&png, &info);
+ 		fclose(fp);
+@@ -306,7 +306,7 @@
+ 		}
+ 					// Allocate info. structure.
+ 	png_infop info = png_create_info_struct(png);
+-	if (setjmp(png->jmpbuf))	// Handle errors.
++	if (setjmp(png_jmpbuf(png)))	// Handle errors.
+ 		{
+ 		png_destroy_read_struct(&png, &info, 0);
+ 		fclose(fp);