diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-10-17 15:34:01 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-10-17 15:34:01 +0000 |
| commit | 6df28cc67b6fd4edec0861b9c448c86aa89ddf41 (patch) | |
| tree | d3361e78205c7d4c70c825d3b813f5e4ed29d0b4 /dev-lang | |
| parent | Version bump pyzmq to 2.1.10. (diff) | |
| download | gentoo-2-6df28cc67b6fd4edec0861b9c448c86aa89ddf41.tar.gz gentoo-2-6df28cc67b6fd4edec0861b9c448c86aa89ddf41.tar.bz2 gentoo-2-6df28cc67b6fd4edec0861b9c448c86aa89ddf41.zip | |
Fix building with libpng15 wrt #366223. Fix building with sys-libs/zlib >= 1.2.5.1-r1 (OF).
(Portage version: 2.2.0_alpha67/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/R/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/R/R-2.10.1.ebuild | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index c2f069b175f9..bdb3e34b3029 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/R # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.189 2011/10/05 19:20:04 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.190 2011/10/17 15:34:01 ssuominen Exp $ + + 17 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> R-2.10.1.ebuild: + Fix building with libpng15 wrt #366223. Fix building with sys-libs/zlib >= + 1.2.5.1-r1 (OF). 05 Oct 2011; Alexis Ballier <aballier@gentoo.org> R-2.10.1.ebuild, R-2.12.1.ebuild, R-2.12.2.ebuild, R-2.13.0.ebuild, R-2.13.1-r1.ebuild: diff --git a/dev-lang/R/R-2.10.1.ebuild b/dev-lang/R/R-2.10.1.ebuild index 8a59a8fc8e91..03f3516b739f 100644 --- a/dev-lang/R/R-2.10.1.ebuild +++ b/dev-lang/R/R-2.10.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.10.1.ebuild,v 1.13 2011/10/05 19:20:04 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.10.1.ebuild,v 1.14 2011/10/17 15:34:01 ssuominen Exp $ EAPI=2 @@ -76,6 +76,16 @@ src_prepare() { sed -i -e 's:\.\./manual/:manual/:g' $(grep -Flr ../manual/ doc) \ || die "sed for HTML links to manual failed" + # Fix compability with zlib-1.2.5.1-r1 OF change + has_version ">=sys-libs/zlib-1.2.5.1-r1" && \ + sed -i -e '1i#define OF(x) x' src/main/unzip.h + + # Missing include that was implicit before + sed -i -e '1i#include <zlib.h>' src/main/dounzip.c || die + + # Don't try to access libpng internal structure + sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/modules/X11/rbitmap.c || die + use lapack && \ export LAPACK_LIBS="$(pkg-config --libs lapack)" |