Date: Tue, 16 Jul 2013 23:29:58 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323136 - in head/java/icedtea-web: . files Message-ID: <201307162329.r6GNTwYL039049@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Tue Jul 16 23:29:58 2013 New Revision: 323136 URL: http://svnweb.freebsd.org/changeset/ports/323136 Log: Add upstream patches to make it work again with the latest security patches for OpenJDK ports. Obtained from: IcedTea Project Added: head/java/icedtea-web/files/patch-netx-Boot.java (contents, props changed) head/java/icedtea-web/files/patch-netx-JNLPRuntime.java (contents, props changed) head/java/icedtea-web/files/patch-plugin-PluginMain.java (contents, props changed) Modified: head/java/icedtea-web/Makefile Modified: head/java/icedtea-web/Makefile ============================================================================== --- head/java/icedtea-web/Makefile Tue Jul 16 23:00:57 2013 (r323135) +++ head/java/icedtea-web/Makefile Tue Jul 16 23:29:58 2013 (r323136) @@ -2,6 +2,7 @@ PORTNAME= icedtea-web PORTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= java www MASTER_SITES= http://icedtea.wildebeest.org/download/source/ \ http://icedtea.classpath.org/download/source/ @@ -16,14 +17,13 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/zip:${PO RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash GNU_CONFIGURE= yes -USE_GMAKE= yes USE_JAVA= yes JAVA_OS= native JAVA_VENDOR= openjdk JAVA_VERSION= 1.6+ USE_PERL5_BUILD=yes USE_XORG= x11 -USES= pkgconfig shebangfix +USES= gmake pkgconfig shebangfix SHEBANG_FILES= javac.in jrunscript.in WANT_GNOME= yes Added: head/java/icedtea-web/files/patch-netx-Boot.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/icedtea-web/files/patch-netx-Boot.java Tue Jul 16 23:29:58 2013 (r323136) @@ -0,0 +1,21 @@ +--- netx/net/sourceforge/jnlp/runtime/Boot.java Tue Jun 18 15:57:01 2013 -0400 ++++ netx/net/sourceforge/jnlp/runtime/Boot.java Thu Jun 20 15:20:57 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")) { Added: head/java/icedtea-web/files/patch-netx-JNLPRuntime.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/icedtea-web/files/patch-netx-JNLPRuntime.java Tue Jul 16 23:29:58 2013 (r323136) @@ -0,0 +1,11 @@ +--- netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Tue Jun 18 15:57:01 2013 -0400 ++++ netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Thu Jun 20 15:20:57 2013 +0200 +@@ -234,7 +234,7 @@ + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (Exception e) { +- // ignore it ++ e.printStackTrace(); + } + + doMainAppContextHacks(); Added: head/java/icedtea-web/files/patch-plugin-PluginMain.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/icedtea-web/files/patch-plugin-PluginMain.java Tue Jul 16 23:29:58 2013 (r323136) @@ -0,0 +1,22 @@ +--- plugin/icedteanp/java/sun/applet/PluginMain.java Tue Jun 18 15:57:01 2013 -0400 ++++ plugin/icedteanp/java/sun/applet/PluginMain.java Thu Jun 20 15:20:57 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); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307162329.r6GNTwYL039049>