[Pkg-phototools-devel] Bug#873997: FTBFS with Java 9 due to -source/-target only

[Markus Koschany]

Control: tags -1 patch

Dear maintainer,

I've prepared a patch to fix the FTBFS with Java 9. Please find attached
the debdiff.

I presume one could also override the JAVA_SOURCE_VERSION CMake variable
in debian/rules but I haven't found an immediate solution for that. The
patch definitely works though.

Regards,

Markus
-------------- next part --------------
diff -Nru openjpeg2-2.3.0/debian/changelog openjpeg2-2.3.0/debian/changelog
--- openjpeg2-2.3.0/debian/changelog	2017-10-16 07:43:41.000000000 +0200
+++ openjpeg2-2.3.0/debian/changelog	2018-01-22 23:49:37.000000000 +0100
@@ -1,3 +1,10 @@
+openjpeg2 (2.3.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with Java 9.
+
+ -- Markus Koschany <apo at debian.org>  Mon, 22 Jan 2018 23:49:37 +0100
+
 openjpeg2 (2.3.0-1) unstable; urgency=medium
 
   * New upstream release. Closes: #877758
diff -Nru openjpeg2-2.3.0/debian/patches/java9.patch openjpeg2-2.3.0/debian/patches/java9.patch
--- openjpeg2-2.3.0/debian/patches/java9.patch	1970-01-01 01:00:00.000000000 +0100
+++ openjpeg2-2.3.0/debian/patches/java9.patch	2018-01-22 23:49:37.000000000 +0100
@@ -0,0 +1,25 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 22 Jan 2018 23:49:10 +0100
+Subject: java9
+
+---
+ src/bin/jpip/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt
+index 301d885..b412510 100644
+--- a/src/bin/jpip/CMakeLists.txt
++++ b/src/bin/jpip/CMakeLists.txt
+@@ -61,10 +61,10 @@ find_package(Java 1.5 COMPONENTS Development) # javac, jar
+ 
+ # User can override this:
+ if(NOT DEFINED JAVA_SOURCE_VERSION)
+-  set(JAVA_SOURCE_VERSION 1.5)
++  set(JAVA_SOURCE_VERSION 1.7)
+ endif()
+ if(NOT DEFINED JAVA_TARGET_VERSION)
+-  set(JAVA_TARGET_VERSION 1.5)
++  set(JAVA_TARGET_VERSION 1.7)
+ endif()
+ 
+ # Only build the java viewer if dev is found:
diff -Nru openjpeg2-2.3.0/debian/patches/series openjpeg2-2.3.0/debian/patches/series
--- openjpeg2-2.3.0/debian/patches/series	2017-10-16 07:43:41.000000000 +0200
+++ openjpeg2-2.3.0/debian/patches/series	2018-01-22 23:49:37.000000000 +0100
@@ -1 +1,2 @@
 multiarch_path.patch
+java9.patch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 963 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-phototools-devel/attachments/20180123/f33e6c9e/attachment.sig>