add patch from Bernard Cafarelli to fix building against libpng-1.6 (bug #465416)

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

4 files changed, 40 insertions, 32 deletions

diff --git a/games-puzzle/neverball/ChangeLog b/games-puzzle/neverball/ChangeLog
index b333786fec9e..a5b6cbe62a48 100644
--- a/games-puzzle/neverball/ChangeLog
+++ b/games-puzzle/neverball/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-puzzle/neverball
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/neverball/ChangeLog,v 1.43 2012/02/14 19:33:14 tristan Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/neverball/ChangeLog,v 1.44 2013/04/10 18:14:42 mr_bones_ Exp $
+
+  10 Apr 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/neverball-1.5.4-libpng.patch, neverball-1.5.4.ebuild:
+  add patch from Bernard Cafarelli to fix building against libpng-1.6 (bug
+  #465416)
 
   14 Feb 2012; Tristan Heaven <tristan@gentoo.org> neverball-1.5.4.ebuild:
   Respect LINGUAS, bug #402311
@@ -200,4 +205,3 @@
   initial commit of neverball. package was renamed upstream from Super Empty
   Ball which was in portage as seb (which will be removed). (bug 25955) ebuild
   from Brent Kelly via bug report and then modified.
-
diff --git a/games-puzzle/neverball/Manifest b/games-puzzle/neverball/Manifest
index 7f8d50155d6c..373816c6393f 100644
--- a/games-puzzle/neverball/Manifest
+++ b/games-puzzle/neverball/Manifest
@@ -1,25 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX neverball-1.5.4-underlink.patch 358 RMD160 b860ecfe483e48de463c29b7b3f7ebaf75ce9eb6 SHA1 e4c2bd2570d80283406bba794eb30ed75990a5e1 SHA256 9b523317f88d5ccd1333c5eb23aa6fc929702dcbac32e5391d90afd82e4365a7
-DIST neverball-1.5.4.tar.gz 26767623 RMD160 f546b5e6c12df1a125976a7e23fa55146480241d SHA1 619c227e1958bd60738f12dbbde9b30c91dd79a7 SHA256 ea31ca9f6eec70c8e66eaa20d7ce9e48295fdb077313b97637c503b16b7b0da6
-EBUILD neverball-1.5.4.ebuild 2112 RMD160 38fdab321222841dce6a9f4772b5703e1a32d79b SHA1 5d369bad89109be82b0eee2f9551204224134f5a SHA256 d70840c17b92065b6197a6b08186a9bad96af3fa56507c2335f17e536d595474
-MISC ChangeLog 5953 RMD160 44ef930a1285277c07347349c7b3d08290dfea08 SHA1 c8d38edfed02ad9d94cf003962b5901cd7a9989f SHA256 7b44bdfb90c46810b859321a42cc4d8f1b520332520e6aac804fe70e5e7eafec
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCgAGBQJPOrcAAAoJEN3Y2YlmgxDZPMQP/2rVc/OxOOqZ7KVf+EMm5jKy
-Cn06m/VgLvLq45BbWUPSUEawSELmbZBQ55G3uTNbOlBDxSZlaLnTo1S/HZiZVoRE
-++xTvxu4pJuVVjKuK/GjRlDehiNRg5qurV300/aF8+/tbTRuMeqR5vwWqFiRVEDJ
-KI+gcVwDKkODUAsWVpt4SbCpibPKiLdTGF7VK7bngCe2b7UF/1wm65W2+OEa86Ar
-tFD3eLILUBsjM2g2Gy6m9I8nuiMUwySXImz686M5hjsu65LNfK2xOu+hlOHm+hmX
-5zVewOSlHTGuHMY/PeViI5HW9/7hCM7ndT+87nAgf7JeaVmeepoYipTy6yR1wWle
-ojcB8Rht9TpYqJLONJGRPvkj3oQKTyJU49FstZ9ymyqDX1yuVMT1hRLTlMuXNa10
-hOc+4l0VYmRxuUBPTy18kQYibWfE8DpzjMFyTcv964hjekArR6f6vgQXPJ4QIL2b
-ByFNtsP++QG8wWN7GY3XMIDkdYzJPrv1tWoNO0x9uw7/81z4I5letUufHxRZeY7I
-lowPAY0VRzAwJ0Euh3hcIqfgFG5dzzum0AAdti7wcPcb5cUj/moPF/TcdO9kH/V/
-7rT2wccfYfEVq6a6Y8LrZ3R2TGbDNwA6q8xFx8KbPO9zBjef3BFQ0RcsZADQVjQA
-1fFOz/n2aNrxLgcyFAWV
-=Gc/h
------END PGP SIGNATURE-----
+AUX neverball-1.5.4-libpng.patch 711 SHA256 509a5e96988b4444a12621eb7bd38ed7ab2b047acf4f2c291132ae7bb9a33b0f SHA512 7c0a2d23234c1978f5998c3770e87658cc331af324b46c37ca57829fa712f1e535548e6da43ded5bce31604d701bbedb085cba65821146a6feff48568ff58e5d WHIRLPOOL 7e5a4db1b871e7f068a19fd75bd360af582180bfda666b4540d1fce71a06c15ad9138bfeeb9ffbd468261628d4ceafacdf93f859982a440986d9cf1119fb3593
+AUX neverball-1.5.4-underlink.patch 358 SHA256 9b523317f88d5ccd1333c5eb23aa6fc929702dcbac32e5391d90afd82e4365a7 SHA512 d07c956677580f5ed365ed1dd7a8885e1e0969736aa9231445cef9449954682d48a3eb85fbf7885379a1c2da09e4754f6b04b4d0f88fa878264e0ba56a38ad85 WHIRLPOOL 128a0927411046718ee9799253d3f17cc493c8d8ba7d07a92d6b1b0c87033ec90da860abc0c94090fd0e9a8d51da7a01570296c4d1786ee57689b8bc2f8310c8
+DIST neverball-1.5.4.tar.gz 26767623 SHA256 ea31ca9f6eec70c8e66eaa20d7ce9e48295fdb077313b97637c503b16b7b0da6 SHA512 ffc0473ea3882edb84f190aa696c2e5fa1a38ea50f73bc144a3b694fd80c71a8d9936aa34f8bbd096523493849d428928a6efd2650c6da4c9962e0355d3cb9c2 WHIRLPOOL c0e6731ee28eb8ac987d5ca98ecbd93fb7d091060e2da51c6fe69043f05fe7d5f8179e62183f946e40b2f734a8041ab35ae1fdd4024e5ff6e25ab8633853e1f4
+EBUILD neverball-1.5.4.ebuild 2156 SHA256 507007540719c544c7fc4e18e5220d8f29670b6204c65e3b9f17323f53b23d65 SHA512 11943b16deafcbf301bbd4496fa70da7a7c584c76c5ffea60bbe7b9b30111ec0f66617647d5e1c75f68006fd33f7c4482e52986a3e9ef68496968234a9f710b0 WHIRLPOOL 03d94703047a85437ef64e54358567308054932908fcc6ed5e9b1c0caaa89bc835debd1642a43bf707a285a380d77f4a56a716d128b05f6e3186f5c4c6576e61
+MISC ChangeLog 6159 SHA256 80b5cd269dc30350cd43db746f953ce5de06ecd3ff9411f98fc59e280e123264 SHA512 1da9ac034fdf571957ec226cd7c7ca52f636d17ebb08540cf152af7b75566bde607d1cb23f38339823e35dc51b7897da3ca8c94d379c709ff6301df1d14da643 WHIRLPOOL 92902433cd3009e59d42992cd12ae446b2c89b8b286d56dd153ee4b3edff3e55703a58e206a45e5f80333fe74abf5902b79f31814e0044fb56656cef59de7ce6
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-puzzle/neverball/files/neverball-1.5.4-libpng.patch b/games-puzzle/neverball/files/neverball-1.5.4-libpng.patch
new file mode 100644
index 000000000000..d7b224673186
--- /dev/null
+++ b/games-puzzle/neverball/files/neverball-1.5.4-libpng.patch
@@ -0,0 +1,21 @@
+Index: neverball-1.5.4/share/base_image.c
+===================================================================
+--- neverball-1.5.4.orig/share/base_image.c
++++ neverball-1.5.4/share/base_image.c
+@@ -15,6 +15,7 @@
+ #include <png.h>
+ #include <jpeglib.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <assert.h>
+ 
+ #include "glext.h"
+@@ -94,7 +95,7 @@ static void *image_load_png(const char *
+         default: longjmp(png_jmpbuf(readp), -1);
+         }
+ 
+-        if (!(bytep = png_malloc(readp, h * png_sizeof(png_bytep))))
++        if (!(bytep = png_malloc(readp, h * sizeof(png_bytep))))
+             longjmp(png_jmpbuf(readp), -1);
+ 
+         /* Allocate the final pixel buffer and read pixels there. */
diff --git a/games-puzzle/neverball/neverball-1.5.4.ebuild b/games-puzzle/neverball/neverball-1.5.4.ebuild
index 7e264fcdca57..1b2f752e83f8 100644
--- a/games-puzzle/neverball/neverball-1.5.4.ebuild
+++ b/games-puzzle/neverball/neverball-1.5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/neverball/neverball-1.5.4.ebuild,v 1.6 2012/02/14 19:33:14 tristan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/neverball/neverball-1.5.4.ebuild,v 1.7 2013/04/10 18:14:42 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -17,7 +17,7 @@ RESTRICT="test"
 
 RDEPEND="media-libs/libsdl[audio,joystick,opengl,video]
 	media-libs/sdl-ttf
-	media-libs/libpng
+	media-libs/libpng:0
 	virtual/jpeg
 	media-libs/libvorbis
 	virtual/opengl
@@ -39,7 +39,9 @@ src_prepare() {
 		-e "/^MAPC_TARG/s/mapc/${PN}-mapc/" \
 		Makefile \
 		|| die "sed failed"
-	epatch "${FILESDIR}"/${P}-underlink.patch
+	epatch \
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-libpng.patch
 }
 
 src_compile() {