/hg/icedtea: Regenerate workaround for Classpath PR40616.

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Wed May 5 13:29:42 PDT 2010


changeset eea3af287202 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=eea3af287202
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 05 21:29:34 2010 +0100

	Regenerate workaround for Classpath PR40616.

	2010-05-05 Andrew John Hughes <ahughes at redhat.com>

	 * patches/boot/icedtea-pr40616.patch: Regenerated
	due to change from GenerateEUC_TW to EUC_TW.


diffstat:

2 files changed, 17 insertions(+), 13 deletions(-)
ChangeLog                          |    6 ++++++
patches/boot/icedtea-pr40616.patch |   24 +++++++++++-------------

diffs (43 lines):

diff -r 04d256af92ed -r eea3af287202 ChangeLog
--- a/ChangeLog	Thu Oct 22 17:31:06 2009 +0100
+++ b/ChangeLog	Wed May 05 21:29:34 2010 +0100
@@ -1,3 +1,9 @@ 2009-10-22  Andrew John Hughes  <ahughes
+2010-05-05  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/boot/icedtea-pr40616.patch:
+	Regenerated due to change from GenerateEUC_TW
+	to EUC_TW.
+
 2009-10-22  Andrew John Hughes  <ahughes at redhat.com>
 
 	* INSTALL:
diff -r 04d256af92ed -r eea3af287202 patches/boot/icedtea-pr40616.patch
--- a/patches/boot/icedtea-pr40616.patch	Thu Oct 22 17:31:06 2009 +0100
+++ b/patches/boot/icedtea-pr40616.patch	Wed May 05 21:29:34 2010 +0100
@@ -1,15 +1,13 @@ diff -Nru openjdk-boot.orig/jdk/make/too
-diff -Nru openjdk-boot.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java
---- openjdk-boot.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java	2009-07-02 12:04:10.000000000 +0100
-+++ openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java	2009-07-02 12:13:09.000000000 +0100
-@@ -36,8 +36,10 @@
- public class GenerateEUC_TW {
+--- openjdk-boot.orig/jdk/make/tools/src/build/tools/charsetmapping/EUC_TW.java	2010-05-05 18:45:07.000000000 +0100
++++ openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/EUC_TW.java	2010-05-05 21:26:31.000000000 +0100
+@@ -83,8 +83,8 @@
+     static void genClass(String args[]) throws Exception
+     {
+         InputStream is = new FileInputStream(new File(args[0], "euc_tw.map"));
+-        PrintStream ps = new PrintStream(new File(args[1], "EUC_TWMapping.java"),
+-                                         "ISO-8859-1");
++        FileOutputStream fos = new FileOutputStream(new File(args[1], "EUC_TWMapping.java"));
++        PrintStream ps = new PrintStream(fos, false, "ISO-8859-1");
+         String copyright = getCopyright(new File(args[3]));
  
-     public static void genEUC_TW(String args[]) throws Exception {
-+        FileOutputStream fos =
-+            new FileOutputStream(new File(args[1], "EUC_TWMapping.java"));
-         genClass(new FileInputStream(new File(args[0], "euc_tw.map")),
--                 new PrintStream(new File(args[1], "EUC_TWMapping.java"), "ISO-8859-1"),
-+                 new PrintStream(fos, false, "ISO-8859-1"),
-                  getCopyright(new File(args[3])));
-     }
  



More information about the distro-pkg-dev mailing list