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