Fix building with libpng14.

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

5 files changed, 24 insertions, 4 deletions

diff --git a/app-text/dvipdfmx/ChangeLog b/app-text/dvipdfmx/ChangeLog
index 548e60e580d3..8ab3a2200803 100644
--- a/app-text/dvipdfmx/ChangeLog
+++ b/app-text/dvipdfmx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/dvipdfmx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfmx/ChangeLog,v 1.49 2010/02/10 21:14:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfmx/ChangeLog,v 1.50 2010/03/08 12:21:38 ssuominen Exp $
+
+  08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  dvipdfmx-20090708-r1.ebuild, +files/dvipdfmx-20090708-libpng14.patch:
+  Fix building with libpng14.
 
   10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   dvipdfmx-20090708-r1.ebuild:
diff --git a/app-text/dvipdfmx/dvipdfmx-20050831.ebuild b/app-text/dvipdfmx/dvipdfmx-20050831.ebuild
index 786b090010b3..2b9447384d3c 100644
--- a/app-text/dvipdfmx/dvipdfmx-20050831.ebuild
+++ b/app-text/dvipdfmx/dvipdfmx-20050831.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfmx/dvipdfmx-20050831.ebuild,v 1.8 2009/12/26 17:29:37 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfmx/dvipdfmx-20050831.ebuild,v 1.9 2010/03/08 12:21:38 ssuominen Exp $
 
 inherit eutils
 
@@ -17,6 +17,7 @@ KEYWORDS="alpha amd64 ppc sparc x86"
 RDEPEND="virtual/tex-base
 	app-text/ghostscript-gpl
 	>=media-libs/libpng-1.2.1
+	<media-libs/libpng-1.4
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/openssl-0.9.6i"
 DEPEND="${RDEPEND}
diff --git a/app-text/dvipdfmx/dvipdfmx-20071115-r1.ebuild b/app-text/dvipdfmx/dvipdfmx-20071115-r1.ebuild
index 5d808b42cc7e..90e2f4972539 100644
--- a/app-text/dvipdfmx/dvipdfmx-20071115-r1.ebuild
+++ b/app-text/dvipdfmx/dvipdfmx-20071115-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfmx/dvipdfmx-20071115-r1.ebuild,v 1.3 2009/11/11 20:47:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfmx/dvipdfmx-20071115-r1.ebuild,v 1.4 2010/03/08 12:21:38 ssuominen Exp $
 
 inherit eutils
 
@@ -16,6 +16,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 
 DEPEND="virtual/tex-base
 	>=media-libs/libpng-1.2.1
+	<media-libs/libpng-1.4
 	>=sys-libs/zlib-1.1.4
 	app-text/libpaper
 	!<app-text/texlive-core-2007-r10"
diff --git a/app-text/dvipdfmx/dvipdfmx-20090708-r1.ebuild b/app-text/dvipdfmx/dvipdfmx-20090708-r1.ebuild
index 1cb7713a8253..91db97ddf8bb 100644
--- a/app-text/dvipdfmx/dvipdfmx-20090708-r1.ebuild
+++ b/app-text/dvipdfmx/dvipdfmx-20090708-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfmx/dvipdfmx-20090708-r1.ebuild,v 1.5 2010/02/10 21:14:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfmx/dvipdfmx-20090708-r1.ebuild,v 1.6 2010/03/08 12:21:38 ssuominen Exp $
 
 EAPI="2"
 
@@ -29,6 +29,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PV}-fix_file_collisions.patch"
+	"${FILESDIR}/${P}-libpng14.patch"
 )
 
 src_prepare() {
diff --git a/app-text/dvipdfmx/files/dvipdfmx-20090708-libpng14.patch b/app-text/dvipdfmx/files/dvipdfmx-20090708-libpng14.patch
new file mode 100644
index 000000000000..37ba9b64f8a1
--- /dev/null
+++ b/app-text/dvipdfmx/files/dvipdfmx-20090708-libpng14.patch
@@ -0,0 +1,13 @@
+http://repos.archlinux.org/wsvn/packages/texlive-bin/trunk/libpng14.patch
+
+--- src/pngimage.c
++++ src/pngimage.c
+@@ -148,7 +148,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;