Mercurial > hg > icedtea6-hg

changeset 2258:4d346d8d7d27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update JAXP tarball. Drop patch for 6438179, as applied upstream. Drop portions of 6951319 applied upstream. 2010-09-05 Andrew John Hughes <ahughes@redhat.com> * patches/openjdk/6438179-systray_check.patch: Dropped, applied upstream. * Makefile.am: Drop above patch and those brought back by merge. * patches/openjdk/6951319-sparc_build_fixes.patch: Remove upstreamed parts.
author Andrew John Hughes <ahughes@redhat.com>
date Mon, 06 Sep 2010 13:16:57 +0100
parents 4ccee81e878c
children d70236972367
files ChangeLog Makefile.am patches/openjdk/6438179-systray_check.patch patches/openjdk/6951319-sparc_build_fixes.patch
diffstat 4 files changed, 12 insertions(+), 123 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Sep 05 20:25:14 2010 +0100
+++ b/ChangeLog	Mon Sep 06 13:16:57 2010 +0100
@@ -1,3 +1,12 @@
+2010-09-05  Andrew John Hughes  <ahughes@redhat.com>
+
+	* patches/openjdk/6438179-systray_check.patch:
+	Dropped, applied upstream.
+	* Makefile.am: Drop above patch and those brought
+	back by merge.  Update JAXP tarball.
+	* patches/openjdk/6951319-sparc_build_fixes.patch:
+	Remove upstreamed parts.
+
 2010-09-03  Pavel Tisnovsky  <ptisnovs@redhat.com>
 
 	* Makefile.am: Fixed indentation, changes spaces to tab.
--- a/Makefile.am	Sun Sep 05 20:25:14 2010 +0100
+++ b/Makefile.am	Mon Sep 06 13:16:57 2010 +0100
@@ -17,9 +17,9 @@
 JAF_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150725
 JAF_DROP_ZIP = jdk6-jaf-b20.zip
 JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
-JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/150648
-JAXP_DROP_ZIP = jdk6-jaxp-b20.zip
-JAXP_DROP_SHA256SUM = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156
+JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/152561
+JAXP_DROP_ZIP = jaxp-1_4_4.zip
+JAXP_DROP_SHA256SUM = 10b203bec5b7d3dd8f515a9e098f80abc316faf977bcc220b56efe3dc6e9e5e9
 
 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
 
@@ -285,10 +285,6 @@
 	patches/fonts-rhel.patch \
 	patches/fonts-gentoo.patch \
 	patches/ipv4-mapped-ipv6-addresses.patch \
-	patches/openjdk/6795060-icu_crash.patch \
-	patches/openjdk/4356282-opentype.patch \
-	patches/openjdk/6954424-opentype_javadoc.patch \
-	patches/openjdk/6438179-systray_check.patch \
 	patches/openjdk/6951319-sparc_build_fixes.patch \
 	patches/icedtea-too-many-args.patch \
 	patches/icedtea-jtreg-OpenGLContextInit.patch
--- a/patches/openjdk/6438179-systray_check.patch	Sun Sep 05 20:25:14 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-# HG changeset patch
-# User omajid
-# Date 1281710168 14400
-# Node ID ac23e40d3880c30085d7a76826145afbe73dd465
-# Parent 636250081b3b27e4b9f536903aa2ddad135f24f2
-6438179: XToolkit.isTraySupported() result has nothing to do with the system tray
-Summary: Use System Tray Protocol Specification
-Reviewed-by: prr, dcherepanov
-
---- openjdk.orig/jdk/src/share/classes/java/awt/SystemTray.java	Wed Aug 11 19:06:15 2010 +0100
-+++ openjdk/jdk/src/share/classes/java/awt/SystemTray.java	Fri Aug 13 10:36:08 2010 -0400
-@@ -164,16 +164,14 @@ public class SystemTray {
-         if (GraphicsEnvironment.isHeadless()) {
-             throw new HeadlessException();
-         }
-+
-+        initializeSystemTrayIfNeeded();
-+
-         if (!isSupported()) {
-             throw new UnsupportedOperationException(
-                 "The system tray is not supported on the current platform.");
-         }
- 
--        synchronized (SystemTray.class) {
--            if (systemTray == null) {
--                systemTray = new SystemTray();
--            }
--        }
-         return systemTray;
-     }
- 
-@@ -204,7 +202,7 @@ public class SystemTray {
-      */
-     public static boolean isSupported() {
-         if (Toolkit.getDefaultToolkit() instanceof SunToolkit) {
--
-+            initializeSystemTrayIfNeeded();
-             return ((SunToolkit)Toolkit.getDefaultToolkit()).isTraySupported();
- 
-         } else if (Toolkit.getDefaultToolkit() instanceof HeadlessToolkit) {
-@@ -472,4 +470,12 @@ public class SystemTray {
-             security.checkPermission(SecurityConstants.ACCESS_SYSTEM_TRAY_PERMISSION);
-         }
-     }
-+
-+    private static void initializeSystemTrayIfNeeded() {
-+        synchronized (SystemTray.class) {
-+            if (systemTray == null) {
-+                systemTray = new SystemTray();
-+            }
-+        }
-+    }
- }
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java	Wed Aug 11 19:06:15 2010 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java	Fri Aug 13 10:36:08 2010 -0400
-@@ -55,6 +55,19 @@ public class XSystemTrayPeer implements 
-         return new Dimension(XTrayIconPeer.TRAY_ICON_HEIGHT, XTrayIconPeer.TRAY_ICON_WIDTH);
-     }
- 
-+    boolean isAvailable() {
-+        boolean available = false;
-+        XToolkit.awtLock();
-+        try {
-+            long selection_owner = XlibWrapper.XGetSelectionOwner(XToolkit.getDisplay(),
-+                _NET_SYSTEM_TRAY.getAtom());
-+            available = (selection_owner != XConstants.None);
-+        } finally {
-+            XToolkit.awtUnlock();
-+        }
-+        return available;
-+    }
-+
-     // ***********************************************************************
-     // ***********************************************************************
- 
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	Wed Aug 11 19:06:15 2010 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	Fri Aug 13 10:36:08 2010 -0400
-@@ -1073,10 +1073,9 @@ public class XToolkit extends UNIXToolki
-     }
- 
-     public boolean isTraySupported() {
--        int wm = XWM.getWMID();
--        if (wm == XWM.METACITY_WM || wm == XWM.KDE2_WM)
--        {
--            return true;
-+        XSystemTrayPeer peer = XSystemTrayPeer.getPeerInstance();
-+        if (peer != null) {
-+            return peer.isAvailable();
-         }
-         return false;
-     }
-
--- a/patches/openjdk/6951319-sparc_build_fixes.patch	Sun Sep 05 20:25:14 2010 +0100
+++ b/patches/openjdk/6951319-sparc_build_fixes.patch	Mon Sep 06 13:16:57 2010 +0100
@@ -270,30 +270,6 @@
  
  DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
  
-diff -r 13f94cc87253 -r 379b95785a1f src/cpu/sparc/vm/assembler_sparc.hpp
---- openjdk.orig/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp	Fri Jun 18 01:17:46 2010 -0700
---- openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp	Fri Aug 27 20:12:31 2010 +0100
-@@ -2239,7 +2239,7 @@
-   AddressLiteral constant_oop_address(jobject obj);                          // find_index
-   inline void    set_oop             (jobject obj, Register d);              // uses allocate_oop_address
-   inline void    set_oop_constant    (jobject obj, Register d);              // uses constant_oop_address
--  inline void    set_oop             (AddressLiteral& obj_addr, Register d); // same as load_address
-+  inline void    set_oop             (const AddressLiteral& obj_addr, Register d); // same as load_address
- 
-   void set_narrow_oop( jobject obj, Register d );
- 
-diff -r 13f94cc87253 -r 379b95785a1f src/cpu/sparc/vm/assembler_sparc.inline.hpp
---- openjdk.orig/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp	Fri Jun 18 01:17:46 2010 -0700
---- openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp	Fri Aug 27 20:12:31 2010 +0100
-@@ -707,7 +707,7 @@
- }
- 
- 
--inline void MacroAssembler::set_oop(AddressLiteral& obj_addr, Register d) {
-+inline void MacroAssembler::set_oop(const AddressLiteral& obj_addr, Register d) {
-   assert(obj_addr.rspec().type() == relocInfo::oop_type, "must be an oop reloc");
-   set(obj_addr, d);
- }
 diff -r 13f94cc87253 -r 379b95785a1f src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp
 --- openjdk.orig/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp	Fri Jun 18 01:17:46 2010 -0700
 --- openjdk/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp	Fri Aug 27 20:12:31 2010 +0100