Mercurial > hg > release > icedtea6-1.12

changeset 2962:5de52fb737ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Match local 8004341 patch to upstream version now it's available. 2013-02-11 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (ICEDTEA_PATCHES): Add additional patch to make 8004341 fix match upstream version. * patches/openjdk/8004341-jck_dialog_failure-02.patch: Fix issue with Dialog serialization.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Mon, 11 Feb 2013 15:25:23 +0000
parents 4a6f2eb69167
children ba91bee6c0d6
files ChangeLog Makefile.am patches/openjdk/8004341-jck_dialog_failure-02.patch
diffstat 3 files changed, 28 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Feb 08 13:31:03 2013 +0000
+++ b/ChangeLog	Mon Feb 11 15:25:23 2013 +0000
@@ -1,3 +1,11 @@
+2013-02-11  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add additional patch to
+	make 8004341 fix match upstream version.
+	* patches/openjdk/8004341-jck_dialog_failure-02.patch:
+	Fix issue with Dialog serialization.
+
 2013-02-08  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	PR1301: PR1171 causes Zero builds to fail
--- a/Makefile.am	Fri Feb 08 13:31:03 2013 +0000
+++ b/Makefile.am	Mon Feb 11 15:25:23 2013 +0000
@@ -502,7 +502,8 @@
 	patches/traceable.patch \
 	patches/openjdk/7010849-modernise_sa.patch \
 	patches/openjdk/8005615-failure_to_load_logger_implementation.patch \
-	patches/openjdk/8004341-jck_dialog_failure.patch
+	patches/openjdk/8004341-jck_dialog_failure.patch \
+	patches/openjdk/8004341-jck_dialog_failure-02.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/8004341-jck_dialog_failure-02.patch	Mon Feb 11 15:25:23 2013 +0000
@@ -0,0 +1,18 @@
+# HG changeset patch
+# User andrew
+# Date 1360590852 0
+# Node ID 892e940d9996b09c01796de27fd57225faf8be0a
+# Parent  c6058fa2a9824f71e06ca214aa8ec54400b56cc4
+8004341: Two JCK tests fails with 7u11 b06
+
+diff --git a/src/share/classes/java/awt/Dialog.java b/src/share/classes/java/awt/Dialog.java
+--- openjdk/jdk/src/share/classes/java/awt/Dialog.java
++++ openjdk/jdk/src/share/classes/java/awt/Dialog.java
+@@ -1643,7 +1643,6 @@
+         this.resizable = fields.get("resizable", true);
+         this.undecorated = fields.get("undecorated", false);
+         this.title = (String)fields.get("title", "");
+-        this.modalityType = localModalityType;
+ 
+         blockedWindows = new IdentityArrayList();
+