[Git][clojure-team/clj-yaml-clojure][master] 2 commits: d/patches: add patch to fix ftbfs with java 21

[Jérôme Charaoui (@lavamind)]

Jérôme Charaoui pushed to branch master at Debian Clojure Maintainers / clj-yaml-clojure


Commits:
76adb9ff by Jérôme Charaoui at 2024-08-30T10:48:32-04:00
d/patches: add patch to fix ftbfs with java 21

Closes: #1052576

- - - - -
7560ccd7 by Jérôme Charaoui at 2024-08-30T10:52:46-04:00
Update changelog for 0.7.2-2 release

- - - - -


4 changed files:

- debian/changelog
- debian/patches/series
- + debian/patches/use-java-target-source-from-java-common.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+clj-yaml-clojure (0.7.2-2) unstable; urgency=medium
+
+  * Team upload.
+  * d/control: fix Vcs-* links
+  * d/patches: add patch to fix ftbfs with java 21 (Closes: #1052576)
+
+ -- Jérôme Charaoui <jerome at riseup.net>  Fri, 30 Aug 2024 10:51:02 -0400
+
 clj-yaml-clojure (0.7.2-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 0001-Lein-Local.patch
+use-java-target-source-from-java-common.patch


=====================================
debian/patches/use-java-target-source-from-java-common.patch
=====================================
@@ -0,0 +1,17 @@
+Description: Use -target and -source values from java-common
+Author: Jérôme Charaoui <jerome at riseup.net>
+Forwarded: not-needed
+Bug-Debian: #1052576
+Index: clj-yaml-clojure/project.clj
+===================================================================
+--- clj-yaml-clojure.orig/project.clj
++++ clj-yaml-clojure/project.clj
+@@ -9,7 +9,7 @@
+   :global-vars {*warn-on-reflection* true}
+   :source-paths ["src/clojure"]
+   :java-source-paths ["src/java"]
+-  :javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"]
++  :javac-options ["-target" ~(System/getenv, "JAVA_TARGET_VERSION") "-source" ~(System/getenv, "JAVA_SOURCE_VERSION") "-Xlint:-options"]
+   :dependencies
+   [[org.yaml/snakeyaml "1.x"]
+    [org.flatland/ordered "debian"]]


=====================================
debian/rules
=====================================
@@ -2,6 +2,7 @@
 
 include /usr/share/dpkg/pkg-info.mk
 include /usr/share/javahelper/java-vars.mk
+include /usr/share/java/java_defaults.mk
 
 export LEIN_HOME=$(CURDIR)/.lein
 export LEIN_OFFLINE=true
@@ -15,7 +16,7 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	lein pom debian/pom.xml
-	lein jar
+	JAVA_SOURCE_VERSION=$(java_compat_level) JAVA_TARGET_VERSION=$(java_compat_level) lein jar
 	# symlinks so we don't need a version in debian/*.poms
 	cd target && ln -sf $(NAME)-$(DEB_VERSION_UPSTREAM).jar $(NAME).jar
 



View it on GitLab: https://salsa.debian.org/clojure-team/clj-yaml-clojure/-/compare/8a9f0fd983bb00844ce26abed841d72cdd78d54f...7560ccd7835cb8c62625d9937a3fec4d4b674d75

-- 
View it on GitLab: https://salsa.debian.org/clojure-team/clj-yaml-clojure/-/compare/8a9f0fd983bb00844ce26abed841d72cdd78d54f...7560ccd7835cb8c62625d9937a3fec4d4b674d75
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/pkg-java-commits/attachments/20240830/664757b7/attachment.htm>