Fix building with libpng14.

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

4 files changed, 42 insertions, 17 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/Manifest b/app-text/dvipdfm/Manifest
index 389dd065771b..05600cce221c 100644
--- a/app-text/dvipdfm/Manifest
+++ b/app-text/dvipdfm/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX dvipdfm-0.13.2d-libpng14.patch 643 RMD160 fa404fff004bfcd4ad4e548e4df27c639e96c3f1 SHA1 0ad1f6fa1f89125521c1a61547b262527002802f SHA256 8a009c2a0bacf7c175714e5fe96d01babf4fc4a2d415f1d3491c6c5fbbee9c6f
 DIST dvipdfm-0.13.2d.tar.gz 236898 RMD160 b167399ceabb6f87f8d2da467f66e8fed3ff9268 SHA1 cb0cfac75efe0e3db6182ca3f1250f1e96838537 SHA256 fc21d4ef316fdd28cce7ce64a9ed3d2254ea1969380a5f52d131ec61d5fb73bc
-EBUILD dvipdfm-0.13.2d-r1.ebuild 1444 RMD160 57e5a27f5cbd6c5ea82921e746d41a676a3b5256 SHA1 c92622675dc697d94f1a658fef715ad1ba8c61f3 SHA256 01bfb057c1b771b6d0420a696ab2a5c7b9e7165cb4819030975b41d024596f59
-MISC ChangeLog 3886 RMD160 5f12a57b4c257b9345c9b65419a40bdd044e72f8 SHA1 07a18ef3bd51ac373c4de1abe72473727a7ec87a SHA256 dc675494f0fa53a141c19f9dca1c2ae73bdea916f56fd7d7f53412a251197ab3
+EBUILD dvipdfm-0.13.2d-r1.ebuild 1543 RMD160 3ad59d8ca045bf2920dbf515b30595796feaecbe SHA1 8cc5e1c7926e78565a2a2fc453ddad3459e65ba9 SHA256 ccf3b94234f81d803eb1ebf716414c294dd3d7c5fb4a698ace22f8e226fd601f
+MISC ChangeLog 4040 RMD160 fb1a26739e6e5cd4384f3281d038aba47596e54f SHA1 ad424a7ef7be18b17f56700af301d5f22601e7b5 SHA256 1e8572260603a764398cf1dc7f2dce89642825bdfee717bf5dd1b4165846da72
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoNhusACgkQvFcC4BYPU0oytgCeMExQIMmy6EmCc6e10Kxra52V
-Md8AnjCLjiixQamCsEMgZbLcfg73xJDL
-=80Ku
------END PGP SIGNATURE-----
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;
+   }