diff options
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/openjdk/openjdk-6-6b18-1.8/icedtea1.8-pre1.8.1-releasebranch-fixes.patch | 1610 | ||||
| -rw-r--r-- | recipes/openjdk/openjdk-6_6b18-1.8.bb | 2 |
2 files changed, 1483 insertions, 129 deletions
diff --git a/recipes/openjdk/openjdk-6-6b18-1.8/icedtea1.8-pre1.8.1-releasebranch-fixes.patch b/recipes/openjdk/openjdk-6-6b18-1.8/icedtea1.8-pre1.8.1-releasebranch-fixes.patch index 96f00c9f39..b48bcf0235 100644 --- a/recipes/openjdk/openjdk-6-6b18-1.8/icedtea1.8-pre1.8.1-releasebranch-fixes.patch +++ b/recipes/openjdk/openjdk-6-6b18-1.8/icedtea1.8-pre1.8.1-releasebranch-fixes.patch @@ -1,7 +1,41 @@ -diff -r a0120629678b ChangeLog ---- a/ChangeLog Wed Apr 14 12:21:03 2010 +0200 -+++ b/ChangeLog Fri Jul 16 14:30:37 2010 +0200 -@@ -1,3 +1,227 @@ +diff -r d1ad52447673 ChangeLog +--- a/ChangeLog Wed Apr 14 12:21:30 2010 +0200 ++++ b/ChangeLog Tue Jul 20 16:36:52 2010 +0200 +@@ -1,3 +1,261 @@ ++2010-07-19 Gary Benson <gbenson@redhat.com> ++ ++ PR icedtea/483 ++ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp ++ (SharkNativeWrapper::initialize): Fix signedness of T_BYTE ++ and T_CHAR results. ++ ++2010-07-16 Deepak Bhole <dbhole@redhat.com> ++ ++ * patches/icedtea-policy-evaluation.patch: New patch. Fixes policy ++ evaluation to match the proprietary JDK. ++ ++2010-07-15 Deepak Bhole <dbhole@redhat.com> ++ ++ * patches/openjdk/6678385.patch: New file. Backpatched from jdk7 for ++ upstream bug#6678385. Fixes rhbz# 551835. Fixes jvm crashes when window is ++ resized. ++ ++2010-07-14 Jon VanAlten <jon.vanalten@redhat.com> ++ ++ * patches/icedtea-override-redirect-metacity.patch: Produces the ++ "expected" behavior for full screen applications or other situations ++ where developers wish to present elements that would cover things like ++ panels. We previously had a version of this patch since changeset 876 ++ ebc064e8892d, but dropped it in changeset changeset 1731 ++ 83619682858e because upstream had rejected as a metacity bug[1]. ++ Metacity maintains that this behavior does not break any spec and does ++ not appear likely to change either[2], so we must be the "good guys" and ++ provide the expected behavior. See discussion[3]. ++ [1] http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6514512 ++ [2] https://bugzilla.gnome.org/show_bug.cgi?id=405269 ++ [3] http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008862.html ++ * Makefile.am: Apply icedtea-override-redirect-metacity.patch. ++ +2010-07-13 Mark Wielaard <mjw@redhat.com> + + Reported by William Cohen <wcohen@redhat.com> @@ -229,10 +263,29 @@ diff -r a0120629678b ChangeLog 2010-04-12 Andrew John Hughes <ahughes@redhat.com> PR icedtea/373 -diff -r a0120629678b Makefile.am ---- a/Makefile.am Wed Apr 14 12:21:03 2010 +0200 -+++ b/Makefile.am Fri Jul 16 14:30:37 2010 +0200 -@@ -374,7 +374,8 @@ +diff -r d1ad52447673 Makefile.am +--- a/Makefile.am Wed Apr 14 12:21:30 2010 +0200 ++++ b/Makefile.am Tue Jul 20 16:36:52 2010 +0200 +@@ -298,6 +298,7 @@ + patches/icedtea-linux-separate-debuginfo.patch \ + patches/icedtea-parisc.patch \ + patches/icedtea-sh4-support.patch \ ++ patches/icedtea-policy-evaluation.patch \ + patches/libpng.patch \ + patches/extensions/netx.patch \ + patches/extensions/netx-dist.patch \ +@@ -326,7 +327,9 @@ + patches/security/20100330/6932480.patch \ + patches/ant-1.8.0.patch \ + patches/icedtea-nss-6763530.patch \ +- patches/nss-debug.patch ++ patches/nss-debug.patch \ ++ patches/icedtea-override-redirect-metacity.patch \ ++ patches/openjdk/6678385.patch + + if WITH_RHINO + ICEDTEA_PATCHES += \ +@@ -374,7 +377,8 @@ endif if ENABLE_SYSTEMTAP @@ -242,7 +295,7 @@ diff -r a0120629678b Makefile.am endif if ENABLE_NSS -@@ -2024,7 +2025,8 @@ +@@ -2024,7 +2028,8 @@ mkdir -p test/langtools/JTwork test/langtools/JTreport $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \ -w:test/langtools/JTwork -r:test/langtools/JTreport \ @@ -252,7 +305,7 @@ diff -r a0120629678b Makefile.am $(ICEDTEA_JTREG_OPTIONS) \ `pwd`/openjdk/langtools/test \ | tee test/$@.log -@@ -2033,7 +2035,8 @@ +@@ -2033,7 +2038,8 @@ mkdir -p test/jdk/JTwork test/jdk/JTreport $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \ -w:test/jdk/JTwork -r:test/jdk/JTreport \ @@ -262,9 +315,9 @@ diff -r a0120629678b Makefile.am -exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.jtx \ $(ICEDTEA_JTREG_OPTIONS) \ `pwd`/openjdk/jdk/test \ -diff -r a0120629678b acinclude.m4 ---- a/acinclude.m4 Wed Apr 14 12:21:03 2010 +0200 -+++ b/acinclude.m4 Fri Jul 16 14:30:37 2010 +0200 +diff -r d1ad52447673 acinclude.m4 +--- a/acinclude.m4 Wed Apr 14 12:21:30 2010 +0200 ++++ b/acinclude.m4 Tue Jul 20 16:36:52 2010 +0200 @@ -85,7 +85,7 @@ CROSS_TARGET_ARCH=s390x ARCHFLAG="-m64" @@ -351,9 +404,9 @@ diff -r a0120629678b acinclude.m4 AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version) fi ]) -diff -r a0120629678b netx/net/sourceforge/jnlp/Launcher.java ---- a/netx/net/sourceforge/jnlp/Launcher.java Wed Apr 14 12:21:03 2010 +0200 -+++ b/netx/net/sourceforge/jnlp/Launcher.java Fri Jul 16 14:30:37 2010 +0200 +diff -r d1ad52447673 netx/net/sourceforge/jnlp/Launcher.java +--- a/netx/net/sourceforge/jnlp/Launcher.java Wed Apr 14 12:21:30 2010 +0200 ++++ b/netx/net/sourceforge/jnlp/Launcher.java Tue Jul 20 16:36:52 2010 +0200 @@ -442,7 +442,7 @@ Method main = mainClass.getDeclaredMethod("main", new Class[] {String[].class} ); String args[] = file.getApplication().getArguments(); @@ -412,9 +465,9 @@ diff -r a0120629678b netx/net/sourceforge/jnlp/Launcher.java return appletInstance; } -diff -r a0120629678b netx/net/sourceforge/jnlp/Parser.java ---- a/netx/net/sourceforge/jnlp/Parser.java Wed Apr 14 12:21:03 2010 +0200 -+++ b/netx/net/sourceforge/jnlp/Parser.java Fri Jul 16 14:30:37 2010 +0200 +diff -r d1ad52447673 netx/net/sourceforge/jnlp/Parser.java +--- a/netx/net/sourceforge/jnlp/Parser.java Wed Apr 14 12:21:30 2010 +0200 ++++ b/netx/net/sourceforge/jnlp/Parser.java Tue Jul 20 16:36:52 2010 +0200 @@ -1169,11 +1169,15 @@ Node jnlpNode = getChildNode(document, "jnlp"); // skip comments */ @@ -503,9 +556,9 @@ diff -r a0120629678b netx/net/sourceforge/jnlp/Parser.java } - -diff -r a0120629678b netx/net/sourceforge/jnlp/SecurityDesc.java ---- a/netx/net/sourceforge/jnlp/SecurityDesc.java Wed Apr 14 12:21:03 2010 +0200 -+++ b/netx/net/sourceforge/jnlp/SecurityDesc.java Fri Jul 16 14:30:37 2010 +0200 +diff -r d1ad52447673 netx/net/sourceforge/jnlp/SecurityDesc.java +--- a/netx/net/sourceforge/jnlp/SecurityDesc.java Wed Apr 14 12:21:30 2010 +0200 ++++ b/netx/net/sourceforge/jnlp/SecurityDesc.java Tue Jul 20 16:36:52 2010 +0200 @@ -31,12 +31,9 @@ */ public class SecurityDesc { @@ -522,9 +575,9 @@ diff -r a0120629678b netx/net/sourceforge/jnlp/SecurityDesc.java /** All permissions. */ public static final Object ALL_PERMISSIONS = "All"; -diff -r a0120629678b netx/net/sourceforge/jnlp/cache/CacheUtil.java ---- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java Wed Apr 14 12:21:03 2010 +0200 -+++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java Fri Jul 16 14:30:37 2010 +0200 +diff -r d1ad52447673 netx/net/sourceforge/jnlp/cache/CacheUtil.java +--- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java Wed Apr 14 12:21:30 2010 +0200 ++++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java Tue Jul 20 16:36:52 2010 +0200 @@ -26,6 +26,7 @@ import net.sourceforge.jnlp.*; @@ -558,9 +611,9 @@ diff -r a0120629678b netx/net/sourceforge/jnlp/cache/CacheUtil.java /** * Waits until the resources are downloaded, while showing a -diff -r a0120629678b netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java ---- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Apr 14 12:21:03 2010 +0200 -+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Jul 16 14:30:37 2010 +0200 +diff -r d1ad52447673 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java +--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Apr 14 12:21:30 2010 +0200 ++++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Jul 20 16:36:52 2010 +0200 @@ -32,6 +32,7 @@ import java.security.Permissions; import java.security.PrivilegedAction; @@ -733,9 +786,9 @@ diff -r a0120629678b netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java } /** -diff -r a0120629678b netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java ---- a/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Wed Apr 14 12:21:03 2010 +0200 -+++ b/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Fri Jul 16 14:30:37 2010 +0200 +diff -r d1ad52447673 netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java +--- a/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Wed Apr 14 12:21:30 2010 +0200 ++++ b/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Tue Jul 20 16:36:52 2010 +0200 @@ -23,10 +23,12 @@ import java.awt.event.WindowEvent; import java.lang.ref.WeakReference; @@ -809,9 +862,9 @@ diff -r a0120629678b netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java /** * Asks the user whether or not to grant permission. * @param perm the permission to be granted -diff -r a0120629678b netx/net/sourceforge/jnlp/services/XSingleInstanceService.java ---- a/netx/net/sourceforge/jnlp/services/XSingleInstanceService.java Wed Apr 14 12:21:03 2010 +0200 -+++ b/netx/net/sourceforge/jnlp/services/XSingleInstanceService.java Fri Jul 16 14:30:37 2010 +0200 +diff -r d1ad52447673 netx/net/sourceforge/jnlp/services/XSingleInstanceService.java +--- a/netx/net/sourceforge/jnlp/services/XSingleInstanceService.java Wed Apr 14 12:21:30 2010 +0200 ++++ b/netx/net/sourceforge/jnlp/services/XSingleInstanceService.java Tue Jul 20 16:36:52 2010 +0200 @@ -145,14 +145,21 @@ } @@ -836,9 +889,9 @@ diff -r a0120629678b netx/net/sourceforge/jnlp/services/XSingleInstanceService.j } /** -diff -r a0120629678b netx/net/sourceforge/jnlp/util/FileUtils.java ---- a/netx/net/sourceforge/jnlp/util/FileUtils.java Wed Apr 14 12:21:03 2010 +0200 -+++ b/netx/net/sourceforge/jnlp/util/FileUtils.java Fri Jul 16 14:30:37 2010 +0200 +diff -r d1ad52447673 netx/net/sourceforge/jnlp/util/FileUtils.java +--- a/netx/net/sourceforge/jnlp/util/FileUtils.java Wed Apr 14 12:21:30 2010 +0200 ++++ b/netx/net/sourceforge/jnlp/util/FileUtils.java Tue Jul 20 16:36:52 2010 +0200 @@ -14,35 +14,58 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -912,9 +965,1308 @@ diff -r a0120629678b netx/net/sourceforge/jnlp/util/FileUtils.java - + } -diff -r a0120629678b patches/systemtap-gcc-4.5.patch +diff -r d1ad52447673 patches/icedtea-override-redirect-metacity.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/patches/systemtap-gcc-4.5.patch Fri Jul 16 14:30:37 2010 +0200 ++++ b/patches/icedtea-override-redirect-metacity.patch Tue Jul 20 16:36:52 2010 +0200 +@@ -0,0 +1,11 @@ ++--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java.orig 2008-05-25 17:31:31.000000000 +0200 +++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java 2008-05-25 17:33:32.000000000 +0200 ++@@ -1124,6 +1124,8 @@ ++ ++ boolean isOverrideRedirect() { ++ return (XWM.getWMID() == XWM.OPENLOOK_WM ? true : false) || +++ (XWM.getWMID() == XWM.METACITY_WM ? true : false) || +++ target.getName().equals("###overrideRedirect###") || ++ ((XToolkit)Toolkit.getDefaultToolkit()).isOverrideRedirect((Window)target) || ++ XTrayIconPeer.isTrayIconStuffWindow((Window)target); ++ } +diff -r d1ad52447673 patches/icedtea-policy-evaluation.patch +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/patches/icedtea-policy-evaluation.patch Tue Jul 20 16:36:52 2010 +0200 +@@ -0,0 +1,35 @@ ++# This patch aligns policy evaluation to be the same as the proprietary JDK. ++# http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-July/009658.html ++# https://bugs.openjdk.java.net/show_bug.cgi?id=100142 ++ ++diff -up ./openjdk/jdk/src/share/classes/sun/security/provider/PolicyFile.java.sav ./jdk/src/share/classes/sun/security/provider/PolicyFile.java ++--- ./openjdk.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java.sav 2010-04-20 14:49:13.000000000 -0400 +++++ ./openjdk/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2010-04-20 14:50:26.000000000 -0400 ++@@ -1799,6 +1799,27 @@ public class PolicyFile extends java.sec ++ ++ CodeSource canonCs = cs; ++ URL u = cs.getLocation(); +++ +++ // If this is a jar protocol url, collapse it to a +++ // file protocol to process it as per the javadocs +++ if (u != null && u.getProtocol().equals("jar")) { +++ try { +++ String fileURL = ""; +++ +++ // remove the initial jar: +++ fileURL = u.getPath(); +++ +++ // remove the part after the ! +++ fileURL = fileURL.substring(0, fileURL.indexOf('!')); +++ +++ u = new URL(fileURL); +++ +++ } catch (Exception e) { +++ // Fail silently. In this case, url stays what it was above +++ } +++ +++ } +++ ++ if (u != null && u.getProtocol().equals("file")) { ++ boolean isLocalFile = false; ++ String host = u.getHost(); +diff -r d1ad52447673 patches/openjdk/6678385.patch +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/patches/openjdk/6678385.patch Tue Jul 20 16:36:52 2010 +0200 +@@ -0,0 +1,1241 @@ ++# HG changeset patch ++# User art ++# Date 1242387635 -14400 ++# Node ID f62f7fcc9965cd0b110f07b4cd42c419f77717c1 ++# Parent b28b073e72b625a4d8b6e71010a2968b5fc85124 ++6678385: Random java.lang.StackOverflowError from various JDKs ++Reviewed-by: stayer ++ ++IcedTea6 note: This patch (upstream bz#6678385) fixes rhbz# 551835. ++ ++diff -uNr openjdk.orig/jdk/make/sun/xawt/mapfile-vers openjdk/jdk/make/sun/xawt/mapfile-vers ++--- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2010-07-15 10:28:21.755105655 -0400 +++++ openjdk/jdk/make/sun/xawt/mapfile-vers 2010-07-15 10:28:42.630981569 -0400 ++@@ -125,6 +125,7 @@ ++ Java_sun_awt_X11_XlibWrapper_SetToolkitErrorHandler; ++ Java_sun_awt_X11_XlibWrapper_XSetErrorHandler; ++ Java_sun_awt_X11_XlibWrapper_CallErrorHandler; +++ Java_sun_awt_X11_XlibWrapper_PrintXErrorEvent; ++ Java_sun_awt_X11_XlibWrapper_XInternAtoms; ++ Java_sun_awt_X11_XlibWrapper_XChangeWindowAttributes; ++ Java_sun_awt_X11_XlibWrapper_XDeleteProperty; ++@@ -269,7 +270,6 @@ ++ Java_sun_awt_X11_XToolkit_getDefaultXColormap; ++ Java_sun_awt_X11_XToolkit_getDefaultScreenData; ++ Java_sun_awt_X11_XToolkit_getEnv; ++- Java_sun_awt_X11_XToolkit_setNoisyXErrorHandler; ++ Java_sun_awt_X11_XlibWrapper_XCreateBitmapFromData; ++ Java_sun_awt_X11_XlibWrapper_XFreePixmap; ++ Java_sun_awt_X11_XlibWrapper_XAllocColor; ++diff -uNr openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/MotifDnDConstants.java openjdk/jdk/src/solaris/classes/sun/awt/X11/MotifDnDConstants.java ++--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/MotifDnDConstants.java 2010-07-15 10:28:21.905105617 -0400 +++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/MotifDnDConstants.java 2010-07-15 10:28:42.631981678 -0400 ++@@ -119,7 +119,7 @@ ++ false, ++ XlibWrapper.AnyPropertyType); ++ try { ++- int status = wpg.execute(XToolkit.IgnoreBadWindowHandler); +++ int status = wpg.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status == XlibWrapper.Success && ++ wpg.getData() != 0 && ++@@ -189,7 +189,7 @@ ++ try { ++ Native.putLong(data, motifWindow); ++ ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XlibWrapper.XChangeProperty(XToolkit.getDisplay(), ++ defaultRootWindow, ++ XA_MOTIF_DRAG_WINDOW.getAtom(), ++@@ -276,7 +276,7 @@ ++ false, ++ XA_MOTIF_DRAG_TARGETS.getAtom()); ++ try { ++- int status = wpg.execute(XToolkit.IgnoreBadWindowHandler); +++ int status = wpg.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status != XlibWrapper.Success ++ || wpg.getActualType() != XA_MOTIF_DRAG_TARGETS.getAtom() ++@@ -390,7 +390,7 @@ ++ } ++ } ++ ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XlibWrapper.XChangeProperty(XToolkit.getDisplay(), ++ motifWindow, ++ XA_MOTIF_DRAG_TARGETS.getAtom(), ++@@ -406,7 +406,7 @@ ++ // Create a new motif window and retry. ++ motifWindow = createMotifWindow(); ++ ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XlibWrapper.XChangeProperty(XToolkit.getDisplay(), ++ motifWindow, ++ XA_MOTIF_DRAG_TARGETS.getAtom(), ++@@ -530,7 +530,7 @@ ++ // CARD32 icc_handle ++ unsafe.putInt(structData + 4, (int)XA_MOTIF_ATOM_0.getAtom()); ++ ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XlibWrapper.XChangeProperty(XToolkit.getDisplay(), window, ++ XA_MOTIF_ATOM_0.getAtom(), ++ XA_MOTIF_DRAG_INITIATOR_INFO.getAtom(), ++@@ -563,7 +563,7 @@ ++ unsafe.putShort(data + 10, (short)0); /* pad */ ++ unsafe.putInt(data + 12, dataSize); ++ ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XlibWrapper.XChangeProperty(XToolkit.getDisplay(), window, ++ XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(), ++ XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(), ++diff -uNr openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java openjdk/jdk/src/solaris/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java ++--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java 2010-07-15 10:28:21.905105617 -0400 +++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java 2010-07-15 10:28:42.633981353 -0400 ++@@ -184,7 +184,7 @@ ++ XlibWrapper.AnyPropertyType); ++ ++ try { ++- int status = wpg.execute(XToolkit.IgnoreBadWindowHandler); +++ int status = wpg.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ /* ++ * DragICCI.h: ++diff -uNr openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java openjdk/jdk/src/solaris/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java ++--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java 2010-07-15 10:28:21.904105558 -0400 +++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java 2010-07-15 10:28:42.636014780 -0400 ++@@ -102,7 +102,7 @@ ++ XlibWrapper.AnyPropertyType); ++ ++ try { ++- status = wpg.execute(XToolkit.IgnoreBadWindowHandler); +++ status = wpg.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ /* ++ * DragICCI.h: ++@@ -162,7 +162,7 @@ ++ unsafe.putInt(data + 12, dataSize); ++ } ++ ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XlibWrapper.XChangeProperty(XToolkit.getDisplay(), embedder, ++ MotifDnDConstants.XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(), ++ MotifDnDConstants.XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(), ++@@ -204,7 +204,7 @@ ++ XlibWrapper.AnyPropertyType); ++ ++ try { ++- status = wpg.execute(XToolkit.IgnoreBadWindowHandler); +++ status = wpg.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ /* ++ * DragICCI.h: ++@@ -236,7 +236,7 @@ ++ ++ unsafe.putInt(data + 4, tproxy); ++ ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XlibWrapper.XChangeProperty(XToolkit.getDisplay(), embedder, ++ MotifDnDConstants.XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(), ++ MotifDnDConstants.XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(), ++@@ -276,7 +276,7 @@ ++ XlibWrapper.AnyPropertyType); ++ ++ try { ++- status = wpg.execute(XToolkit.IgnoreBadWindowHandler); +++ status = wpg.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ /* ++ * DragICCI.h: ++@@ -325,7 +325,7 @@ ++ XlibWrapper.AnyPropertyType); ++ ++ try { ++- int status = wpg.execute(XToolkit.IgnoreBadWindowHandler); +++ int status = wpg.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status == (int)XlibWrapper.Success && wpg.getData() != 0 && ++ wpg.getActualType() != 0 && wpg.getActualFormat() == 8 && ++@@ -375,7 +375,7 @@ ++ MotifDnDConstants.XA_MOTIF_DRAG_INITIATOR_INFO.getAtom()); ++ ++ try { ++- int status = wpg.execute(XToolkit.IgnoreBadWindowHandler); +++ int status = wpg.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status == XlibWrapper.Success && wpg.getData() != 0 && ++ wpg.getActualType() == ++@@ -412,7 +412,7 @@ ++ */ ++ XWindowAttributes wattr = new XWindowAttributes(); ++ try { ++- XToolkit.WITH_XERROR_HANDLER(XToolkit.IgnoreBadWindowHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(), ++ source_win, wattr.pData); ++ ++@@ -429,7 +429,7 @@ ++ wattr.dispose(); ++ } ++ ++- XToolkit.WITH_XERROR_HANDLER(XToolkit.IgnoreBadWindowHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ XlibWrapper.XSelectInput(XToolkit.getDisplay(), source_win, ++ source_win_mask | ++ XlibWrapper.StructureNotifyMask); ++@@ -1020,7 +1020,7 @@ ++ if (sourceWindow != 0) { ++ XToolkit.awtLock(); ++ try { ++- XToolkit.WITH_XERROR_HANDLER(XToolkit.IgnoreBadWindowHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ XlibWrapper.XSelectInput(XToolkit.getDisplay(), sourceWindow, ++ sourceWindowMask); ++ XToolkit.RESTORE_XERROR_HANDLER(); ++diff -uNr openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java openjdk/jdk/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java ++--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java 2010-07-15 10:28:21.900105578 -0400 +++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java 2010-07-15 10:28:42.637046074 -0400 ++@@ -75,7 +75,7 @@ ++ public int execute() { ++ return execute(null); ++ } ++- public int execute(XToolkit.XErrorHandler errorHandler) { +++ public int execute(XErrorHandler errorHandler) { ++ ++ XToolkit.awtLock(); ++ try { ++@@ -94,7 +94,7 @@ ++ ++ // Fix for performance problem - IgnodeBadWindowHandler is ++ // used too much without reason, just ignore it ++- if (errorHandler == XToolkit.IgnoreBadWindowHandler) { +++ if (errorHandler instanceof XErrorHandler.IgnoreBadWindowHandler) { ++ errorHandler = null; ++ } ++ ++diff -uNr openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XAWTXSettings.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XAWTXSettings.java ++--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XAWTXSettings.java 2010-07-15 10:28:21.896105637 -0400 +++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XAWTXSettings.java 2010-07-15 10:28:42.637981716 -0400 ++@@ -122,7 +122,7 @@ ++ new WindowPropertyGetter(owner, xSettingsPropertyAtom, 0, MAX_LENGTH, ++ false, xSettingsPropertyAtom.getAtom() ); ++ try { ++- int status = getter.execute(XToolkit.IgnoreBadWindowHandler); +++ int status = getter.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status != XlibWrapper.Success || getter.getData() == 0) { ++ if (log.isLoggable(Level.FINE)) log.fine("OH OH : getter failed status = " + status ); ++diff -uNr openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java ++--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java 2010-07-15 10:28:21.895105718 -0400 +++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java 2010-07-15 10:28:42.640232090 -0400 ++@@ -1155,7 +1155,8 @@ ++ } ++ ++ boolean isOverrideRedirect() { ++- return false; +++// return false; +++ return ((XToolkit)Toolkit.getDefaultToolkit()).isOverrideRedirect((Window)target); ++ } ++ ++ public boolean requestWindowFocus(long time, boolean timeProvided) { ++diff -uNr openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java ++--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java 2010-07-15 10:28:21.906105640 -0400 +++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java 2010-07-15 10:28:42.642232277 -0400 ++@@ -96,7 +96,7 @@ ++ action_count++; ++ } ++ ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XDnDConstants.XA_XdndActionList.setAtomData(window, ++ XAtom.XA_ATOM, ++ data, action_count); ++@@ -117,7 +117,7 @@ ++ try { ++ Native.put(data, formats); ++ ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XDnDConstants.XA_XdndTypeList.setAtomData(window, ++ XAtom.XA_ATOM, ++ data, formats.length); ++@@ -195,7 +195,7 @@ ++ new WindowPropertyGetter(window, XDnDConstants.XA_XdndAware, 0, 1, ++ false, XlibWrapper.AnyPropertyType); ++ ++- int status = wpg1.execute(XToolkit.IgnoreBadWindowHandler); +++ int status = wpg1.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status == XlibWrapper.Success && ++ wpg1.getData() != 0 && wpg1.getActualType() == XAtom.XA_ATOM) { ++@@ -215,7 +215,7 @@ ++ 0, 1, false, XAtom.XA_WINDOW); ++ ++ try { ++- status = wpg2.execute(XToolkit.IgnoreBadWindowHandler); +++ status = wpg2.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status == XlibWrapper.Success && ++ wpg2.getData() != 0 && ++@@ -233,7 +233,7 @@ ++ 0, 1, false, XAtom.XA_WINDOW); ++ ++ try { ++- status = wpg3.execute(XToolkit.IgnoreBadWindowHandler); +++ status = wpg3.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status != XlibWrapper.Success || ++ wpg3.getData() == 0 || ++@@ -249,7 +249,7 @@ ++ XlibWrapper.AnyPropertyType); ++ ++ try { ++- status = wpg4.execute(XToolkit.IgnoreBadWindowHandler); +++ status = wpg4.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status != XlibWrapper.Success || ++ wpg4.getData() == 0 || ++diff -uNr openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java ++--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java 2010-07-15 10:28:21.903105589 -0400 +++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java 2010-07-15 10:28:42.645236553 -0400 ++@@ -88,7 +88,7 @@ ++ try { ++ Native.putLong(data, 0, XDnDConstants.XDND_PROTOCOL_VERSION); ++ ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XDnDConstants.XA_XdndAware.setAtomData(window, XAtom.XA_ATOM, data, 1); ++ XToolkit.RESTORE_XERROR_HANDLER(); ++ ++@@ -122,7 +122,7 @@ ++ false, XlibWrapper.AnyPropertyType); ++ ++ try { ++- status = wpg1.execute(XToolkit.IgnoreBadWindowHandler); +++ status = wpg1.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status == XlibWrapper.Success && ++ wpg1.getData() != 0 && wpg1.getActualType() == XAtom.XA_ATOM) { ++@@ -141,7 +141,7 @@ ++ 0, 1, false, XAtom.XA_WINDOW); ++ ++ try { ++- status = wpg2.execute(XToolkit.IgnoreBadWindowHandler); +++ status = wpg2.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status == XlibWrapper.Success && ++ wpg2.getData() != 0 && ++@@ -159,7 +159,7 @@ ++ 0, 1, false, XAtom.XA_WINDOW); ++ ++ try { ++- status = wpg3.execute(XToolkit.IgnoreBadWindowHandler); +++ status = wpg3.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status != XlibWrapper.Success || ++ wpg3.getData() == 0 || ++@@ -175,7 +175,7 @@ ++ XlibWrapper.AnyPropertyType); ++ ++ try { ++- status = wpg4.execute(XToolkit.IgnoreBadWindowHandler); +++ status = wpg4.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status != XlibWrapper.Success || ++ wpg4.getData() == 0 || ++@@ -205,7 +205,7 @@ ++ ++ /* The proxy window must have the XdndAware set, as XDnD protocol ++ prescribes to check the proxy window for XdndAware. */ ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XDnDConstants.XA_XdndAware.setAtomData(newProxy, XAtom.XA_ATOM, ++ data, 1); ++ XToolkit.RESTORE_XERROR_HANDLER(); ++@@ -219,7 +219,7 @@ ++ Native.putLong(data, 0, newProxy); ++ ++ /* The proxy window must have the XdndProxy set to point to itself.*/ ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XDnDConstants.XA_XdndProxy.setAtomData(newProxy, XAtom.XA_WINDOW, ++ data, 1); ++ XToolkit.RESTORE_XERROR_HANDLER(); ++@@ -232,7 +232,7 @@ ++ ++ Native.putLong(data, 0, XDnDConstants.XDND_PROTOCOL_VERSION); ++ ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XDnDConstants.XA_XdndAware.setAtomData(embedder, XAtom.XA_ATOM, ++ data, 1); ++ XToolkit.RESTORE_XERROR_HANDLER(); ++@@ -245,7 +245,7 @@ ++ ++ Native.putLong(data, 0, newProxy); ++ ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XDnDConstants.XA_XdndProxy.setAtomData(embedder, XAtom.XA_WINDOW, ++ data, 1); ++ XToolkit.RESTORE_XERROR_HANDLER(); ++@@ -278,7 +278,7 @@ ++ try { ++ Native.putLong(data, 0, entry.getVersion()); ++ ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XDnDConstants.XA_XdndAware.setAtomData(embedder, XAtom.XA_ATOM, ++ data, 1); ++ XToolkit.RESTORE_XERROR_HANDLER(); ++@@ -291,7 +291,7 @@ ++ ++ Native.putLong(data, 0, (int)entry.getProxy()); ++ ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XDnDConstants.XA_XdndProxy.setAtomData(embedder, XAtom.XA_WINDOW, ++ data, 1); ++ XToolkit.RESTORE_XERROR_HANDLER(); ++@@ -329,7 +329,7 @@ ++ false, XlibWrapper.AnyPropertyType); ++ ++ try { ++- status = wpg1.execute(XToolkit.IgnoreBadWindowHandler); +++ status = wpg1.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status == XlibWrapper.Success && ++ wpg1.getData() != 0 && wpg1.getActualType() == XAtom.XA_ATOM) { ++@@ -348,7 +348,7 @@ ++ 0, 1, false, XAtom.XA_WINDOW); ++ ++ try { ++- status = wpg2.execute(XToolkit.IgnoreBadWindowHandler); +++ status = wpg2.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status == XlibWrapper.Success && ++ wpg2.getData() != 0 && ++@@ -366,7 +366,7 @@ ++ 0, 1, false, XAtom.XA_WINDOW); ++ ++ try { ++- status = wpg3.execute(XToolkit.IgnoreBadWindowHandler); +++ status = wpg3.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status != XlibWrapper.Success || ++ wpg3.getData() == 0 || ++@@ -382,7 +382,7 @@ ++ XlibWrapper.AnyPropertyType); ++ ++ try { ++- status = wpg4.execute(XToolkit.IgnoreBadWindowHandler); +++ status = wpg4.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status != XlibWrapper.Success || ++ wpg4.getData() == 0 || ++@@ -411,7 +411,7 @@ ++ false, XlibWrapper.AnyPropertyType); ++ ++ try { ++- int status = wpg1.execute(XToolkit.IgnoreBadWindowHandler); +++ int status = wpg1.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (status == XlibWrapper.Success && ++ wpg1.getData() != 0 && wpg1.getActualType() == XAtom.XA_ATOM) { ++@@ -473,7 +473,7 @@ ++ 0, 0xFFFF, false, ++ XAtom.XA_ATOM); ++ try { ++- wpg.execute(XToolkit.IgnoreBadWindowHandler); +++ wpg.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (wpg.getActualType() == XAtom.XA_ATOM && ++ wpg.getActualFormat() == 32) { ++@@ -505,7 +505,7 @@ ++ 0, 0xFFFF, false, ++ XAtom.XA_ATOM); ++ try { ++- wpg.execute(XToolkit.IgnoreBadWindowHandler); +++ wpg.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (wpg.getActualType() == XAtom.XA_ATOM && ++ wpg.getActualFormat() == 32) { ++@@ -541,7 +541,7 @@ ++ */ ++ XWindowAttributes wattr = new XWindowAttributes(); ++ try { ++- XToolkit.WITH_XERROR_HANDLER(XToolkit.IgnoreBadWindowHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(), ++ source_win, wattr.pData); ++ ++@@ -558,7 +558,7 @@ ++ wattr.dispose(); ++ } ++ ++- XToolkit.WITH_XERROR_HANDLER(XToolkit.IgnoreBadWindowHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ XlibWrapper.XSelectInput(XToolkit.getDisplay(), source_win, ++ source_win_mask | ++ XlibWrapper.StructureNotifyMask); ++@@ -963,7 +963,7 @@ ++ if (sourceWindow != 0) { ++ XToolkit.awtLock(); ++ try { ++- XToolkit.WITH_XERROR_HANDLER(XToolkit.IgnoreBadWindowHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ XlibWrapper.XSelectInput(XToolkit.getDisplay(), sourceWindow, ++ sourceWindowMask); ++ XToolkit.RESTORE_XERROR_HANDLER(); ++@@ -1104,14 +1104,14 @@ ++ 0, 0xFFFF, false, ++ XAtom.XA_ATOM); ++ try { ++- wpg.execute(XToolkit.IgnoreBadWindowHandler); +++ wpg.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); ++ ++ if (wpg.getActualType() == XAtom.XA_ATOM && ++ wpg.getActualFormat() == 32) { ++ ++ XToolkit.awtLock(); ++ try { ++- XToolkit.WITH_XERROR_HANDLER(XWM.VerifyChangePropertyHandler); +++ XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance()); ++ XDnDConstants.XA_XdndTypeList.setAtomData(xclient.get_window(), ++ XAtom.XA_ATOM, ++ wpg.getData(), ++diff -uNr openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java ++--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java 2010-07-15 10:28:21.896105637 -0400 |