Mercurial > hg > release > icedtea6-1.9

changeset 2285:c298e3121204 icedtea6-1.9.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Split the patching of the applet class files into a separate patch, applied to all builds. 2010-11-17 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Add applet hole patch for all builds. * patches/applet_hole.patch: Split applet class patching into separate file to be applied in all builds. * patches/extensions/netx.patch: Include only the Makefile additions to build the jaxws binary and documentation.
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 17 Nov 2010 22:55:22 +0000
parents 3d0ae18fb9a3
children e2b020ce5f03
files ChangeLog Makefile.am patches/extensions/netx.patch
diffstat 3 files changed, 13 insertions(+), 109 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Nov 17 16:37:33 2010 +0000
+++ b/ChangeLog	Wed Nov 17 22:55:22 2010 +0000
@@ -1,3 +1,14 @@
+2010-11-17  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Add applet hole patch for all builds.
+	* patches/applet_hole.patch:
+	Split applet class patching into separate
+	file to be applied in all builds.
+	* patches/extensions/netx.patch:
+	Include only the Makefile additions to build
+	the jaxws binary and documentation.
+
 2010-11-17  Andrew John Hughes  <ahughes@redhat.com>
 
 	* configure.ac: Bump to 1.9.2 proper.
--- a/Makefile.am	Wed Nov 17 16:37:33 2010 +0000
+++ b/Makefile.am	Wed Nov 17 22:55:22 2010 +0000
@@ -315,7 +315,8 @@
 	patches/openjdk/6622432-bigdecimal_performance.patch \
 	patches/openjdk/6850606-bigdecimal_regression.patch \
 	patches/openjdk/6876282-bigdecimal_divide.patch \
-	patches/f14-fonts.patch
+	patches/f14-fonts.patch \
+	patches/applet_hole.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
--- a/patches/extensions/netx.patch	Wed Nov 17 16:37:33 2010 +0000
+++ b/patches/extensions/netx.patch	Wed Nov 17 22:55:22 2010 +0000
@@ -9,114 +9,6 @@
  $(call make-launcher, jconsole, sun.tools.jconsole.JConsole, \
    -J-Djconsole.showOutputViewer, )
  $(call make-launcher, jdb, com.sun.tools.example.debug.tty.TTY, , )
-diff -urN openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java
---- openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java	2008-01-12 15:53:45.000000000 -0500
-+++ openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java	2008-02-04 11:51:20.000000000 -0500
-@@ -42,25 +42,25 @@
-  *
-  * @author      Arthur van Hoff
-  */
--class AppletViewerPanel extends AppletPanel {
-+public class AppletViewerPanel extends AppletPanel {
- 
-     /* Are we debugging? */
--    static boolean debug = false;
-+    protected static boolean debug = false;
- 
-     /**
-      * The document url.
-      */
--    URL documentURL;
-+    protected URL documentURL;
- 
-     /**
-      * The base url.
-      */
--    URL baseURL;
-+    protected URL baseURL;
- 
-     /**
-      * The attributes of the applet.
-      */
--    Hashtable atts;
-+    protected Hashtable atts;
- 
-     /*
-      * JDK 1.1 serialVersionUID
-@@ -70,7 +70,7 @@
-     /**
-      * Construct an applet viewer and start the applet.
-      */
--    AppletViewerPanel(URL documentURL, Hashtable atts) {
-+    protected AppletViewerPanel(URL documentURL, Hashtable atts) {
-         this.documentURL = documentURL;
-         this.atts = atts;
- 
-@@ -202,12 +202,12 @@
-         return (AppletContext)getParent();
-     }
- 
--    static void debug(String s) {
-+    protected static void debug(String s) {
-         if(debug)
-             System.err.println("AppletViewerPanel:::" + s);
-     }
- 
--    static void debug(String s, Throwable t) {
-+    protected static void debug(String s, Throwable t) {
-         if(debug) {
-             t.printStackTrace();
-             debug(s);
-diff -urN openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java
---- openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java	2008-03-26 04:58:12.000000000 -0400
-+++ openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java	2008-04-07 21:55:56.000000000 -0400
-@@ -68,7 +68,7 @@
-     /**
-      * The applet (if loaded).
-      */
--    Applet applet;
-+    protected Applet applet;
- 
-     /**
-      * Applet will allow initialization.  Should be
-@@ -117,7 +117,7 @@
-     /**
-      * The thread for the applet.
-      */
--    Thread handler;
-+    protected Thread handler;
- 
- 
-     /**
-@@ -162,7 +162,8 @@
-      * Creates a thread to run the applet. This method is called
-      * each time an applet is loaded and reloaded.
-      */
--    synchronized void createAppletThread() {
-+	//Overridden by NetxPanel.
-+    protected synchronized void createAppletThread() {
-         // Create a thread group for the applet, and start a new
-         // thread to load the applet.
-         String nm = "applet-" + getCode();
-@@ -306,7 +307,7 @@
-     /**
-      * Get an event from the queue.
-      */
--    synchronized AppletEvent getNextEvent() throws InterruptedException {
-+    protected synchronized AppletEvent getNextEvent() throws InterruptedException {
-         while (queue == null || queue.isEmpty()) {
-             wait();
-         }
-@@ -695,7 +696,8 @@
-      * applet event processing so that it can be gracefully interrupted from
-      * things like HotJava.
-      */
--    private void runLoader() {
-+	//Overridden by NetxPanel.
-+    protected void runLoader() {
-         if (status != APPLET_DISPOSE) {
-             showAppletStatus("notdisposed");
-             return;
 --- openjdk/jdk/make/docs/NON_CORE_PKGS.gmk.orig	2009-06-04 11:02:18.000000000 -0400
 +++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk	2009-06-04 11:02:45.000000000 -0400
 @@ -84,6 +84,8 @@