summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2011-01-21 22:47:13 +0000
committerVlastimil Babka <caster@gentoo.org>2011-01-21 22:47:13 +0000
commit2e1d5b298de8f458ee678d44191884818296f349 (patch)
tree4dff3db9f74f00db48e302dbb43d10fed66dc663 /dev-java/icedtea
parentadded myself as maintainer (diff)
downloadhistorical-2e1d5b298de8f458ee678d44191884818296f349.tar.gz
historical-2e1d5b298de8f458ee678d44191884818296f349.tar.bz2
historical-2e1d5b298de8f458ee678d44191884818296f349.zip
Add missing patch from the overlay, sorry. Bug #352314.
Package-Manager: portage-2.2.0_alpha18/cvs/Linux x86_64
Diffstat (limited to 'dev-java/icedtea')
-rw-r--r--dev-java/icedtea/ChangeLog5
-rw-r--r--dev-java/icedtea/Manifest3
-rw-r--r--dev-java/icedtea/files/6.1.9.4-sparc.patch30
3 files changed, 36 insertions, 2 deletions
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index fbfa2aa04df5..b6b3bf678200 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,9 @@
# 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.19 2011/01/21 00:20:39 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.20 2011/01/21 22:47:13 caster Exp $
+
+ 21 Jan 2011; Vlastimil Babka <caster@gentoo.org> +files/6.1.9.4-sparc.patch:
+ Add missing patch from the overlay, sorry. Bug #352314.
*icedtea-6.1.9.4 (21 Jan 2011)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index fbff9b3f33ea..56192ee3652e 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,4 +1,5 @@
AUX 6.1.9.3-sparc.patch 1490 RMD160 fac1e9e3ac3344db332e68789f3222c13010f6e2 SHA1 09be6ad20c687553bab07bcf0a7ca533caa156f2 SHA256 1aab4538d893bd1a009a61add2c9cda5bffc82bf7d4853f1968e491bde84c7e7
+AUX 6.1.9.4-sparc.patch 1518 RMD160 de412ef3e2c6f34a9dd7b126d9f154d23cfddc02 SHA1 811643c18cc88f0416b6136022de3678fdcbdf82 SHA256 7b6e6663babc24dc3a754087b33560f8a0338c1185b0a07656ee5a5be8dab7a6
AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433
AUX icedtea.env 999 RMD160 83d735b0941a9e33c4dd3f3bd3fe16e64c55f5e1 SHA1 6d8da5ad9d396d96f16f148c3a826d9e2a357d0e SHA256 85dc9543de305637739eea7b58e61865bd780aa50fd574ce19ccd95bc1013ec1
DIST 13edc857b967.tar.gz 8401448 RMD160 3b0f967cebe2e564769ebbdc630c384458aa1f82 SHA1 9ca443bc4994b80535bbe94f0de426a87421d950 SHA256 c595349cb8e4778c9409c550ded749feb0bdd11b962be3e1449eeb53c12b8433
@@ -11,5 +12,5 @@ DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5
DIST openjdk-6-src-b20-21_jun_2010.tar.gz 45078703 RMD160 5248e9b3ed762829c33bf2ff7e3ca0cbf4bee5d2 SHA1 39fc162a740f16aa18afa855fea9d5daf8cf03d4 SHA256 fcf8f1d614e5965e90ef1b1a6d5eecc2bcc3078eaffbb62b83dfba52da62e54b
EBUILD icedtea-6.1.9.3.ebuild 10849 RMD160 c7c50bb9ac1efc52ea241d308256eda66d4ad2be SHA1 88c8a929fe68b9fcd43f7f9f7c0690615a49cd96 SHA256 64a4a58ce7e6249dd2d74d2fda4d3571ef74c33d6f32e1f84de73b7a7c28de70
EBUILD icedtea-6.1.9.4.ebuild 10845 RMD160 d4fd80afbd9a548f84b4cff2f6cb72037b4ec64e SHA1 583b8160da972a189bcf012d826f5f812511e3c0 SHA256 600b98319cee7e28d1d3788972a3c77d94aea03879bcb8e6348d40789d94266a
-MISC ChangeLog 3997 RMD160 0817b7b02ce00ef677aba33e1b7c08baa323e353 SHA1 64e9a540cac60a49006aa869f8ec56a42a78a22b SHA256 a6a8de876c68ec2786aea5c7d553b6b174ff00c4941feeb4a304da01d84a498a
+MISC ChangeLog 4135 RMD160 8bbd66b1ea75a5ef7897528f0e57bf0313feec25 SHA1 e5c556f636e80e657310e92f90a5c88a7b98efbe SHA256 63210b374999bd8f8577c644751b984a37b7094a39cf14927775fdf3ca72a901
MISC metadata.xml 1488 RMD160 c219e274f64f63b4c4592f2e3e9a3ad057164c40 SHA1 7f502d7b065098357570a5e88066008eec7532b5 SHA256 cc617d5cc3325f92365746d0fcdb62cd247fa2077b2b8686dbe553c05c8c1311
diff --git a/dev-java/icedtea/files/6.1.9.4-sparc.patch b/dev-java/icedtea/files/6.1.9.4-sparc.patch
new file mode 100644
index 000000000000..85b7a78f75a1
--- /dev/null
+++ b/dev-java/icedtea/files/6.1.9.4-sparc.patch
@@ -0,0 +1,30 @@
+diff -Nru icedtea6-1.9.4.old/Makefile.am icedtea6-1.9.4/Makefile.am
+--- icedtea6-1.9.4.old/Makefile.am 2010-12-16 19:16:41.134748413 +0000
++++ icedtea6-1.9.4/Makefile.am 2010-12-20 21:06:38.564730121 +0000
+@@ -323,7 +323,9 @@
+ patches/openjdk/6438179-systray_check.patch \
+ patches/openjdk/4356282-opentype.patch \
+ patches/openjdk/6954424-opentype_javadoc.patch \
+- patches/openjdk/6795356-proxylazyvalue-leak.patch
++ patches/openjdk/6795356-proxylazyvalue-leak.patch \
++ patches/g344659-sparc_fscanf_fix.patch
++
+
+ if WITH_ALT_HSBUILD
+ ICEDTEA_PATCHES += \
+diff -Nru icedtea6-1.9.4.old/patches/g344659-sparc_fscanf_fix.patch icedtea6-1.9.4/patches/g344659-sparc_fscanf_fix.patch
+--- icedtea6-1.9.4.old/patches/g344659-sparc_fscanf_fix.patch 1970-01-01 01:00:00.000000000 +0100
++++ icedtea6-1.9.4/patches/g344659-sparc_fscanf_fix.patch 2010-12-20 21:06:16.094886394 +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;
++ }