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

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

diff --git a/media-libs/simage/ChangeLog b/media-libs/simage/ChangeLog
index c8b540752a85e0991ecd4353fedfcb5d0b0609fa..734e832b3946f9e67536c9dbc3de4f67523e8cb5 100644 (file)
--- a/media-libs/simage/ChangeLog
+++ b/media-libs/simage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/simage
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/simage/ChangeLog,v 1.4 2010/11/09 09:05:53 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/simage/ChangeLog,v 1.5 2011/09/15 18:47:03 ssuominen Exp $
+
+  15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> simage-1.7.0.ebuild,
+  +files/simage-1.7.0-libpng15.patch:
+  Fix building with libpng15 wrt #383131 by Diego Elio Pettenò
 
   09 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> simage-1.7.0.ebuild:
   Use virtual/jpeg wrt #327487.

diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index d8e83ad9a268ea4f112a5844bb3c26eccd508989..382d44c52f4149110d4ef43a82fd32f7cd995f4f 100644 (file)
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX simage-1.7.0-libpng15.patch 422 RMD160 eada0d456b2997c44df6fc5f5b86f570738c4237 SHA1 ad2913cdd55ea3448fa186a448720db3ed9495ae SHA256 05bd76b16837a76468a6f52cf276482eb9b56b7884a2bee9fe0dc70007556122
 AUX simage-1.7.0-pkgconfig-partial.patch 468 RMD160 42d54481125f99f32943c77863c2ce0500d106e4 SHA1 ccba77070c0d9f7518117426e7cda4cde15e0968 SHA256 2ae9cb1a65d8d7c5254cc4a607f83d16a5e410f45c9c3069af8200241c25751a
 DIST simage-1.7.0.tar.gz 752602 RMD160 be5e13c0acc345a39f4686e3121222faa3cdbd51 SHA1 32b2bbfd7f2e7ec3591f506094c9d006e4af3921 SHA256 c9a0c43e45f825c46941789f5a8f6c3b61da5ac87e4088cb611ac0fead494def
-EBUILD simage-1.7.0.ebuild 1823 RMD160 b3e240d48fc43c1781489b154528cf77e57d17c5 SHA1 e6568b372ba8fca10703e49fa3e07b507f16e689 SHA256 ecdbd948bc63000cb42b63c7249a900d2fba0b46348fe907c52cf9992b02b2a7
-MISC ChangeLog 809 RMD160 e0351638d292b9a620706fee8c5540c1eeb3eb1a SHA1 077b0cf06e9e76f8ef3e54c7ffdd7b2eee9b4875 SHA256 1413e2250f843962c33a5017980d08793f596e333beea2fe98d0f3392beff508
+EBUILD simage-1.7.0.ebuild 1865 RMD160 570f9484c9435b82b671b48ebfa43a52a32ce42e SHA1 cbf08a0d10f336f9ee5b09b3ec232a4a276ed471 SHA256 c56f6ba28d707e968e92ff571777916d6a1cfce1240ab78f892c6689efdba506
+MISC ChangeLog 987 RMD160 b2eb784176d9f6217403d2da838f1785e1d02a5b SHA1 ca1abb43ff7d4e176db78633f3acdacfe77e5400 SHA256 774f9f87f1cdb89bd3aec85584161a7854cb8face7cc1b5f3941766d7a64dcb2
 MISC metadata.xml 223 RMD160 d5189fe7f8f603fb9e67951b617d0ad517ad1bb0 SHA1 6e59101bd30c63151d80cee3be02a18d95bf2020 SHA256 88de6fef5837fc6140830f1ef762f603831f0a13c8d7ceefe80963555d541ea7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk5ySGAACgkQXkR9YqOcLPGEzwD/eDzzyF61Kah2f8l775pzuwiI
+07s+0tRw3HMrd36dfagA/Aw/npTjlLWJaOaC4LdnphU3pcjZS+sBMOX7FSB731Ra
+=jj0x
+-----END PGP SIGNATURE-----

diff --git a/media-libs/simage/files/simage-1.7.0-libpng15.patch b/media-libs/simage/files/simage-1.7.0-libpng15.patch
new file mode 100644 (file)
index 0000000..c42fd1f
--- /dev/null
+++ b/media-libs/simage/files/simage-1.7.0-libpng15.patch
@@ -0,0 +1,11 @@
+--- src/simage_png.c
++++ src/simage_png.c
+@@ -323,7 +323,7 @@
+   /* Set error handling.  REQUIRED if you aren't supplying your own
+    * error hadnling functions in the png_create_write_struct() call.
+    */
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     /* If we get here, we had a problem reading the file */
+     fclose(fp);
+     png_destroy_write_struct(&png_ptr,  (png_infopp)info_ptr);

diff --git a/media-libs/simage/simage-1.7.0.ebuild b/media-libs/simage/simage-1.7.0.ebuild
index f1777111b0dac43b6ca01d213c7b4dff6739edd7..1a460ef823b4db7b2067a618f8ab1812f980c3f4 100644 (file)
--- a/media-libs/simage/simage-1.7.0.ebuild
+++ b/media-libs/simage/simage-1.7.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/media-libs/simage/simage-1.7.0.ebuild,v 1.4 2010/11/09 09:05:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/simage/simage-1.7.0.ebuild,v 1.5 2011/09/15 18:47:03 ssuominen Exp $
 
 EAPI=2
 
@@ -35,7 +35,8 @@ DEPEND="${RDEPEND}
 DOCS=(AUTHORS ChangeLog NEWS README)
 
 PATCHES=(
-       "${FILESDIR}/${PN}-1.7.0-pkgconfig-partial.patch"
+       "${FILESDIR}"/${PN}-1.7.0-pkgconfig-partial.patch
+       "${FILESDIR}"/${PN}-1.7.0-libpng15.patch
 )
 
 # --with-pic, two defined (PIC and one for image format, sillyt), no not pass