Fix building with libpng 1.4.x wrt #319253 by Dmitry Kravtsov.

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

4 files changed, 31 insertions, 9 deletions

diff --git a/dev-scheme/plt-scheme/ChangeLog b/dev-scheme/plt-scheme/ChangeLog
index 6f1a6b01cf28..b94b325a35c9 100644
--- a/dev-scheme/plt-scheme/ChangeLog
+++ b/dev-scheme/plt-scheme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-scheme/plt-scheme
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/plt-scheme/ChangeLog,v 1.11 2009/10/09 15:15:42 hkbst Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/plt-scheme/ChangeLog,v 1.12 2010/05/11 10:28:00 ssuominen Exp $
+
+  11 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  plt-scheme-4.2.2.ebuild, +files/plt-scheme-4.2.2-libpng14.patch:
+  Fix building with libpng 1.4.x wrt #319253 by Dmitry Kravtsov.
 
 *plt-scheme-4.2.2 (09 Oct 2009)
 
diff --git a/dev-scheme/plt-scheme/Manifest b/dev-scheme/plt-scheme/Manifest
index 639d5644d223..c8dd6131e938 100644
--- a/dev-scheme/plt-scheme/Manifest
+++ b/dev-scheme/plt-scheme/Manifest
@@ -1,5 +1,6 @@
 AUX plt-scheme-372-as_needed.patch 1682 RMD160 13e9e2e17c8eeadcb1f54d87a44a76e076673556 SHA1 33b92cb5cf94efdd3c024b95b801012f0fee53db SHA256 afd811f6d803f23c998c7b199a854b1100089a16470c0ce06e77a64b4df7fec0
 AUX plt-scheme-4.1.2-as_needed.patch 1724 RMD160 5eba5c33ab5945a040356d6b5639cb43dcf0b2cd SHA1 775690004e0cbd379a7c06cd83c98f8c6cd8d3d6 SHA256 cc3fa1bfafc76d19378671257853182d6b056229c7392815a1cfa315f8cda1ae
+AUX plt-scheme-4.2.2-libpng14.patch 603 RMD160 99fa0e5046041d1fcdda6f09732bde60bc5bea21 SHA1 86c3d7ca198cfc3e8aade8cad2ca9a268b8b074d SHA256 73e1851756b2a91fee72161b88bc103ac5f125215b279979cf8e3226cf0c1d52
 AUX typo.patch 553 RMD160 f96b5439d6ac997894761e133e31c3596c52bde1 SHA1 9e386d9934469c972335f10f3defea7a70f9f79b SHA256 1769aaebba3a75311d2297d8258ec2f69ff893801674d2bb0ca70416c75624df
 DIST plt-4.1-src-unix.tgz 14908190 RMD160 80bb4b9bf0bf878c5150c5d69330b47cdd5e1de2 SHA1 12b0de3ea1255a40c7c184105a6272d4bd4d8c1b SHA256 d632a469923f087f3dd34ef39c36c0f3ad277018b8d8f26030d26c773f3de28c
 DIST plt-4.1.2-src-unix.tgz 14624105 RMD160 16bee63b04857fe147d57434fee52684382cbfa2 SHA1 62efd7047e9e5fe90492487a02583236464ddbbc SHA256 0ab7ea7b59387565e8ce066431ad39d31d6229b3e65f57eb018993585b82e8a9
@@ -15,7 +16,7 @@ EBUILD plt-scheme-4.1.4.ebuild 2332 RMD160 4b06fe1547705207ad09801545f3ac57dc68a
 EBUILD plt-scheme-4.1.5.ebuild 2261 RMD160 419aadbabeba42262e8ebee010c092e7389b6bd7 SHA1 abd1ecc6c89f806beae3b50941fa9a8b24d90052 SHA256 7d480737cacb4dce9930f205154b39bfec66016431899d1b9634e9ec71e8adb3
 EBUILD plt-scheme-4.1.ebuild 2369 RMD160 8fd22368b2ad8deceedb254d76f0e604b2023e4c SHA1 38233f00766539e3b88eafe9d3dfe4aac766eb2b SHA256 13a04f8175e32a30313993a4791de6d00df8075f758b59b0aab0a9027753fa0f
 EBUILD plt-scheme-4.2.1.ebuild 2388 RMD160 619faffca7ed4c5253b43b4b8ceb63f230ddf20b SHA1 42dadad1cd51073de37a9e82e7a4eba43ee1c2aa SHA256 a0d3eb60caf6580484cda22736ef274a996562fa5342af114e7c492ab7680194
-EBUILD plt-scheme-4.2.2.ebuild 2389 RMD160 fc7b4a3c1e0d7862c0040f18187fc84aac842bd3 SHA1 5d01e0d88310f1acb49d301c7c68e82f2d428902 SHA256 a7970c4b61eae6b21954e36e942fad2c2963d6861944ed4adac370a79e52b8ac
+EBUILD plt-scheme-4.2.2.ebuild 2412 RMD160 ccd0aafd1cb0136d27cc6edef312977eec6b8670 SHA1 192a9b2ed9964439e410dea6e017ed796b690cee SHA256 9f82b2f0f8a0ba674a171d1212d8f37be15e1e476abb37be82f3a2d8283bcee4
 EBUILD plt-scheme-4.2.ebuild 2352 RMD160 128e7afa687c8385ce143c9bc047e416f2058a01 SHA1 a24b04d9d82fb535ccf470680df2b8c216ac24bb SHA256 d62b3a2daa15eef8e325b90559e0ff776863373e27ad6cb95722c379bdb39ee9
-MISC ChangeLog 18957 RMD160 e77af20cfcf1bb2a35a2fc4a1cf690fd37efb0ee SHA1 81cd133a8cb19628e6fc9cc341992c0233d3ad7b SHA256 b48ab2b9441192bbbce8677b7f8321ccd759a96dd5d249553929df9b016b5a20
+MISC ChangeLog 19148 RMD160 37c6db412e42924013d3bb8abf6585a7ad5b0d39 SHA1 8a317ed35173bea0b6ffc6c589d7479189e26ce1 SHA256 cbd830ffcd87dd32bcd165eda11fcb8662d9459131eaa9fea9c940633b1ed490
 MISC metadata.xml 911 RMD160 2f67df0759e77a8edd33ec8934987c7ae797bbad SHA1 92a76ca8f5712fa8564fde78856b512397f02151 SHA256 8cb2bb61a4d6bbbba0485f40ada3daa8ef48cb0c271199d7d3fe7941092b900e
diff --git a/dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch b/dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch
new file mode 100644
index 000000000000..da20e0878c16
--- /dev/null
+++ b/dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch
@@ -0,0 +1,15 @@
+diff -ur plt-4.2.2.orig/src/wxcommon/wxJPEG.cxx plt-4.2.2/src/wxcommon/wxJPEG.cxx
+--- plt-4.2.2.orig/src/wxcommon/wxJPEG.cxx	2009-09-17 06:08:52.000000000 +0300
++++ plt-4.2.2/src/wxcommon/wxJPEG.cxx	2010-05-11 13:17:28.000000000 +0300
+@@ -726,7 +726,11 @@
+        png_set_strip_16(png_ptr);
+ 
+      /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
++     #if PNG_LIBPNG_VER < 10400
+      png_set_gray_1_2_4_to_8(png_ptr);
++     #else
++     png_set_expand_gray_1_2_4_to_8(png_ptr);
++     #endif
+    }
+ 
+    /* Set the background color to draw transparent and alpha images over.
diff --git a/dev-scheme/plt-scheme/plt-scheme-4.2.2.ebuild b/dev-scheme/plt-scheme/plt-scheme-4.2.2.ebuild
index f26a50d64db8..381d558495c8 100644
--- a/dev-scheme/plt-scheme/plt-scheme-4.2.2.ebuild
+++ b/dev-scheme/plt-scheme/plt-scheme-4.2.2.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/dev-scheme/plt-scheme/plt-scheme-4.2.2.ebuild,v 1.1 2009/10/09 15:15:42 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/plt-scheme/plt-scheme-4.2.2.ebuild,v 1.2 2010/05/11 10:28:00 ssuominen Exp $
 
 inherit eutils latex-package
 
@@ -45,12 +45,14 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-#	epatch "${FILESDIR}"/typo.patch
-
 	#remove bundled libraries
 	rm -rf wxcommon/{jpeg,libpng,zlib}
 
-	sed "s,docdir=\"\${datadir}/plt/doc,docdir=\"\${datadir}/doc/${PF}," -i configure || die
+	epatch "${FILESDIR}"/${P}-libpng14.patch
+
+	sed -i \
+		-e "s,docdir=\"\${datadir}/plt/doc,docdir=\"\${datadir}/doc/${PF}," \
+		configure || die
 }
 
 src_compile() {