Add libpng-1.5 patch for 356851.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 39 insertions, 10 deletions

diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index 2390be5e3f84..14ba866c5fc3 100644
--- a/games-rpg/eternal-lands/ChangeLog
+++ b/games-rpg/eternal-lands/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/eternal-lands
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.55 2010/12/30 22:56:18 rich0 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.56 2011/03/19 19:33:05 rich0 Exp $
+
+  19 Mar 2011; Richard Freeman <rich0@gentoo.org>
+  eternal-lands-1.9.1.ebuild, +files/eternal-lands-1.9.1-libpng.patch:
+  Add libpng-1.5 patch for 356851.
 
 *eternal-lands-1.9.1 (30 Dec 2010)
 
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 56a309a53675..06b1d823d7d2 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -2,19 +2,20 @@
 Hash: SHA1
 
 AUX eternal-lands-1.9.0-glext.patch 302 RMD160 81702799ee5b06ed43e6a858c48fd36ab8450a8f SHA1 4281701bf4b1c87ca54f0f0476e524335c461b9b SHA256 696da44a3c5064881f738cc08af05a9e0aa9ae80c342b1d04170459f3834f016
+AUX eternal-lands-1.9.1-libpng.patch 604 RMD160 65e1c768de9f4633726c2bdce7dba5de7c2d29cb SHA1 3040914f67e91b9f85afdf382f19b039e1163c07 SHA256 a60bd9a16aa965e451a747bd43a5650af9d62b53a2e6fae93a6b3d94b2357e60
 DIST elc_1.9.0-20100717.tar.bz2 2107100 RMD160 d7e9c587e981dd039788ce9ab48c54005f5e2d4d SHA1 3548f6f02ffcdbade4b8b4b24928c7353a043574 SHA256 1a1181ef0c3091120600187da3d7eb23553647790ba6f8b9aca3130630539747
 DIST elc_1.9.0.tar.bz2 2103257 RMD160 2ac719cc14c301a33ce114ba5fec7cbe8424957f SHA1 c999fdd8cbacd85554ef36a264469b5eb4ffd988 SHA256 afb582046a01f95ed0f3164144caa7347065b3e99beb7c01bf06f496092edbe4
 DIST elc_1.9.1-20101230.tar.bz2 2118968 RMD160 6dd822195e35a0756cc49145d96d54b086a4e1d3 SHA1 338363a022f5ae497f6ed798f53dcaea8bcabb95 SHA256 8936a478210e2314053576158ffb221510704d5816a635f4faedc007d79a7262
 DIST eternal-lands.png 9955 RMD160 2f9c8acd96214577cf8b8027f0d20fb1fe7574ff SHA1 34ee1c154178090f45ca171509f8ba00d26d6a21 SHA256 dd7d45cd9948fe7875ebd0bfcd1925d9b34e7606a223faf61d37a6dd2cd433fb
 EBUILD eternal-lands-1.9.0.ebuild 3969 RMD160 e1832d432a2e370503629b3c207b78fab5d8ad75 SHA1 cec8e0bbe9c962df9a292093111815b75d8493a7 SHA256 a7906a80e30e56f56f4b29595ac62a15abff7e350ca6a89c4d5ae98b2bbd7b5f
 EBUILD eternal-lands-1.9.0_p20100717.ebuild 3988 RMD160 ef3c64e5e393f73791facffed4af0d5d2e44b51a SHA1 1f09a17b2f94b1880274d0de08229a3e592df02d SHA256 7dc78ac38ed026ba471a8b48bbffb5543531c1c41824b8b2e2db043dff8e716d
-EBUILD eternal-lands-1.9.1.ebuild 3978 RMD160 ce6eb6cef4c9f8411e3a49d758559c091997bf0c SHA1 7c531e78034b3afa47f1ccc60965eea98cf95eed SHA256 54d7e4354cdd1ae805674e9b844398f175938b823ea721aaff10972b0cb6c975
-MISC ChangeLog 10130 RMD160 6b4d5dc01df42b4b4f837bce9c3e0ebacaf565c5 SHA1 84ba50331e0a55362917fb6df8440a86efafb445 SHA256 a7a9156f46dd7ebadf392a32149ec09e79d585c21b1556d6fc18dadf0c79110b
+EBUILD eternal-lands-1.9.1.ebuild 4025 RMD160 0894df3f3aa7ae92880562dcabbddf00274dd864 SHA1 ec6918014b32fe7ce4b78c4976ce616b61130114 SHA256 9777e6aabe2ff4408f73b45607a3a959cbaab1f29debc72f1e555126004cbfab
+MISC ChangeLog 10287 RMD160 d0e2a8bbe3d8cc7d811b2ad0bf38aa95b7ba39ec SHA1 3df5e1de8b60f6820af1583451f7521ba575b496 SHA256 862aa52648c8548f3914857845abb0196eb683cc564588aac2425317a7b401e6
 MISC metadata.xml 366 RMD160 ccbe7a2729da6681a8dbcd3d7ea23add0ff18c65 SHA1 667cc0ff9d3cc004febdc7e34903e6d81ad2c68d SHA256 3d87566ab1a097e5e331a2238ddb230fe2e5eb2b7097744a2aa609abf0d90732
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0dDhsACgkQG4/rWKZmVWn55gCgo/4lqE7MHwJLebaF6OlUI7a2
-F54AoI33nixDdm07EkPfLi3tXFZdGzC5
-=HZ6T
+iEYEARECAAYFAk2FBR0ACgkQG4/rWKZmVWmIFwCgz/OHe9Y/jOQYhcYKu7OnuY4R
+Kl8AoIBC6EEYve9AS2LbBuAEQ/ZVyleK
+=hYR7
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.1.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.1.ebuild
index 87d9838aaa7a..8640f7103bde 100644
--- a/games-rpg/eternal-lands/eternal-lands-1.9.1.ebuild
+++ b/games-rpg/eternal-lands/eternal-lands-1.9.1.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-rpg/eternal-lands/eternal-lands-1.9.1.ebuild,v 1.1 2010/12/30 22:56:18 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.9.1.ebuild,v 1.2 2011/03/19 19:33:05 rich0 Exp $
 
 EAPI=2
 inherit eutils flag-o-matic games
@@ -101,6 +101,7 @@ src_prepare() {
 	cp Makefile.linux Makefile
 
 	epatch "${FILESDIR}/${PN}-1.9.0-glext.patch"
+	epatch "${FILESDIR}/${PN}-1.9.1-libpng.patch"
 }
 
 src_compile() {
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.1-libpng.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.1-libpng.patch
new file mode 100644
index 000000000000..953ab8ffefd7
--- /dev/null
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.1-libpng.patch
@@ -0,0 +1,23 @@
+--- elc.orig/misc.c
++++ elc/misc.c
+@@ -311,7 +311,7 @@ int IMG_SavePNG_RW (SDL_Surface *face, S
+ 	}
+ 	
+ 	/* 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 */
+ 		IMG_SetError("Error writing the PNG file");
+@@ -360,10 +360,7 @@ done:
+ 	if (row_pointers != NULL)
+ 		free (row_pointers);
+ 	
+-	if (info_ptr != NULL && info_ptr->palette != NULL)
+-		free (info_ptr->palette);
+-	
+-	png_destroy_write_struct (&png_ptr, (png_infopp)NULL);
++	png_destroy_write_struct (&png_ptr, &info_ptr);
+ 	
+ 	return result;
+ }