From: Samuli Suominen <ssuominen@gentoo.org>
Date: Mon, 8 Mar 2010 12:21:40 +0000 (+0000)
Subject: Fix building with libpng14.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=469d6429512c243a9868713259c8167dae53ad90;p=gentoo.git

Fix building with libpng14.
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64
---

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/Manifest b/app-text/dvipdfmx/Manifest
index ebff2f9accfa..28bf73f8343a 100644
--- a/app-text/dvipdfmx/Manifest
+++ b/app-text/dvipdfmx/Manifest
@@ -1,10 +1,11 @@
 AUX 20090708-fix_file_collisions.patch 452 RMD160 738020ac65a9b60d470bdc9678cc272859651a4e SHA1 5d35afdacad052c353e3aa9d311ff99bd2bfe9b0 SHA256 c2dc6112a432a19763a6118190141745d02dec3d648c8f212b204906007ed31b
 AUX cid-x.map 3906 RMD160 a3dc6c7b64e10c70ae6c19eb9a7b5fbe266e830b SHA1 317908795e30df1d4a3be36ab37ab57f4ee5af24 SHA256 0007e23b2bd87880020a9b7802c44c10c83106072c2f120fc45822504948ba14
+AUX dvipdfmx-20090708-libpng14.patch 386 RMD160 71d42ac53d62df8f576def144d416047d135ae60 SHA1 3e578b637f9e6ecd1754b34a74960786eb65c821 SHA256 a5dd0ac342776943c598cbadbb79c0a4961feda87945c7e1e6ac07be8a8665f5
 DIST dvipdfmx-20050831.tar.gz 553761 RMD160 43c559fa663307998069ce79b49049d276484be4 SHA1 331b41a7d139a166e7646c180e018463e2e54298 SHA256 40d235d4f888bc5438c29f7007cebb36e3480669a87746d54e64a2f5cfe19475
 DIST dvipdfmx-20071115.tar.gz 579875 RMD160 4124c96a9833771be2b50ca0c3655c80e8deb4d5 SHA1 96425fdd01f36dda68165fcc3fa0363f92bd3f43 SHA256 8d72eb3f6058bcaf8b54c1d0c981dcd92cda9d97f07debcc1a948a862b648854
 DIST dvipdfmx-20090708.tar.gz 593214 RMD160 41b57a20264a569222f3b59ac023dff427e2fddf SHA1 f520bf3ff4ab038b3d2950ba85ebb2c1a6429b08 SHA256 ca3b227211b10ceeb8b4ae4065e52f8b523c55bf42174f5007ac5abba13f7a3a
-EBUILD dvipdfmx-20050831.ebuild 1841 RMD160 ef30686d5cef96d15dea6d8735eb79170b32a2fa SHA1 2bb272b792473cfd566ac33d9c4843fcca39d190 SHA256 ec05c969414000543f972dd9a32038db51c6ab90563f05cebe12a567376e702a
-EBUILD dvipdfmx-20071115-r1.ebuild 1537 RMD160 b231cc4f3a530c81ae24084e4fe05bfd41aa9022 SHA1 f8e45cc8a878c01bf54d0e13ab8f30830e060037 SHA256 666a7f03d940bfdce5181e257d887875f411eed8000ea874104519a61a59cec0
-EBUILD dvipdfmx-20090708-r1.ebuild 1551 RMD160 1e1ffc0d277cafbbd03da07f6b46b1c6202b9bfa SHA1 6e6d9e3c78570510d31f505c1fbffc8c0466f887 SHA256 f08f241591e5dbeaf4c3020f8e92f6ab969f51d2c4b4a50f1a86167d09e29886
-MISC ChangeLog 7388 RMD160 29c051d205b45bc5caeb25a545694d3afeb46dda SHA1 3a11ba0648a388c7ec1bfc194b8d614573f24ef8 SHA256 5ced764cd00247d1853b0a53d977889b1b9c138761339a68401f90a2cba0b9e6
+EBUILD dvipdfmx-20050831.ebuild 1871 RMD160 3f8926b4c1fd5cf838d440f0259d6fd1f4ec36bb SHA1 33ce1a3527c1cd22f47dfc1033e15907e02a0e5d SHA256 848eec6f2c11ec3c58c3a674cc1a6cca7e1c74a049441a5bf348ad11c00ac29a
+EBUILD dvipdfmx-20071115-r1.ebuild 1567 RMD160 d10f66c73928e3504760e91cf61ff7cbe70e93d3 SHA1 94cbe7d24572c43e722358d9b4ea4561fa03d4b0 SHA256 22201d0d269ef59335fbda9f115f5cf6fc2cdf24c3e62dc4d565d1eef668dbd7
+EBUILD dvipdfmx-20090708-r1.ebuild 1586 RMD160 000d39d3d9d7c57e844e7a227f92f2916a7a1353 SHA1 55e852528d5bdefffe94bc38c31a10b3171ced9e SHA256 d0cd79a790215992b053cab3a78c90a60f0baf4c4a65a49c83e335093b786e07
+MISC ChangeLog 7545 RMD160 3a86a8683d9bbbcbe40a0add1e0c36997e68afed SHA1 0dac75bb5f9263c03418e6daaea7b93921c5feb4 SHA256 ce1cf4bf4bc99389b8c2e730ee2ca41de9a6c79151e97570b9300bc6a43013bf
 MISC metadata.xml 781 RMD160 c0c563dad903352fa9e4b6ef66e9e5b58a82be0a SHA1 48c055def27eb5fc5a2b2d857879e4fdbd6c83cf SHA256 90ba24b54256cad9b4d7efc894f1019058252e07653f1e95f2edd90cfb00b91c
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;