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

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

4 files changed, 40 insertions, 13 deletions

diff --git a/media-gfx/pngtoico/ChangeLog b/media-gfx/pngtoico/ChangeLog
index dcf484eb9723..de422e0ca9ff 100644
--- a/media-gfx/pngtoico/ChangeLog
+++ b/media-gfx/pngtoico/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/pngtoico
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/ChangeLog,v 1.15 2010/10/10 11:57:19 phajdan.jr Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/ChangeLog,v 1.16 2011/08/13 03:19:23 ssuominen Exp $
+
+  13 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> pngtoico-1.0.1-r1.ebuild,
+  +files/pngtoico-1.0.1-libpng15.patch:
+  Fix building with libpng15 wrt #378511 by Diego Elio Pettenò
 
   10 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   pngtoico-1.0.1-r1.ebuild:
diff --git a/media-gfx/pngtoico/Manifest b/media-gfx/pngtoico/Manifest
index ddd24d63e3c4..a6c391dbd4b8 100644
--- a/media-gfx/pngtoico/Manifest
+++ b/media-gfx/pngtoico/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX pngtoico-1.0.1-Makefile.patch 467 RMD160 2dad4af2fe2d1cf00f04aa3bb3cc4dc08389d74c SHA1 3d5dfb1d61da36ec5baa999296b83cd7635052e4 SHA256 eb3450365ffe0c3138794e8e9d1429adf911173afa0c35b6e2ae43fa6e901177
+AUX pngtoico-1.0.1-libpng15.patch 231 RMD160 5d6c3554bc1016558a422027a61de333e6504fa8 SHA1 1a530910ccb5209d4cef5febc0ae45ecdb0972d1 SHA256 4ddde16030c5869a0e7b2db6d09aee3d7646a340baf6315f12a0e0f84c94283b
 DIST pngtoico-1.0.1.tar.bz2 4355 RMD160 a8dc5d1618ed9ba077836357516404ff85f7c5b9 SHA1 5a51a6a9e79a723a0b6b23b7b13a84fb19bf46b4 SHA256 63201bf4abff473ee7056bd1c8f54c5eaaade2d9e42ae04ca7426812d64e522b
-EBUILD pngtoico-1.0.1-r1.ebuild 758 RMD160 90c7dcef53ab2397307332607a613167b0189b30 SHA1 6ce453a80353a780f286f62312e5698873892843 SHA256 1e5cdce7dff63a55ab063367bb1d2b992e4407cf138e9b62dc8271205a75f6d1
-MISC ChangeLog 1967 RMD160 bb98b009f35e71de85e5baa3668297b6ea3f15f2 SHA1 aa90ad0e1802b1f1591fa497f10d53c15f0e0872 SHA256 bda48b76a749aeafc015854645721b125e039494c46149815f044a4269c7ae1f
+EBUILD pngtoico-1.0.1-r1.ebuild 799 RMD160 11bea099235be8b76be10de4fe8821154e570252 SHA1 597f4902f55e5c3054e25681e4c80b669b50e085 SHA256 49d53a6f77c6d4a58c680ebb4405acb0846b2a4936a3f76d9990bf02bf80a9ad
+MISC ChangeLog 2151 RMD160 519ff1336d1884ed850adea64d0123411acdecfd SHA1 7b9d4267c4856908c6dca92afb0b7005cccdd0d5 SHA256 27de8613195089d956a217bbc2e7c57fcf7f50b66a65c864ae45a9791be96b94
 MISC metadata.xml 248 RMD160 d6c9deac62816903fa896c02812e7b644a67dfd0 SHA1 c9c17191c605c607ba6a47cf37c80256353b28f3 SHA256 4b70871cee0948180519799125b78c0a47c91d8840b618b96018e31b9df6bb74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk5F7RkACgkQXkR9YqOcLPH8IgD/fq/yXGUzSbFQOMLtnaM1agv7
+W1i3p1+5++AMJT6plD4A/RYwm4iOQXKAasTnb1ry2WpHLNO9KSsozFfdGvYVChhY
+=cV4t
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch b/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch
new file mode 100644
index 000000000000..c81b25ade627
--- /dev/null
+++ b/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch
@@ -0,0 +1,11 @@
+--- pngtoico.c
++++ pngtoico.c
+@@ -188,7 +188,7 @@
+     goto perrexit;
+   }
+ 
+-  if ( setjmp(png_ptr->jmpbuf) ) {
++  if ( setjmp(png_jmpbuf(png_ptr)) ) {
+     fprintf(stderr, "%s: PNG format error\n", file);
+     goto errexit;
+   }
diff --git a/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
index 9801a71ace44..9ab9d1950304 100644
--- a/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
+++ b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
@@ -1,9 +1,8 @@
-# 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-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild,v 1.3 2010/10/10 11:57:19 phajdan.jr Exp $
-
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild,v 1.4 2011/08/13 03:19:23 ssuominen Exp $
 
+EAPI=4
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Convert png images to MS ico format"
@@ -15,11 +14,13 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-DEPEND="media-libs/libpng"
-RDEPEND="${DEPEND}"
+RDEPEND=">=media-libs/libpng-1.4"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-Makefile.patch"
+	epatch \
+		"${FILESDIR}"/${P}-Makefile.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
 }
 
 src_compile() {
@@ -27,6 +28,6 @@ src_compile() {
 }
 
 src_install() {
-	dobin pngtoico
-	doman pngtoico.1
+	dobin ${PN}
+	doman ${PN}.1
 }