/hg/release/icedtea6-1.11: Fix backport of GNOME system tray patch.
ddadacha at icedtea.classpath.org
ddadacha at icedtea.classpath.org
Fri Jan 13 08:33:12 PST 2012
changeset 0242cfaf15fa in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=0242cfaf15fa
author: Danesh Dadachanji <ddadacha at redhat.com>
date: Fri Jan 13 11:30:31 2012 -0500
Fix backport of GNOME system tray patch.
diffstat:
ChangeLog | 10 +
Makefile.am | 2 +-
NEWS | 2 +-
patches/openjdk/683768-System-tray-icon.patch | 79 --------
patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch | 93 ++++++++++
5 files changed, 105 insertions(+), 81 deletions(-)
diffs (234 lines):
diff -r ad4d331b4cd0 -r 0242cfaf15fa ChangeLog
--- a/ChangeLog Wed Jan 11 11:38:55 2012 -0500
+++ b/ChangeLog Fri Jan 13 11:30:31 2012 -0500
@@ -1,3 +1,13 @@
+2012-01-12 Danesh Dadachanji <ddadacha at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Replace patches/openjdk/683768-System-tray-icon.patch with
+ patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch
+ * NEWS: Moved RH683768 from Bug fixes to 1.11 Backports, added S7103610 to it.
+ * patches/openjdk/683768-System-tray-icon.patch: Removed.
+ * patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch:
+ New file. Sets XAtoms _NET_WM_PID and WM_CLIENT_MACHINE for X windows.
+
2012-01-09 Omair Majid <omajid at redhat.com>
* acinclude.m4 (IT_SET_SHARK_BUILD): Error out if shark is enabled.
diff -r ad4d331b4cd0 -r 0242cfaf15fa Makefile.am
--- a/Makefile.am Wed Jan 11 11:38:55 2012 -0500
+++ b/Makefile.am Fri Jan 13 11:30:31 2012 -0500
@@ -399,7 +399,7 @@
patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \
patches/openjdk/7103224-glibc_name_collision.patch \
patches/arm-debug.patch \
- patches/openjdk/683768-System-tray-icon.patch \
+ patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \
patches/openjdk/7102369-7094468-rmiregistry.patch \
patches/openjdk/6851973-kerberos.patch \
patches/openjdk/7091528-javadoc_class_files.patch \
diff -r ad4d331b4cd0 -r 0242cfaf15fa NEWS
--- a/NEWS Wed Jan 11 11:38:55 2012 -0500
+++ b/NEWS Fri Jan 13 11:30:31 2012 -0500
@@ -23,7 +23,6 @@
- PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan
- RH727195: Japanese font mappings are broken
- LP862286: Fix exception on trying to start PulseAudio playback
- - RH683768: Add a workaround for Java applications using tray icon for Gnome Shell
- PR719: make distcheck should work in IcedTea6
* Import of OpenJDK6 b24
- S7099148: increment build number of hs20.0 to b12
@@ -386,6 +385,7 @@
- S6851973: ignore incoming channel binding if acceptor does not set one
- S7091528: javadoc attempts to parse .class files
- S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA
+ - S7103610, RH683768: _NET_WM_PID and WM_CLIENT_MACHINE are not set
* ARM Port
- Ported to the EABI hard-fp model
- Locking for multi-core operation added.
diff -r ad4d331b4cd0 -r 0242cfaf15fa patches/openjdk/683768-System-tray-icon.patch
--- a/patches/openjdk/683768-System-tray-icon.patch Wed Jan 11 11:38:55 2012 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
---- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2011-11-10 14:24:02.954504503 -0500
-+++ openjdk/jdk/make/sun/xawt/mapfile-vers 2011-11-14 15:17:31.710505342 -0500
-@@ -304,6 +304,8 @@
- Java_sun_awt_X11_XlibWrapper_XSynchronize;
- Java_java_awt_FileDialog_initIDs;
- Java_sun_awt_X11_XWindow_initIDs;
-+ Java_sun_awt_X11_XWindowPeer_getLocalHostname;
-+ Java_sun_awt_X11_XWindowPeer_getJvmPID;
-
- Java_sun_java2d_opengl_OGLContext_getOGLIdString;
- Java_sun_java2d_opengl_OGLMaskFill_maskFill;
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java 2011-11-10 14:24:02.702508353 -0500
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java 2011-11-14 15:17:31.735504849 -0500
-@@ -199,11 +199,18 @@
- return name;
- }
-
-+ private static native String getLocalHostname();
-+ private static native int getJvmPID();
-+
- void postInit(XCreateWindowParams params) {
- super.postInit(params);
-
- // Init WM_PROTOCOLS atom
- initWMProtocols();
-+
-+ // Set _NET_WM_PID and WM_CLIENT_MACHINE using this JVM
-+ XAtom.get("WM_CLIENT_MACHINE").setProperty(getWindow(), getLocalHostname());
-+ XAtom.get("_NET_WM_PID").setCard32Property(getWindow(), getJvmPID());
-
- // Set WM_TRANSIENT_FOR and group_leader
- Window t_window = (Window)target;
---- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c 2011-07-05 14:36:12.000000000 -0400
-+++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2011-11-14 15:17:31.775504063 -0500
-@@ -46,6 +46,8 @@
- #include "java_awt_SystemColor.h"
- #include "java_awt_TrayIcon.h"
-
-+#include <unistd.h>
-+
- uint32_t awt_NumLockMask = 0;
- Boolean awt_ModLockIsShiftLock = False;
-
-@@ -914,3 +916,38 @@
- AWT_UNLOCK();
- }
- }
-+
-+/*
-+ * Class: sun_awt_X11_XWindowPeer
-+ * Method: getJvmPID
-+ * Signature: ()I
-+ */
-+JNIEXPORT jint JNICALL Java_sun_awt_X11_XWindowPeer_getJvmPID
-+(JNIEnv *env, jclass cls)
-+{
-+ /* Return the JVM's PID. */
-+ return getpid();
-+}
-+
-+#ifndef HOST_NAME_MAX
-+#define HOST_NAME_MAX 1024 /* Overestimated */
-+#endif
-+
-+/*
-+ * Class: sun_awt_X11_XWindowPeer
-+ * Method: getLocalHostname
-+ * Signature: ()Ljava/lang/String;
-+ */
-+JNIEXPORT jstring JNICALL Java_sun_awt_X11_XWindowPeer_getLocalHostname
-+(JNIEnv *env, jclass cls)
-+{
-+ /* Return the machine's FQDN. */
-+ char hostname[HOST_NAME_MAX + 1];
-+ if (gethostname(hostname, HOST_NAME_MAX + 1) == 0) {
-+ hostname[HOST_NAME_MAX] = '\0';
-+ jstring res = (*env)->NewStringUTF(env, hostname);
-+ return res;
-+ }
-+
-+ return (jstring)NULL;
-+}
diff -r ad4d331b4cd0 -r 0242cfaf15fa patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch Fri Jan 13 11:30:31 2012 -0500
@@ -0,0 +1,96 @@
+# HG changeset patch
+# User anthony
+# Date 1321013871 -10800
+# Node ID f614bcada2a992a2db8dfc7510cd8d82386ac1f0
+# Parent 16327765859cebadeadaad9a4b61469c510c7a6e
+7103610: _NET_WM_PID and WM_CLIENT_MACHINE are not set
+Summary: Set the properties to all top-level windows
+Reviewed-by: anthony
+Contributed-by: Danesh Dadachanji <ddadacha at redhat.com>
+
+diff -r 16327765859c -r f614bcada2a9 make/sun/xawt/mapfile-vers
+--- openjdk.orig/jdk/make/sun/xawt/mapfile-vers Thu Nov 10 17:37:29 2011 +0400
++++ openjdk/jdk/make/sun/xawt/mapfile-vers Fri Nov 11 15:17:51 2011 +0300
+@@ -322,6 +322,8 @@
+ Java_sun_awt_X11_XlibWrapper_XSynchronize;
+ Java_java_awt_FileDialog_initIDs;
+ Java_sun_awt_X11_XWindow_initIDs;
++ Java_sun_awt_X11_XWindowPeer_getLocalHostname;
++ Java_sun_awt_X11_XWindowPeer_getJvmPID;
+
+ Java_sun_java2d_opengl_OGLContext_getOGLIdString;
+ Java_sun_java2d_opengl_OGLMaskFill_maskFill;
+diff -r 16327765859c -r f614bcada2a9 src/solaris/classes/sun/awt/X11/XWindowPeer.java
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java Thu Nov 10 17:37:29 2011 +0400
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java Fri Nov 11 15:17:51 2011 +0300
+@@ -208,12 +208,19 @@
+ return name;
+ }
+
++ private static native String getLocalHostname();
++ private static native int getJvmPID();
++
+ void postInit(XCreateWindowParams params) {
+ super.postInit(params);
+
+ // Init WM_PROTOCOLS atom
+ initWMProtocols();
+
++ // Set _NET_WM_PID and WM_CLIENT_MACHINE using this JVM
++ XAtom.get("WM_CLIENT_MACHINE").setProperty(getWindow(), getLocalHostname());
++ XAtom.get("_NET_WM_PID").setCard32Property(getWindow(), getJvmPID());
++
+ // Set WM_TRANSIENT_FOR and group_leader
+ Window t_window = (Window)target;
+ Window owner = t_window.getOwner();
+diff -r 16327765859c -r f614bcada2a9 src/solaris/native/sun/xawt/XToolkit.c
+--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c Thu Nov 10 17:37:29 2011 +0400
++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c Fri Nov 11 15:17:51 2011 +0300
+@@ -47,6 +47,8 @@
+ #include "java_awt_TrayIcon.h"
+ #include <X11/extensions/XTest.h>
+
++#include <unistd.h>
++
+ uint32_t awt_NumLockMask = 0;
+ Boolean awt_ModLockIsShiftLock = False;
+
+@@ -1087,3 +1089,38 @@
+
+ return local_num_buttons;
+ }
++
++/*
++ * Class: sun_awt_X11_XWindowPeer
++ * Method: getJvmPID
++ * Signature: ()I
++ */
++JNIEXPORT jint JNICALL Java_sun_awt_X11_XWindowPeer_getJvmPID
++(JNIEnv *env, jclass cls)
++{
++ /* Return the JVM's PID. */
++ return getpid();
++}
++
++#ifndef HOST_NAME_MAX
++#define HOST_NAME_MAX 1024 /* Overestimated */
++#endif
++
++/*
++ * Class: sun_awt_X11_XWindowPeer
++ * Method: getLocalHostname
++ * Signature: ()Ljava/lang/String;
++ */
++JNIEXPORT jstring JNICALL Java_sun_awt_X11_XWindowPeer_getLocalHostname
++(JNIEnv *env, jclass cls)
++{
++ /* Return the machine's FQDN. */
++ char hostname[HOST_NAME_MAX + 1];
++ if (gethostname(hostname, HOST_NAME_MAX + 1) == 0) {
++ hostname[HOST_NAME_MAX] = '\0';
++ jstring res = (*env)->NewStringUTF(env, hostname);
++ return res;
++ }
++
++ return (jstring)NULL;
++}
More information about the distro-pkg-dev
mailing list