/hg/release/icedtea6-1.6: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jul 16 09:25:52 PDT 2010
changeset 64567ce4112b in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=64567ce4112b
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jul 16 17:22:19 2010 +0100
Fix issues found when building on Gentoo/ppc64 with 32-bit userland
and --enable-cacao.
2010-07-16 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (IT_SET_ARCH_DIRS): Check for
LINUX32 here as this is the macro that needs it.
(FIND_ECJ_JAR): Check for /usr/share/eclipse-ecj/ecj.jar, as
this is used by the bootstrap ecj-gcj package on Gentoo.
(ENABLE_ZERO_BUILD): Add requirement on CACAO check.
(IT_CHECK_ENABLE_CACAO): Renamed from AC_CHECK_ENABLE_CACAO,
as this is not an autoconf macro but an IcedTea one.
* configure.ac: Remove search for LINUX32 (moved to
IT_SET_ARCH_DIRS). Fix name of CACAO macro (see above).
changeset caa873752fc9 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=caa873752fc9
author: Deepak Bhole <dbhole at redhat.com>
date: Fri Jul 16 17:25:03 2010 +0100
Backpatched from jdk7 for upstream bug#6678385. Fixes rhbz# 551835.
Fixes jvm crashes when window is resized.
2010-07-15 Deepak Bhole <dbhole at 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.
changeset bcdcc12c519e in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=bcdcc12c519e
author: Mark Wielaard <mark at klomp.org>
date: Tue Jul 13 11:46:10 2010 +0200
Fix hotspot tapset object_alloc size variable.
Reported by William Cohen <wcohen at redhat.com>
* tapset/hotspot.stp.in (object_alloc): size is arg4, not arg3.
diffstat:
6 files changed, 1276 insertions(+), 5 deletions(-)
ChangeLog | 25
Makefile.am | 3
acinclude.m4 | 7
configure.ac | 3
patches/openjdk/6678385.patch | 1241 +++++++++++++++++++++++++++++++++++++++++
tapset/hotspot.stp.in | 2
diffs (truncated from 1359 to 500 lines):
diff -r c3605faebe92 -r bcdcc12c519e ChangeLog
--- a/ChangeLog Wed Jun 02 16:59:01 2010 +0100
+++ b/ChangeLog Tue Jul 13 11:46:10 2010 +0200
@@ -1,3 +1,28 @@ 2009-12-22 Andrew John Hughes <ahughes
+2010-07-13 Mark Wielaard <mjw at redhat.com>
+
+ Reported by William Cohen <wcohen at redhat.com>
+ * tapset/hotspot.stp.in (object_alloc): size is arg4, not arg3.
+
+2010-07-15 Deepak Bhole <dbhole at 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-16 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_SET_ARCH_DIRS): Check for LINUX32 here
+ as this is the macro that needs it.
+ (FIND_ECJ_JAR): Check for /usr/share/eclipse-ecj/ecj.jar,
+ as this is used by the bootstrap ecj-gcj package on Gentoo.
+ (ENABLE_ZERO_BUILD): Add requirement on CACAO check.
+ (IT_CHECK_ENABLE_CACAO): Renamed from AC_CHECK_ENABLE_CACAO,
+ as this is not an autoconf macro but an IcedTea one.
+ * configure.ac:
+ Remove search for LINUX32 (moved to IT_SET_ARCH_DIRS).
+ Fix name of CACAO macro (see above).
+
2009-12-22 Andrew John Hughes <ahughes at redhat.com>
Backport --with-tzdata-dir option from IcedTea6.
diff -r c3605faebe92 -r bcdcc12c519e Makefile.am
--- a/Makefile.am Wed Jun 02 16:59:01 2010 +0100
+++ b/Makefile.am Tue Jul 13 11:46:10 2010 +0200
@@ -668,7 +668,8 @@ ICEDTEA_PATCHES = \
patches/icedtea-fortify-source.patch \
patches/hotspot/$(HSBUILD)/icedtea-6791168.patch \
patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \
- patches/icedtea-use-system-tzdata.patch
+ patches/icedtea-use-system-tzdata.patch \
+ patches/openjdk/6678385.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r c3605faebe92 -r bcdcc12c519e acinclude.m4
--- a/acinclude.m4 Wed Jun 02 16:59:01 2010 +0100
+++ b/acinclude.m4 Tue Jul 13 11:46:10 2010 +0200
@@ -1,5 +1,6 @@ AC_DEFUN_ONCE([IT_SET_ARCH_DIRS],
AC_DEFUN_ONCE([IT_SET_ARCH_DIRS],
[
+ AC_PATH_TOOL([LINUX32],[linux32])
case "${host}" in
x86_64-*-*)
BUILD_ARCH_DIR=amd64
@@ -257,6 +258,9 @@ AC_DEFUN([FIND_ECJ_JAR],
AC_MSG_RESULT(${ECJ_JAR})
elif test -e "/usr/share/java/ecj.jar"; then
ECJ_JAR=/usr/share/java/ecj.jar
+ AC_MSG_RESULT(${ECJ_JAR})
+ elif test -e "/usr/share/eclipse-ecj/ecj.jar"; then
+ ECJ_JAR=/usr/share/eclipse-ecj/ecj.jar
AC_MSG_RESULT(${ECJ_JAR})
elif test -e "/usr/share/eclipse-ecj-3.3/lib/ecj.jar"; then
ECJ_JAR=/usr/share/eclipse-ecj-3.3/lib/ecj.jar
@@ -680,6 +684,7 @@ AC_DEFUN_ONCE([ENABLE_ZERO_BUILD],
[
AC_REQUIRE([SET_SHARK_BUILD])
AC_REQUIRE([IT_SET_ARCH_DIRS])
+ AC_REQUIRE([IT_CHECK_ENABLE_CACAO])
AC_MSG_CHECKING(whether to use the zero-assembler port)
use_zero=no
AC_ARG_ENABLE([zero],
@@ -798,7 +803,7 @@ AC_DEFUN_ONCE([SET_SHARK_BUILD],
AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes)
])
-AC_DEFUN([AC_CHECK_ENABLE_CACAO],
+AC_DEFUN([IT_CHECK_ENABLE_CACAO],
[
AC_MSG_CHECKING(whether to use CACAO as VM)
AC_ARG_ENABLE([cacao],
diff -r c3605faebe92 -r bcdcc12c519e configure.ac
--- a/configure.ac Wed Jun 02 16:59:01 2010 +0100
+++ b/configure.ac Tue Jul 13 11:46:10 2010 +0200
@@ -44,7 +44,6 @@ AC_PATH_TOOL([LSB_RELEASE],[lsb_release]
AC_PATH_TOOL([LSB_RELEASE],[lsb_release])
AC_CHECK_WITH_GCJ
AC_CHECK_WITH_HOTSPOT_BUILD
-AC_PATH_TOOL([LINUX32],[linux32])
AC_CHECK_GCC_VERSION
AC_CHECK_FOR_OPENJDK
@@ -240,7 +239,7 @@ WITH_HOTSPOT_SRC_ZIP
WITH_HOTSPOT_SRC_ZIP
WITH_OPENJDK_SRC_DIR
WITH_ALT_JAR_BINARY
-AC_CHECK_ENABLE_CACAO
+IT_CHECK_ENABLE_CACAO
AC_CHECK_WITH_CACAO_HOME
AC_CHECK_WITH_CACAO_SRC_ZIP
ENABLE_OPTIMIZATIONS
diff -r c3605faebe92 -r bcdcc12c519e patches/openjdk/6678385.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6678385.patch Tue Jul 13 11:46:10 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,
More information about the distro-pkg-dev
mailing list