Fix building with libpng15 wrt #389591 by Navid Zamani

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

3 files changed, 46 insertions, 15 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/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