Fix building with libpng15 wrt #389591 by Navid Zamani

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

4 files changed, 57 insertions, 23 deletions

diff --git a/media-gfx/zgv/ChangeLog b/media-gfx/zgv/ChangeLog
index 83916dac6ea7..75ff80b2fa8e 100644
--- a/media-gfx/zgv/ChangeLog
+++ b/media-gfx/zgv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/zgv
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/ChangeLog,v 1.18 2011/02/28 17:49:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/ChangeLog,v 1.19 2011/11/05 06:54:22 ssuominen Exp $
+
+  05 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> zgv-5.9.ebuild,
+  +files/zgv-5.9-libpng15.patch:
+  Fix building with libpng15 wrt #389591 by Navid Zamani
 
   28 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> zgv-5.9.ebuild:
   Use virtual/jpeg.
diff --git a/media-gfx/zgv/Manifest b/media-gfx/zgv/Manifest
index 1a6416650eae..c9b61a5fe5ec 100644
--- a/media-gfx/zgv/Manifest
+++ b/media-gfx/zgv/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX zgv-5.9-Makefile-QA.patch 1906 RMD160 36c6d8daa89e46e40024025d699b413efca33473 SHA1 9aedbafd2b9c901cca6b915b43e4479271377c02 SHA256 5979a006a7a54f999afc3cfeb7f2a3c6b4bc4ed7c28a7854055df58abe72e492
 AUX zgv-5.9-cmyk-yccl-fix.diff 1554 RMD160 c7b9c9c4f1bfda5e7b49d4ced5da75e2de974953 SHA1 1e161341030ab69feba9926693e7e97bd8aaecad SHA256 17291c05c6d67c32b5bfc1c4afd0756bc8e168567c7a8e965a2befb20b18689c
+AUX zgv-5.9-libpng15.patch 468 RMD160 0315fe7ac3f4223ee2fe6b0b205f6ab9e30c4480 SHA1 68c73059d1fb5da700f6bb081d63889c38418d54 SHA256 7e38c92999be1dafa6234b9d2869b9359ea02941da2dbd29d500faf2f3f871dc
 DIST zgv-5.9.tar.gz 395525 RMD160 1d1c47c77adc732c581d9db1189243a94c510586 SHA1 e29b81bb51401376b43397de3857e8ed846a7cad SHA256 92e5d848fb51a77dc0ebb0ab383c1499c23aaff01f5445e9b0d75e067a8a64ba
-EBUILD zgv-5.9.ebuild 1232 RMD160 16b061e2d5876921792e29fb2b87a6fc73d7960e SHA1 d97867b1c53ac9a2b447b635fa84d51ed52789f2 SHA256 8e33bf46037e2b32052691d4bbbbebbbc7abbd71caee9bfb3b35246dd76e8efb
-MISC ChangeLog 2578 RMD160 9d8b42e4d02bf9f7d4e51c8d87a8471719adc25c SHA1 2a7e503eb0a7f445843e4a57dd7d5619869ff2a8 SHA256 6d76b824c28a3c38f989584e604f5033d73b8ebf91f342dc902603e745a0ff95
+EBUILD zgv-5.9.ebuild 1263 RMD160 c0db1c44dd8ffd64d2e732973b15affa7c0e6b1d SHA1 34637f4aaec6a69043b80cfa85b553f9f7e4690a SHA256 b8293b4760f6e597cf9d7d6f71184db2ee7e424439aaa85fa307b547392a2bc8
+MISC ChangeLog 2739 RMD160 ef871a43045b0002151a70248c7c00462b5ede01 SHA1 66e91312f85b43f0835382a5d3d7669b4862e975 SHA256 13d7e7163f2477aced8f85eb07c8edb46dc76985891c1cb97b3a1bdd23db45f7
 MISC metadata.xml 268 RMD160 01696164cd82ae0617304a419940adecf5a9d222 SHA1 b52a9b90dd049bc8749bc0d25cdfddebd447860f SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59ovwACgkQfXuS5UK5QB1ufwP/WwWf1+IVjM7OqBYyHPMYtR3f
-Q3T5fopiJXBy08/vd4Ni9Bf4rXfymh062WgwdwJAEliaSibdmPVRrxgmOVuYcS70
-F5a3FyAV0avn4VA8GakuS+Onq03uV/WmvOvmidx0pjplpRr2baH7DbnG3kmjir22
-ro7k3bx5erYKYem+0s4=
-=zRu9
+iQEcBAEBAgAGBQJOtN2DAAoJEEdUh39IaPFNMLwH+wTZIUgLfr3l9ZFPDOqroQsn
+GtbGovqCbh2OTSlGUqNP8mf91svsd+CDmdhYp8zSD1f13qkQXbUwTYzTY80Hx3u9
+E2m7dYC05RA+NYouuTp5v2pEeVu/761b9xTlALsJze0kJMXx9rMlHmQ5q/492mHO
+6pwSb2hv8mHIp4/PeGsLD2m167PwhQ5MOPnPu6Bef4DPuFOcKTowHrwVy9BUjpeL
+KNxkfin0HiiyoQS2kAQylavJalqfqwtg09mKbZkFaLhnyvQMxb6/tTMXymcAco73
++EXBOZ5CoJbueghPRQK6UCIE8DboicCdCnUq7amD43uOFJXK9qOkQt3HZSj4MEE=
+=Fonv
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/zgv/files/zgv-5.9-libpng15.patch b/media-gfx/zgv/files/zgv-5.9-libpng15.patch
new file mode 100644
index 000000000000..2f12532831de
--- /dev/null
+++ b/media-gfx/zgv/files/zgv-5.9-libpng15.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/389591
+
+--- src/readpng.c
++++ src/readpng.c
+@@ -63,7 +63,7 @@
+ use_errmsg=1;
+ 
+ /* cleanup is done after jump back, so just do that now... */
+-longjmp(png_ptr->jmpbuf,1);
++longjmp(png_jmpbuf(png_ptr), 1);
+ }
+ 
+ 
+@@ -132,7 +132,7 @@
+   return(_PICERR_NOMEM);
+   }
+ 
+-if(setjmp(png_ptr->jmpbuf))
++if(setjmp(png_jmpbuf(png_ptr)))
+   {
+   /* if we get here, there was an error. */
+   /* don't use local variables here, they may have been blasted */
diff --git a/media-gfx/zgv/zgv-5.9.ebuild b/media-gfx/zgv/zgv-5.9.ebuild
index e790e228ca88..9c2644ef271a 100644
--- a/media-gfx/zgv/zgv-5.9.ebuild
+++ b/media-gfx/zgv/zgv-5.9.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/zgv-5.9.ebuild,v 1.4 2011/02/28 17:49:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/zgv-5.9.ebuild,v 1.5 2011/11/05 06:54:22 ssuominen Exp $
 
+EAPI=4
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A svgalib console image viewer"
@@ -13,33 +14,37 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-DEPEND=">=media-libs/svgalib-1.4.2
+RDEPEND=">=media-libs/svgalib-1.4.2
 	virtual/jpeg
 	media-libs/libpng
 	>=media-libs/tiff-3.5.5
 	>=sys-libs/zlib-1.1.4
 	sys-apps/gawk"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i "/^CFLAGS=/s:=.*:=${CFLAGS}:" config.mk
-	sed -i -e 's:$(RM):echo:' doc/Makefile
-	epatch "${FILESDIR}"/${P}-Makefile-QA.patch
-	epatch "${FILESDIR}"/zgv-5.9-cmyk-yccl-fix.diff
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e "/^CFLAGS=/s:=.*:=${CFLAGS}:" config.mk || die
+	sed -i -e 's:$(RM):echo:' doc/Makefile || die
+
+	epatch \
+		"${FILESDIR}"/${P}-Makefile-QA.patch \
+		"${FILESDIR}"/${P}-cmyk-yccl-fix.diff \
+		"${FILESDIR}"/${P}-libpng15.patch
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
 	dodir /usr/bin /usr/share/info /usr/share/man/man1
-	make PREFIX="${D}"/usr \
+
+	emake \
+		PREFIX="${D}"/usr \
 		INFODIR="${D}"/usr/share/info \
 		MANDIR="${D}"/usr/share/man/man1 \
-		install || die
+		install
+
 	dodoc AUTHORS ChangeLog INSTALL NEWS README* SECURITY TODO
 
 	# Fix info files