Tony Mancill pushed to branch master at Debian Java Maintainers / weka
Commits: e4ab2cb0 by Vladimir Petko at 2023-12-04T18:10:59+13:00 d/p/set_compiler_release.patch, d/rules: adjust -release level - - - - - 171ce995 by Vladimir Petko at 2023-12-04T18:11:28+13:00 changelog - - - - - 99d7136d by Tony Mancill at 2023-12-04T06:47:27+00:00 Merge branch 'master' into 'master' Resolve Java 21 FTBFS See merge request java-team/weka!2 - - - - - 4 changed files: - debian/changelog - debian/patches/series - + debian/patches/set_compiler_release.patch - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +weka (3.6.14-4) UNRELEASED; urgency=medium + + * d/p/set_compiler_release.patch, d/rules: use java_compat_level + variable provided by java-common to adjust -release level (Closes: + #1053086). + + -- Vladimir Petko <vladimir.pe...@canonical.com> Mon, 04 Dec 2023 18:09:28 +1300 + weka (3.6.14-3) unstable; urgency=medium * Team Upload. ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ jar.patch disable-rmic-static-stub.patch reproducible.patch +set_compiler_release.patch ===================================== debian/patches/set_compiler_release.patch ===================================== @@ -0,0 +1,29 @@ +Description: Set compiler release level to 8 + WEKA uses PropertyDescriptor that fails to compile when setting + only -source/-target levels. Set compiler release level to 8 to + use the correct compilation environment. + See https://bugs.openjdk.org/browse/JDK-8212636 + The patch is not needed upstream as 3.8 does not have this issue. +Author: Vladimir Petko <vladimir.pe...@canonical.com> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1053086 +Forwarded: not-needed +Last-Update: 2023-12-04 +--- a/build.xml ++++ b/build.xml +@@ -27,6 +27,7 @@ + <property name="headless" value="false"/> + <property name="macdistrib" value="osx-distrib"/> + <property name="debug" value="on" /> ++ <property environment="env" /> + + <target name="init_all"> + <!-- Create the time stamp --> +@@ -66,7 +67,7 @@ + includeantruntime="false" + debug="${debug}" + deprecation="${deprecation}" +- source="1.5" target="1.5"> ++ release="${env.JAVA_COMPAT_LEVEL}"> + + <classpath refid="project.class.path" /> + </javac> ===================================== debian/rules ===================================== @@ -1,6 +1,8 @@ #!/usr/bin/make -f include /usr/share/dpkg/pkg-info.mk +include /usr/share/java/java_defaults.mk +export JAVA_COMPAT_LEVEL=$(java_compat_level) %: dh $@ View it on GitLab: https://salsa.debian.org/java-team/weka/-/compare/57712878b19637bc9eaab9bddfa9794de025dc58...99d7136d93ca59fa2755558456731e84f3c26303 -- View it on GitLab: https://salsa.debian.org/java-team/weka/-/compare/57712878b19637bc9eaab9bddfa9794de025dc58...99d7136d93ca59fa2755558456731e84f3c26303 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
