[gentoo-commits] gentoo-x86 commit in dev-java/icedtea-web/files: icedtea-web-1.3.2-openjdk-build-25.patch

[gentoo-commits] gentoo-x86 commit in dev-java/icedtea-web/files: icedtea-web-1.3.2-openjdk-build-25.patch

[Vlastimil Babka (caster)]

caster      13/07/23 21:08:15

  Added:                icedtea-web-1.3.2-openjdk-build-25.patch
  Log:
  Version bump with upstream patch to work with latest icedtea. See http://blog.fuseyism.com/index.php/2013/06/19/imminent-icedtea-web-breakage/
  
  (Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key 4E61DE84)

Revision  Changes    Path
1.1                  dev-java/icedtea-web/files/icedtea-web-1.3.2-openjdk-build-25.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/files/icedtea-web-1.3.2-openjdk-build-25.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/files/icedtea-web-1.3.2-openjdk-build-25.patch?rev=1.1&content-type=text/plain

Index: icedtea-web-1.3.2-openjdk-build-25.patch
===================================================================
diff -r 3c5e0952d876 -r e5e87b61a02d netx/net/sourceforge/jnlp/runtime/Boot.java
--- a/netx/net/sourceforge/jnlp/runtime/Boot.java	Thu Jun 06 17:09:54 2013 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java	Thu Jun 20 15:27:22 2013 +0200
@@ -35,6 +35,8 @@
 import net.sourceforge.jnlp.cache.UpdatePolicy;
 import net.sourceforge.jnlp.security.viewer.CertificateViewer;
 import net.sourceforge.jnlp.services.ServiceUtil;
+import sun.awt.AppContext;
+import sun.awt.SunToolkit;
 
 /**
  * This is the main entry point for the JNLP client.  The main
@@ -113,6 +115,9 @@
      * Launch the JNLP file specified by the command-line arguments.
      */
     public static void main(String[] argsIn) {
+        if (AppContext.getAppContext() == null) {
+            SunToolkit.createNewAppContext();
+        }
         args = argsIn;
 
         if (null != getOption("-viewer")) {
diff -r 3c5e0952d876 -r e5e87b61a02d netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java	Thu Jun 06 17:09:54 2013 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java	Thu Jun 20 15:27:22 2013 +0200
@@ -233,7 +233,7 @@
         try {
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
         } catch (Exception e) {
-            // ignore it
+            e.printStackTrace();
         }
 
         doMainAppContextHacks();
diff -r 3c5e0952d876 -r e5e87b61a02d plugin/icedteanp/java/sun/applet/PluginMain.java
--- a/plugin/icedteanp/java/sun/applet/PluginMain.java	Thu Jun 06 17:09:54 2013 +0200
+++ b/plugin/icedteanp/java/sun/applet/PluginMain.java	Thu Jun 20 15:27:22 2013 +0200
@@ -72,6 +72,8 @@
 import java.net.ProxySelector;
 import java.util.Enumeration;
 import java.util.Properties;
+import sun.awt.AppContext;
+import sun.awt.SunToolkit;
 
 import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
@@ -94,6 +96,9 @@
      */
     public static void main(String args[])
             throws IOException {
+        if (AppContext.getAppContext() == null) {
+            SunToolkit.createNewAppContext();
+        }
         if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) {
             System.err.println("Invalid pipe names provided. Refusing to proceed.");
             System.exit(1);