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

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

4 files changed, 49 insertions, 10 deletions

diff --git a/games-roguelike/crossfire-client/ChangeLog b/games-roguelike/crossfire-client/ChangeLog
index c63c07555fb6..64267457f7ed 100644
--- a/games-roguelike/crossfire-client/ChangeLog
+++ b/games-roguelike/crossfire-client/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-roguelike/crossfire-client
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.26 2011/08/07 06:45:58 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.27 2011/09/15 03:01:36 ssuominen Exp $
+
+  15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+  crossfire-client-1.12.0.ebuild,
+  +files/crossfire-client-1.12.0-libpng15.patch:
+  Fix building with libpng15 wrt #378409 by Diego Elio Pettenò
 
   07 Aug 2011; Christoph Mende <angelos@gentoo.org>
   crossfire-client-1.12.0.ebuild,
diff --git a/games-roguelike/crossfire-client/Manifest b/games-roguelike/crossfire-client/Manifest
index 8d8b4e5d147c..a85c1bec4ae8 100644
--- a/games-roguelike/crossfire-client/Manifest
+++ b/games-roguelike/crossfire-client/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA256
 
 AUX crossfire-client-1.12.0-curl-headers.patch 312 RMD160 51a90a8790210a89bb1a07f6853c3ee3af99ae45 SHA1 4fe8d1ff55b934b120284e4f923602d527af239c SHA256 f8756577998ffd2dae37420c6c6841e998ae7eaaa9e2c537ef648db3e7e9db68
+AUX crossfire-client-1.12.0-libpng15.patch 864 RMD160 a36cd7a329746dcdaa1ebc9177e34d1e6f7797f5 SHA1 6eab6542c9c703f955a06d32b011f03a97a2bc3c SHA256 4420de57673ce891712a03d243a12dc9fb27061b9aac6143b67741f04771b9a6
 AUX crossfire-client-1.12.0-lua.patch 568 RMD160 86ff822514108c82ed63e0ec1a112f7ded3967e5 SHA1 4b4dc514739d0dd0586c2f691d0a845967008ad9 SHA256 b1d02cb6e6b179696aa7b49b41761d2a309aba18c001739d56e06dac95978904
 AUX crossfire-client-1.12.0-underlink.patch 474 RMD160 ef1d54f58c5f6f76375433c7d53dda28e6195686 SHA1 0f9a47a06f3e735169f8011e955763f64d803ac8 SHA256 fcf7c9db26027f25ef2b532cd9555deed5d512776c429b669ceb6e95f968e3d0
 DIST crossfire-client-1.12.0.tar.bz2 823766 RMD160 21568bab022a4b3cdf4115f33fcfb1c8da0d2363 SHA1 7ec3db117084164cee7b9a42291874b4a7240662 SHA256 cfdbc11d06f00d53bde9620ed0a13b5fd54fc7fec4d11b4beaf2146c3cedf227
-EBUILD crossfire-client-1.12.0.ebuild 1697 RMD160 3bd83180a922429404be7180c3d63dab8bf4374f SHA1 3e747990beff89f280fd206d66a8ede1124c8a72 SHA256 bf5d793ce46ac7f2d6059c6638cd958ef054385cde7cb39ae0a062fc89546217
-MISC ChangeLog 4856 RMD160 dbb4c161371fa091f012b0be1434675c607e6a53 SHA1 42ac71eb6d47010e367df743ffb09b08bd6df80d SHA256 be02b4004a1088d0a59eba31dc16a32dbae7db9ed7f00a17a51d0462b27577fb
+EBUILD crossfire-client-1.12.0.ebuild 1741 RMD160 70b55f418024d153a452cf2c6721e73844a912dd SHA1 8c9f2524de86442db2fd550630b3b7155003f681 SHA256 25a1c186abc2d9b6a7227ba9798a10ad1550342084c751dee71c030e93eb72e4
+MISC ChangeLog 5060 RMD160 6e7324ba5798fc07b9c863c23717f294317b0ecb SHA1 4a7ea999ae14669f19c4e92a0098ca72b9e6eaef SHA256 a46e14886cc28dd78d5690e470deed5bb32ab352fcf9e4b3511c3c5ccf8aebdd
 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)
 
-iF4EAREIAAYFAk4+NJIACgkQmWq1bYTyC0OT2QEAiqtQ1Lps53D4F4qpRjdRGuOR
-7dw8p7MZTOm+JoO5A6MA/3iftgpvFbcUJMCsmQozsAp1EcICCD9gxVc2saG2T7CY
-=AiSU
+iF4EAREIAAYFAk5xasgACgkQXkR9YqOcLPHx7QD/QZNymnHbUBuMN2tYChYJUJDB
+RacjuhU5j58eNKX1TjUBAKq2xrhgaA5k1dVV4vJq/GgQQ7MeomjQRsvy01N1bxoP
+=Npmv
 -----END PGP SIGNATURE-----
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild
index daa676c5fdb5..de2d61af6252 100644
--- a/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild
+++ b/games-roguelike/crossfire-client/crossfire-client-1.12.0.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-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild,v 1.7 2011/08/07 06:45:58 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild,v 1.8 2011/09/15 03:01:36 ssuominen Exp $
 
 EAPI=2
 inherit eutils autotools games
@@ -30,9 +30,11 @@ src_prepare() {
 		-r '/^.TH/s:$: 6:' \
 		$(find . -name "*man") \
 		|| die "sed failed"
-	epatch "${FILESDIR}/${P}-lua.patch" \
+	epatch \
+		"${FILESDIR}"/${P}-lua.patch \
 		"${FILESDIR}"/${P}-underlink.patch \
-		"${FILESDIR}"/${P}-curl-headers.patch
+		"${FILESDIR}"/${P}-curl-headers.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
 	eautoreconf
 }
 
diff --git a/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-libpng15.patch b/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-libpng15.patch
new file mode 100644
index 000000000000..c5644e80bfe5
--- /dev/null
+++ b/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-libpng15.patch
@@ -0,0 +1,31 @@
+--- gtk-v2/src/png.c
++++ gtk-v2/src/png.c
+@@ -571,7 +571,7 @@
+         png_destroy_read_struct (&png_ptr, NULL, NULL);
+         return PNGX_OUTOFMEM;
+     }
+-    if (setjmp (png_ptr->jmpbuf)) {
++    if (setjmp (png_jmpbuf(png_ptr))) {
+         png_destroy_read_struct (&png_ptr, &info_ptr,NULL);
+         return PNGX_DATA;
+     }
+--- x11/png.c
++++ x11/png.c
+@@ -88,7 +88,7 @@
+ 	png_destroy_read_struct (&png_ptr, NULL, NULL);
+ 	return NULL;
+     }
+-    if (setjmp (png_ptr->jmpbuf)) {
++    if (setjmp (png_jmpbuf(png_ptr))) {
+ 	png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
+ 	return NULL;
+     }
+@@ -600,7 +600,7 @@
+ 	png_destroy_read_struct (&png_ptr, NULL, NULL);
+ 	return PNGX_OUTOFMEM;
+     }
+-    if (setjmp (png_ptr->jmpbuf)) {
++    if (setjmp (png_jmpbuf(png_ptr))) {
+ 	png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
+ 	return PNGX_DATA;
+     }