Mercurial > hg > release > icedtea7-2.6

changeset 1981:26c1a149107b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump to b70. 2009-08-24 Andrew John Hughes <ahughes@redhat.com> * patches/icedtea-graphics.patch: Removed; applied upstream. * Makefile.am: Bump to b70. * patches/ecj/icedtea-sbcs.patch, * patches/icedtea-testenv.patch: Recreated.
author Andrew John Hughes <ahughes@redhat.com>
date Tue, 25 Aug 2009 01:27:11 +0100
parents 92838f870914
children d719734879cc
files ChangeLog Makefile.am patches/ecj/icedtea-sbcs.patch patches/icedtea-graphics.patch patches/icedtea-testenv.patch
diffstat 5 files changed, 42 insertions(+), 106 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Aug 21 20:02:09 2009 +0100
+++ b/ChangeLog	Tue Aug 25 01:27:11 2009 +0100
@@ -1,4 +1,13 @@
-2009-08-17  Andrew John Hughes  <ahughes@redhat.com>
+2009-08-24  Andrew John Hughes  <ahughes@redhat.com>
+
+	* patches/icedtea-graphics.patch:
+	Removed; applied upstream.
+	* Makefile.am: Bump to b70.
+	* patches/ecj/icedtea-sbcs.patch,
+	* patches/icedtea-testenv.patch:
+	Recreated.
+
+2009-08-21  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	Add variables for source, target and other
--- a/Makefile.am	Fri Aug 21 20:02:09 2009 +0100
+++ b/Makefile.am	Tue Aug 25 01:27:11 2009 +0100
@@ -1,20 +1,20 @@
-OPENJDK_VERSION = b69
+OPENJDK_VERSION = b70
 
-OPENJDK_CHANGESET = 2914e1cb084e
-CORBA_CHANGESET = a0eefb08a314
-JAXP_CHANGESET = fa81a375c19a
-JAXWS_CHANGESET = bcf234d82efa
-JDK_CHANGESET = bd5e610df2e8
-LANGTOOLS_CHANGESET = ce9bcdcb7859
-HOTSPOT_CHANGESET = 12b81df6076d
+OPENJDK_CHANGESET = 1bbbd5c42f3a
+CORBA_CHANGESET = 309d97756352
+JAXP_CHANGESET = df9569f46ae8
+JAXWS_CHANGESET = c33dece1b2b3
+JDK_CHANGESET = 1b0f308e49c3
+LANGTOOLS_CHANGESET = 742987f2c0d2
+HOTSPOT_CHANGESET = 468ea732650d
 
-OPENJDK_MD5SUM = 37c6c85e9bfc58ee4f0312f32cdfc524
-CORBA_MD5SUM = 8e800563935f4a8603585d182204286d
-JAXP_MD5SUM = fc6c3556e5932ce1155498e894d85b93
-JAXWS_MD5SUM = 6b7ba2f3b438e8c71ba7ad380c7b15bf
-JDK_MD5SUM = 0e4c01b569edb101c8a2f3f0b1933fd6
-LANGTOOLS_MD5SUM = 0df12414550c8022b85f3106b303f0c5
-HOTSPOT_MD5SUM = eb455e08a9a305714a971abecbdb78db
+OPENJDK_MD5SUM = 84dabfc7b592490dcd4b2a232bde44ef
+CORBA_MD5SUM = ec0de438056ee14c48deb510c0d583dc
+JAXP_MD5SUM = 732708e633ffef87fb4095ecbbf4add0
+JAXWS_MD5SUM = 492e61bf7f96d3832b3246c01c716aa8
+JDK_MD5SUM = f286fbed4ffb4bb5d368e8cab11b50fd
+LANGTOOLS_MD5SUM = a0a13535ef6eec2292daa14f4cfe849d
+HOTSPOT_MD5SUM = 9e2a49be9371abe80c6fb1bd4ad3de3e
 
 CACAO_VERSION = 0.99.4
 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -2010,7 +2010,6 @@
 	patches/hotspot/$(HSBUILD)/icedtea-version.patch \
 	patches/icedtea-copy-plugs.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \
-	patches/icedtea-graphics.patch \
 	patches/icedtea-ssl.patch \
 	$(PLUGIN_PATCH) \
 	patches/icedtea-webstart.patch \
--- a/patches/ecj/icedtea-sbcs.patch	Fri Aug 21 20:02:09 2009 +0100
+++ b/patches/ecj/icedtea-sbcs.patch	Tue Aug 25 01:27:11 2009 +0100
@@ -1,15 +1,15 @@
 diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java
---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java	2009-07-01 11:39:50.000000000 +0100
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java	2009-07-01 12:24:04.000000000 +0100
-@@ -27,7 +27,6 @@
- 
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java	2009-08-24 15:47:02.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java	2009-08-24 16:07:07.000000000 +0100
+@@ -28,7 +28,6 @@
  import java.io.*;
+ import java.util.Arrays;
  import java.util.ArrayList;
 -import java.util.Scanner;
  import java.util.Formatter;
  import java.util.regex.*;
  import java.nio.charset.*;
-@@ -37,9 +36,8 @@
+@@ -38,9 +37,8 @@
  
      public static void genSBCS(String args[]) throws Exception {
  
@@ -21,15 +21,15 @@
              if (line.startsWith("#") || line.length() == 0)
                  continue;
              String[] fields = line.split("\\s+");
-@@ -198,12 +196,10 @@
-                                      int    c2blen)
-         throws Exception
-     {
+@@ -208,12 +206,11 @@
+         String b2cNR = b2cNRSB.toString();
+         String c2bNR = c2bNRSB.toString();
+ 
 -        Scanner s = new Scanner(new File(srcDir, template));
-+      BufferedReader s = new BufferedReader(new FileReader(new File(srcDir, template)));
++        BufferedReader s = new BufferedReader(new FileReader(new File(srcDir, template)));
          PrintStream out = new PrintStream(new FileOutputStream(
                                new File(dstDir, clzName + ".java")));
--
+ 
 -        while (s.hasNextLine()) {
 -            String line = s.nextLine();
 +        for (String line = s.readLine(); line != null; line = s.readLine()) {
--- a/patches/icedtea-graphics.patch	Fri Aug 21 20:02:09 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
---- ../opienjdkb23/openjdk/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java	2007-10-30 04:37:06.000000000 -0400
-+++ openjdk/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java	2007-11-13 12:50:52.000000000 -0500
-@@ -236,9 +236,6 @@
-         Segment segment = SegmentCache.getSharedSegment();
-         loadText(segment, p0, p1);
-         int currentWidth = getWidth();
--        if (currentWidth == Integer.MAX_VALUE) {
--            currentWidth = (int) getDefaultSpan(View.X_AXIS);
--        }
-         if (wordWrap) {
-             p = p0 + Utilities.getBreakLocation(segment, metrics,
-                                                 tabBase, tabBase + currentWidth,
-@@ -324,20 +321,6 @@
-         tabSize = getTabSize() * metrics.charWidth('m');
-     }
- 
--    /**
--     * Return reasonable default values for the view dimensions.  The standard
--     * text terminal size 80x24 is pretty suitable for the wrapped plain view.
--     */
--    private float getDefaultSpan(int axis) {
--         switch (axis) {
--            case View.X_AXIS:
--                return 80 * metrics.getWidths()['M'];
--            case View.Y_AXIS:
--                return 24 * metrics.getHeight();
--            default:
--                throw new IllegalArgumentException("Invalid axis: " + axis);
--        }
--    }
- 
-     // --- TabExpander methods ------------------------------------------
- 
-@@ -573,19 +556,16 @@
-                 if (width == Integer.MAX_VALUE) {
-                     // We have been initially set to MAX_VALUE, but we don't
-                     // want this as our preferred.
--                    width = getDefaultSpan(axis);
-+                    return 100f;
-                 }
-                 return width;
-             case View.Y_AXIS:
--                if (getDocument().getLength() > 0) {
--                    if ((lineCount < 0) || widthChanging) {
--                        breakLines(getStartOffset());
--                    }
--                    return lineCount * metrics.getHeight();
--                } else {
--                    return getDefaultSpan(axis);
--                }
--            default:
-+            	if (lineCount < 0 || widthChanging) {
-+                   breakLines(getStartOffset());
-+               }
-+                int h = lineCount * metrics.getHeight();
-+                return h;
-+	    default:
-                 throw new IllegalArgumentException("Invalid axis: " + axis);
-             }
-         }
--- a/patches/icedtea-testenv.patch	Fri Aug 21 20:02:09 2009 +0100
+++ b/patches/icedtea-testenv.patch	Tue Aug 25 01:27:11 2009 +0100
@@ -1,6 +1,6 @@
 diff -Nru openjdk.orig/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java openjdk/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java
---- openjdk.orig/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java	2008-11-06 08:45:01.000000000 +0000
-+++ openjdk/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java	2008-11-17 14:46:05.000000000 +0000
+--- openjdk.orig/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java	2009-08-24 15:09:16.000000000 +0100
++++ openjdk/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java	2009-08-24 15:15:58.000000000 +0100
 @@ -40,7 +40,7 @@
          InetAddress bogus = InetAddress.getByName("0.0.0.0");
          SocketChannel sc = SocketChannel.open();
@@ -10,21 +10,9 @@
  
          //Test1: connect only
          sc.connect(saddr);
-diff -Nru openjdk.orig/jdk/test/java/nio/channels/SocketChannel/Shutdown.java openjdk/jdk/test/java/nio/channels/SocketChannel/Shutdown.java
---- openjdk.orig/jdk/test/java/nio/channels/SocketChannel/Shutdown.java	2008-11-06 08:45:01.000000000 +0000
-+++ openjdk/jdk/test/java/nio/channels/SocketChannel/Shutdown.java	2008-11-17 14:45:53.000000000 +0000
-@@ -35,7 +35,7 @@
- 
-     public static void main(String args[]) throws Exception {
-         InetSocketAddress sa = new InetSocketAddress(
--                                InetAddress.getByName(TestUtil.HOST), 23);
-+                                InetAddress.getByName(TestUtil.HOST), 7);
-         SocketChannel sc = SocketChannel.open(sa);
-         boolean before = sc.socket().isInputShutdown();
-         sc.socket().shutdownInput();
 diff -Nru openjdk.orig/jdk/test/java/nio/channels/TestUtil.java openjdk/jdk/test/java/nio/channels/TestUtil.java
---- openjdk.orig/jdk/test/java/nio/channels/TestUtil.java	2008-11-17 14:43:22.000000000 +0000
-+++ openjdk/jdk/test/java/nio/channels/TestUtil.java	2008-11-17 14:44:24.000000000 +0000
+--- openjdk.orig/jdk/test/java/nio/channels/TestUtil.java	2009-08-24 15:09:16.000000000 +0100
++++ openjdk/jdk/test/java/nio/channels/TestUtil.java	2009-08-24 15:15:58.000000000 +0100
 @@ -36,9 +36,9 @@
  
      // Test hosts used by the channels tests - change these when
@@ -39,8 +27,8 @@
  
      private TestUtil() { }
 diff -Nru openjdk.orig/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh openjdk/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh
---- openjdk.orig/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh	2008-11-06 08:45:08.000000000 +0000
-+++ openjdk/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh	2008-11-17 14:48:52.000000000 +0000
+--- openjdk.orig/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh	2009-03-30 17:23:12.000000000 +0100
++++ openjdk/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh	2009-08-24 15:15:58.000000000 +0100
 @@ -26,14 +26,14 @@
  
  # @test