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

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

4 files changed, 36 insertions, 11 deletions

diff --git a/games-sports/gracer/ChangeLog b/games-sports/gracer/ChangeLog
index 82fbb6d69b32..199bef56947f 100644
--- a/games-sports/gracer/ChangeLog
+++ b/games-sports/gracer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-sports/gracer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/ChangeLog,v 1.21 2011/02/26 15:32:17 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/ChangeLog,v 1.22 2011/09/14 12:37:51 tupone Exp $
+
+  14 Sep 2011; Tupone Alfredo <tupone@gentoo.org> gracer-0.1.5.ebuild,
+  +files/gracer-0.1.5-png15.patch:
+  Build with media-libs/libpng-1.5 Bug #380447 by Diego Elio Pettenò
 
   26 Feb 2011; Kevin McCarthy <signals@gentoo.org> gracer-0.1.5.ebuild:
   Updated depends from media-libs/jpeg to virtual/jpeg
diff --git a/games-sports/gracer/Manifest b/games-sports/gracer/Manifest
index d6c7bc628f0b..892ba8c40dc6 100644
--- a/games-sports/gracer/Manifest
+++ b/games-sports/gracer/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.1.5-gldefs.patch 1068 RMD160 47d1b371534831dd5d1980db9c6f30d1bf78bdfd SHA1 8f49a7358f924d2219e1aced7a8bc35a8ee89b69 SHA256 78e0b8c0e38ed16bb55207d76cdce192508371f624567d4c27633b6d44b97241
 AUX gracer-0.1.5-as-needed.patch 1134 RMD160 f914206ed44c1aa98d87b17b68aaa12b92505f5a SHA1 cdb91529219f59119a62134efacdf693b6929320 SHA256 332d7c5fcf810139f4c7f759e79636d7cb98ce3ee5fe83a8367a1051bb6a8144
 AUX gracer-0.1.5-gcc41.patch 414 RMD160 b0571a4eb2ce8c399afa50fa2ce43966b8ee947a SHA1 9f1e56f54468c0d9600df46cf5ccd9b22d9d7f5b SHA256 2f5b3cd8620aa8e9df3b8fcc61aa0d901d329a7734a9a89e850d726e3fc60f2a
 AUX gracer-0.1.5-libpng14.patch 385 RMD160 09fb9086be00e9161ada846dabc6f0c0accdcd14 SHA1 5616503d1c0963d4ce43ae81afcd1be9c15e56e0 SHA256 6aaf0ffbb1b5978ab73ee70c9767f9fc7dd6d9c79e4783dbf324dfde30061ddb
+AUX gracer-0.1.5-png15.patch 314 RMD160 13dca6fecbe031c96817c43289900347e933b8dd SHA1 58f7afb999e637cb6580eace35e9e6ffcc6593d5 SHA256 76b6f10be0bae67f92ac6e5a45972cbb54f6c7779d56ccb97559fbaaf68885f9
 AUX gracer-gcc-3.4.patch 1755 RMD160 17083ad43ac9694313e573e1d9cba36a18b07cc9 SHA1 db8fad5111bfa07ec28163f5227e42b93ab476db SHA256 50680ff8fe9e51dbbb9fd07953c2be0e028cb7a89db703413ad448052bc47427
 DIST gracer-0.1.5.tar.gz 520599 RMD160 31cfda3061c025cbdd454ec537f7f3c3621c4271 SHA1 f459ae644c7f74553354e7cc10285ee31ed63b99 SHA256 dc478610d60cd5f00a52cc52877a333bd4b3a2d96ed1660ba8d26ad7143367c0
-EBUILD gracer-0.1.5.ebuild 1202 RMD160 8ea884e6aefec7c7d80dc9dcb926f38e1081bdf5 SHA1 39f74e0544f397464b5cb0225ed39d91089d3141 SHA256 4577174c1220be6d569e1484e87a529f4c6c714d747bfb130508a0dbc7b6a008
-MISC ChangeLog 2450 RMD160 cf5fad7cc7ea6bd534849c0fe17b6e989eadbffc SHA1 7566e8d5cf19f0d3a248b0935c74a9c502782a14 SHA256 044c502f79e32e8e0a5e96e25805190ff76e1ab5b7a97ad4ecb34fce3ac4cc16
+EBUILD gracer-0.1.5.ebuild 1207 RMD160 3fd25d585bbbc2ea1e1b5ce67afce5b551e5c6cf SHA1 9eee41fca1685bf05ce2957539b7314993e1fe53 SHA256 4b5a3bb5c77fb0fa0e6361abce6a8c6eff54de5b651aad27bee64b874b13bc15
+MISC ChangeLog 2626 RMD160 b5b26b40777278d0d2af5680c9b1547290d5635a SHA1 8aad43145aed0a3025e1f25164594a58c8d3d2b0 SHA256 abb720ef3d78ca241901b82fe80bb8a30bb97b7a9d5e558d0aeb372ed0532ba5
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk5wn8UACgkQIY77eQFFFC05AACfTu0qNsSHg4JBS6QA0eEEl4Ei
+3w4AoIscfJ1aNPPBAUq14Bi7sMgbV8My
+=NFfU
+-----END PGP SIGNATURE-----
diff --git a/games-sports/gracer/files/gracer-0.1.5-png15.patch b/games-sports/gracer/files/gracer-0.1.5-png15.patch
new file mode 100644
index 000000000000..1efaec3d6fc6
--- /dev/null
+++ b/games-sports/gracer/files/gracer-0.1.5-png15.patch
@@ -0,0 +1,11 @@
+--- common/gr_texture.c.old	2011-09-14 14:23:46.820207882 +0200
++++ common/gr_texture.c	2011-09-14 14:24:22.861203604 +0200
+@@ -431,7 +431,7 @@
+   if (!info_ptr) {
+     goto ERROR;
+   }
+-  if (setjmp (png_ptr->jmpbuf)) {
++  if (setjmp (png_jmpbuf(png_ptr))) {
+     goto ERROR;
+   }
+   png_init_io (png_ptr, file);
diff --git a/games-sports/gracer/gracer-0.1.5.ebuild b/games-sports/gracer/gracer-0.1.5.ebuild
index e41ea51eee6f..6710ea9b72e0 100644
--- a/games-sports/gracer/gracer-0.1.5.ebuild
+++ b/games-sports/gracer/gracer-0.1.5.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-sports/gracer/gracer-0.1.5.ebuild,v 1.21 2011/02/26 15:32:17 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/gracer-0.1.5.ebuild,v 1.22 2011/09/14 12:37:51 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -25,13 +25,12 @@ DEPEND="x11-libs/libXi
 	media-libs/libpng
 	media-libs/plib"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gldefs.patch \
-		"${FILESDIR}"/${PN}-gcc-3.4.patch \
-		"${FILESDIR}/${P}"-gcc41.patch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
-}
+PATCHES=( "${FILESDIR}"/${PV}-gldefs.patch
+	"${FILESDIR}"/${PN}-gcc-3.4.patch
+	"${FILESDIR}/${P}"-gcc41.patch
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-libpng14.patch
+	"${FILESDIR}"/${P}-png15.patch )
 
 src_configure() {
 	egamesconf \