Mercurial > hg > release > icedtea6-1.7
changeset 2002:902c6f336008
Merge
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Mon, 18 Oct 2010 14:18:22 +0100 |
| parents | eb34904f4061 (current diff) 35325772e106 (diff) |
| children | fcc8fa217369 |
| files | ChangeLog |
| diffstat | 3 files changed, 24 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Oct 18 14:13:53 2010 +0100 +++ b/ChangeLog Mon Oct 18 14:18:22 2010 +0100 @@ -1,3 +1,9 @@ +2010-10-15 Pavel Tisnovsky <ptisnovs@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@redhat.com> * NEWS:
--- a/Makefile.am Mon Oct 18 14:13:53 2010 +0100 +++ b/Makefile.am Mon Oct 18 14:18:22 2010 +0100 @@ -369,7 +369,8 @@ patches/fonts-rhel.patch \ patches/openjdk/6638712-wildcard_types.patch \ patches/openjdk/6650759-missing_inference.patch \ - patches/numa_on_early_glibc.patch + patches/numa_on_early_glibc.patch \ + patches/openjdk/6853592-badwindow-warning-fix.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6853592-badwindow-warning-fix.patch Mon Oct 18 14:18:22 2010 +0100 @@ -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(); +- } + } + }); + }