diff options
| author |   Jan Brinkmann <luckyduck@gentoo.org> | 2005-01-31 22:44:55 +0000 |
|---|---|---|
| committer | Jan Brinkmann <luckyduck@gentoo.org> | 2005-01-31 22:44:55 +0000 |
| commit | 30043f6bdce7d33f38f533d77e032f55f9023df1 (patch) | |
| tree | cfb2c99ae7392ab96d7c86f09abd0eb7a893348d /dev-java/rhino | |
| parent | Cleanup autotools stuff. (diff) | |
| download | gentoo-2-30043f6bdce7d33f38f533d77e032f55f9023df1.tar.gz gentoo-2-30043f6bdce7d33f38f533d77e032f55f9023df1.tar.bz2 gentoo-2-30043f6bdce7d33f38f533d77e032f55f9023df1.zip | |
added a patch to fix compilation with jdk1.5, fixes bug #80257
(Portage version: 2.0.51-r15)
Diffstat (limited to 'dev-java/rhino')
| -rw-r--r-- | dev-java/rhino/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/rhino/files/1.5.5_jdk15.patch | 24 | ||||
| -rw-r--r-- | dev-java/rhino/rhino-1.5.5-r1.ebuild | 3 |
3 files changed, 31 insertions, 2 deletions
diff --git a/dev-java/rhino/ChangeLog b/dev-java/rhino/ChangeLog index 1857c065eb75..07c94df4b365 100644 --- a/dev-java/rhino/ChangeLog +++ b/dev-java/rhino/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/rhino # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.26 2005/01/29 21:16:24 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.27 2005/01/31 22:44:55 luckyduck Exp $ + + 31 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +files/1.5.5_jdk15.patch, + rhino-1.5.5-r1.ebuild: + added a patch to fix compilation with jdk1.5, fixes bug #80257 *rhino-1.6.1-r1 (29 Jan 2005) diff --git a/dev-java/rhino/files/1.5.5_jdk15.patch b/dev-java/rhino/files/1.5.5_jdk15.patch new file mode 100644 index 000000000000..e1cbccb4648b --- /dev/null +++ b/dev-java/rhino/files/1.5.5_jdk15.patch @@ -0,0 +1,24 @@ +diff -uprN toolsrc.orig/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java +--- toolsrc.orig/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2005-01-31 23:35:59.926932408 +0100 ++++ toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2005-01-31 23:42:08.121958256 +0100 +@@ -124,7 +124,8 @@ public class JavaPolicySecurity extends +
+ public JavaPolicySecurity() {
+ // To trigger error on jdk-1.1 with lazy load
+- new CodeSource(null, null);
++ java.security.CodeSigner[] foo = new java.security.CodeSigner[1];
++ new CodeSource(null, foo);
+ }
+
+ protected void callProcessFileSecure(final Context cx,
+@@ -167,7 +168,9 @@ public class JavaPolicySecurity extends + }
+
+ private ProtectionDomain getUrlDomain(URL url) {
+- CodeSource cs = new CodeSource(url, null);
++ // dummy needed for jdk1.5
++ java.security.CodeSigner[] foo = new java.security.CodeSigner[1];
++ CodeSource cs = new CodeSource(url, foo);
+ PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
+ return new ProtectionDomain(cs, pc);
+ }
diff --git a/dev-java/rhino/rhino-1.5.5-r1.ebuild b/dev-java/rhino/rhino-1.5.5-r1.ebuild index 4dff9daa5ad5..ec3f75d806dc 100644 --- a/dev-java/rhino/rhino-1.5.5-r1.ebuild +++ b/dev-java/rhino/rhino-1.5.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.5.5-r1.ebuild,v 1.2 2005/01/29 21:23:03 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.5.5-r1.ebuild,v 1.3 2005/01/31 22:44:55 luckyduck Exp $ inherit eutils java-pkg @@ -23,6 +23,7 @@ src_unpack() { unpack ${MY_P}.zip cd ${S} mkdir build/ + epatch ${FILESDIR}/${PV}_jdk15.patch epatch ${FILESDIR}/00_dont-fetch-swing-ex.patch cp ${DISTDIR}/rhino-swing-ex-1.0.zip build/swingExSrc.zip || die "unpack error" |