Fix building with libpng14 (copied from app-text/dvipdfm and app-text/dvipdfmx).

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

4 files changed, 48 insertions, 7 deletions

diff --git a/app-text/ptex/ChangeLog b/app-text/ptex/ChangeLog
index c718df5bfc4a..948fa3bd7401 100644
--- a/app-text/ptex/ChangeLog
+++ b/app-text/ptex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/ptex
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.90 2009/12/13 15:30:47 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.91 2010/03/08 16:41:39 ssuominen Exp $
+
+  08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  ptex-3.1.10_p20090610-r1.ebuild,
+  +files/ptex-3.1.10_p20090610-libpng14.patch:
+  Fix building with libpng14 (copied from app-text/dvipdfm and
+  app-text/dvipdfmx).
 
   11 Dec 2009; Brent Baude <ranger@gentoo.org> ptex-3.1.10_p20090610.ebuild:
   Marking ptex-3.1.10_p20090610 ppc64 for bug 289339
diff --git a/app-text/ptex/Manifest b/app-text/ptex/Manifest
index 02cc64162f4b..0a0ab5e9b5da 100644
--- a/app-text/ptex/Manifest
+++ b/app-text/ptex/Manifest
@@ -6,6 +6,7 @@ AUX ptex-3.1.10_p20071122-pdftosrc-install.patch 979 RMD160 08544f56b48be70f974d
 AUX ptex-3.1.10_p20071203-gentoo.patch 4337 RMD160 ffe5b5d6dd9dc203541d99f8249c3bb5f8dd5296 SHA1 14d6686c9ffd47050e3f0281c7bdd242481a4ce7 SHA256 c3d7fab82f264d4aee70ae27aeca2f8c2615a3910715d17894ead9ccca9e6540
 AUX ptex-3.1.10_p20090610-gentoo.patch 5497 RMD160 2f2c8f53b43416f771a312123c158bdb7ce69922 SHA1 9d31ac401ed73fcce76d87dc6e6d9e9d9f63ccde SHA256 f3fac1a1c60d915882a5f47434ee857e22c77001d2ff9c4fc042de35c2d1456a
 AUX ptex-3.1.10_p20090610-getline.patch 2670 RMD160 5fbc40f7f394bff0a57b16dbbde24f5b6b6bbbbc SHA1 c81b08ac72db0ceadaf9e3eb90272159529f1cc8 SHA256 1f61b5a1dbaea2133ed275df8dcc264f58c648ae6330e8d9270de9304efb71ee
+AUX ptex-3.1.10_p20090610-libpng14.patch 1034 RMD160 008b9363473241e617742f0e700e73b8beb515e3 SHA1 ff4d2a3e9a9d278850ecc2d95c97cd24a131d522 SHA256 a4b466c72d0e1f906a496b25a87c61b5338421256bdd09b8ca7d554a0f192ef5
 AUX ptex-3.1.10_p20090610-r1-gentoo.patch 7758 RMD160 b1d832a9e7b2dd27fe8315b1543bb22be19c0af0 SHA1 dd39f3f94980a4fb89c52eddb5b18f1412db121b SHA256 3daa6d6b2aba0dd230e1cec9bf9eac89d2f5fe4947eb9b086f06e0c96e89892e
 AUX tetex-3.0-kpathsea-pic.patch 1791 RMD160 30c7da6951977eab26323509b7034a9a1cb6a809 SHA1 d5a894337e87c04daf2f98fdb3fcdab9cf55c8f2 SHA256 d00020bd51264210be5425d2392e373b9f3964302e4f24401c398f3704631691
 AUX tetex-3.0_p1-create-empty-files.patch 1171 RMD160 908bfb3dedd721e021fc16c1ed9bee1159e5f947 SHA1 e929b5d8272ae81a65c726f139d4cfe14ea9a4a5 SHA256 3c2efa2cc82fccd5452e3ba49a9207264bcf06d2a4467158f4d5f45bd84b3268
@@ -23,7 +24,7 @@ DIST ptex-3.1.10_p20071122-dviljk-security-fixes.patch.bz2 8739 RMD160 7a63ebf1e
 DIST tetex-src-3.0.tar.gz 12749314 RMD160 15a139f5f36993e4ed3583260e175cfb13ce7bcc SHA1 7637789f7f4929694aed1b89820f5bad4753e8fc SHA256 9c0f7eaeb5ba6dc6f66433404d264941bf95cded2fa798b1f7a9dd580c21649b
 DIST tetex-texmf-3.0po.tar.gz 91402377 RMD160 a1e87733fa3cbef04e39a690ed8549aeaaddb241 SHA1 1be97f57a26a6e9b72ebfd932e45914a959aff16 SHA256 6c3b8fa619749cbb28ca0f8847e56773d13e0bb92f1ea34287420950373640c2
 EBUILD ptex-3.1.10_p20071203.ebuild 7837 RMD160 c5637d155307bcac3726b05d37bbbe9a8068bdd5 SHA1 8cfa9ba8e4c4fc10d9d1ba94d7f0f11bb56823f6 SHA256 bc12e8ab650d55b10e310d00f723a8dfa5fbd972f2d037c726e6ef673d23010c
-EBUILD ptex-3.1.10_p20090610-r1.ebuild 8277 RMD160 aee309cd7358338efdd19350789fc2899d1bcc2d SHA1 d1027425dd9b814f8d842b70841cf8a2c884d459 SHA256 dd4d8fbd74d139a34f3183fade3faf86705710ae9103c46e547a37916b6ad3ca
+EBUILD ptex-3.1.10_p20090610-r1.ebuild 8318 RMD160 a45be406a6b61f03f6e429d1b12b84ecbd61273a SHA1 5fca27f886a666cb7ea201793fa5ad55954438a3 SHA256 2e62d20d742728230ed1e9d6c7e3e477d587a11ff54da408ea2346e18fd32ee8
 EBUILD ptex-3.1.10_p20090610.ebuild 8208 RMD160 93cc2ebd660e0216d14659537e89b866496f31d0 SHA1 06d26722b6329a95e0bb1c7221be3e14ed32715c SHA256 5e637e54f1c772ec44171a11ef6ae313e41e5b367bdf6bb62c6362525a64ddd3
-MISC ChangeLog 15298 RMD160 09ac5abb2694f89e18a6dccdae671fce3593738b SHA1 1e2ef72e75d5c1fb6c30b194c445b438066b8db5 SHA256 f2da043b4c4c30bd51765e1f954b45fa5839718eb6bf0bea8559c97730b70f9c
+MISC ChangeLog 15523 RMD160 94635853c7b450e33da73072a12167a265256266 SHA1 fc5beaad28b23361f147e43180fd56dc18b666d7 SHA256 0fa64e92fe21ad2eee7580c78ba481d74041a61f8e6292250ed317c213b0fddb
 MISC metadata.xml 450 RMD160 910d918b9fe476cdb72c633a1c5532549d3f6114 SHA1 33ca5b367c7d2f1d470d8c18afc11230b501da89 SHA256 b9d2baa3e5a641dd35a68feed6752e874b2131480d63989ef5830080a942608b
diff --git a/app-text/ptex/files/ptex-3.1.10_p20090610-libpng14.patch b/app-text/ptex/files/ptex-3.1.10_p20090610-libpng14.patch
new file mode 100644
index 000000000000..b19ba6a00482
--- /dev/null
+++ b/app-text/ptex/files/ptex-3.1.10_p20090610-libpng14.patch
@@ -0,0 +1,33 @@
+--- texk/dvipdfm/pngimage.c
++++ texk/dvipdfm/pngimage.c
+@@ -42,7 +42,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;
+--- texk/dvipdfm/thumbnail.c
++++ texk/dvipdfm/thumbnail.c
+@@ -79,7 +79,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;
+   }
+--- texk/dvipdfmx/src/pngimage.c
++++ texk/dvipdfmx/src/pngimage.c
+@@ -146,7 +146,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;
diff --git a/app-text/ptex/ptex-3.1.10_p20090610-r1.ebuild b/app-text/ptex/ptex-3.1.10_p20090610-r1.ebuild
index 7f855e966491..707c133aeb29 100644
--- a/app-text/ptex/ptex-3.1.10_p20090610-r1.ebuild
+++ b/app-text/ptex/ptex-3.1.10_p20090610-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/ptex/ptex-3.1.10_p20090610-r1.ebuild,v 1.1 2009/11/15 02:37:33 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.10_p20090610-r1.ebuild,v 1.2 2010/03/08 16:41:39 ssuominen Exp $
 
 # jmbreuer FOR DEV ONLY
 RESTRICT="mirror test"
@@ -199,7 +199,8 @@ EOF
 	# security bug #282874
 	epatch "${FILESDIR}/CVE-2009-1284.patch"
 
-	epatch "${FILESDIR}/${P}-getline.patch"
+	epatch "${FILESDIR}"/${P}-getline.patch \
+		"${FILESDIR}"/${P}-libpng14.patch
 
 	cd "${TETEX_S}/texk/dviljk"
 	eautoreconf