[Git][java-team/rhino][master] 7 commits: Refresh the patches
Markus Koschany (@apo)
gitlab at salsa.debian.org
Mon Feb 13 13:52:02 GMT 2023
Markus Koschany pushed to branch master at Debian Java Maintainers / rhino
Commits:
77b2f8e5 by Markus Koschany at 2023-02-13T11:59:42+01:00
Refresh the patches
- - - - -
e14d2b92 by Markus Koschany at 2023-02-13T13:57:38+01:00
Add missing Bundle information
- - - - -
b186207d by Markus Koschany at 2023-02-13T14:06:05+01:00
Include javax.script.ScriptEngineFactory into the jar file
- - - - -
2270c493 by Markus Koschany at 2023-02-13T14:13:10+01:00
Update debian/rules
- - - - -
77ec4db6 by Markus Koschany at 2023-02-13T14:44:21+01:00
Update changelog
- - - - -
59280c17 by Markus Koschany at 2023-02-13T14:49:25+01:00
Remove obsolete Conflicts and Replaces fields.
- - - - -
9f6dd243 by Markus Koschany at 2023-02-13T14:49:41+01:00
Remove clean file.
- - - - -
9 changed files:
- debian/changelog
- − debian/clean
- debian/control
- debian/librhino-java.manifest
- debian/patches/05_modify-usage.patch
- + debian/patches/preserve-backward-compatibility.patch
- + debian/patches/public_getSourcePositionFromStack.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -7,17 +7,18 @@ rhino (1.7.14-1) unstable; urgency=medium
* d/control: Change homepage field to github repository because
the old URL can no longer be found. (Closes: #1029166)
* d/rules: Change source level to 8 and target Java 8.
- * Drop 03_public_getSourcePositionFromStack.patch
- * Drop 06_preserve-backward-compatibility.patch
* Drop 07_fix-context-implementation-version.patch
* Drop 08_fix-jar-version-number.patch
* Drop script-engine.patch.
+ * Refresh preserve-backward-compatibility.patch and
+ public_getSourcePositionFromStack.patch because reverse-dependencies in
+ Debian still require them.
* Drop librhino-java-doc binary package.
* Use javahelper instead of ant to build the jar file.
* Add debian/pom.xml.
* Install upstream's rhino.1 manpage.
- -- Markus Koschany <apo at debian.org> Mon, 13 Feb 2023 10:14:24 +0100
+ -- Markus Koschany <apo at debian.org> Mon, 13 Feb 2023 14:44:17 +0100
rhino (1.7.7.2-3) unstable; urgency=medium
=====================================
debian/clean deleted
=====================================
@@ -1 +0,0 @@
-build/
=====================================
debian/control
=====================================
@@ -30,8 +30,6 @@ Description: JavaScript engine written in Java
Package: librhino-java
Section: java
Architecture: all
-Replaces: rhino (<< 1.7R3~pre-2)
-Conflicts: rhino (<< 1.7R3~pre-2)
Depends: ${misc:Depends}
Suggests: rhino
Description: Libraries for rhino Java Script Engine
=====================================
debian/librhino-java.manifest
=====================================
@@ -5,3 +5,8 @@ usr/share/java/js.jar:
Bundle-Version: 1.7
Bundle-SymbolicName: org.mozilla.javascript
Export-Package: org.mozilla.javascript;version="1.7",org.mozilla.javascript.annotations;version="1.7",org.mozilla.javascript.ast;version="1.7",org.mozilla.javascript;version="1.7",org.mozilla.javascript.commonjs.module;version="1.7",org.mozilla.javascript.commonjs.module.provider;version="1.7",org.mozilla.javascript.debug;version="1.7",org.mozilla.javascript.jdk13;version="1.7",org.mozilla.javascript.json;version="1.7",org.mozilla.javascript.optimizer;version="1.7",org.mozilla.javascript.regexp;version="1.7",org.mozilla.javascript.serialize;version="1.7",org.mozilla.javascript.tools;version="1.7",org.mozilla.javascript.tools.debugger;version="1.7",org.mozilla.javascript.tools.debugger.downloaded;version="1.7",org.mozilla.javascript.tools.debugger.treetable;version="1.7",org.mozilla.javascript.tools.idswitch;version="1.7",org.mozilla.javascript.tools.jsc;version="1.7",org.mozilla.javascript.tools.shell;version="1.7",org.mozilla.javascript.xml;version="1.7",org.mozilla.javascript.xmlimpl;version="1.7",org.mozilla.classfile;version="1.7"
+ Implementation-Title: Mozilla Rhino 1.7.14
+ Implementation-URL: http://www.mozilla.org/rhino
+ Implementation-Vendor: Mozilla Foundation
+ Implementation-Version: 1.7.14
+ Main-Class: org.mozilla.javascript.tools.shell.Main
=====================================
debian/patches/05_modify-usage.patch
=====================================
@@ -1,9 +1,17 @@
-Description: Simplify the usage syntax displayed with the --help option
-Author: Emmanuel Bourg <ebourg at apache.org>
+From: Emmanuel Bourg <ebourg at apache.org>
+Date: Mon, 13 Feb 2023 11:39:55 +0100
+Subject: Simplify the usage syntax displayed with the --help option
+
Forwarded: not-needed
+---
+ toolsrc/org/mozilla/javascript/tools/resources/Messages.properties | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/toolsrc/org/mozilla/javascript/tools/resources/Messages.properties b/toolsrc/org/mozilla/javascript/tools/resources/Messages.properties
+index 154f1e5..f2b0b6c 100644
--- a/toolsrc/org/mozilla/javascript/tools/resources/Messages.properties
+++ b/toolsrc/org/mozilla/javascript/tools/resources/Messages.properties
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ msg.shell.invalid =\
Invalid option "{0}"
msg.shell.usage =\
@@ -12,7 +20,7 @@ Forwarded: not-needed
Valid options are:\n\
\ -?, -help Displays help messages.\n\
\ -w Enable warnings.\n\
-@@ -110,7 +110,7 @@
+@@ -110,7 +110,7 @@ msg.jsc.bad.usage =\
For more information, try java {0} -h
msg.jsc.usage =\
=====================================
debian/patches/preserve-backward-compatibility.patch
=====================================
@@ -0,0 +1,196 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 13 Feb 2023 11:58:06 +0100
+Subject: preserve-backward-compatibility
+
+Reintroduces removed classes and methods to preserve the backward compatibility.
+ * Commit 9144b81 renamed isGetter/Setter methods, this breaks closure-compiler
+ * Commit 71468c9 removed deprecated exceptions still used by htmlunit/2.8-2
+
+Forwarded: no
+---
+ .../javascript/ClassDefinitionException.java | 22 ++++++++++++++++++++++
+ .../mozilla/javascript/NotAFunctionException.java | 20 ++++++++++++++++++++
+ src/org/mozilla/javascript/PropertyException.java | 22 ++++++++++++++++++++++
+ src/org/mozilla/javascript/ast/FunctionNode.java | 20 ++++++++++++++++++++
+ src/org/mozilla/javascript/ast/ObjectProperty.java | 16 ++++++++++++++++
+ 5 files changed, 100 insertions(+)
+ create mode 100644 src/org/mozilla/javascript/ClassDefinitionException.java
+ create mode 100644 src/org/mozilla/javascript/NotAFunctionException.java
+ create mode 100644 src/org/mozilla/javascript/PropertyException.java
+
+diff --git a/src/org/mozilla/javascript/ClassDefinitionException.java b/src/org/mozilla/javascript/ClassDefinitionException.java
+new file mode 100644
+index 0000000..e53e12e
+--- /dev/null
++++ b/src/org/mozilla/javascript/ClassDefinitionException.java
+@@ -0,0 +1,22 @@
++
++/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
++ *
++ * This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++// API class
++
++package org.mozilla.javascript;
++
++/**
++ * @deprecated The exception is no longer thrown by Rhino runtime as
++ * {@link EvaluatorException} is used instead.
++ */
++public class ClassDefinitionException extends RuntimeException
++{
++ static final long serialVersionUID = -5637830967241712746L;
++
++ public ClassDefinitionException(String detail) {
++ super(detail);
++ }
++}
+diff --git a/src/org/mozilla/javascript/NotAFunctionException.java b/src/org/mozilla/javascript/NotAFunctionException.java
+new file mode 100644
+index 0000000..0ab2007
+--- /dev/null
++++ b/src/org/mozilla/javascript/NotAFunctionException.java
+@@ -0,0 +1,20 @@
++
++/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
++ *
++ * This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++// API class
++
++package org.mozilla.javascript;
++
++/**
++ * @deprecated The exception is no longer thrown by Rhino runtime as
++ * {@link EvaluatorException} is used instead.
++ */
++public class NotAFunctionException extends RuntimeException
++{
++ static final long serialVersionUID = 6461524852170711724L;
++
++ public NotAFunctionException() { }
++}
+diff --git a/src/org/mozilla/javascript/PropertyException.java b/src/org/mozilla/javascript/PropertyException.java
+new file mode 100644
+index 0000000..a9fcae1
+--- /dev/null
++++ b/src/org/mozilla/javascript/PropertyException.java
+@@ -0,0 +1,22 @@
++/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
++ *
++ * This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++// API class
++
++package org.mozilla.javascript;
++
++/**
++ * @deprecated This exception is no longer thrown by Rhino runtime.
++ */
++public class PropertyException extends RuntimeException
++{
++ static final long serialVersionUID = -8221564865490676219L;
++
++ public PropertyException(String detail) {
++ super(detail);
++ }
++
++}
+diff --git a/src/org/mozilla/javascript/ast/FunctionNode.java b/src/org/mozilla/javascript/ast/FunctionNode.java
+index 14efad9..863b173 100644
+--- a/src/org/mozilla/javascript/ast/FunctionNode.java
++++ b/src/org/mozilla/javascript/ast/FunctionNode.java
+@@ -340,14 +340,26 @@ public class FunctionNode extends ScriptNode {
+ return functionForm == Form.GETTER || functionForm == Form.SETTER || functionForm == Form.METHOD;
+ }
+
++ public boolean isGetterOrSetter() {
++ return functionForm == Form.GETTER || functionForm == Form.SETTER;
++ }
++
+ public boolean isGetterMethod() {
+ return functionForm == Form.GETTER;
+ }
+
++ public boolean isGetter() {
++ return isGetterMethod();
++ }
++
+ public boolean isSetterMethod() {
+ return functionForm == Form.SETTER;
+ }
+
++ public boolean isSetter() {
++ return isSetterMethod();
++ }
++
+ public boolean isNormalMethod() {
+ return functionForm == Form.METHOD;
+ }
+@@ -356,10 +368,18 @@ public class FunctionNode extends ScriptNode {
+ functionForm = Form.GETTER;
+ }
+
++ public void setFunctionIsGetter() {
++ setFunctionIsGetterMethod();
++ }
++
+ public void setFunctionIsSetterMethod() {
+ functionForm = Form.SETTER;
+ }
+
++ public void setFunctionIsSetter() {
++ setFunctionIsSetterMethod();
++ }
++
+ public void setFunctionIsNormalMethod() {
+ functionForm = Form.METHOD;
+ }
+diff --git a/src/org/mozilla/javascript/ast/ObjectProperty.java b/src/org/mozilla/javascript/ast/ObjectProperty.java
+index 4d06059..d8f894f 100644
+--- a/src/org/mozilla/javascript/ast/ObjectProperty.java
++++ b/src/org/mozilla/javascript/ast/ObjectProperty.java
+@@ -32,6 +32,10 @@ public class ObjectProperty extends InfixExpression {
+ type = Token.COLON;
+ }
+
++ public void setIsGetter() {
++ setIsGetterMethod();
++ }
++
+ /**
+ * Sets the node type. Must be one of {@link Token#COLON}, {@link Token#GET}, or {@link
+ * Token#SET}.
+@@ -67,16 +71,28 @@ public class ObjectProperty extends InfixExpression {
+ return type == Token.GET;
+ }
+
++ public boolean isGetter() {
++ return isGetterMethod();
++ }
++
+ /** Marks this node as a "setter" property. */
+ public void setIsSetterMethod() {
+ type = Token.SET;
+ }
+
++ public void setIsSetter() {
++ setIsSetterMethod();
++ }
++
+ /** Returns true if this is a setter function. */
+ public boolean isSetterMethod() {
+ return type == Token.SET;
+ }
+
++ public boolean isSetter() {
++ return isSetterMethod();
++ }
++
+ public void setIsNormalMethod() {
+ type = Token.METHOD;
+ }
=====================================
debian/patches/public_getSourcePositionFromStack.patch
=====================================
@@ -0,0 +1,24 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 13 Feb 2023 11:44:43 +0100
+Subject: public_getSourcePositionFromStack
+
+This is needed by package geogebra.
+
+Forwarded: no
+---
+ src/org/mozilla/javascript/Context.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/org/mozilla/javascript/Context.java b/src/org/mozilla/javascript/Context.java
+index 8836e04..ac829e6 100644
+--- a/src/org/mozilla/javascript/Context.java
++++ b/src/org/mozilla/javascript/Context.java
+@@ -2512,7 +2512,7 @@ public class Context implements Closeable {
+ return (Evaluator) Kit.newInstanceOrNull(interpreterClass);
+ }
+
+- static String getSourcePositionFromStack(int[] linep) {
++ public static String getSourcePositionFromStack(int[] linep) {
+ Context cx = getCurrentContext();
+ if (cx == null) return null;
+ if (cx.lastInterpreterFrame != null) {
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
05_modify-usage.patch
-
+public_getSourcePositionFromStack.patch
+preserve-backward-compatibility.patch
=====================================
debian/rules
=====================================
@@ -1,10 +1,15 @@
#!/usr/bin/make -f
+export JH_JAR_EXTRA=META-INF/services/javax.script.ScriptEngineFactory
+
%:
dh $@ --with javahelper --with maven-repo-helper
override_dh_auto_build:
+ mkdir -p META-INF/services
+ cp src/META-INF/services/javax.script.ScriptEngineFactory META-INF/services/
jh_build --javacopts='--release 8' --no-javadoc js.jar src toolsrc xmlimplsrc
+ $(RM) -r META-INF/services
override_dh_installchangelogs:
dh_installchangelogs -- RELEASE-NOTES.md
View it on GitLab: https://salsa.debian.org/java-team/rhino/-/compare/315d77b7ffc6680fc4985132ff4569194afb718e...9f6dd2432928ec74f5c635ca4ec16414a2048e92
--
View it on GitLab: https://salsa.debian.org/java-team/rhino/-/compare/315d77b7ffc6680fc4985132ff4569194afb718e...9f6dd2432928ec74f5c635ca4ec16414a2048e92
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230213/f85b0f7a/attachment.htm>
More information about the pkg-java-commits
mailing list