[rhino] 02/03: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Jan 19 14:07:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository rhino.
commit adc175c5191a93a3947e33b5aa95030c43a4f872
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Jan 19 15:03:15 2017 +0100
Refreshed the patches
---
debian/changelog | 3 +-
debian/patches/01_rhino-nowarn.patch | 6 +-
debian/patches/02_exclude-jdk15.patch | 2 +-
.../03_public_getSourcePositionFromStack.patch | 2 +-
debian/patches/04_bug_798642_800616.diff | 178 ---------------------
debian/patches/series | 1 -
6 files changed, 7 insertions(+), 185 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 28faa4b..973db2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-rhino (1.7R5-1) UNRELEASED; urgency=medium
+rhino (1.7.6-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
- Refreshed the patches
+ - Removed 04_bug_798642_800616.diff (fixed upstream)
* Removed the transitional package rhino-doc
* Standards-Version updated to 3.9.8
* Switch to debhelper level 10
diff --git a/debian/patches/01_rhino-nowarn.patch b/debian/patches/01_rhino-nowarn.patch
index 2838524..9cb3a45 100644
--- a/debian/patches/01_rhino-nowarn.patch
+++ b/debian/patches/01_rhino-nowarn.patch
@@ -9,12 +9,12 @@ Description: Pass "nowarn" to javac ant task to disable printing of warning
+ nowarn="true"
debug="${debug}"
includeAntRuntime="false"
- target="${target-jvm}"
-@@ -50,6 +51,7 @@
+ encoding="UTF-8"
+@@ -51,6 +52,7 @@
destdir="${classes}"
includes="org/**/jdk15/*.java"
deprecation="on"
+ nowarn="true"
debug="${debug}"
includeAntRuntime="false"
- target="${target-jvm}"
+ encoding="UTF-8"
diff --git a/debian/patches/02_exclude-jdk15.patch b/debian/patches/02_exclude-jdk15.patch
index a41f512..8727805 100644
--- a/debian/patches/02_exclude-jdk15.patch
+++ b/debian/patches/02_exclude-jdk15.patch
@@ -2,7 +2,7 @@ Description: Exclude everything except "jdk1.5/**" when building
1.5 specific source code.
--- a/src/build.xml
+++ b/src/build.xml
-@@ -49,6 +49,7 @@
+@@ -50,6 +50,7 @@
<target name="compile-jdk15" if="jdk15">
<javac srcdir="src"
destdir="${classes}"
diff --git a/debian/patches/03_public_getSourcePositionFromStack.patch b/debian/patches/03_public_getSourcePositionFromStack.patch
index 45009d1..5eeef2f 100644
--- a/debian/patches/03_public_getSourcePositionFromStack.patch
+++ b/debian/patches/03_public_getSourcePositionFromStack.patch
@@ -7,7 +7,7 @@ This is needed by package geogebra.
--- a/src/org/mozilla/javascript/Context.java
+++ b/src/org/mozilla/javascript/Context.java
-@@ -2428,7 +2428,7 @@
+@@ -2540,7 +2540,7 @@
return (Evaluator)Kit.newInstanceOrNull(interpreterClass);
}
diff --git a/debian/patches/04_bug_798642_800616.diff b/debian/patches/04_bug_798642_800616.diff
deleted file mode 100644
index 6dd7629..0000000
--- a/debian/patches/04_bug_798642_800616.diff
+++ /dev/null
@@ -1,178 +0,0 @@
---- a/src/org/mozilla/javascript/Parser.java
-+++ b/src/org/mozilla/javascript/Parser.java
-@@ -2796,6 +2796,12 @@
- if (this.inUseStrictDirective && ts.isNumberOctal()) {
- reportError("msg.no.octal.strict");
- }
-+ if (ts.isNumberOctal()) {
-+ s = "0"+s;
-+ }
-+ if (ts.isNumberHex()) {
-+ s = "0x"+s;
-+ }
- return new NumberLiteral(ts.tokenBeg,
- s,
- ts.getNumber());
-@@ -3334,8 +3340,10 @@
- ObjectProperty pn = new ObjectProperty(pos);
- if (isGetter) {
- pn.setIsGetter();
-+ fn.setFunctionIsGetter();
- } else {
- pn.setIsSetter();
-+ fn.setFunctionIsSetter();
- }
- int end = getNodeEnd(fn);
- pn.setLeft(propName);
---- a/src/org/mozilla/javascript/TokenStream.java
-+++ b/src/org/mozilla/javascript/TokenStream.java
-@@ -267,6 +267,7 @@
-
- final double getNumber() { return number; }
- final boolean isNumberOctal() { return isOctal; }
-+ final boolean isNumberHex() { return isHex; }
-
- final boolean eof() { return hitEOF; }
-
-@@ -412,11 +413,13 @@
- isOctal = false;
- stringBufferTop = 0;
- int base = 10;
-+ isHex = isOctal = false;
-
- if (c == '0') {
- c = getChar();
- if (c == 'x' || c == 'X') {
- base = 16;
-+ isHex = true;
- c = getChar();
- } else if (isDigit(c)) {
- base = 8;
-@@ -1558,6 +1561,7 @@
- private String string = "";
- private double number;
- private boolean isOctal;
-+ private boolean isHex;
-
- // delimiter for last string literal scanned
- private int quoteChar;
---- a/src/org/mozilla/javascript/ast/FunctionNode.java
-+++ b/src/org/mozilla/javascript/ast/FunctionNode.java
-@@ -368,8 +368,10 @@
- @Override
- public String toSource(int depth) {
- StringBuilder sb = new StringBuilder();
-- sb.append(makeIndent(depth));
-- sb.append("function");
-+ if (!isGetterOrSetter()) {
-+ sb.append(makeIndent(depth));
-+ sb.append("function");
-+ }
- if (functionName != null) {
- sb.append(" ");
- sb.append(functionName.toSource(0));
-@@ -398,7 +400,7 @@
- } else {
- sb.append(getBody().toSource(depth).trim());
- }
-- if (functionType == FUNCTION_STATEMENT) {
-+ if (functionType == FUNCTION_STATEMENT || isGetterOrSetter()) {
- sb.append("\n");
- }
- return sb.toString();
---- a/src/org/mozilla/javascript/ast/ObjectProperty.java
-+++ b/src/org/mozilla/javascript/ast/ObjectProperty.java
-@@ -92,17 +92,18 @@
- @Override
- public String toSource(int depth) {
- StringBuilder sb = new StringBuilder();
-- sb.append(makeIndent(depth));
-+ sb.append("\n");
-+ sb.append(makeIndent(depth+1));
- if (isGetter()) {
- sb.append("get ");
- } else if (isSetter()) {
- sb.append("set ");
- }
-- sb.append(left.toSource(0));
-+ sb.append(left.toSource(getType()==Token.COLON ? 0 : depth));
- if (type == Token.COLON) {
- sb.append(": ");
- }
-- sb.append(right.toSource(0));
-+ sb.append(right.toSource(getType()==Token.COLON ? 0 : depth+1));
- return sb.toString();
- }
- }
---- a/testsrc/org/mozilla/javascript/tests/Bug491621Test.java
-+++ b/testsrc/org/mozilla/javascript/tests/Bug491621Test.java
-@@ -96,4 +96,22 @@
- assertSource("if(c)const a=0;else a=1",
- "if (c) \n const a = 0;\nelse \n a = 1;\n");
- }
-+
-+ @Test//Bug 800616
-+ public void testOctLiteralToSource()
-+ {
-+ assertSource("010;", "010;\n");
-+ }
-+
-+ @Test//Bug 800616
-+ public void testHexLiteralToSource()
-+ {
-+ assertSource("0xff;", "0xff;\n");
-+ }
-+
-+ @Test//Bug 800616
-+ public void testHexOctDecLiteralToSource()
-+ {
-+ assertSource("0xff;\n9;\n07;\n1;", "0xff;\n9;\n07;\n1;\n");
-+ }
- }
---- /dev/null
-+++ b/testsrc/org/mozilla/javascript/tests/BugGetterSetterTest.java
-@@ -0,0 +1,44 @@
-+/* 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/. */
-+
-+package org.mozilla.javascript.tests;
-+
-+import org.junit.Before;
-+import org.junit.Test;
-+import org.mozilla.javascript.CompilerEnvirons;
-+import org.mozilla.javascript.Parser;
-+import org.mozilla.javascript.ast.AstRoot;
-+
-+import java.io.IOException;
-+import java.io.StringReader;
-+
-+import static junit.framework.Assert.assertEquals;
-+
-+public class BugGetterSetterTest {
-+ private CompilerEnvirons environment = new CompilerEnvirons();
-+
-+ @Before
-+ public void setUp() throws Exception {
-+ environment.setLanguageVersion(180);
-+ environment.setStrictMode(false);
-+ }
-+
-+ @Test
-+ public void testNodeReplacementInWhileLoopWithBrackets() throws IOException {
-+ String script = "var o = {\n" +
-+ " _x: 123, \n" +
-+ " get x() {\n" +
-+ " return this._x;\n" +
-+ " }\n" +
-+ ", \n" +
-+ " set x(value) {\n" +
-+ " this._x = value;\n" +
-+ " }\n" +
-+ "};\n";
-+
-+ Parser parser = new Parser(environment);
-+ AstRoot astRoot = parser.parse(new StringReader(script), null, 1);
-+ assertEquals(script, astRoot.toSource());
-+ }
-+}
diff --git a/debian/patches/series b/debian/patches/series
index 5e7bb1e..0797f4e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
01_rhino-nowarn.patch
02_exclude-jdk15.patch
03_public_getSourcePositionFromStack.patch
-04_bug_798642_800616.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/rhino.git
More information about the pkg-java-commits
mailing list