Fix building with libpng14.

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

4 files changed, 27 insertions, 19 deletions

diff --git a/media-gfx/pngnq/ChangeLog b/media-gfx/pngnq/ChangeLog
index d28e8ff63a8d..da6d90dce748 100644
--- a/media-gfx/pngnq/ChangeLog
+++ b/media-gfx/pngnq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/pngnq
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/ChangeLog,v 1.6 2010/01/17 22:32:13 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/ChangeLog,v 1.7 2010/03/10 16:59:32 ssuominen Exp $
+
+  10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> pngnq-1.0.ebuild,
+  +files/pngnq-1.0-libpng14.patch:
+  Fix building with libpng14.
 
   17 Jan 2010; Hanno Boeck <hanno@gentoo.org> pngnq-1.0.ebuild,
   +files/pngnq-1.0-as-needed.patch:
diff --git a/media-gfx/pngnq/Manifest b/media-gfx/pngnq/Manifest
index 60fd74db0477..15d32dcab76e 100644
--- a/media-gfx/pngnq/Manifest
+++ b/media-gfx/pngnq/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pngnq-0.5-cflags.diff 585 RMD160 2646d90b06cf77761528d42836b75289f52896e9 SHA1 cec2146b62624a99e1b85faf3abdcd6a6ce3532c SHA256 019c2b2e07be4a4ccfb2cc1835fcb5de769185c5a98bbe32eb04e37085929996
 AUX pngnq-1.0-as-needed.patch 1348 RMD160 bc3e003a3e574dd2335a69312380a53496a74302 SHA1 49ed5a95cdc05af175155fecd4c9a5b82a865662 SHA256 184be7fb7ed9418080e00c799ac6e91d6be992e4de334016581a4606368a6b1f
+AUX pngnq-1.0-libpng14.patch 378 RMD160 d65871500df7388c498865cc9689e4da16559156 SHA1 8a33fe6735c8780e6dea0b58f13165480994874d SHA256 2f56e5f3c71462d70fb1e73f103bdab136399afba7ae49df3357622a7f9e17d0
 DIST pngnq-0.5-makefile.patch 879 RMD160 891c1ed7f78b9728fc99b8cf308f9643ff7a9676 SHA1 eb09959219ee76a32672642ce90dad42907b2eb5 SHA256 870a11fae638b845031f2e87e6cda9523b9bca183a2df11b115753f8c65a6d38
 DIST pngnq-0.5-src.tar.gz 26115 RMD160 7772b56cb3e12f49243a5d0d9248a9d7947a351c SHA1 aa41a0ce7c3baf8f6b2ba8c17b8dc9d0f63b2a43 SHA256 c9f2f4239e07d23064176909cd59ef12d96573599a3fa29bed59fe554b769b92
 DIST pngnq-1.0.tar.gz 105155 RMD160 6b5ef5d1cfb838874bcb9a9f554a42c36cec2459 SHA1 cc58af70cfe5ba26f6abfa4dc41d828985cf560b SHA256 3413cb72af4e1a25268892ad182f6f9f516c5b67d9ff873968e5a60c293c00a7
 EBUILD pngnq-0.5.ebuild 909 RMD160 0b0085b3c0c6e9539ec37c262c2a67499af59dc0 SHA1 e566d5e645ec5d2c228b42aa0f6c854db078850b SHA256 608a08cc2853ee3ab42c699ab5173208f87413b473eaddfc78b0eb248a772fad
-EBUILD pngnq-1.0.ebuild 689 RMD160 dc4f49e7924638b3d68740c115d3b9285ef99391 SHA1 e768774181589faaa74f06ac8bae98f82458f9f1 SHA256 1a7accef2da6388efc27abd72048592e123500dabb49c9ac3a4830b543789a20
-MISC ChangeLog 947 RMD160 3b930f8f35fc595e9a4cfd25154be7d25bfc4448 SHA1 a6f7fc60ebe80a2ebe6e4d324c521843be99087f SHA256 683cc649721359ab015546c9e3ca034042373a862ba5ffea103082fe6deb1eb9
+EBUILD pngnq-1.0.ebuild 693 RMD160 fdf727935d44eceb349795c7855a10e47a988482 SHA1 5ca7287ae800ebb521af9b2410d06a5fbe0a7c39 SHA256 840f56572bf6bb670caff41894943c4b0ef17110b9a03f3e0a24278cad32cdd5
+MISC ChangeLog 1089 RMD160 ce7dbb7b6eda8eca15a944683fae63dbf46e81d8 SHA1 b8b1025b761de4996858ab7ea5bfed7295358884 SHA256 59d92729004798b882550101c431ed572681f416d1d0aeaa8dd7774cc4220848
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktTj/MACgkQr2QksT29OyBtKwCfSI7rYkSVbcoPwlH3XP2R/X23
-dgsAmgM8XthXTx35lGlSTqrOSPyW+ico
-=x+Ye
------END PGP SIGNATURE-----
diff --git a/media-gfx/pngnq/files/pngnq-1.0-libpng14.patch b/media-gfx/pngnq/files/pngnq-1.0-libpng14.patch
new file mode 100644
index 000000000000..e2eb9c8972e5
--- /dev/null
+++ b/media-gfx/pngnq/files/pngnq-1.0-libpng14.patch
@@ -0,0 +1,13 @@
+http://aur.archlinux.org/packages.php?ID=10325
+
+--- src/rwpng.c
++++ src/rwpng.c
+@@ -80,7 +80,7 @@
+      * have used slightly more general png_sig_cmp() function instead */
+ 
+     fread(sig, 1, 8, infile);
+-    if (!png_check_sig(sig, 8)) {
++    if (png_sig_cmp(sig, 0, 8)) {
+         mainprog_ptr->retval = 21;   /* bad signature */
+         return mainprog_ptr->retval;
+     }
diff --git a/media-gfx/pngnq/pngnq-1.0.ebuild b/media-gfx/pngnq/pngnq-1.0.ebuild
index a0646cfd2157..3ca3f6177fab 100644
--- a/media-gfx/pngnq/pngnq-1.0.ebuild
+++ b/media-gfx/pngnq/pngnq-1.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/pngnq-1.0.ebuild,v 1.2 2010/01/17 22:32:13 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/pngnq-1.0.ebuild,v 1.3 2010/03/10 16:59:32 ssuominen Exp $
 
 EAPI=2
-
-inherit eutils autotools
+inherit autotools eutils
 
 DESCRIPTION="Pngnq is a tool for quantizing PNG images in RGBA format."
 HOMEPAGE="http://pngnq.sourceforge.net/"
@@ -18,11 +17,12 @@ IUSE=""
 DEPEND="media-libs/libpng"
 
 src_prepare() {
-	epatch "${FILESDIR}/pngnq-1.0-as-needed.patch"
+	epatch "${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-libpng14.patch
 	eautoreconf
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README NEWS || die "dodoc failed"
+	emake DESTDIR="${D}" install || die
+	dodoc README NEWS || die
 }