diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2015-02-03 15:36:47 +0000 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2015-02-03 15:36:47 +0000 |
| commit | 40d4f7a1bfa8fedb80a13baedc63c8bc5d0dd172 (patch) | |
| tree | db1cd4720c16014d7695be97baa100fdb89b539e /dev-java/icu4j | |
| parent | Linux patch 3.4.106 (diff) | |
| download | gentoo-2-40d4f7a1bfa8fedb80a13baedc63c8bc5d0dd172.tar.gz gentoo-2-40d4f7a1bfa8fedb80a13baedc63c8bc5d0dd172.tar.bz2 gentoo-2-40d4f7a1bfa8fedb80a13baedc63c8bc5d0dd172.zip | |
dev-java/icu4j-4.4.2: fixed compilation with jdk8
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key CFE47E2F)
Diffstat (limited to 'dev-java/icu4j')
| -rw-r--r-- | dev-java/icu4j/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/icu4j/files/icu4j-4.4.2-add-jdk8-to-check.patch | 12 | ||||
| -rw-r--r-- | dev-java/icu4j/icu4j-4.4.2.ebuild | 10 |
3 files changed, 25 insertions, 5 deletions
diff --git a/dev-java/icu4j/ChangeLog b/dev-java/icu4j/ChangeLog index e99a028279fe..77c91e28f2ab 100644 --- a/dev-java/icu4j/ChangeLog +++ b/dev-java/icu4j/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/icu4j -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.65 2014/10/25 06:29:18 ercpe Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.66 2015/02/03 15:36:47 fordfrog Exp $ + + 03 Feb 2015; Miroslav Šulc <fordfrog@gentoo.org> icu4j-4.4.2.ebuild, + +files/icu4j-4.4.2-add-jdk8-to-check.patch: + fixed compilation with jdk8 *icu4j-54.1.1 (25 Oct 2014) diff --git a/dev-java/icu4j/files/icu4j-4.4.2-add-jdk8-to-check.patch b/dev-java/icu4j/files/icu4j-4.4.2-add-jdk8-to-check.patch new file mode 100644 index 000000000000..4946cf8c9840 --- /dev/null +++ b/dev-java/icu4j/files/icu4j-4.4.2-add-jdk8-to-check.patch @@ -0,0 +1,12 @@ +diff --git a/build.xml b/build.xml +index 6f82ec5..9e763ae 100644 +--- a/build.xml ++++ b/build.xml +@@ -27,6 +27,7 @@ + <or>
+ <contains string="${java.version}" substring="1.6."/>
+ <contains string="${java.version}" substring="1.7."/>
++ <contains string="${java.version}" substring="1.8."/>
+ </or>
+ </condition>
+ <condition property="is.java5">
diff --git a/dev-java/icu4j/icu4j-4.4.2.ebuild b/dev-java/icu4j/icu4j-4.4.2.ebuild index bcbf3ba40299..dba30db01bcf 100644 --- a/dev-java/icu4j/icu4j-4.4.2.ebuild +++ b/dev-java/icu4j/icu4j-4.4.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-4.4.2.ebuild,v 1.6 2014/08/10 20:15:08 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-4.4.2.ebuild,v 1.7 2015/02/03 15:36:47 fordfrog Exp $ -EAPI=2 +EAPI=5 # We currently download the Javadoc documentation. # It could optionally be built using the Ant build file. @@ -48,6 +48,10 @@ src_unpack() { fi } +src_prepare() { + epatch "${FILESDIR}"/icu4j-4.4.2-add-jdk8-to-check.patch +} + src_compile() { # Classes extending CharsetICU not implementing Comparable # Breaks with ecj on jdk 1.5+, javac doesn't mind - Sun's hack? |