/hg/release/icedtea6-1.9: Added patch which fixes bug #6853592 i...

[ptisnovs at icedtea.classpath.org]

changeset 66e3c18bd585 in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=66e3c18bd585
author: ptisnovs
date: Mon Oct 18 11:29:08 2010 +0200

	Added patch which fixes bug #6853592 introduced by another patch
	6678385-window_movement_crasher.patch


diffstat:

3 files changed, 24 insertions(+), 1 deletion(-)
ChangeLog                                           |    6 ++++++
Makefile.am                                         |    3 ++-
patches/openjdk/6853592-badwindow-warning-fix.patch |   16 ++++++++++++++++

diffs (46 lines):

diff -r f087888f1785 -r 66e3c18bd585 ChangeLog
--- a/ChangeLog	Wed Oct 13 01:29:59 2010 +0100
+++ b/ChangeLog	Mon Oct 18 11:29:08 2010 +0200
@@ -1,3 +1,9 @@ 2010-10-13  Andrew John Hughes  <ahughes
+2010-10-15  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* patches/openjdk/6853592-badwindow-warning-fix.patch:
+	Added patch which fixes bug #6853592 introduced by another patch
+	6678385-window_movement_crasher.patch
+
 2010-10-13  Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS:
diff -r f087888f1785 -r 66e3c18bd585 Makefile.am
--- a/Makefile.am	Wed Oct 13 01:29:59 2010 +0100
+++ b/Makefile.am	Mon Oct 18 11:29:08 2010 +0200
@@ -321,7 +321,8 @@ ICEDTEA_PATCHES += \
 	patches/shark-debug-option.patch \
 	patches/icedtea-shark.patch \
 	patches/icedtea-linux-separate-debuginfo.patch \
-	patches/openjdk/6951319-sparc_build_fixes.patch
+	patches/openjdk/6951319-sparc_build_fixes.patch \
+	patches/openjdk/6853592-badwindow-warning-fix.patch
 endif
 
 if WITH_RHINO
diff -r f087888f1785 -r 66e3c18bd585 patches/openjdk/6853592-badwindow-warning-fix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6853592-badwindow-warning-fix.patch	Mon Oct 18 11:29:08 2010 +0200
@@ -0,0 +1,16 @@
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	2010-07-15 10:28:21.896105637 -0400
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	2010-07-15 10:30:45.039232001 -0400
+@@ -298,13 +298,6 @@
+                 if (log.isLoggable(Level.FINE)) {
+                         dumpPeers();
+                 }
+-
+-                awtLock();
+-                try {
+-                        XlibWrapper.XSetErrorHandler(saved_error_handler);
+-                } finally {
+-                        awtUnlock();
+-                }
+             }
+         });
+     }