summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolkmar W. Pogatzki <gentoo@pogatzki.net>2024-03-29 16:10:28 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2024-04-15 09:47:12 +0200
commit913c3ecd4e31361b5408e22b119977cf72b4a3c9 (patch)
treee66a25493f229bb6b782ea669272b372e5421d7b
parentwww-client/seamonkey: 2.53.18.2: version bump. (diff)
downloadgentoo-913c3ecd4e31361b5408e22b119977cf72b4a3c9.tar.gz
gentoo-913c3ecd4e31361b5408e22b119977cf72b4a3c9.tar.bz2
gentoo-913c3ecd4e31361b5408e22b119977cf72b4a3c9.zip
dev-java/antlr-tool: 3.5.3-java21.patch
Closes: https://bugs.gentoo.org/919481 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/35984 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
-rw-r--r--dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild (renamed from dev-java/antlr-tool/antlr-tool-3.5.3.ebuild)4
-rw-r--r--dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch11
2 files changed, 14 insertions, 1 deletions
diff --git a/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
index 0d99b11e44be..1997ce8c081f 100644
--- a/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -58,9 +58,11 @@ JAVA_TEST_GENTOO_CLASSPATH="junit-4"
JAVA_TEST_SRC_DIR="${TARBALL_S}/tool/src/test/java"
DOCS=( "${TARBALL_S}/tool/CHANGES.txt" )
+PATCHES=( "${FILESDIR}/antlr-tool-3.5.3-java21.patch" )
src_prepare() {
java-pkg_clean
+ default #780585
java-pkg-2_src_prepare
# Some tests fail under Java 8 in ways that probably aren't limited
diff --git a/dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch b/dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch
new file mode 100644
index 000000000000..2e196df96ef9
--- /dev/null
+++ b/dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch
@@ -0,0 +1,11 @@
+bug #919481
+--- a/org/antlr/codegen/templates/Java/ST.stg
++++ b/org/antlr/codegen/templates/Java/ST.stg
+@@ -32,6 +32,7 @@
+ @outputFile.imports() ::= <<
+ <@super.imports()>
+ import org.antlr.stringtemplate.*;
++import org.antlr.stringtemplate.StringTemplate;
+ import org.antlr.stringtemplate.language.*;
+ import java.util.HashMap;
+ >>