diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-05-11 10:28:00 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-11 10:28:00 +0000 |
| commit | ba128fd975918e47ac013d8b851777a2cb351730 (patch) | |
| tree | 9b11e23fd778c4498e93f20a6439e3896c7fa68a | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-ba128fd975918e47ac013d8b851777a2cb351730.tar.gz gentoo-2-ba128fd975918e47ac013d8b851777a2cb351730.tar.bz2 gentoo-2-ba128fd975918e47ac013d8b851777a2cb351730.zip | |
Fix building with libpng 1.4.x wrt #319253 by Dmitry Kravtsov.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
| -rw-r--r-- | dev-scheme/plt-scheme/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch | 15 | ||||
| -rw-r--r-- | dev-scheme/plt-scheme/plt-scheme-4.2.2.ebuild | 12 |
3 files changed, 28 insertions, 7 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/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() { |