Fix building with libpng15 wrt #378411 by Diego Elio Pettenò

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

4 files changed, 38 insertions, 15 deletions

diff --git a/media-libs/libsfml/ChangeLog b/media-libs/libsfml/ChangeLog
index 3364750b745d..5bd1ef63ec22 100644
--- a/media-libs/libsfml/ChangeLog
+++ b/media-libs/libsfml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libsfml
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/ChangeLog,v 1.6 2011/09/10 10:56:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/ChangeLog,v 1.7 2011/09/14 09:14:02 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> libsfml-1.6-r1.ebuild,
+  +files/libsfml-1.6-libpng15.patch:
+  Fix building with libpng15 wrt #378411 by Diego Elio Pettenò
 
   10 Sep 2011; Tim Harder <radhermit@gentoo.org> libsfml-1.6-r1.ebuild,
   +files/libsfml-1.6-gcc46.patch:
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index 6eff392f058d..2f9a5b3dee68 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX libsfml-1.6-deps-and-flags.patch 3546 RMD160 f1b2b9391d193a42e8d554936a45cc57143f1583 SHA1 53910669d105fd0d2fa8118e447b9ed87f74c849 SHA256 ae54446a78d96ec373dd8f28c7db7d8d64a87f90ae9d79d36ca14bec9ef7e813
 AUX libsfml-1.6-destdir.patch 3855 RMD160 a1152276e723dba9246e5fb252c3f5426266e21a SHA1 10e6d368db1c51c6ebc7378171efcc706138d992 SHA256 2f4343f60460bda2ad7b121e3e00a03b52c44366f488af1bfac7914019dc0094
 AUX libsfml-1.6-gcc46.patch 253 RMD160 58fb41cbfa2c509705d0569c8bfb188144326279 SHA1 af254cd682fc8a89c6bcf35d6781468d75dcade0 SHA256 87d9feb405492654f3423bcb43e4895a6856a70ae518f9e6951cc1b257399bdf
+AUX libsfml-1.6-libpng15.patch 566 RMD160 f082a98198bce2587fb5be74c0ba372c2eb81f76 SHA1 d1add452c596b05b9bae96e980491f4a9ce9b15d SHA256 caaa919fb601f2c83a3403695f6974955149f430904a7b9861389d9dc3e59fab
 DIST SFML-1.6-sdk-linux-32.tar.gz 12937755 RMD160 78058f4d24667b015c3e11421f0a0a01c49652b7 SHA1 85e3e0a73982678c2c0ab32275be7e365822d69c SHA256 b1c18f9b99c54ebb4cd433792f33ed2b85c846cca28eb871a12b3191dc1532f8
-EBUILD libsfml-1.6-r1.ebuild 1527 RMD160 332feb7e27ae18dd9646dd1e6de043ca044e1db8 SHA1 3c7ee926a910c9a95e8291c35e6e80fa3fdebab7 SHA256 00d4443b129c36eadbcdd05fb5b53e8100d6b1a47232c3cde98d23686d71a2fb
-MISC ChangeLog 1285 RMD160 0edcd3246eb2b543db457c6cde3c033044c42a11 SHA1 1c2b077fd690ed80fdd73a12e5dff65ce9fb7faf SHA256 164120f4103f21fb258531a58a3d1986c14cfa63abee80f28705c714330ae55a
+EBUILD libsfml-1.6-r1.ebuild 1575 RMD160 5321de0526b8b59f3909a0022bab04d1e83f4790 SHA1 80a8752328e47fcb1be37f5f522f901961162a0d SHA256 4dc9ad01a60f161f8643f48a44f8c1fa37ba1b937bc0fd6278c78cd511970156
+MISC ChangeLog 1464 RMD160 7479bcec1462f8f1f7b3f0b50901541ffcfcb7a6 SHA1 dbffc2e867e3004be3130886795dca8d16087c4f SHA256 df552ef50f42f310300ec8cafbda4f68ca738c1870bd38eb4de9a47eb2d52027
 MISC metadata.xml 700 RMD160 db8950492c530186cec595e3fd2aefcfafa8067a SHA1 41001abc20e670f11a93fe278527b5755fdcc6cd SHA256 390a9c11770462b79093e3f0fc13b68065d49fbef5b140e81e19294bb896dcb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOa0JNAAoJEEqz6FtPBkyjzjsH/12oZGMw8yOWiGDihj/XFb8M
-GbTljhpqHRfxyZaCdZVYkOXXlUKmfy1JdDYQKMpSdPg0MJ88Dupp5AlVlMhjNzcm
-CHq9TIjuQ1UFBltpiMoxPOta5O9fHt5qzyLcrL0myWpsgqdFHFzOzkbF3tl2bU/7
-7LPdiywqVFv7MNM67LO3c5l3Qwml5e6LgjXJK7i+iHp+z5FvGbyKLjCc6nry8l2w
-ziCKn/8lFrwhs2J+6t+H8RN8u0md7SfuzYo8UqmIYK8e+YWvq4H235fqMalPezhB
-dvOUtro9Elxi1UuDv0zAPDll9PzYonh/QpCiATDKzDuf7swIv4tUwvMCf/ZzkrA=
-=Sl9l
+iF4EAREIAAYFAk5wcJAACgkQXkR9YqOcLPGsdwD8Cm1TBxKHI4ZLSP8qqpSPZo50
+Ue5CSdLVa6dEwJjJi08BAJFqroakWGM0lTIpDLQDiRA1rWCYfpr+w1P8S6o4HU4J
+=7ncW
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsfml/files/libsfml-1.6-libpng15.patch b/media-libs/libsfml/files/libsfml-1.6-libpng15.patch
new file mode 100644
index 000000000000..46be00ebd0e0
--- /dev/null
+++ b/media-libs/libsfml/files/libsfml-1.6-libpng15.patch
@@ -0,0 +1,20 @@
+--- src/SFML/Graphics/ImageLoader.cpp
++++ src/SFML/Graphics/ImageLoader.cpp
+@@ -44,7 +44,7 @@
+     void PngErrorHandler(png_structp Png, png_const_charp Message)

+     {

+         std::cerr << "Failed to write PNG image. Reason : " << Message << std::endl;

+-        longjmp(Png->jmpbuf, 1);

++        longjmp(png_jmpbuf(Png), 1);

+     }

+ }

+ 

+@@ -289,7 +289,7 @@
+     }

+ 

+     // For proper error handling...

+-    if (setjmp(Png->jmpbuf))

++    if (setjmp(png_jmpbuf(Png)))

+     {

+         png_destroy_write_struct(&Png, &PngInfo);

+         return false;

diff --git a/media-libs/libsfml/libsfml-1.6-r1.ebuild b/media-libs/libsfml/libsfml-1.6-r1.ebuild
index 73fddcc7594f..f16505362dfc 100644
--- a/media-libs/libsfml/libsfml-1.6-r1.ebuild
+++ b/media-libs/libsfml/libsfml-1.6-r1.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/media-libs/libsfml/libsfml-1.6-r1.ebuild,v 1.3 2011/09/10 10:56:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/libsfml-1.6-r1.ebuild,v 1.4 2011/09/14 09:14:02 ssuominen Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ IUSE="debug doc examples static-libs"
 
 DEPEND="media-libs/freetype:2
 	media-libs/glew
-	media-libs/libpng
+	>=media-libs/libpng-1.4
 	media-libs/libsndfile
 	media-libs/mesa
 	media-libs/openal
@@ -31,9 +31,11 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-destdir.patch \
+	epatch \
+		"${FILESDIR}"/${P}-destdir.patch \
 		"${FILESDIR}"/${P}-deps-and-flags.patch \
-		"${FILESDIR}"/${P}-gcc46.patch
+		"${FILESDIR}"/${P}-gcc46.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
 }
 
 src_compile() {