Gentoo Archives: gentoo-commits

From: "Vlastimil Babka (caster)" <caster@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/icedtea-web/files: fix-plugin-in-icedtea-7.patch
Date: Sat, 03 Mar 2012 21:51:36
Message-Id: 20120303215126.2249A2004C@flycatcher.gentoo.org
1 caster 12/03/03 21:51:26
2
3 Modified: fix-plugin-in-icedtea-7.patch
4 Log:
5 Fix the patch, bug #406715. Thanks to Flameeyes.
6
7 (Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 dev-java/icedtea-web/files/fix-plugin-in-icedtea-7.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/files/fix-plugin-in-icedtea-7.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/files/fix-plugin-in-icedtea-7.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/files/fix-plugin-in-icedtea-7.patch?r1=1.1&r2=1.2
15
16 Index: fix-plugin-in-icedtea-7.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/files/fix-plugin-in-icedtea-7.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- fix-plugin-in-icedtea-7.patch 2 Mar 2012 23:21:55 -0000 1.1
23 +++ fix-plugin-in-icedtea-7.patch 3 Mar 2012 21:51:26 -0000 1.2
24 @@ -264,73 +264,6 @@
25 usePack = false;
26 useVersion = false;
27 String jargs = atts.get("java_arguments");
28 -diff -r f0647c938535 -r 77640d74d21c netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java
29 ---- a/netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java Sat Jan 07 02:48:05 2012 -0500
30 -+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
31 -@@ -1,63 +0,0 @@
32 --// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
33 --//
34 --// This library is free software; you can redistribute it and/or
35 --// modify it under the terms of the GNU Lesser General Public
36 --// License as published by the Free Software Foundation; either
37 --// version 2.1 of the License, or (at your option) any later version.
38 --//
39 --// This library is distributed in the hope that it will be useful,
40 --// but WITHOUT ANY WARRANTY; without even the implied warranty of
41 --// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
42 --// Lesser General Public License for more details.
43 --//
44 --// You should have received a copy of the GNU Lesser General Public
45 --// License along with this library; if not, write to the Free Software
46 --// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
47 --
48 --package net.sourceforge.jnlp.runtime;
49 --
50 --/**
51 -- * Thread group for a JNLP application.
52 -- *
53 -- * @author <a href="mailto:jmaxwell@×××××××××××××××××.net">Jon A. Maxwell (JAM)</a> - initial author
54 -- * @version $Revision: 1.1 $
55 -- */
56 --public class AppThreadGroup extends ThreadGroup {
57 --
58 -- /** the app */
59 -- private ApplicationInstance app = null;
60 --
61 -- /**
62 -- * Creates new JavaAppThreadGroup
63 -- *
64 -- * @param name of the App
65 -- */
66 -- public AppThreadGroup(ThreadGroup parent, String name) {
67 -- super(parent, name);
68 -- }
69 --
70 -- /**
71 -- * Sets the JNLP app this group is for; can only be called once.
72 -- */
73 -- public void setApplication(ApplicationInstance app) {
74 -- if (this.app != null)
75 -- throw new IllegalStateException("Application can only be set once");
76 --
77 -- this.app = app;
78 -- }
79 --
80 -- /**
81 -- * Returns the JNLP app for this thread group.
82 -- */
83 -- public ApplicationInstance getApplication() {
84 -- return app;
85 -- }
86 --
87 -- /**
88 -- * Handle uncaught exceptions for the app.
89 -- */
90 -- public void uncaughtException(Thread t, Throwable e) {
91 -- super.uncaughtException(t, e);
92 -- }
93 --
94 --}
95 diff -r f0647c938535 -r 77640d74d21c plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
96 --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Sat Jan 07 02:48:05 2012 -0500
97 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri Apr 29 16:58:05 2011 -0400