[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/files/

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/files/

[Patrice Clement]

commit:     168c4354dacdd40b547abadc7f8e68a9f0662deb
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Aug 14 08:32:11 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 21:50:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168c4354

dev-java/antlr: remove unused patch/file.

 dev-java/antlr/files/antlr-4.4-build.xml.patch | 20 --------------------
 dev-java/antlr/files/antlr.pc.in               |  9 ---------
 2 files changed, 29 deletions(-)

diff --git a/dev-java/antlr/files/antlr-4.4-build.xml.patch b/dev-java/antlr/files/antlr-4.4-build.xml.patch
deleted file mode 100644
index 1e64d30e9fc..00000000000
--- a/dev-java/antlr/files/antlr-4.4-build.xml.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- build.xml.orig	2015-05-20 19:58:28.345000000 +0000
-+++ build.xml	2015-05-20 19:58:44.809000000 +0000
-@@ -11,8 +11,6 @@
-         <property name="antlr3.version" value="3.5.2"/>
-         <property name="antlr3.jar.name" value="antlr-${antlr3.version}-complete-no-st3.jar"/>
-         <property name="antlr3.jar" value="${lib.dir}/${antlr3.jar.name}"/>
--        <mkdir dir="${lib.dir}"/>
--        <get src="http://www.antlr3.org/download/${antlr3.jar.name}" dest="${antlr3.jar}" skipexisting="true"/>
-         <path id="cp.antlr3" path="${antlr3.jar}"/>
- 
-         <property name="build.antlr3.dir" value="${build.dir}/generated-sources/antlr3" />
-@@ -23,8 +21,6 @@
-         <property name="antlr4.version" value="4.3"/>
-         <property name="antlr4.jar.name" value="antlr-${antlr4.version}-complete.jar"/>
-         <property name="antlr4.jar" value="${lib.dir}/${antlr4.jar.name}"/>
--        <mkdir dir="${lib.dir}"/>
--        <get src="http://www.antlr.org/download/${antlr4.jar.name}" dest="${antlr4.jar}" skipexisting="true"/>
-         <path id="cp.antlr4" path="${antlr4.jar}"/>
- 
-         <property name="build.antlr4.dir" value="${build.dir}/generated-sources/antlr4" />

diff --git a/dev-java/antlr/files/antlr.pc.in b/dev-java/antlr/files/antlr.pc.in
deleted file mode 100644
index fb5480637a9..00000000000
--- a/dev-java/antlr/files/antlr.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-
-
-Name: antlr
-Description: ANother Tool for Language Recognition
-Version: @VERSION@
-Libs: @libs@

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/files/

[Miroslav Šulc]

commit:     bdbbd5e32de50347380fd048c35128c92444423b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Mar 18 06:19:24 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 08:45:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdbbd5e3

dev-java/antlr: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/24631
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/antlr/files/3.5.2-test-fixes.patch | 36 -----------------------------
 1 file changed, 36 deletions(-)

diff --git a/dev-java/antlr/files/3.5.2-test-fixes.patch b/dev-java/antlr/files/3.5.2-test-fixes.patch
deleted file mode 100644
index f2609ac1f0b5..000000000000
--- a/dev-java/antlr/files/3.5.2-test-fixes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestAttributes.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestAttributes.java
---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestAttributes.java	2014-03-25 11:47:54.000000000 +0000
-+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestAttributes.java	2015-10-02 22:42:56.921263410 +0100
-@@ -2131,7 +2132,7 @@
- 		assertEquals(expecting, found);
- 	}
- 
--	@Test public void testRuleLabelOnTwoDifferentRulesTemplate() throws Exception {
-+	@org.junit.Ignore @Test public void testRuleLabelOnTwoDifferentRulesTemplate() throws Exception {
- 		String grammar =
- 			"grammar T;\n"+
- 				"options {output=template;}\n"+
-diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java
---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java	2014-03-25 11:47:54.000000000 +0000
-+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java	2015-10-02 22:43:07.303105023 +0100
-@@ -339,7 +340,7 @@
- 		assertEquals("b:alt 2 a:alt 1\n", found);
- 	}
- 
--	@Test public void testSynPredWithOutputTemplate() throws Exception {
-+	@org.junit.Ignore @Test public void testSynPredWithOutputTemplate() throws Exception {
- 		// really just seeing if it will compile
- 		String grammar =
- 			"grammar T;\n" +
-diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestTreeParsing.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestTreeParsing.java
---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestTreeParsing.java	2014-03-25 11:47:54.000000000 +0000
-+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestTreeParsing.java	2015-10-02 22:41:32.235554776 +0100
-@@ -141,7 +142,7 @@
- 		assertEquals("alt 1\n", found);
- 	}
- 
--	@Test public void testTemplateOutput() throws Exception {
-+	@org.junit.Ignore @Test public void testTemplateOutput() throws Exception {
- 		String grammar =
- 			"grammar T;\n" +
- 			"options {output=AST;}\n" +

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/files/

[Miroslav Šulc]

commit:     4a0cee19ad01cd2557dcd6c294dc0c07dd856528
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Mar 29 17:43:24 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 07:45:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a0cee19

dev-java/antlr: 3.2-r1 fix test failures

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35979
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/antlr/files/antlr-3.2-java21.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dev-java/antlr/files/antlr-3.2-java21.patch b/dev-java/antlr/files/antlr-3.2-java21.patch
index 9df897ac22de..8d885f9a5f11 100644
--- a/dev-java/antlr/files/antlr-3.2-java21.patch
+++ b/dev-java/antlr/files/antlr-3.2-java21.patch
@@ -19,3 +19,13 @@ bug #919684
      import antlr.TokenWithIndex;
      import antlr.CommonToken;
      import org.antlr.codegen.*;
+--- a/tool/src/main/resources/org/antlr/codegen/templates/Java/ST.stg
++++ b/tool/src/main/resources/org/antlr/codegen/templates/Java/ST.stg
+@@ -33,6 +33,7 @@ group ST;
+ @outputFile.imports() ::= <<
+ <@super.imports()>
+ import org.antlr.stringtemplate.*;
++import org.antlr.stringtemplate.StringTemplate;
+ import org.antlr.stringtemplate.language.*;
+ import java.util.HashMap;
+ >>