commit: 913c3ecd4e31361b5408e22b119977cf72b4a3c9 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Mar 29 15:10:28 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Apr 15 07:47:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=913c3ecd
dev-java/antlr-tool: 3.5.3-java21.patch Closes: https://bugs.gentoo.org/919481 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/35984 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../{antlr-tool-3.5.3.ebuild => antlr-tool-3.5.3-r1.ebuild} | 4 +++- dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) 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 similarity index 94% rename from dev-java/antlr-tool/antlr-tool-3.5.3.ebuild rename to 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; + >>
