diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2009-05-08 00:39:40 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2009-05-08 00:39:40 +0000 |
| commit | bafd62432d763e0f3c2379c52ce6a3d54e693ac5 (patch) | |
| tree | 76c6a3c0a0f76df5b37a47a41e3f025c7978f0f4 /dev-libs/icu | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-bafd62432d763e0f3c2379c52ce6a3d54e693ac5.tar.gz gentoo-2-bafd62432d763e0f3c2379c52ce6a3d54e693ac5.tar.bz2 gentoo-2-bafd62432d763e0f3c2379c52ce6a3d54e693ac5.zip | |
Fix bug 258377, gcc-4.4 compatibility. Thanks to Daniel J. <sleeperseven@hotmail.com> for the patch.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/icu')
| -rw-r--r-- | dev-libs/icu/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-libs/icu/icu-3.8.1-r1.ebuild | 7 | ||||
| -rw-r--r-- | dev-libs/icu/icu-4.0.1.ebuild | 5 |
3 files changed, 16 insertions, 5 deletions
diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog index a7e776bed092..ad2239f4dc3a 100644 --- a/dev-libs/icu/ChangeLog +++ b/dev-libs/icu/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/icu -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.84 2009/04/18 17:33:16 armin76 Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.85 2009/05/08 00:39:40 loki_val Exp $ + + 08 May 2009; Peter Alfredsen <loki_val@gentoo.org> icu-3.8.1-r1.ebuild, + icu-4.0.1.ebuild: + Fix bug 258377, gcc-4.4 compatibility. Thanks to Daniel J. + <sleeperseven@hotmail.com> for the patch. 18 Apr 2009; Raúl Porcel <armin76@gentoo.org> icu-4.0.1.ebuild: arm/ia64/s390/sh/sparc stable wrt #239538 diff --git a/dev-libs/icu/icu-3.8.1-r1.ebuild b/dev-libs/icu/icu-3.8.1-r1.ebuild index 4c70bfd0d33f..a6bba797b215 100644 --- a/dev-libs/icu/icu-3.8.1-r1.ebuild +++ b/dev-libs/icu/icu-3.8.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-3.8.1-r1.ebuild,v 1.7 2008/12/07 12:06:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-3.8.1-r1.ebuild,v 1.8 2009/05/08 00:39:40 loki_val Exp $ inherit eutils versionator @@ -51,6 +51,9 @@ src_unpack() { # Bug 208001 epatch "${FILESDIR}"/${PN}-3.8-regexp-CVE-2007-4770+4771.diff + # Bug 258377 + sed -i -e 's:^#elif$:#else:g' ${S}/layoutex/ParagraphLayout.cpp || die 'elif sed failed' + # do not hardcode used CFLAGS, LDFLAGS etc. into icu-config # Bug 202059 # http://bugs.icu-project.org/trac/ticket/6102 diff --git a/dev-libs/icu/icu-4.0.1.ebuild b/dev-libs/icu/icu-4.0.1.ebuild index 3b4562ed0736..4b6bc9e8f9e2 100644 --- a/dev-libs/icu/icu-4.0.1.ebuild +++ b/dev-libs/icu/icu-4.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.0.1.ebuild,v 1.8 2009/04/18 17:33:16 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.0.1.ebuild,v 1.9 2009/05/08 00:39:40 loki_val Exp $ EAPI="2" @@ -54,6 +54,9 @@ src_prepare() { sed -i -e "/^${x} =.*/s:@${x}@::" config/Makefile.inc.in || die "sed failed" done + # Bug 258377 + sed -i -e 's:^#elif$:#else:g' ${S}/layoutex/ParagraphLayout.cpp || die 'elif sed failed' + epatch "${FILESDIR}/${P}-fix_parallel_building.patch" epatch "${FILESDIR}/${P}-TestDisplayNamesMeta.patch" } |