commit: 005afcc264209c3a0f0bbfe8ad473986eabaced4 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Mar 29 08:21:05 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Apr 15 07:45:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005afcc2
dev-java/antlr: java21.patch Closes: https://bugs.gentoo.org/919684 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../{antlr-3.2-r1.ebuild => antlr-3.2-r2.ebuild} | 3 ++- dev-java/antlr/files/antlr-3.2-java21.patch | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dev-java/antlr/antlr-3.2-r1.ebuild b/dev-java/antlr/antlr-3.2-r2.ebuild similarity index 97% rename from dev-java/antlr/antlr-3.2-r1.ebuild rename to dev-java/antlr/antlr-3.2-r2.ebuild index bf4946c25c62..b3ec93f8722e 100644 --- a/dev-java/antlr/antlr-3.2-r1.ebuild +++ b/dev-java/antlr/antlr-3.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -31,6 +31,7 @@ PATCHES=( # These fixes have been applied in 3.5. "${FILESDIR}/${PV}-test-fixes.patch" "${FILESDIR}/${PV}-java-8.patch" + "${FILESDIR}/antlr-3.2-java21.patch" ) S="${WORKDIR}/${P}" diff --git a/dev-java/antlr/files/antlr-3.2-java21.patch b/dev-java/antlr/files/antlr-3.2-java21.patch new file mode 100644 index 000000000000..9df897ac22de --- /dev/null +++ b/dev-java/antlr/files/antlr-3.2-java21.patch @@ -0,0 +1,21 @@ +bug #919684 +--- a/tool/src/main/java/org/antlr/codegen/CodeGenerator.java ++++ b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java +@@ -36,6 +36,7 @@ import org.antlr.Tool; + import org.antlr.analysis.*; + import org.antlr.misc.*; + import org.antlr.stringtemplate.*; ++import org.antlr.stringtemplate.StringTemplate; + import org.antlr.stringtemplate.language.AngleBracketTemplateLexer; + import org.antlr.tool.*; + +--- a/tool/src/main/antlr2/org/antlr/grammar/v2/codegen.g ++++ b/tool/src/main/antlr2/org/antlr/grammar/v2/codegen.g +@@ -32,6 +32,7 @@ header { + import org.antlr.misc.*; + import java.util.*; + import org.antlr.stringtemplate.*; ++ import org.antlr.stringtemplate.StringTemplate; + import antlr.TokenWithIndex; + import antlr.CommonToken; + import org.antlr.codegen.*;
