/hg/icedtea6: Fixed ISO-8859-1 and ISO-8859-15 charsets relation...

[ptisnovs at icedtea.classpath.org]

changeset f9e489455ed3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f9e489455ed3
author: ptisnovs
date: Tue May 04 14:26:09 2010 +0200

	Fixed ISO-8859-1 and ISO-8859-15 charsets relationship.


diffstat:

3 files changed, 17 insertions(+), 1 deletion(-)
ChangeLog                             |    5 +++++
Makefile.am                           |    3 ++-
patches/icedtea-iso-8859-15-fix.patch |   10 ++++++++++

diffs (39 lines):

diff -r 26b11cdd7394 -r f9e489455ed3 ChangeLog
--- a/ChangeLog	Mon May 03 18:36:41 2010 +0200
+++ b/ChangeLog	Tue May 04 14:26:09 2010 +0200
@@ -1,3 +1,8 @@ 2010-05-03  Pavel Tisnovsky  <ptisnovs at r
+2010-05-04  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* patches/icedtea-iso-8859-15-fix.patch:
+	fixed ISO-8859-1 and ISO-8859-15 charsets relationship
+
 2010-05-03  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* patches/icedtea-6616792-fix.patch:
diff -r 26b11cdd7394 -r f9e489455ed3 Makefile.am
--- a/Makefile.am	Mon May 03 18:36:41 2010 +0200
+++ b/Makefile.am	Tue May 04 14:26:09 2010 +0200
@@ -301,7 +301,8 @@ ICEDTEA_PATCHES = \
 	patches/extensions/netx-umask.patch \
 	patches/icedtea-jtreg-httpTest.patch \
 	patches/nss-debug.patch \
-        patches/icedtea-6616792-fix.patch
+        patches/icedtea-6616792-fix.patch \
+        patches/icedtea-iso-8859-15-fix.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r 26b11cdd7394 -r f9e489455ed3 patches/icedtea-iso-8859-15-fix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-iso-8859-15-fix.patch	Tue May 04 14:26:09 2010 +0200
@@ -0,0 +1,10 @@
+--- openjdk.orig/jdk/src/share/classes/sun/nio/cs/ISO_8859_15.java	2010-04-15 09:35:35.000000000 +0200
++++ openjdk/jdk/src/share/classes/sun/nio/cs/ISO_8859_15.java	2010-05-04 13:45:15.000000000 +0200
+@@ -49,7 +49,6 @@
+ 
+     public boolean contains(Charset cs) {
+         return ((cs instanceof US_ASCII)
+-                || (cs instanceof ISO_8859_1)
+                 || (cs instanceof ISO_8859_15));
+     }
+