add patch for building against libpng15 (bug #371651)

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

4 files changed, 37 insertions, 20 deletions

diff --git a/games-sports/speed-dreams/ChangeLog b/games-sports/speed-dreams/ChangeLog
index 26675985d9d6..682ad3361662 100644
--- a/games-sports/speed-dreams/ChangeLog
+++ b/games-sports/speed-dreams/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-sports/speed-dreams
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/speed-dreams/ChangeLog,v 1.8 2010/11/09 16:22:46 tomka Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/speed-dreams/ChangeLog,v 1.9 2011/06/14 22:00:20 mr_bones_ Exp $
+
+  14 Jun 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  speed-dreams-1.4.0.ebuild, +files/speed-dreams-1.4.0-libpng15.patch:
+  add patch for building against libpng15 (bug #371651)
 
   09 Nov 2010; Thomas Kahle <tomka@gentoo.org> speed-dreams-1.4.0.ebuild:
   x86 stable per bug 333261
diff --git a/games-sports/speed-dreams/Manifest b/games-sports/speed-dreams/Manifest
index 9bc438538cc1..044e8dd0281a 100644
--- a/games-sports/speed-dreams/Manifest
+++ b/games-sports/speed-dreams/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX speed-dreams-1.4.0-asneeded.patch 4190 RMD160 dd486c345ce8535a39491be735bf7b453ea534b1 SHA1 48593efbb208776a4d576f2dc15534f970a195f8 SHA256 52620e323b663e6fdd60caf2522506588d08a8ea7b1915eb6de704babb3c901d
+AUX speed-dreams-1.4.0-libpng15.patch 516 RMD160 f4853bf2989d1200727d743af52295370d334177 SHA1 6c231fbce242e7c54317b892c1033dc570b127f8 SHA256 8fe1de4656ee42c6ef4910658e18999fa85e59711608d271834452d6eec62500
 DIST speed-dreams-1.4.0-r2307-src.tar.bz2 332667666 RMD160 9be038c8e124d0ab230b55bef2e1c13f6b408b23 SHA1 5f55e001ae1eb1660001cf11dd22e9afaa97b111 SHA256 c109bb77785e33ab66992db8566584f4393d2f141fb12e32a58793953fcd6893
-EBUILD speed-dreams-1.4.0.ebuild 1795 RMD160 ee3d531103d6ce787b1d3a93d5c772e72740d61b SHA1 9ed94bb23c694b79cd5f322d03c36fda04b5338d SHA256 b9a67599f3c416f1f37b7df40f366c9c1abe600f9cf32ad9e995d75b4bb029f6
-MISC ChangeLog 1452 RMD160 e6e7d0337f6f551464904bdbd584dbad55f61f9e SHA1 51716fe5cd8b993ee5d070966de0ca50b6468030 SHA256 258c11343812196e0f56630c8f47c8a5987a5bb9265cb51353e6730a984a667c
+EBUILD speed-dreams-1.4.0.ebuild 1845 RMD160 c217d97fed6bd28188e72164e50d54c1c36b0e64 SHA1 2565b7940123743576560ce09ec6a1fb6b5f546d SHA256 7c277ff7ba9fedb47ffdfe8361fd7d259e04438a8a69f7f27760fa32ef498a43
+MISC ChangeLog 1639 RMD160 8f49f0d12260c7ef2e40bb349be107c280c1c250 SHA1 c0ddb57257bd9863f8c69492626f8f4904ec57eb SHA256 e7105d1b4eb94a6e8be5ae9dd6f3c7340eafb815f679daf914592b970ee90b8e
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzZdakACgkQnZsgo/h8kNb3iACfWwG6GNSs0M8Vc6wXYAo9DTqA
-AUsAni+IUGZQ2DTNaDeV6tUpADyfKbve
-=sm8r
------END PGP SIGNATURE-----
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch
new file mode 100644
index 000000000000..6b09ce2a41c8
--- /dev/null
+++ b/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch
@@ -0,0 +1,20 @@
+--- a/src/libs/tgfclient/img.cpp
++++ b/src/libs/tgfclient/img.cpp
+@@ -98,7 +98,7 @@
+		return (unsigned char *)NULL;
+	}
+	
+-	if (setjmp(png_ptr->jmpbuf))
++	if (setjmp(png_jmpbuf(png_ptr)))
+	{
+		/* Free all of the memory associated with the png_ptr and info_ptr */
+		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+@@ -229,7 +229,7 @@
+		return -1;
+	}
+	
+-	if (setjmp(png_ptr->jmpbuf)) {    
++	if (setjmp(png_jmpbuf(png_ptr))) {
+		png_destroy_write_struct(&png_ptr, &info_ptr);
+		fclose(fp);
+		return -1;
diff --git a/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild b/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild
index fafe570a05af..29ec847313bb 100644
--- a/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild
+++ b/games-sports/speed-dreams/speed-dreams-1.4.0.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-sports/speed-dreams/speed-dreams-1.4.0.ebuild,v 1.4 2010/11/09 16:22:46 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild,v 1.5 2011/06/14 22:00:20 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools eutils versionator games
@@ -38,11 +38,13 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)-src
 
-# http://sourceforge.net/apps/trac/speed-dreams/ticket/111
-MAKEOPTS="${MAKEOPTS} -j1"
-
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
+	# http://sourceforge.net/apps/trac/speed-dreams/ticket/111
+	MAKEOPTS="${MAKEOPTS} -j1"
+
+	epatch \
+			"${FILESDIR}"/${P}-asneeded.patch \
+			"${FILESDIR}"/${P}-libpng15.patch
 
 	sed -i \
 		-e '/ADDCFLAGS/s: -O2::' \