Fix building with libpng14.

(Portage version: 2.2_rc65/cvs/Linux x86_64)

3 files changed, 39 insertions, 5 deletions

diff --git a/app-text/dvipdfm/ChangeLog b/app-text/dvipdfm/ChangeLog
index 39d3dde06c37..1c832aa6c03b 100644
--- a/app-text/dvipdfm/ChangeLog
+++ b/app-text/dvipdfm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/dvipdfm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfm/ChangeLog,v 1.32 2009/05/15 15:14:51 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfm/ChangeLog,v 1.33 2010/03/08 15:40:37 ssuominen Exp $
+
+  08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  dvipdfm-0.13.2d-r1.ebuild, +files/dvipdfm-0.13.2d-libpng14.patch:
+  Fix building with libpng14.
 
   15 May 2009; Alexis Ballier <aballier@gentoo.org>
   dvipdfm-0.13.2d-r1.ebuild:
diff --git a/app-text/dvipdfm/dvipdfm-0.13.2d-r1.ebuild b/app-text/dvipdfm/dvipdfm-0.13.2d-r1.ebuild
index fe4499a8d874..43cea59eebf8 100644
--- a/app-text/dvipdfm/dvipdfm-0.13.2d-r1.ebuild
+++ b/app-text/dvipdfm/dvipdfm-0.13.2d-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfm/dvipdfm-0.13.2d-r1.ebuild,v 1.13 2009/05/15 15:14:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfm/dvipdfm-0.13.2d-r1.ebuild,v 1.14 2010/03/08 15:40:37 ssuominen Exp $
+
+inherit eutils
 
 DESCRIPTION="DVI to PDF translator"
 SRC_URI="http://gaspra.kettering.edu/dvipdfm/${P}.tar.gz"
@@ -17,7 +19,13 @@ DEPEND="!>=app-text/tetex-2
 	!app-text/ptex
 	virtual/latex-base"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-libpng14.patch
+}
 
 src_install () {
 	einstall || die "einstall failed!"
diff --git a/app-text/dvipdfm/files/dvipdfm-0.13.2d-libpng14.patch b/app-text/dvipdfm/files/dvipdfm-0.13.2d-libpng14.patch
new file mode 100644
index 000000000000..f2b2e9816fae
--- /dev/null
+++ b/app-text/dvipdfm/files/dvipdfm-0.13.2d-libpng14.patch
@@ -0,0 +1,22 @@
+--- pngimage.c
++++ pngimage.c
+@@ -41,7 +41,7 @@
+   rewind (png_file);
+   if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
+       sizeof(sigbytes) ||
+-      (!png_check_sig (sigbytes, sizeof(sigbytes))))
++      (png_sig_cmp (sigbytes, 0, sizeof(sigbytes))))
+     return 0;
+   else
+     return 1;
+--- thumbnail.c
++++ thumbnail.c
+@@ -78,7 +78,7 @@
+   }
+   if (fread (sigbytes, 1, sizeof(sigbytes), thumb_file) !=
+       sizeof(sigbytes) ||
+-      (!png_check_sig (sigbytes, sizeof(sigbytes)))) {
++      (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)))) {
+     fprintf (stderr, "\nThumbnail not a png file! Skipping\n");
+     return NULL;
+   }