[java-1.8.0-openjdk] Allow icedtea-web to build

Omair Majid omajid at fedoraproject.org
Fri Jan 24 21:20:06 UTC 2014


commit 47360e10b1a5eaa56a511defb312c3cb3feed206
Author: Omair Majid <omajid at redhat.com>
Date:   Fri Jan 24 13:44:52 2014 -0500

    Allow icedtea-web to build

 applet-hole.patch       |  108 +++++++++++++++++++++++++++++++++++++++++++++++
 java-1.8.0-openjdk.spec |    6 +++
 2 files changed, 114 insertions(+), 0 deletions(-)
---
diff --git a/applet-hole.patch b/applet-hole.patch
new file mode 100644
index 0000000..6f163e9
--- /dev/null
+++ b/applet-hole.patch
@@ -0,0 +1,108 @@
+diff --git jdk8/jdk/src/share/classes/sun/applet/AppletPanel.java jdk8/jdk/src/share/classes/sun/applet/AppletPanel.java
+--- jdk8/jdk/src/share/classes/sun/applet/AppletPanel.java
++++ jdk8/jdk/src/share/classes/sun/applet/AppletPanel.java
+@@ -68,7 +68,7 @@
+     /**
+      * The applet (if loaded).
+      */
+-    Applet applet;
++    protected Applet applet;
+ 
+     /**
+      * Applet will allow initialization.  Should be
+@@ -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();
+         }
+@@ -692,7 +693,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;
+diff --git jdk8/jdk/src/share/classes/sun/applet/AppletViewerPanel.java jdk8/jdk/src/share/classes/sun/applet/AppletViewerPanel.java
+--- jdk8/jdk/src/share/classes/sun/applet/AppletViewerPanel.java
++++ jdk8/jdk/src/share/classes/sun/applet/AppletViewerPanel.java
+@@ -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<String,String> 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<String,String> atts) {
+         this.documentURL = documentURL;
+         this.atts = atts;
+ 
+@@ -106,7 +106,7 @@
+      * Get an applet parameter.
+      */
+     public String getParameter(String name) {
+-        return (String)atts.get(name.toLowerCase());
++        return atts.get(name.toLowerCase());
+     }
+ 
+     /**
+@@ -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 --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 34e0737..cf7e2ef 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -188,6 +188,9 @@ Patch4: PStack-808293.patch
 # OpenJDK specific patches
 #
 
+# Allow icedtea-web to build
+Patch99: applet-hole.patch
+
 # Recognize s390/s390x
 Patch100: %{name}-s390.patch
 # Type fixing for s390
@@ -204,6 +207,7 @@ Patch2021: system-libpng-aarch64.patch
 Patch203: system-lcms.patch
 Patch2031: system-lcmsAARCH64.patch
 
+
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: alsa-lib-devel
@@ -377,6 +381,8 @@ sh %{SOURCE12}
 %patch3
 %patch4
 
+%patch99
+
 # Type fixes for s390
 %ifarch s390 s390x
 %patch100


More information about the scm-commits mailing list