Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package antlr3 for openSUSE:Factory checked in at 2022-11-21 15:30:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/antlr3 (Old) and /work/SRC/openSUSE:Factory/.antlr3.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "antlr3" Mon Nov 21 15:30:32 2022 rev:4 rq:1037089 version:3.5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/antlr3/antlr3.changes 2022-03-21 20:13:33.144531057 +0100 +++ /work/SRC/openSUSE:Factory/.antlr3.new.1597/antlr3.changes 2022-11-21 15:30:57.729064557 +0100 @@ -1,0 +2,11 @@ +Fri Nov 18 21:43:50 UTC 2022 - Pedro Monreal <[email protected]> + +- Update to 3.5.3: + * change source compatibility to 1.8 and enable github workflows + * Change Wiki URLs to theantlrguy.atlassian.net in README.txt + * Bazel support + * Modify patches: + - Rebase osgi-manifest.patch and rename to antlr3-osgi-manifest.patch + - Rename 0001-java8-fix.patch to antlr3-java8-fix.patch + +------------------------------------------------------------------- Old: ---- 0001-java8-fix.patch 3.5.2.tar.gz osgi-manifest.patch New: ---- 3.5.3.tar.gz antlr3-java8-fix.patch antlr3-osgi-manifest.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ antlr3.spec ++++++ --- /var/tmp/diff_new_pack.neHlZY/_old 2022-11-21 15:30:58.377067847 +0100 +++ /var/tmp/diff_new_pack.neHlZY/_new 2022-11-21 15:30:58.381067867 +0100 @@ -17,7 +17,7 @@ %global flavor @BUILD_FLAVOR@%{nil} -%global antlr_version 3.5.2 +%global antlr_version 3.5.3 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 %if "%{flavor}" == "bootstrap" @@ -34,12 +34,13 @@ Release: 0 URL: https://www.antlr3.org/ Source0: https://github.com/antlr/antlr3/archive/%{antlr_version}.tar.gz -Patch0: 0001-java8-fix.patch +Patch0: antlr3-java8-fix.patch # Generate OSGi metadata -Patch1: osgi-manifest.patch +Patch1: antlr3-osgi-manifest.patch Patch100: antlr3-generated_sources.patch BuildRequires: fdupes BuildRequires: java-devel >= 1.8 +BuildRequires: maven-enforcer-plugin BuildRequires: maven-local BuildRequires: unzip BuildRequires: mvn(antlr:antlr) ++++++ 3.5.2.tar.gz -> 3.5.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/antlr3/3.5.2.tar.gz /work/SRC/openSUSE:Factory/.antlr3.new.1597/3.5.3.tar.gz differ: char 12, line 1 ++++++ antlr3-java8-fix.patch ++++++ >From 33f662c60e6e7b703e197854d2478a8747f044f0 Mon Sep 17 00:00:00 2001 From: Michael Simacek <[email protected]> Date: Tue, 17 Jun 2014 19:36:24 +0200 Subject: [PATCH] java8 fix Signed-off-by: Michael Simacek <[email protected]> --- tool/src/main/java/org/antlr/codegen/CodeGenerator.java | 2 +- tool/src/main/java/org/antlr/tool/Grammar.java | 4 ++-- tool/src/main/java/org/antlr/tool/Strip.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tool/src/main/java/org/antlr/codegen/CodeGenerator.java b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java index b279bd5..566e33c 100644 --- a/tool/src/main/java/org/antlr/codegen/CodeGenerator.java +++ b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java @@ -1087,7 +1087,7 @@ public class CodeGenerator { catch (Exception tse) { ErrorManager.internalError("can't parse template action",tse); } - GrammarAST rewriteTree = parseResult.getTree(); + GrammarAST rewriteTree = (GrammarAST)parseResult.getTree(); // then translate via codegen.g CodeGenTreeWalker gen = new CodeGenTreeWalker(new CommonTreeNodeStream(rewriteTree)); diff --git a/tool/src/main/java/org/antlr/tool/Grammar.java b/tool/src/main/java/org/antlr/tool/Grammar.java index 667ebb2..4ca4328 100644 --- a/tool/src/main/java/org/antlr/tool/Grammar.java +++ b/tool/src/main/java/org/antlr/tool/Grammar.java @@ -706,7 +706,7 @@ public class Grammar { } } - setGrammarTree(result.getTree()); + setGrammarTree((GrammarAST)result.getTree()); //if ( grammarTree!=null ) System.out.println("grammar tree: "+grammarTree.toStringTree()); @@ -927,7 +927,7 @@ public class Grammar { parser.setGrammarType(this.type); try { ANTLRParser.rule_return result = parser.rule(); - return result.getTree(); + return (GrammarAST)result.getTree(); } catch (Exception e) { ErrorManager.error(ErrorManager.MSG_ERROR_CREATING_ARTIFICIAL_RULE, diff --git a/tool/src/main/java/org/antlr/tool/Strip.java b/tool/src/main/java/org/antlr/tool/Strip.java index f411090..ddda4ed 100644 --- a/tool/src/main/java/org/antlr/tool/Strip.java +++ b/tool/src/main/java/org/antlr/tool/Strip.java @@ -64,7 +64,7 @@ public class Strip { tokens = new TokenRewriteStream(lex); ANTLRv3Parser g = new ANTLRv3Parser(tokens); ANTLRv3Parser.grammarDef_return r = g.grammarDef(); - CommonTree t = r.getTree(); + CommonTree t = (CommonTree)r.getTree(); if (tree_option) System.out.println(t.toStringTree()); rewrite(g.getTreeAdaptor(),t,g.getTokenNames()); } -- 2.7.4 ++++++ antlr3-osgi-manifest.patch ++++++ Index: runtime/Java/pom.xml =================================================================== --- runtime/Java/pom.xml.orig +++ runtime/Java/pom.xml @@ -81,6 +81,20 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.felix</groupId><artifactId>maven-bundle-plugin</artifactId> + <executions><execution><id>bundle-manifest</id><phase>process-classes</phase><goals><goal>manifest</goal></goals></execution></executions> + <configuration> + <manifestLocation>${project.build.directory}/osgi</manifestLocation> + <instructions><Bundle-SymbolicName>org.antlr.runtime</Bundle-SymbolicName><Import-Package>!org.antlr.stringtemplate,*</Import-Package></instructions> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId><artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive><manifestFile>${project.build.directory}/osgi/MANIFEST.MF</manifestFile></archive> + </configuration> + </plugin> </plugins> </build> </project>
