[med-svn] [Git][med-team/dicomscope][master] Resolve Java 21 FTBFS

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / dicomscope


Commits:
3f3b0771 by Vladimir Petko at 2023-12-09T07:56:26+00:00
Resolve Java 21 FTBFS

- - - - -


3 changed files:

- debian/changelog
- debian/patches/openjdk-1.9.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+dicomscope (3.6.0-26) UNRELEASED; urgency=medium
+
+  * d/p/openjdk-1.9.patch, d/rules: use java_compat_level variable
+    provided by java-common (Closes: #1052573).
+
+ -- Vladimir Petko <vladimir.petko at canonical.com>  Fri, 17 Nov 2023 21:51:23 +1300
+
 dicomscope (3.6.0-25) unstable; urgency=medium
 
   * Depends java-wrappers


=====================================
debian/patches/openjdk-1.9.patch
=====================================
@@ -1,16 +1,16 @@
 Author: Gert Wollny <gewo at debian.org>
 Description: Make code compatible with java 1.7
 Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=872945
-Last-Changed: 2017-08-23
+Last-Changed: 2023-11-17
 
 --- a/tkgui/CMakeLists.txt
 +++ b/tkgui/CMakeLists.txt
 @@ -7,7 +7,7 @@
- 
+
  add_custom_command(
    OUTPUT ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class
 -  COMMAND ${JAVA_COMPILE} ARGS -encoding Latin1 -d ../DICOMscope -classpath . -source 1.5 -target 1.5 dicomscope/DICOMscope.java
-+  COMMAND ${JAVA_COMPILE} ARGS -encoding Latin1 -d ../DICOMscope -classpath . -source 1.7 -target 1.7  dicomscope/DICOMscope.java
++  COMMAND ${JAVA_COMPILE} ARGS -encoding Latin1 -d ../DICOMscope -classpath . -source $ENV{JAVA_COMPAT_LEVEL} -target $ENV{JAVA_COMPAT_LEVEL} dicomscope/DICOMscope.java
    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
    DEPENDS ${javafiles}
    COMMENT "javac *.java"


=====================================
debian/rules
=====================================
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
+include /usr/share/java/java_defaults.mk
+export JAVA_COMPAT_LEVEL=$(java_compat_level)
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 



View it on GitLab: https://salsa.debian.org/med-team/dicomscope/-/commit/3f3b077151740f74092260152bf9712d26490553

-- 
View it on GitLab: https://salsa.debian.org/med-team/dicomscope/-/commit/3f3b077151740f74092260152bf9712d26490553
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20231209/38fa890a/attachment-0001.htm>