Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock X-Debbugs-Cc: a...@debian.org
Please unblock package closure-compiler [ Reason ] This is related to #1034127 and the unblock request of rhino 1.7.14. If we ship rhino 1.7.14 in Bookworm, then closure-compiler should be unblocked too to fix a FTBFS. [ Impact ] If rhino is unblocked but closure-compiler is not, then the package in testing will FTBFS. [ Tests ] closure-compiler builds fine now and works as expected. [ Risks ] closure-compiler is used to minify/optimize Javascript files and this still seems to work. [ Checklist ] [x] all changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in testing unblock closure-compiler/20130227+dfsg1-13
diff -Nru closure-compiler-20130227+dfsg1/debian/changelog closure-compiler-20130227+dfsg1/debian/changelog --- closure-compiler-20130227+dfsg1/debian/changelog 2022-11-19 09:00:34.000000000 +0100 +++ closure-compiler-20130227+dfsg1/debian/changelog 2023-02-14 00:18:02.000000000 +0100 @@ -1,3 +1,12 @@ +closure-compiler (20130227+dfsg1-13) unstable; urgency=medium + + * QA upload. + * Tighten dependency on librhino-java to >= 1.7.14. + * Fix FTBFS with rhino 1.7.14. + * Use canonical VCS URI. + + -- Markus Koschany <a...@debian.org> Tue, 14 Feb 2023 00:18:02 +0100 + closure-compiler (20130227+dfsg1-12) unstable; urgency=medium * QA upload. diff -Nru closure-compiler-20130227+dfsg1/debian/control closure-compiler-20130227+dfsg1/debian/control --- closure-compiler-20130227+dfsg1/debian/control 2022-11-19 09:00:34.000000000 +0100 +++ closure-compiler-20130227+dfsg1/debian/control 2023-02-14 00:18:02.000000000 +0100 @@ -12,7 +12,7 @@ libargs4j-java, libguava-java (>= 15.0), libjsr305-java, - librhino-java (>= 1.7R4), + librhino-java (>= 1.7.14), ant, libjarjar-java, protobuf-compiler, @@ -20,8 +20,8 @@ javahelper (>= 0.25) Build-Depends-Indep: default-jdk-doc, libmaven-javadoc-plugin-java Standards-Version: 4.1.0 -Vcs-Git: https://anonscm.debian.org/git/pkg-java/closure-compiler.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/closure-compiler.git +Vcs-Git: https://salsa.debian.org/java-team/closure-compiler.git +Vcs-Browser: https://salsa.debian.org/java-team/closure-compiler Homepage: https://developers.google.com/closure/compiler/ Package: closure-compiler diff -Nru closure-compiler-20130227+dfsg1/debian/patches/fix-librhino-java-FTBFS.patch closure-compiler-20130227+dfsg1/debian/patches/fix-librhino-java-FTBFS.patch --- closure-compiler-20130227+dfsg1/debian/patches/fix-librhino-java-FTBFS.patch 1970-01-01 01:00:00.000000000 +0100 +++ closure-compiler-20130227+dfsg1/debian/patches/fix-librhino-java-FTBFS.patch 2023-02-14 00:18:02.000000000 +0100 @@ -0,0 +1,65 @@ +From: Markus Koschany <a...@debian.org> +Date: Tue, 14 Feb 2023 00:06:12 +0100 +Subject: fix librhino-java FTBFS + +Fix FTBFS with rhino 1.7.14. + +Forwarded: not-needed +--- + src/com/google/javascript/jscomp/parsing/IRFactory.java | 4 ++-- + src/com/google/javascript/jscomp/parsing/TypeSafeDispatcher.java | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/com/google/javascript/jscomp/parsing/IRFactory.java b/src/com/google/javascript/jscomp/parsing/IRFactory.java +index 361f31d..0e34a4d 100644 +--- a/src/com/google/javascript/jscomp/parsing/IRFactory.java ++++ b/src/com/google/javascript/jscomp/parsing/IRFactory.java +@@ -65,7 +65,7 @@ import com.google.javascript.rhino.head.ast.SwitchCase; + import com.google.javascript.rhino.head.ast.SwitchStatement; + import com.google.javascript.rhino.head.ast.ThrowStatement; + import com.google.javascript.rhino.head.ast.TryStatement; +-import com.google.javascript.rhino.head.ast.UnaryExpression; ++import com.google.javascript.rhino.head.ast.UpdateExpression; + import com.google.javascript.rhino.head.ast.VariableDeclaration; + import com.google.javascript.rhino.head.ast.VariableInitializer; + import com.google.javascript.rhino.head.ast.WhileLoop; +@@ -1145,7 +1145,7 @@ class IRFactory { + } + + @Override +- Node processUnaryExpression(UnaryExpression exprNode) { ++ Node processUpdateExpression(UpdateExpression exprNode) { + int type = transformTokenType(exprNode.getType()); + Node operand = transform(exprNode.getOperand()); + if (type == Token.NEG && operand.isNumber()) { +diff --git a/src/com/google/javascript/jscomp/parsing/TypeSafeDispatcher.java b/src/com/google/javascript/jscomp/parsing/TypeSafeDispatcher.java +index 95aaacd..fc6ace3 100644 +--- a/src/com/google/javascript/jscomp/parsing/TypeSafeDispatcher.java ++++ b/src/com/google/javascript/jscomp/parsing/TypeSafeDispatcher.java +@@ -55,7 +55,7 @@ import com.google.javascript.rhino.head.ast.SwitchCase; + import com.google.javascript.rhino.head.ast.SwitchStatement; + import com.google.javascript.rhino.head.ast.ThrowStatement; + import com.google.javascript.rhino.head.ast.TryStatement; +-import com.google.javascript.rhino.head.ast.UnaryExpression; ++import com.google.javascript.rhino.head.ast.UpdateExpression; + import com.google.javascript.rhino.head.ast.VariableDeclaration; + import com.google.javascript.rhino.head.ast.VariableInitializer; + import com.google.javascript.rhino.head.ast.WhileLoop; +@@ -109,7 +109,7 @@ abstract class TypeSafeDispatcher<T> { + abstract T processSwitchStatement(SwitchStatement statementNode); + abstract T processThrowStatement(ThrowStatement statementNode); + abstract T processTryStatement(TryStatement statementNode); +- abstract T processUnaryExpression(UnaryExpression exprNode); ++ abstract T processUpdateExpression(UpdateExpression exprNode); + abstract T processVariableDeclaration(VariableDeclaration declarationNode); + abstract T processVariableInitializer(VariableInitializer initializerNode); + abstract T processWhileLoop(WhileLoop loopNode); +@@ -168,7 +168,7 @@ abstract class TypeSafeDispatcher<T> { + case Token.POS: + case Token.TYPEOF: + case Token.VOID: +- return processUnaryExpression((UnaryExpression) node); ++ return processUpdateExpression((UpdateExpression) node); + case Token.BLOCK: + if (node instanceof Block) { + return processBlock((Block) node); diff -Nru closure-compiler-20130227+dfsg1/debian/patches/series closure-compiler-20130227+dfsg1/debian/patches/series --- closure-compiler-20130227+dfsg1/debian/patches/series 2022-11-19 09:00:34.000000000 +0100 +++ closure-compiler-20130227+dfsg1/debian/patches/series 2023-02-14 00:18:02.000000000 +0100 @@ -3,3 +3,4 @@ guava-compatibility.patch ftbfs-commandlinerunner.patch ignore-maven-ant-tasks.patch +fix-librhino-java-FTBFS.patch