commit: f3f78c3afa19e069a0eaeb4de24273d75caecacc Author: Vlastimil Babka <caster <AT> gentoo <DOT> org> AuthorDate: Sat Nov 1 19:07:34 2014 +0000 Commit: Vlastimil Babka <caster <AT> gentoo <DOT> org> CommitDate: Sat Nov 1 19:07:34 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=f3f78c3a
Remove dev-java/icedtea-web; contains obsolete versions compared to portage. --- dev-java/icedtea-web/ChangeLog | 160 --------- dev-java/icedtea-web/Manifest | 21 -- .../icedtea-web/files/0002-Respect-LDFLAGS.patch | 11 - .../files/fix-plugin-in-icedtea-7.patch | 388 --------------------- dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild | 118 ------- dev-java/icedtea-web/icedtea-web-1.2.ebuild | 118 ------- dev-java/icedtea-web/metadata.xml | 14 - 7 files changed, 830 deletions(-) diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog deleted file mode 100644 index 0dd9545..0000000 --- a/dev-java/icedtea-web/ChangeLog +++ /dev/null @@ -1,160 +0,0 @@ -# ChangeLog for dev-java/icedtea-web -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 21 Jul 2012; Ralph Sennhauser <[email protected]> -icedtea-web-1.1.4.ebuild, - -icedtea-web-1.1.4-r7.ebuild, -icedtea-web-1.1.4-r8.ebuild, - icedtea-web-1.2.ebuild, icedtea-web-1.2-r7.ebuild: - Drop elog message about old browsers not working. #427458 - Remove old. - - 14 Mar 2012; Ralph Sennhauser <[email protected]> icedtea-web-1.2.ebuild: - Fix typo in handle name. - - 14 Mar 2012; Ralph Sennhauser <[email protected]> icedtea-web-1.2.ebuild, - icedtea-web-1.2-r7.ebuild: - Use JAVA_PKG_WANT_BUILD_VM for selecting VM. Obsoletes handle migration code. - -*icedtea-web-1.2-r7 (06 Mar 2012) -*icedtea-web-1.2 (06 Mar 2012) - - 06 Mar 2012; Ralph Sennhauser <[email protected]> +icedtea-web-1.2.ebuild, - +icedtea-web-1.2-r7.ebuild: - Version bump - -*icedtea-web-1.1.4-r8 (02 Mar 2012) - - 02 Mar 2012; Vlastimil Babka <[email protected]> - +icedtea-web-1.1.4-r8.ebuild, +files/fix-plugin-in-icedtea-7.patch: - Revbump with upstream patch to fix plugin initialization. - - 13 Feb 2012; Vlastimil Babka <[email protected]> - -files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch: - Remove old. - - 13 Feb 2012; Vlastimil Babka <[email protected]> icedtea-web-1.1.3.ebuild, - icedtea-web-1.1.3-r7.ebuild, icedtea-web-1.1.4.ebuild, - icedtea-web-1.1.4-r7.ebuild: - Update installdir with USE=build, die when users set the flag. - -*icedtea-web-1.1.4-r7 (24 Nov 2011) -*icedtea-web-1.1.4 (24 Nov 2011) - - 24 Nov 2011; Ralph Sennhauser <[email protected]> +icedtea-web-1.1.4.ebuild, - +icedtea-web-1.1.4-r7.ebuild, metadata.xml: - Version and EAPI bump. - Finish VMHANDLE migration. - Add missing dependencies. Bug #389795 - - 04 Nov 2011; Vlastimil Babka <[email protected]> icedtea-web-1.1.3-r7.ebuild: - Add ~x86 keyword. - - 04 Nov 2011; Vlastimil Babka <[email protected]> icedtea-web-1.1.3-r7.ebuild: - Remove the no longer needed addpredict, match KEYWORDS with icedtea:7. - - 30 Oct 2011; Vlastimil Babka <[email protected]> icedtea-web-1.1.3.ebuild, - icedtea-web-1.1.3-r7.ebuild: - Prepare for icedtea VMHANDLE changes. - - 30 Oct 2011; Vlastimil Babka <[email protected]> -icedtea-web-1.0.4.ebuild, - -icedtea-web-1.0.4-r7.ebuild, -icedtea-web-1.1.1.ebuild, - -icedtea-web-1.1.1-r7.ebuild, -icedtea-web-1.1.2.ebuild, - -icedtea-web-1.1.2-r1.ebuild, -icedtea-web-1.1.2-r7.ebuild, - -icedtea-web-1.1.2-r8.ebuild: - Cleanup old versions. - - 30 Sep 2011; Miroslav Šulc <[email protected]> - icedtea-web-1.1.3-r7.ebuild: - Fixed problem with sandbox access violation - - 29 Sep 2011; Vlastimil Babka <[email protected]> - +icedtea-web-1.1.3.ebuild, +icedtea-web-1.1.3-r7.ebuild: - Version bump, npapi-sdk support now upstream. - - 20 Sep 2011; Vlastimil Babka <[email protected]> - +files/0002-Respect-LDFLAGS.patch: - Add missing patch, bug #383601. - - 18 Sep 2011; Vlastimil Babka <[email protected]> - +icedtea-web-1.1.2-r1.ebuild, +icedtea-web-1.1.2-r8.ebuild: - Revbump to respect LDFLAGS, bug #356645. - - 06 Sep 2011; Vlastimil Babka <[email protected]> icedtea-web-1.0.4.ebuild, - icedtea-web-1.0.4-r7.ebuild, - +files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch, - icedtea-web-1.1.1.ebuild, icedtea-web-1.1.1-r7.ebuild, - +icedtea-web-1.1.2.ebuild, +icedtea-web-1.1.2-r7.ebuild: - Version bump. Support building against npapi-sdk instead of xulrunner, bug - #381957. Also remove xulrunner from RDEPEND in all older versions, bug - #381147. - -*icedtea-web-1.1.1-r7 (20 Jul 2011) -*icedtea-web-1.1.1 (20 Jul 2011) -*icedtea-web-1.0.4-r7 (20 Jul 2011) -*icedtea-web-1.0.4 (20 Jul 2011) - - 20 Jul 2011; Andrew John Hughes <[email protected]> - -icedtea-web-1.0.2.ebuild, -icedtea-web-1.0.2-r7.ebuild, - +icedtea-web-1.0.4.ebuild, +icedtea-web-1.0.4-r7.ebuild, - -icedtea-web-1.1.ebuild, -icedtea-web-1.1-r7.ebuild, - +icedtea-web-1.1.1.ebuild, +icedtea-web-1.1.1-r7.ebuild: - Security update for IcedTea-Web: - https://dbhole.wordpress.com/2011/07/20/icedtea-web-1-0-4-and-1-1-1-security-releases-released/ - - 20 Jun 2011; Vlastimil Babka <[email protected]> icedtea-web-1.1.ebuild, - icedtea-web-1.1-r7.ebuild: - Add 'build' USE flag for building icedtea-web for icedtea6-bin. Disable - parallel make install until bug #372235 is resolved. - - 13 Jun 2011; Vlastimil Babka <[email protected]> +icedtea-web-1.1.ebuild, - +icedtea-web-1.1-r7.ebuild: - Version bump, security bug #370787. - -*icedtea-web-1.0.2-r7 (04 Apr 2011) -*icedtea-web-1.0.2 (04 Apr 2011) - - 04 Apr 2011; Andrew John Hughes <[email protected]> - -icedtea-web-1.0.1.ebuild, -icedtea-web-1.0.1-r7.ebuild, - +icedtea-web-1.0.2.ebuild, +icedtea-web-1.0.2-r7.ebuild: - Bump to 1.0.2: - https://dbhole.wordpress.com/2011/04/04/icedtea-web-1-0-2-released/ - - 30 Mar 2011; Vlastimil Babka <[email protected]> icedtea-web-1.0.1.ebuild, - icedtea-web-1.0.1-r7.ebuild: - Remove -j1 from src_install as there should be no problem now that - compilation is properly in src_compile. - - 30 Mar 2011; Vlastimil Babka <[email protected]> icedtea-web-1.0.1.ebuild, - icedtea-web-1.0.1-r7.ebuild: - Add src_compile() phase to override the one from java-pkg-2. - - 18 Feb 2011; Vlastimil Babka <[email protected]> icedtea-web-1.0.1.ebuild, - icedtea-web-1.0.1-r7.ebuild: - Add xulrunner dependency. - - 18 Feb 2011; Vlastimil Babka <[email protected]> icedtea-web-1.0.1.ebuild, - icedtea-web-1.0.1-r7.ebuild: - Install with emake -j1 due to experienced error. - - 17 Feb 2011; Vlastimil Babka <[email protected]> icedtea-web-1.0.1.ebuild, - +icedtea-web-1.0.1-r7.ebuild: - Add a -r7 revision with SLOT=7 intended for icedtea7. - - 16 Feb 2011; Vlastimil Babka <[email protected]> icedtea-web-1.0.1.ebuild, - +metadata.xml: - Use the same hacks as in the icedtea ebuild to select icedtea VM for - building regardless of system vm settings. Plus some more polishing. - -*icedtea-web-1.0.1 (15 Feb 2011) - - 15 Feb 2011; Andrew John Hughes <[email protected]> -icedtea-web-1.0.ebuild, - +icedtea-web-1.0.1.ebuild: - Security update: - http://dbhole.wordpress.com/2011/02/15/icedtea-web-1-0-1-released/ - -*icedtea-web-1.0 (02 Feb 2011) - - 02 Feb 2011; Andrew John Hughes <[email protected]> +icedtea-web-1.0.ebuild: - Initial release: - http://blog.fuseyism.com/index.php/2011/02/02/icedtea-web-10-released/ - diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest deleted file mode 100644 index 9cd607e..0000000 --- a/dev-java/icedtea-web/Manifest +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX 0002-Respect-LDFLAGS.patch 352 SHA256 3e4660e84420e2ae85b00eef40e7e20c0df2c6965fda6827ab025e8167e8f866 SHA512 83e431505808e5e8b553d17b74590eaf232f69ccc7d0c9c3753af6995105a08b4cf8cc844295edb977e5a6456c5fe3b53ba0fa565607c99cc82ac025169dd16f WHIRLPOOL ef0f6ccdd1f879940351dbe0ece62c2f1ecc333df06328f7d12e07885579255f973689545e32ec7db679cc1ec516860f2b7acb52070dc4714c2a3b78b9eeae87 -AUX fix-plugin-in-icedtea-7.patch 15838 SHA256 335ddc5f92751756f21a623f7ba82cb9046287c8eaaed574c96f71ccadb8e985 SHA512 2baa7b48b1b2830ca1470383bfdee5cfd0850f8a96e9c28826566514bcbfc5534eff0f6f56ff41be488a38910e2a28f04cfc4a57407091e2c8e5f25b8a88d69b WHIRLPOOL 3c857c94b871592922ac97a9e57c82be3dd5674600f1e7779b42c2d9a505ecc1ba4c3b15c9aabaa32e1b686f3ffae700546464d05643356042087a70defbe23b -DIST icedtea-web-1.2.tar.gz 885793 SHA256 3f8d22b655df207409dd3451ba02907f61a12ac051e4df4d44bb5ed47c4f778d SHA512 42b6878457965ed3b077acb72940587efbf6b751e2a197fceed20c9cd0be8e878412a4a838c0dfbb5b02eeaae1833073c3bbf4baef7944c576f3c71c06b7419a WHIRLPOOL bd7bc02be559648290e852470daa9ad962fe7b5e168d1cfe2520b4cafdd9b0cbced96e1dfe75e04e20174a963086bce25ae199c8cd9f11b4add25a36c62e53d0 -EBUILD icedtea-web-1.2-r7.ebuild 3222 SHA256 36f1b84cca867de5977c4a8e8b3fe38ae846c01d6f945de62caec573b5f429ed SHA512 1ce62192d5f2f427cb036bdd780d5d7a3d10758104da858d1c77f338f0aa22769a973b08277451d55681a162ef0f71200e8afe6b7650ca0ee7dcbeb8cc986260 WHIRLPOOL a01051b1a3210def95e95ebf365f8b75f02eab8b885dbbb062b60d3f31be914858b8e779df131e369044b2245d0aae04553d764d0c7944711fc6d05bf8eb30bc -EBUILD icedtea-web-1.2.ebuild 3231 SHA256 8cf32c2b4bd34b2096e0b08d24eee81c00c7b049f3ec8378ba6187183f05cc72 SHA512 2fac7b92ccada394ba1b98ad927a6ad31d9118c7d4e2771a30bf184405d127c0802c1e0070abdb142a7909bd7888c4b48f5d5b4acbfbf4bf68498f0c8627716d WHIRLPOOL 8a02a8e73b07033882a875f30ac195917ef39f171ecb48e96241e083817b7e83c26de09ef1680e6df2915fc4c019aa0ea91fe64d9751603a04e9f455660d0d07 -MISC ChangeLog 6282 SHA256 c519a4e041c4c9b224ef186f049789aa392c926c0ad3cfba2ab9c5c7231b6a1a SHA512 ee4f507518e52fa678253c860daaf8995bdfdb27b362f88b7bf75607c3d4c751503dd7a9de36bfd7446b319c78ed94ed109d8bd23787f99078875ef59991e995 WHIRLPOOL 5be485a64f19762cf795aff3eba2e7cfcb5ec988567d6040ac6f006171984870751d9b63f0f198cb61184ea585a698125b47d659353ec78ac2b607d211a92ea1 -MISC metadata.xml 532 SHA256 48eafb34adc623b7f298610feaac56f61a01f52658b83be30e4cc8d3a9b9f1d7 SHA512 7e87ec902c3cc65e7b3f8cf7ae4bc408caa57f037c415cea0ab9cafc492c85e26fae800d1a70762ac67e44b125736a4cc3a06c3fb2b22ca885ae6e012de836e9 WHIRLPOOL 1824a4e566404d40110520abb4db3cb58e673a04ea0c2f4c911fa84aa29da8658618647868ae23eab82b9d95f2e8f87486c23f917956d6af78deb50a2d9f5469 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iQEcBAEBCAAGBQJQCpeeAAoJEIUJ+svaV163fTAH/0nsJjnDtoUFQlz2gndhczPM -hP0PHTmKn7joaUr73KZfm+9jo23Gga+wlVxqd1UJCI56duFDokCkdmsIJLbr/CsJ -+C/ltWdtMwceMleJ50FnPEg+Gz3Ro7lQtya90R6y9L0/VpXbSzKFvmueVehvUbb+ -WLw/7rPN/RcHUcpBCb+cHUGIUuihmds+kJ/HT6TssD/BJJXosj026+DiIHgd3Evm -vlyl59EIXwnOP7L2ABg9/N+2LRh4yg8Lwg1P1Cz8J3wcTsxhJnvpa7xzP36eIga+ -Jpeubv+WhuP/yrG7uAN/rfa4rfI06CyX6r5x3EQaQ6voIKs/CkeYVP0UM5C+Csg= -=GLau ------END PGP SIGNATURE----- diff --git a/dev-java/icedtea-web/files/0002-Respect-LDFLAGS.patch b/dev-java/icedtea-web/files/0002-Respect-LDFLAGS.patch deleted file mode 100644 index 6f62d08..0000000 --- a/dev-java/icedtea-web/files/0002-Respect-LDFLAGS.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am.orig 2011-09-18 23:35:31.396740781 +0200 -+++ Makefile.am 2011-09-18 23:35:44.284392366 +0200 -@@ -216,7 +216,7 @@ - - $(PLUGIN_DIR)/IcedTeaPlugin.so: $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) - cd $(PLUGIN_DIR) && \ -- $(CXX) $(CXXFLAGS) \ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) \ - $(PLUGIN_OBJECTS) \ - $(GLIB_LIBS) \ - $(GTK_LIBS) \ diff --git a/dev-java/icedtea-web/files/fix-plugin-in-icedtea-7.patch b/dev-java/icedtea-web/files/fix-plugin-in-icedtea-7.patch deleted file mode 100644 index ff084fc..0000000 --- a/dev-java/icedtea-web/files/fix-plugin-in-icedtea-7.patch +++ /dev/null @@ -1,388 +0,0 @@ - -# HG changeset patch -# User Denis Lila <[email protected]> -# Date 1304110685 14400 -# Node ID 77640d74d21c2303b64bbc05583a3850db564894 -# Parent f0647c9385358b4fc3fe747ba7b95b9117c2f681 -Fix appcontext related plugin bugs. - -diff -r f0647c938535 -r 77640d74d21c netx/net/sourceforge/jnlp/Launcher.java ---- a/netx/net/sourceforge/jnlp/Launcher.java Sat Jan 07 02:48:05 2012 -0500 -+++ b/netx/net/sourceforge/jnlp/Launcher.java Fri Apr 29 16:58:05 2011 -0400 -@@ -33,7 +33,6 @@ - - import net.sourceforge.jnlp.cache.CacheUtil; - import net.sourceforge.jnlp.cache.UpdatePolicy; --import net.sourceforge.jnlp.runtime.AppThreadGroup; - import net.sourceforge.jnlp.runtime.AppletInstance; - import net.sourceforge.jnlp.runtime.ApplicationInstance; - import net.sourceforge.jnlp.runtime.JNLPClassLoader; -@@ -707,7 +706,7 @@ - throw new ClassNotFoundException("Can't do a codebase look up and there are no jars. Failing sooner rather than later"); - } - -- AppThreadGroup group = (AppThreadGroup) Thread.currentThread().getThreadGroup(); -+ ThreadGroup group = Thread.currentThread().getThreadGroup(); - - String appletName = file.getApplet().getMainClass(); - -@@ -723,7 +722,6 @@ - else - appletInstance = new AppletInstance(file, group, loader, applet, cont); - -- group.setApplication(appletInstance); - loader.setApplication(appletInstance); - - setContextClassLoaderForAllThreads(appletInstance.getThreadGroup(), appletInstance.getClassLoader()); -@@ -770,10 +768,9 @@ - protected ApplicationInstance createApplication(JNLPFile file) throws LaunchException { - try { - JNLPClassLoader loader = JNLPClassLoader.getInstance(file, updatePolicy); -- AppThreadGroup group = (AppThreadGroup) Thread.currentThread().getThreadGroup(); -+ ThreadGroup group = Thread.currentThread().getThreadGroup(); - - ApplicationInstance app = new ApplicationInstance(file, group, loader); -- group.setApplication(app); - loader.setApplication(app); - - return app; -@@ -789,16 +786,16 @@ - * then this method simply returns the existing ThreadGroup. The applet - * ThreadGroup has to be created at an earlier point in the applet code. - */ -- protected AppThreadGroup createThreadGroup(JNLPFile file) { -- AppThreadGroup appThreadGroup = null; -+ protected ThreadGroup createThreadGroup(JNLPFile file) { -+ ThreadGroup tg = null; - - if (file instanceof PluginBridge) { -- appThreadGroup = (AppThreadGroup) Thread.currentThread().getThreadGroup(); -+ tg = Thread.currentThread().getThreadGroup(); - } else { -- appThreadGroup = new AppThreadGroup(mainGroup, file.getTitle()); -+ tg = new ThreadGroup(mainGroup, file.getTitle()); - } - -- return appThreadGroup; -+ return tg; - } - - /** -diff -r f0647c938535 -r 77640d74d21c netx/net/sourceforge/jnlp/NetxPanel.java ---- a/netx/net/sourceforge/jnlp/NetxPanel.java Sat Jan 07 02:48:05 2012 -0500 -+++ b/netx/net/sourceforge/jnlp/NetxPanel.java Fri Apr 29 16:58:05 2011 -0400 -@@ -23,12 +23,13 @@ - package net.sourceforge.jnlp; - - import net.sourceforge.jnlp.AppletLog; --import net.sourceforge.jnlp.runtime.AppThreadGroup; - import net.sourceforge.jnlp.runtime.AppletInstance; - import net.sourceforge.jnlp.runtime.JNLPRuntime; - - import java.net.URL; - import java.util.Hashtable; -+import java.util.concurrent.ConcurrentHashMap; -+import java.util.concurrent.ConcurrentMap; - - import sun.applet.AppletViewerPanel; - import sun.awt.SunToolkit; -@@ -44,9 +45,58 @@ - private boolean exitOnFailure = true; - private AppletInstance appInst = null; - private boolean appletAlive; -+ private final String uKey; -+ -+ // We use this so that we can create exactly one thread group -+ // for all panels with the same uKey. -+ private static final ConcurrentMap<String, ThreadGroup> uKeyToTG = -+ new ConcurrentHashMap<String, ThreadGroup>(); -+ -+ // This map is actually a set (unfortunately there is no ConcurrentSet -+ // in java.util.concurrent). If KEY is in this map, then we know that -+ // an app context has been created for the panel that has uKey.equals(KEY), -+ // so we avoid creating it a second time for panels with the same uKey. -+ // Because it's a set, only the keys matter. However, we can't insert -+ // null values in because if we did, we couldn't use null checks to see -+ // if a key was absent before a putIfAbsent. -+ private static final ConcurrentMap<String, Boolean> appContextCreated = -+ new ConcurrentHashMap<String, Boolean>(); - - public NetxPanel(URL documentURL, Hashtable<String, String> atts) { - super(documentURL, atts); -+ -+ /* According to http://download.oracle.com/javase/6/docs/technotes/guides/deployment/deployment-guide/applet-compatibility.html, -+ * classloaders are shared iff these properties match: -+ * codebase, cache_archive, java_archive, archive -+ * -+ * To achieve this, we create the uniquekey based on those 4 values, -+ * always in the same order. The initial "<NAME>=" parts ensure a -+ * bad tag cannot trick the loader into getting shared with another. -+ */ -+ -+ // Firefox sometimes skips the codebase if it is default -- ".", -+ // so set it that way if absent -+ String codebaseAttr = atts.get("codebase") != null ? -+ atts.get("codebase") : "."; -+ -+ String cache_archiveAttr = atts.get("cache_archive") != null ? -+ atts.get("cache_archive") : ""; -+ -+ String java_archiveAttr = atts.get("java_archive") != null ? -+ atts.get("java_archive") : ""; -+ -+ String archiveAttr = atts.get("archive") != null ? -+ atts.get("archive") : ""; -+ -+ this.uKey = "codebase=" + codebaseAttr + -+ "cache_archive=" + cache_archiveAttr + -+ "java_archive=" + java_archiveAttr + -+ "archive=" + archiveAttr; -+ -+ // when this was being done (incorrectly) in Launcher, the call was -+ // new AppThreadGroup(mainGroup, file.getTitle()); -+ ThreadGroup tg = new ThreadGroup(Launcher.mainGroup, this.documentURL.toString()); -+ uKeyToTG.putIfAbsent(this.uKey, tg); - } - - // overloaded constructor, called when initialized via plugin -@@ -58,18 +108,6 @@ - } - - @Override -- public void run() { -- /* -- * create an AppContext for this thread associated with this particular -- * plugin instance (which runs in a different thread group from the rest -- * of the plugin). -- */ -- SunToolkit.createNewAppContext(); -- -- super.run(); -- } -- -- @Override - protected void showAppletException(Throwable t) { - /* - * Log any exceptions thrown while loading, initializing, starting, -@@ -78,7 +116,7 @@ - AppletLog.log(t); - super.showAppletException(t); - } -- -+ - //Overriding to use Netx classloader. You might need to relax visibility - //in sun.applet.AppletPanel for runLoader(). - protected void runLoader() { -@@ -90,7 +128,7 @@ - getCode(), - getWidth(), - getHeight(), -- atts); -+ atts, uKey); - - doInit = true; - dispatchAppletEvent(APPLET_LOADING, null); -@@ -154,11 +192,7 @@ - } - } - -- // when this was being done (incorrectly) in Launcher, the call was -- // new AppThreadGroup(mainGroup, file.getTitle()); -- ThreadGroup tg = new AppThreadGroup(Launcher.mainGroup, -- this.documentURL.toString()); -- handler = new Thread(tg, this); -+ handler = new Thread(getThreadGroup(), this); - handler.start(); - } - -@@ -174,4 +208,19 @@ - public boolean isAlive() { - return handler != null && handler.isAlive() && this.appletAlive; - } -+ -+ public ThreadGroup getThreadGroup() { -+ return uKeyToTG.get(uKey); -+ } -+ -+ public void createNewAppContext() { -+ if (Thread.currentThread().getThreadGroup() != getThreadGroup()) { -+ throw new RuntimeException("createNewAppContext called from the wrong thread."); -+ } -+ // only create a new context if one hasn't already been created for the -+ // applets with this unique key. -+ if (null == appContextCreated.putIfAbsent(uKey, Boolean.TRUE)) { -+ SunToolkit.createNewAppContext(); -+ } -+ } - } -diff -r f0647c938535 -r 77640d74d21c netx/net/sourceforge/jnlp/PluginBridge.java ---- a/netx/net/sourceforge/jnlp/PluginBridge.java Sat Jan 07 02:48:05 2012 -0500 -+++ b/netx/net/sourceforge/jnlp/PluginBridge.java Fri Apr 29 16:58:05 2011 -0400 -@@ -44,7 +44,8 @@ - private boolean codeBaseLookup; - - public PluginBridge(URL codebase, URL documentBase, String jar, String main, -- int width, int height, Hashtable<String, String> atts) -+ int width, int height, Hashtable<String, String> atts, -+ String uKey) - throws Exception { - specVersion = new Version("1.0"); - fileVersion = new Version("1.1"); -@@ -132,34 +133,7 @@ - else - security = null; - -- /* According to http://download.oracle.com/javase/6/docs/technotes/guides/deployment/deployment-guide/applet-compatibility.html, -- * classloaders are shared iff these properties match: -- * codebase, cache_archive, java_archive, archive -- * -- * To achieve this, we create the uniquekey based on those 4 values, -- * always in the same order. The initial "<NAME>=" parts ensure a -- * bad tag cannot trick the loader into getting shared with another. -- */ -- -- // Firefox sometimes skips the codebase if it is default -- ".", -- // so set it that way if absent -- String codebaseAttr = atts.get("codebase") != null ? -- atts.get("codebase") : "."; -- -- String cache_archiveAttr = atts.get("cache_archive") != null ? -- atts.get("cache_archive") : ""; -- -- String java_archiveAttr = atts.get("java_archive") != null ? -- atts.get("java_archive") : ""; -- -- String archiveAttr = atts.get("archive") != null ? -- atts.get("archive") : ""; -- -- this.uniqueKey = "codebase=" + codebaseAttr + -- "cache_archive=" + cache_archiveAttr + -- "java_archive=" + java_archiveAttr + -- "archive=" + archiveAttr; -- -+ this.uniqueKey = uKey; - usePack = false; - useVersion = false; - String jargs = atts.get("java_arguments"); -diff -r f0647c938535 -r 77640d74d21c netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java ---- a/netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java Sat Jan 07 02:48:05 2012 -0500 -+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 -@@ -1,63 +0,0 @@ --// Copyright (C) 2001-2003 Jon A. Maxwell (JAM) --// --// This library is free software; you can redistribute it and/or --// modify it under the terms of the GNU Lesser General Public --// License as published by the Free Software Foundation; either --// version 2.1 of the License, or (at your option) any later version. --// --// This library is distributed in the hope that it will be useful, --// but WITHOUT ANY WARRANTY; without even the implied warranty of --// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --// Lesser General Public License for more details. --// --// You should have received a copy of the GNU Lesser General Public --// License along with this library; if not, write to the Free Software --// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --package net.sourceforge.jnlp.runtime; -- --/** -- * Thread group for a JNLP application. -- * -- * @author <a href="mailto:[email protected]";>Jon A. Maxwell (JAM)</a> - initial author -- * @version $Revision: 1.5 $ -- */ --public class AppThreadGroup extends ThreadGroup { -- -- /** the app */ -- private ApplicationInstance app = null; -- -- /** -- * Creates new JavaAppThreadGroup -- * -- * @param name of the App -- */ -- public AppThreadGroup(ThreadGroup parent, String name) { -- super(parent, name); -- } -- -- /** -- * Sets the JNLP app this group is for; can only be called once. -- */ -- public void setApplication(ApplicationInstance app) { -- if (this.app != null) -- throw new IllegalStateException("Application can only be set once"); -- -- this.app = app; -- } -- -- /** -- * Returns the JNLP app for this thread group. -- */ -- public ApplicationInstance getApplication() { -- return app; -- } -- -- /** -- * Handle uncaught exceptions for the app. -- */ -- public void uncaughtException(Thread t, Throwable e) { -- super.uncaughtException(t, e); -- } -- --} -diff -r f0647c938535 -r 77640d74d21c plugin/icedteanp/java/sun/applet/PluginAppletViewer.java ---- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Sat Jan 07 02:48:05 2012 -0500 -+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri Apr 29 16:58:05 2011 -0400 -@@ -123,10 +123,10 @@ - class PluginAppletPanelFactory { - - public AppletPanel createPanel(PluginStreamHandler streamhandler, -- int identifier, -- long handle, int x, int y, -- final URL doc, -- final Hashtable<String, String> atts) { -+ final int identifier, -+ final long handle, int x, int y, -+ final URL doc, -+ final Hashtable<String, String> atts) { - final NetxPanel panel = AccessController.doPrivileged(new PrivilegedAction<NetxPanel>() { - public NetxPanel run() { - NetxPanel panel = new NetxPanel(doc, atts, false); -@@ -136,13 +136,29 @@ - } - }); - -- // create the frame. -- PluginAppletViewer.framePanel(identifier, handle, panel); -+ // Framing the panel needs to happen in a thread whose thread group -+ // is the same as the threadgroup of the applet thread. If this -+ // isn't the case, the awt eventqueue thread's context classloader -+ // won't be set to a JNLPClassLoader, and when an applet class needs -+ // to be loaded from the awt eventqueue, it won't be found. -+ Thread panelInit = new Thread(panel.getThreadGroup(), new Runnable() { -+ @Override public void run() { -+ panel.createNewAppContext(); -+ // create the frame. -+ PluginAppletViewer.framePanel(identifier, handle, panel); -+ panel.init(); -+ // Start the applet -+ initEventQueue(panel); -+ } -+ }, "NetXPanel initializer"); - -- panel.init(); -- -- // Start the applet -- initEventQueue(panel); -+ panelInit.start(); -+ while(panelInit.isAlive()) { -+ try { -+ panelInit.join(); -+ } catch (InterruptedException e) { -+ } -+ } - - // Wait for the panel to initialize - PluginAppletViewer.waitForAppletInit(panel); - diff --git a/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild b/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild deleted file mode 100644 index a11f4cb..0000000 --- a/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild,v 1.1 2011/11/24 20:57:04 sera Exp $ -# Build written by Andrew John Hughes ([email protected]) - -EAPI="4" - -inherit autotools eutils java-pkg-2 java-vm-2 - -DESCRIPTION="FOSS Java browser plugin and Web Start implementation" -HOMEPAGE="http://icedtea.classpath.org"; -SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"; - -LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" -SLOT="7" -KEYWORDS="~amd64 ~x86" - -IUSE="build doc javascript +nsplugin test" - -RDEPEND="dev-java/icedtea:${SLOT}" -# Need system junit 4.8+. Bug #389795 -DEPEND="${RDEPEND} - javascript? ( dev-java/rhino:1.6 ) - nsplugin? ( - || ( net-misc/npapi-sdk - >=net-libs/xulrunner-1.9.1 ) ) - test? ( >=dev-java/junit-4.8:4 )" - -pkg_setup() { - JAVA_PKG_WANT_BUILD_VM="icedtea-7 icedtea7" - JAVA_PKG_WANT_SOURCE="1.6" - JAVA_PKG_WANT_TARGET="1.6" - - java-vm-2_pkg_setup - java-pkg-2_pkg_setup -} - -unset_vars() { - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS -} - -src_prepare() { - # bug #356645 - epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch - eautoreconf -} - -src_configure() { - local vmhome=$(java-config -O) - - if use build; then - icedteadir="${ICEDTEA_BIN_DIR}" - [[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled" - installdir="/opt/icedtea-web-bin-${SLOT}" - else - icedteadir="/usr/$(get_libdir)/icedtea${SLOT}" - installdir="/usr/$(get_libdir)/icedtea${SLOT}-web" - fi - - unset_vars - - if use build || [[ ${vmhome} == ${icedteadir} ]] ; then - VMHANDLE="icedtea-${SLOT}" - else - die "Unexpected install location of IcedTea${SLOT}" - fi - - einfo "Installing IcedTea-Web in ${installdir}" - einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}" - if [ ! -e ${vmhome} ] ; then - eerror "Could not find JDK install directory ${vmhome}." - die - fi - - # we need to override all *dir variables that econf sets - # man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know - # the suffix the man page will end up compressed with, anyway - econf \ - --prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \ - --with-jdk-home=${icedteadir} \ - $(use_enable doc docs) \ - $(use_enable nsplugin plugin) \ - $(use_with javascript rhino) -} - -src_compile() { - # we need this to override the src_compile from java-pkg-2 - default -} - -src_install() { - # parallel make problem bug #372235 - emake -j1 DESTDIR="${D}" install - dodoc AUTHORS README NEWS - - if use nsplugin; then - install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so"; - fi - - for binary in javaws itweb-settings; do - dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary} - dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary} - done -} - -pkg_postinst() { - java-vm_check-nsplugin - java_mozilla_clean_ - - if use nsplugin; then - elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin" - fi -} - -pkg_prerm() { - # override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here - :; -} diff --git a/dev-java/icedtea-web/icedtea-web-1.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.2.ebuild deleted file mode 100644 index 15badf3..0000000 --- a/dev-java/icedtea-web/icedtea-web-1.2.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild,v 1.1 2011/11/24 20:57:04 sera Exp $ -# Build written by Andrew John Hughes ([email protected]) - -EAPI="4" - -inherit autotools eutils java-pkg-2 java-vm-2 - -DESCRIPTION="FOSS Java browser plugin and Web Start implementation" -HOMEPAGE="http://icedtea.classpath.org"; -SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"; - -LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" -SLOT="6" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -IUSE="build doc javascript +nsplugin test" - -RDEPEND="dev-java/icedtea:${SLOT}" -# Need system junit 4.8+. Bug #389795 -DEPEND="${RDEPEND} - javascript? ( dev-java/rhino:1.6 ) - nsplugin? ( - || ( net-misc/npapi-sdk - >=net-libs/xulrunner-1.9.1 ) ) - test? ( >=dev-java/junit-4.8:4 )" - -pkg_setup() { - JAVA_PKG_WANT_BUILD_VM="icedtea-6 icedtea6" - JAVA_PKG_WANT_SOURCE="1.6" - JAVA_PKG_WANT_TARGET="1.6" - - java-vm-2_pkg_setup - java-pkg-2_pkg_setup -} - -unset_vars() { - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS -} - -src_prepare() { - # bug #356645 - epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch - eautoreconf -} - -src_configure() { - local vmhome=$(java-config -O) - - if use build; then - icedteadir="${ICEDTEA_BIN_DIR}" - [[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled" - installdir="/opt/icedtea-web-bin-${SLOT}" - else - icedteadir="/usr/$(get_libdir)/icedtea${SLOT}" - installdir="/usr/$(get_libdir)/icedtea${SLOT}-web" - fi - - unset_vars - - if use build || [[ ${vmhome} == ${icedteadir} ]] ; then - VMHANDLE="icedtea-${SLOT}" - else - die "Unexpected install location of IcedTea${SLOT}" - fi - - einfo "Installing IcedTea-Web in ${installdir}" - einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}" - if [ ! -e ${vmhome} ] ; then - eerror "Could not find JDK install directory ${vmhome}." - die - fi - - # we need to override all *dir variables that econf sets - # man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know - # the suffix the man page will end up compressed with, anyway - econf \ - --prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \ - --with-jdk-home=${icedteadir} \ - $(use_enable doc docs) \ - $(use_enable nsplugin plugin) \ - $(use_with javascript rhino) -} - -src_compile() { - # we need this to override the src_compile from java-pkg-2 - default -} - -src_install() { - # parallel make problem bug #372235 - emake -j1 DESTDIR="${D}" install - dodoc AUTHORS README NEWS - - if use nsplugin; then - install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so"; - fi - - for binary in javaws itweb-settings; do - dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary} - dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary} - done -} - -pkg_postinst() { - java-vm_check-nsplugin - java_mozilla_clean_ - - if use nsplugin; then - elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin" - fi -} - -pkg_prerm() { - # override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here - :; -} diff --git a/dev-java/icedtea-web/metadata.xml b/dev-java/icedtea-web/metadata.xml deleted file mode 100644 index 2d5a1a5..0000000 --- a/dev-java/icedtea-web/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<herd>java</herd> -<maintainer> - <email>[email protected]</email> - <name>Andrew John Hughes</name> -</maintainer> -<longdescription>FOSS Java browser plugin and Web Start implementation based on NetX.</longdescription> -<use> - <flag name="javascript">Enable support for using proxy auto config (PAC) files.</flag> - <flag name="nsplugin">Enable browser plugin (NPPlugin).</flag> -</use> -</pkgmetadata>
