diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2012-02-09 17:35:25 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2012-02-09 17:35:25 +0000 |
| commit | 24f85c1b159296a4fc6e5870d6b6258956a7a245 (patch) | |
| tree | 6cf36fc351528b0b8b88a85055997e69ba4a82b3 /dev-lang/R | |
| parent | Fix compilation with clang, drop old version (diff) | |
| download | gentoo-2-24f85c1b159296a4fc6e5870d6b6258956a7a245.tar.gz gentoo-2-24f85c1b159296a4fc6e5870d6b6258956a7a245.tar.bz2 gentoo-2-24f85c1b159296a4fc6e5870d6b6258956a7a245.zip | |
Fixed for pcre-8.30, thanks Rainer 'Siju' Sigl for his initial work
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/R')
| -rw-r--r-- | dev-lang/R/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/R/R-2.14.1.ebuild | 5 | ||||
| -rw-r--r-- | dev-lang/R/files/R-2.14.1-pcre830.patch | 33 |
3 files changed, 41 insertions, 3 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index 697676736a50..26bb4c17c11c 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/R # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.193 2012/02/06 21:19:57 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.194 2012/02/09 17:35:24 bicatali Exp $ + + 09 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> R-2.14.1.ebuild, + +files/R-2.14.1-pcre830.patch: + Fixed for pcre-8.30, thanks Rainer 'Siju' Sigl for his initial work 06 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> R-2.14.1.ebuild, files/R-2.14.1-tiff.patch: diff --git a/dev-lang/R/R-2.14.1.ebuild b/dev-lang/R/R-2.14.1.ebuild index e5b1b68c7941..1c03e404734f 100644 --- a/dev-lang/R/R-2.14.1.ebuild +++ b/dev-lang/R/R-2.14.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.14.1.ebuild,v 1.2 2012/02/06 21:19:57 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.14.1.ebuild,v 1.3 2012/02/09 17:35:24 bicatali Exp $ EAPI=4 @@ -64,7 +64,8 @@ src_prepare() { "${FILESDIR}"/${PN}-2.12.1-ldflags.patch \ "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \ "${FILESDIR}"/${PN}-2.14.1-tiff.patch \ - "${FILESDIR}"/${PN}-2.14.1-rmath-shared.patch + "${FILESDIR}"/${PN}-2.14.1-rmath-shared.patch \ + "${FILESDIR}"/${PN}-2.14.1-pcre830.patch # fix packages.html for doc (bug #205103) sed -i \ diff --git a/dev-lang/R/files/R-2.14.1-pcre830.patch b/dev-lang/R/files/R-2.14.1-pcre830.patch new file mode 100644 index 000000000000..54036d6e01c7 --- /dev/null +++ b/dev-lang/R/files/R-2.14.1-pcre830.patch @@ -0,0 +1,33 @@ +Fix for pcre-8.30 and above + +--- src/main/util.c.orig 2012-02-09 17:15:08.000000000 +0000 ++++ src/main/util.c 2012-02-09 17:20:31.000000000 +0000 +@@ -1257,8 +1257,18 @@ + } + + #include "pcre.h" ++ ++/* This changed at 8.30 */ ++#if PCRE_MAJOR > 8 || PCRE_MINOR >= 30 ++extern int _pcre_valid_utf(const char *string, int length, int *erroroffset); ++ ++Rboolean utf8Valid(const char *str) ++{ ++ int errp; ++ return (_pcre_valid_utf(str, (int) strlen(str), &errp) == 0); ++} + /* This changed at 8.13: we don't allow < 8.0 */ +-#if PCRE_MAJOR > 8 || PCRE_MINOR >= 13 ++#elif PCRE_MAJOR > 8 || PCRE_MINOR >= 13 + extern int _pcre_valid_utf8(const char *string, int length, int *erroroffset); + + Rboolean utf8Valid(const char *str) +@@ -1266,7 +1276,7 @@ + int errp; + return (_pcre_valid_utf8(str, (int) strlen(str), &errp) == 0); + } +-#else ++#else + extern int _pcre_valid_utf8(const char *string, int length); + + Rboolean utf8Valid(const char *str) |