diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2011-11-04 09:47:02 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2011-11-04 09:47:02 +0000 |
| commit | 517e5e7a30abe3eee8b389ef9704ad0b800b5681 (patch) | |
| tree | 8b1a978575ef86dc8397bac7a608296b6f227550 /dev-java | |
| parent | Bump to rc2. Cleanup older masked ones. (diff) | |
| download | gentoo-2-517e5e7a30abe3eee8b389ef9704ad0b800b5681.tar.gz gentoo-2-517e5e7a30abe3eee8b389ef9704ad0b800b5681.tar.bz2 gentoo-2-517e5e7a30abe3eee8b389ef9704ad0b800b5681.zip | |
Remove unused patches.
(Portage version: 2.2.0_alpha68/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/icedtea/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/icedtea/files/6.1.10.2-371405-linux_version.patch | 29 | ||||
| -rw-r--r-- | dev-java/icedtea/files/6.1.9.6-sparc.patch | 29 |
3 files changed, 5 insertions, 59 deletions
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index efa9312c1194..ba7f21d3d8aa 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/icedtea # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.35 2011/11/04 09:44:17 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.36 2011/11/04 09:47:02 caster Exp $ + + 04 Nov 2011; Vlastimil Babka <caster@gentoo.org> + -files/6.1.10.2-371405-linux_version.patch, -files/6.1.9.6-sparc.patch: + Remove unused patches. *icedtea-6.1.10.4-r1 (04 Nov 2011) diff --git a/dev-java/icedtea/files/6.1.10.2-371405-linux_version.patch b/dev-java/icedtea/files/6.1.10.2-371405-linux_version.patch deleted file mode 100644 index 7eaa09d955ab..000000000000 --- a/dev-java/icedtea/files/6.1.10.2-371405-linux_version.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Nru icedtea6-1.10.2.orig/Makefile.am icedtea6-1.10.2/Makefile.am ---- icedtea6-1.10.2.orig/Makefile.am 2011-05-25 17:35:41.000000000 +0100 -+++ icedtea6-1.10.2/Makefile.am 2011-06-13 15:47:16.000000000 +0100 -@@ -341,7 +341,8 @@ - patches/openjdk/7031385-gcc-register-allocation-fix.patch \ - patches/shark-llvm-2.9.patch \ - patches/openjdk/pgram-pipe-regression.patch \ -- patches/openjdk/mutter.patch -+ patches/openjdk/mutter.patch \ -+ patches/linux_version.patch - - if WITH_ALT_HSBUILD - ICEDTEA_PATCHES += \ -diff -Nru icedtea6-1.10.2.orig/patches/linux_version.patch icedtea6-1.10.2/patches/linux_version.patch ---- icedtea6-1.10.2.orig/patches/linux_version.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea6-1.10.2/patches/linux_version.patch 2011-06-13 15:46:50.000000000 +0100 -@@ -0,0 +1,12 @@ -+diff -r d4dac52dafbc make/linux/Makefile -+--- openjdk.orig/hotspot/make/linux/Makefile Thu Jun 02 18:59:50 2011 +0100 -++++ openjdk/hotspot/make/linux/Makefile Mon Jun 13 15:40:58 2011 +0100 -+@@ -230,7 +230,7 @@ -+ # Solaris 2.5.1, 2.6). -+ # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. -+ -+-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% -++SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% -+ OS_VERSION := $(shell uname -r) -+ EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) -+ diff --git a/dev-java/icedtea/files/6.1.9.6-sparc.patch b/dev-java/icedtea/files/6.1.9.6-sparc.patch deleted file mode 100644 index ea41ad005ab1..000000000000 --- a/dev-java/icedtea/files/6.1.9.6-sparc.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Nru icedtea6-1.9.6.orig/Makefile.am icedtea6-1.9.6/Makefile.am ---- icedtea6-1.9.6.orig/Makefile.am 2011-02-09 10:48:29.464832314 +0000 -+++ icedtea6-1.9.6/Makefile.am 2011-02-09 13:01:39.430490143 +0000 -@@ -327,7 +327,8 @@ - patches/openjdk/6795356-proxylazyvalue-leak.patch \ - patches/openjdk/6687968-pngimagereader_mem_leak.patch \ - patches/openjdk/6541476-png-iTXt-chunk.patch \ -- patches/openjdk/6782079-png_metadata_oom.patch -+ patches/openjdk/6782079-png_metadata_oom.patch \ -+ patches/g344659-sparc_fscanf_fix.patch - - if WITH_ALT_HSBUILD - ICEDTEA_PATCHES += \ -diff -Nru icedtea6-1.9.6.orig/patches/g344659-sparc_fscanf_fix.patch icedtea6-1.9.6/patches/g344659-sparc_fscanf_fix.patch ---- icedtea6-1.9.6.orig/patches/g344659-sparc_fscanf_fix.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea6-1.9.6/patches/g344659-sparc_fscanf_fix.patch 2011-02-09 13:01:39.430490143 +0000 -@@ -0,0 +1,12 @@ -+diff -uNr openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp openjdk/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp -+--- openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp 2010-06-21 22:12:15.000000000 +0100 -++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp 2010-11-29 20:15:36.179541001 +0000 -+@@ -35,7 +35,7 @@ -+ } -+ -+ while (!feof(fp)) { -+- if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu) == 1) { -++ if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu[0]) == 1) { -+ if (strstr(cpu, "Niagara") != NULL) { -+ rv = true; -+ } |