commit: af2d73433a2869344c961aa0f1f73b6372f8ddba Author: Keri Harris <keri <AT> gentoo <DOT> org> AuthorDate: Fri May 27 17:36:41 2022 +0000 Commit: Keri Harris <keri <AT> gentoo <DOT> org> CommitDate: Fri May 27 17:38:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af2d7343
dev-lang/interprolog: support compiling with Java 17 Closes: https://bugs.gentoo.org/846929 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Keri Harris <keri <AT> gentoo.org> dev-lang/interprolog/files/interprolog-2.1.2-java17.patch | 13 +++++++++++++ dev-lang/interprolog/interprolog-2.1.2.ebuild | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dev-lang/interprolog/files/interprolog-2.1.2-java17.patch b/dev-lang/interprolog/files/interprolog-2.1.2-java17.patch new file mode 100644 index 000000000000..5c0ad07b8daa --- /dev/null +++ b/dev-lang/interprolog/files/interprolog-2.1.2-java17.patch @@ -0,0 +1,13 @@ +--- interprolog212.orig/com/declarativa/interprolog/AbstractPrologEngine.java 2005-09-30 19:26:22.000000000 +0200 ++++ interprolog212/com/declarativa/interprolog/AbstractPrologEngine.java 2022-05-27 19:26:35.059409877 +0200 +@@ -389,9 +389,7 @@ + progressMessage("Cleaning path "+p); + if (System.getProperty("java.version").compareTo("1.4")>=0) { + try{ +- Method decode = URLDecoder.class.getMethod("decode", new +- Class[]{String.class, String.class}); +- return (String)decode.invoke(new URLDecoder(),new Object[]{p,"UTF-8"}); ++ return URLDecoder.decode(p,"UTF-8"); + } catch (Exception e){ + throw new IPException("Inconsistency in PrologEngine.cleanPath"+e); + } diff --git a/dev-lang/interprolog/interprolog-2.1.2.ebuild b/dev-lang/interprolog/interprolog-2.1.2.ebuild index af273a150564..dc9d77efd441 100644 --- a/dev-lang/interprolog/interprolog-2.1.2.ebuild +++ b/dev-lang/interprolog/interprolog-2.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,6 +33,7 @@ EANT_GENTOO_CLASSPATH="junit" src_prepare() { eapply "${FILESDIR}"/${P}-java1.4.patch + eapply "${FILESDIR}"/${P}-java17.patch eapply_user cp "${FILESDIR}"/build.xml "${S}" || die
