Build with media-libs/libpng-1.5 Bug #380633

Package-Manager: portage-2.1.10.15/cvs/Linux i686

4 files changed, 43 insertions, 7 deletions

diff --git a/games-arcade/xbubble/ChangeLog b/games-arcade/xbubble/ChangeLog
index 83a6423554d7..5dddc19c685c 100644
--- a/games-arcade/xbubble/ChangeLog
+++ b/games-arcade/xbubble/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/xbubble
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xbubble/ChangeLog,v 1.13 2010/03/09 21:22:50 mr_bones_ Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xbubble/ChangeLog,v 1.14 2011/09/14 08:11:24 tupone Exp $
+
+  14 Sep 2011; Tupone Alfredo <tupone@gentoo.org> xbubble-0.5.8.ebuild,
+  +files/xbubble-0.5.8-png15.patch:
+  Build with media-libs/libpng-1.5 Bug #380633 by Diego Elio Pettenò
 
   09 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> xbubble-0.5.8.ebuild:
   EAPI=2
diff --git a/games-arcade/xbubble/Manifest b/games-arcade/xbubble/Manifest
index 12d92095a127..bbe62771e9c9 100644
--- a/games-arcade/xbubble/Manifest
+++ b/games-arcade/xbubble/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xbubble-0.5.8-libpng14.patch 415 RMD160 ac4530045df74b8d97815a0e1b6b15571d8eb11f SHA1 7e898c1dae357d4357812c33606e35d8141e7dc4 SHA256 c72191921045953aee0a532349b7ecedbba13453ccee0f24b0ba80ba9249dc73
 AUX xbubble-0.5.8-locale.patch 248 RMD160 8852c2fc82de8ba7f0171c9457efdb4f236d7b55 SHA1 4d8b394e2ad8898d6e0c1643f66da2c57fa750b3 SHA256 12d1ed774e9e75010fb4882fd1d3e86f1acde500be5fd91479bab47c5995abcd
+AUX xbubble-0.5.8-png15.patch 694 RMD160 c58a872a1cf835b1a17db0836dbaeb7d9b61a406 SHA1 0675ed5b5b06aa13a62e9f654b62f10e0fa48b7d SHA256 b3d86c8bfa9d7f6f299c90f285070dd96cc2a91f9257d7988e0c4225556ed728
 AUX xbubble-0.5.8-xpaths.patch 200 RMD160 00b58c86ec7492e36c5513aefa4b7ff498c258c9 SHA1 bdbf5cd116adb3b2b29c0a334bf5c2211975617f SHA256 445a5349d2185c2633733f9d617b28f083956ef00ec6124ac6b76db36911aa95
 DIST xbubble-0.5.8.tar.gz 5544359 RMD160 001dc3eda2e821a2b2cec4d6600834fa04cbec38 SHA1 96a14d891a05729a0350a9ef609d192c9a5b4466 SHA256 91fc805f661f5fdc3ddca4cfcfc06670b948f4f80f01333372368a0be4743025
-EBUILD xbubble-0.5.8.ebuild 1302 RMD160 e44b4806a76372bd96e11bcd33349f5b2a768f8d SHA1 a2c8c8f7f1976bf5c7f0cbfd112b6dedbab464ac SHA256 95b0caff60d39f514525c21f8696cd41afe622ddf22fccc63173436e1d8b181e
-MISC ChangeLog 1858 RMD160 7e76879bdda3eddad262bebd0d0b619e53345f9a SHA1 e1bbc610a346e601a7d4bb3c5b7cdae0cb27ea90 SHA256 34c15e03f9649fb40eb3f8df2b8b4b9ebf32888dfdc37068ae0365c6b31bf0eb
+EBUILD xbubble-0.5.8.ebuild 1334 RMD160 0f27e5b284ad62db9721a5a10ddca5c92652f6a2 SHA1 dc65b8c709bb9086b43f379f74e13595ccea3c8d SHA256 f17206b2014b520c02174c766cfd4c008c6b535df689af53411b8063c42cb267
+MISC ChangeLog 2034 RMD160 71d626447575ee91a0a415b00827777d5b1510ca SHA1 1586e1c1c2fcf7dc33c0ec61d436e3ecd2b13358 SHA256 2966f73d4fbd94497ae183021cfd733720e6212471d2ed7c3dc95bfdbaf4c2fe
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk5wYVgACgkQIY77eQFFFC2qlACggGmJo1zG/7627GZac0SKeiR0
+S1QAoKxTNRByGdVkeAIMXf9e3T04bl78
+=Bqej
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch b/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch
new file mode 100644
index 000000000000..3a0a7d360efb
--- /dev/null
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch
@@ -0,0 +1,20 @@
+--- src/loadpng.c.old	2011-09-14 09:58:40.503566961 +0200
++++ src/loadpng.c	2011-09-14 10:03:39.708531447 +0200
+@@ -73,7 +73,7 @@
+     return NULL;
+   }
+   /* libpng does a longjmp here when it encounters an error */
+-  if ( setjmp( png_ptr->jmpbuf ) ) {
++  if ( setjmp( png_jmpbuf(png_ptr) ) ) {
+     png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
+     fclose(fd);
+     return NULL;
+@@ -95,7 +95,7 @@
+     png_set_gray_to_rgb(png_ptr);
+ 
+   /* detect alpha layer */
+-  if (( info_ptr->color_type & PNG_COLOR_MASK_ALPHA )||
++  if (( png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA )||
+       ( png_get_valid( png_ptr, info_ptr, PNG_INFO_tRNS )))
+     *has_alpha = 1;
+   else
diff --git a/games-arcade/xbubble/xbubble-0.5.8.ebuild b/games-arcade/xbubble/xbubble-0.5.8.ebuild
index ae5794957ae3..fa63fcdcea9c 100644
--- a/games-arcade/xbubble/xbubble-0.5.8.ebuild
+++ b/games-arcade/xbubble/xbubble-0.5.8.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-arcade/xbubble/xbubble-0.5.8.ebuild,v 1.15 2010/03/09 21:22:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xbubble/xbubble-0.5.8.ebuild,v 1.16 2011/09/14 08:11:24 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -25,7 +25,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-xpaths.patch \
 		"${FILESDIR}"/${P}-locale.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
+		"${FILESDIR}"/${P}-libpng14.patch \
+		"${FILESDIR}"/${P}-png15.patch
 	sed -i \
 		-e '/^AM_CFLAGS/d' \
 		src/Makefile.in || die "sed cflags"