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

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

4 files changed, 52 insertions, 5 deletions

diff --git a/games-arcade/criticalmass/ChangeLog b/games-arcade/criticalmass/ChangeLog
index e253b0e68f66..4bdafbc5c959 100644
--- a/games-arcade/criticalmass/ChangeLog
+++ b/games-arcade/criticalmass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/criticalmass
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/ChangeLog,v 1.23 2011/09/13 18:59:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/ChangeLog,v 1.24 2011/09/17 16:20:45 ssuominen Exp $
+
+  17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+  criticalmass-1.0.2.ebuild, +files/criticalmass-1.0.2-libpng15.patch:
+  Fix building with libpng15 wrt #383207 by Diego Elio Pettenò
 
   13 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org>
   criticalmass-1.0.0-r1.ebuild, criticalmass-1.0.2.ebuild:
diff --git a/games-arcade/criticalmass/Manifest b/games-arcade/criticalmass/Manifest
index aa82f3195277..b8ad164ed071 100644
--- a/games-arcade/criticalmass/Manifest
+++ b/games-arcade/criticalmass/Manifest
@@ -1,13 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX criticalmass-1.0.0-gcc43.patch 3150 RMD160 b7071775f419ceecd2b138d8a1009697c819a090 SHA1 9ad1a20872759453a2fdf6bd3c7ce80df5121f72 SHA256 a7f74c031aa03fa2a4dd522b4c289f7b992e045b498e71700aed88aea397459c
 AUX criticalmass-1.0.0-libpng14.patch 445 RMD160 a50541521001c8f14f8ccdab54b53baba3f8c5b2 SHA1 5ec3fe2e2e575f51b4576c502da3a3658d7099c9 SHA256 7f20895eceb0caafb3bd7315b99080731647677c7b938e512625b3b9885dfaf3
 AUX criticalmass-1.0.0-system_curl.patch 964 RMD160 31f28f327e78142404ff9d1daee845af1bf5f6fa SHA1 cbaa1ea3a8c98e65c99f05e5a973a938c48f21c2 SHA256 0fc918bea78df003ba37370a83fc349bfec6d191959c0d443c1e33df96be409d
 AUX criticalmass-1.0.2-cflags.patch 864 RMD160 c5525b3d4f3ba01f4ee77f3e11b45f64f8d7d512 SHA1 d22974b312b366fea3b6d7f9428024f7cd451269 SHA256 e6c6698fc2ae2b96c2db6409de004adead248b5aa51e6a789a7e3dd0b978d035
 AUX criticalmass-1.0.2-gcc43.patch 3150 RMD160 b7071775f419ceecd2b138d8a1009697c819a090 SHA1 9ad1a20872759453a2fdf6bd3c7ce80df5121f72 SHA256 a7f74c031aa03fa2a4dd522b4c289f7b992e045b498e71700aed88aea397459c
 AUX criticalmass-1.0.2-libpng14.patch 445 RMD160 a50541521001c8f14f8ccdab54b53baba3f8c5b2 SHA1 5ec3fe2e2e575f51b4576c502da3a3658d7099c9 SHA256 7f20895eceb0caafb3bd7315b99080731647677c7b938e512625b3b9885dfaf3
+AUX criticalmass-1.0.2-libpng15.patch 678 RMD160 cb9459a932f9dd5cb08a503787ab9d1a188e5b42 SHA1 0db296f86860bacb18ca7337ba5d1efd10f78495 SHA256 fcf92674547fa96389d64df2612906a2aac7d82ef19fb01b4665def32a518585
 AUX criticalmass-1.0.2-system_curl.patch 964 RMD160 31f28f327e78142404ff9d1daee845af1bf5f6fa SHA1 cbaa1ea3a8c98e65c99f05e5a973a938c48f21c2 SHA256 0fc918bea78df003ba37370a83fc349bfec6d191959c0d443c1e33df96be409d
 DIST CriticalMass-1.0.0.tar.bz2 5092549 RMD160 33c7b60f1cb3cf6e887fe4bbc99928b17f97c047 SHA1 ce0de4fa9259f0586f8dfa7ee96978da21e57335 SHA256 94cedac39f9279faa63f6ce4098f2a778a8c8f9013ba8dd7d5b85766739e0858
 DIST CriticalMass-1.0.2.tar.bz2 5122126 RMD160 6c0b6988f6a52c4b19fbca2525b1daec0202693d SHA1 d2d1f35183e9fbed76fd8da2a948745a4c89f20b SHA256 846db2d30d39e559612328594084a7aef980169948b2cfaee9fddec8ffdef724
 EBUILD criticalmass-1.0.0-r1.ebuild 1283 RMD160 664f9666978becd6e8a9c9b52535b5d5733c203e SHA1 f5cc187bb83062681ccb2fad05856a2d492cfbf5 SHA256 55373b402149a5e5c5bda6faa3a937859e633df68251187a7e1aa91f453e0a0c
-EBUILD criticalmass-1.0.2.ebuild 1294 RMD160 86ba59d1a3d4705842d478f6edc34be1f6a3f4f3 SHA1 ba95a7c7874ec49f10356e76d5c242a5cc0177c0 SHA256 f523ec31b3993dae17e9b5dca6cc8956faaffbb5376b98397dea30979c855c03
-MISC ChangeLog 4700 RMD160 4ce6f994c5fcc0a825248310f16d6ae7bc7ba1b6 SHA1 4488e7a1788ce9b7346b7e97bff71792360a72cd SHA256 6811150652f98ec087fb77b257024b1f4db7d467ba0bc8b7cf462592b487cc65
+EBUILD criticalmass-1.0.2.ebuild 1332 RMD160 a5cd2968c07b44591b8d55f47d4bc130e0d920e5 SHA1 1f40dc42a052a760b8dd5f8e73a0174ca8453c16 SHA256 47d3cee42ef6c6fc9c813f76cdbb97b642b01fd9d386fa254d7caa47ae07c21d
+MISC ChangeLog 4890 RMD160 6a302d84853fa59395ad1a108cce82a4c014d634 SHA1 e4a6b83430946bbb1efcb12b1822aa30fecbe740 SHA256 963776ab4bad2b1230a9d00de5c4af6c178a06090b70ba482af300d76db4751b
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk50yRkACgkQXkR9YqOcLPGPCQD/RxP9HTVZwGsRgTCh5aGQImLo
+5i6umLM2k8gk1ysgK6MBAIKPdklUwQkUgV77d8L5Iy/PNRAvdKIthA4ZyrMcqjyK
+=HpK5
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/criticalmass/criticalmass-1.0.2.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2.ebuild
index e37d23809011..0396588b5aa1 100644
--- a/games-arcade/criticalmass/criticalmass-1.0.2.ebuild
+++ b/games-arcade/criticalmass/criticalmass-1.0.2.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-arcade/criticalmass/criticalmass-1.0.2.ebuild,v 1.4 2011/09/13 18:59:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/criticalmass-1.0.2.ebuild,v 1.5 2011/09/17 16:20:45 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -26,7 +26,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-system_curl.patch \
 		"${FILESDIR}"/${P}-libpng14.patch \
-		"${FILESDIR}"/${P}-cflags.patch
+		"${FILESDIR}"/${P}-cflags.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
 	rm -rf curl
 	eautoreconf
 }
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
new file mode 100644
index 000000000000..ac1b8c0c617f
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
@@ -0,0 +1,31 @@
+--- game/main.cpp
++++ game/main.cpp
+@@ -28,6 +28,8 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ 
++#include <zlib.h>
++
+ void migrateConfig( void)
+ {
+     //if onlineCheck is not set, default it to true
+--- utilssdl/PNG.cpp
++++ utilssdl/PNG.cpp
+@@ -45,7 +45,7 @@
+ {
+     png_size_t check;
+ 
+-    check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
++    check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
+     if( check != length)
+     {
+ 	png_error( png, "Write Error");
+@@ -72,7 +72,7 @@
+ 	return false;
+     }
+ 
+-    if( setjmp(_png->jmpbuf))
++    if( setjmp(png_jmpbuf(_png)))
+     {
+ 	fclose( fp);
+ 	png_destroy_write_struct(&_png, (png_infopp)NULL);