Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br>
Date: 2013-07-11
Initial Package Version: 1.4 (though original post mentions head, 1.3, 1.2 as well)
Upstream Status: Submitted
Origin: Jiri Vanek <jvanek at redhat.com>
http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-June/023745.html
Description: Latest OpenJDK breaks Java browser plugin
diff -Naur icedtea-web-1.4.orig/netx/net/sourceforge/jnlp/runtime/Boot.java icedtea-web-1.4/netx/net/sourceforge/jnlp/runtime/Boot.java
old
|
new
|
|
35 | 35 | import net.sourceforge.jnlp.cache.UpdatePolicy; |
36 | 36 | import net.sourceforge.jnlp.security.viewer.CertificateViewer; |
37 | 37 | import net.sourceforge.jnlp.services.ServiceUtil; |
| 38 | import sun.awt.AppContext; |
| 39 | import sun.awt.SunToolkit; |
38 | 40 | |
39 | 41 | /** |
40 | 42 | * This is the main entry point for the JNLP client. The main |
… |
… |
|
113 | 115 | * Launch the JNLP file specified by the command-line arguments. |
114 | 116 | */ |
115 | 117 | public static void main(String[] argsIn) { |
| 118 | if (AppContext.getAppContext() == null) { |
| 119 | SunToolkit.createNewAppContext(); |
| 120 | } |
116 | 121 | args = argsIn; |
117 | 122 | |
118 | 123 | if (null != getOption("-viewer")) { |
diff -Naur icedtea-web-1.4.orig/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java icedtea-web-1.4/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
old
|
new
|
|
234 | 234 | try { |
235 | 235 | UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); |
236 | 236 | } catch (Exception e) { |
237 | | // ignore it |
| 237 | e.printStackTrace(); |
238 | 238 | } |
239 | 239 | |
240 | 240 | doMainAppContextHacks(); |
diff -Naur icedtea-web-1.4.orig/plugin/icedteanp/java/sun/applet/PluginMain.java icedtea-web-1.4/plugin/icedteanp/java/sun/applet/PluginMain.java
old
|
new
|
|
72 | 72 | import java.net.ProxySelector; |
73 | 73 | import java.util.Enumeration; |
74 | 74 | import java.util.Properties; |
| 75 | import sun.awt.AppContext; |
| 76 | import sun.awt.SunToolkit; |
75 | 77 | |
76 | 78 | import net.sourceforge.jnlp.config.DeploymentConfiguration; |
77 | 79 | import net.sourceforge.jnlp.runtime.JNLPRuntime; |
… |
… |
|
94 | 96 | */ |
95 | 97 | public static void main(String args[]) |
96 | 98 | throws IOException { |
| 99 | if (AppContext.getAppContext() == null) { |
| 100 | SunToolkit.createNewAppContext(); |
| 101 | } |
97 | 102 | if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) { |
98 | 103 | System.err.println("Invalid pipe names provided. Refusing to proceed."); |
99 | 104 | System.exit(1); |