Fix missing zlib.h include with libpng >= 1.5 present wrt #378183 by by Diego Elio Pettenò

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

4 files changed, 44 insertions, 15 deletions

diff --git a/media-gfx/pngnq/ChangeLog b/media-gfx/pngnq/ChangeLog
index 045fb82b6389..58105cc55cc5 100644
--- a/media-gfx/pngnq/ChangeLog
+++ b/media-gfx/pngnq/ChangeLog
@@ -1,6 +1,11 @@
 # 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.9 2010/05/21 16:15:19 phajdan.jr Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/ChangeLog,v 1.10 2011/08/08 16:37:28 ssuominen Exp $
+
+  08 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> pngnq-1.0.ebuild,
+  +files/pngnq-1.0-libpng15.patch:
+  Fix missing zlib.h include with libpng >= 1.5 present wrt #378183 by by Diego
+  Elio Pettenò
 
   21 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> pngnq-1.0.ebuild:
   x86 stable wrt bug #319535
diff --git a/media-gfx/pngnq/Manifest b/media-gfx/pngnq/Manifest
index 61046c7945c1..8ad6dd77ae3d 100644
--- a/media-gfx/pngnq/Manifest
+++ b/media-gfx/pngnq/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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
+AUX pngnq-1.0-libpng15.patch 355 RMD160 f5739e5ef295a4419c662392833147126728a18c SHA1 e5ed78f6a4010c1fbf430c59b69c3818580964c2 SHA256 4f9675b5ff007fe46aad998df17a94b683aa4a647d93eb600b15c2cde117e56f
 DIST pngnq-1.0.tar.gz 105155 RMD160 6b5ef5d1cfb838874bcb9a9f554a42c36cec2459 SHA1 cc58af70cfe5ba26f6abfa4dc41d828985cf560b SHA256 3413cb72af4e1a25268892ad182f6f9f516c5b67d9ff873968e5a60c293c00a7
-EBUILD pngnq-1.0.ebuild 692 RMD160 a5707dc871d7260f670945f2e3c56d0741540d06 SHA1 335459136be9f9ea9a478ba3cdce9acff8c571ab SHA256 04ff4a8d436f1c1173bbdfdbca96521d6d30b4ebd15ce3a208eda3ca739f21ee
-MISC ChangeLog 1299 RMD160 f6a01f0adb5f63a954ee25d55f954487b7c03471 SHA1 2a91c6060f2d60e8bcbb033b5cedfd50b45e4175 SHA256 1c6af3637992e1a559305ec7777667ec9e2ff43aee4e5df0110ccf73ee984999
+EBUILD pngnq-1.0.ebuild 661 RMD160 9d384203e5bd4b514121c0a6b87f3aebda1e7399 SHA1 fe3c45d35f0dfe715f6612b3ff5d8df25b73d5d8 SHA256 332d0d629dfa9d97c91ac396d083d79d87b66c215b4d263a5840552b079cc559
+MISC ChangeLog 1503 RMD160 390ea5fe075f494289872c1a89da30fc8414250d SHA1 ffaad07b3b80f2f5846c7845b4f59a480a85584c SHA256 6016e6673eccb5bf121b70ecf62f192e54b97fde0edc4a3321db627356aa3d91
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk5AEMkACgkQXkR9YqOcLPHmpQEAmP0RBjfXprtjPS+DDe19O8VM
+AM3vjvDhp0ZO3dB2nyoA/RkKPumAETxLkCgpRCHhPg+h9F6FFWNTS+mvE8d0zNin
+=QRa5
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/pngnq/files/pngnq-1.0-libpng15.patch b/media-gfx/pngnq/files/pngnq-1.0-libpng15.patch
new file mode 100644
index 000000000000..7590431dcd3a
--- /dev/null
+++ b/media-gfx/pngnq/files/pngnq-1.0-libpng15.patch
@@ -0,0 +1,13 @@
+--- src/rwpng.c
++++ src/rwpng.c
+@@ -31,8 +31,9 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <zlib.h>
+ 
+-#include "png.h"        /* libpng header; includes zlib.h */
++#include "png.h"        /* libpng header */
+ #include "rwpng.h"      /* typedefs, common macros, public prototypes */
+ 
+ /* future versions of libpng will provide this macro: */
diff --git a/media-gfx/pngnq/pngnq-1.0.ebuild b/media-gfx/pngnq/pngnq-1.0.ebuild
index 03ec9900da7d..5d946d8716b8 100644
--- a/media-gfx/pngnq/pngnq-1.0.ebuild
+++ b/media-gfx/pngnq/pngnq-1.0.ebuild
@@ -1,8 +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/pngnq/pngnq-1.0.ebuild,v 1.5 2010/05/21 16:15:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/pngnq-1.0.ebuild,v 1.6 2011/08/08 16:37:28 ssuominen Exp $
 
-EAPI=2
+EAPI=4
 inherit autotools eutils
 
 DESCRIPTION="Pngnq is a tool for quantizing PNG images in RGBA format."
@@ -14,15 +14,15 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="media-libs/libpng"
+RDEPEND="media-libs/libpng"
+DEPEND="${RDEPEND}"
+
+DOCS=( NEWS README )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
-	eautoreconf
-}
+	epatch \
+		"${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-libpng1{4,5}.patch
 
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README NEWS || die
+	eautoreconf
 }