Source: clj-yaml-clojure Version: 0.7.2-2 Severity: important Tags: ftbfs patch User: [email protected] Usertags: ftbfs-snakeyaml2
Dear Maintainer, clj-yaml-clojure 0.7.2-2 FTBFS against snakeyaml/2.5+ds-1 currently in experimental. I solved this with the enclosed patch.I am planning to upload snakeyaml/2.5+ds-2 to unstable on the 27th of October or a bit later.
Best regards, -- Pierre
diff -Nru clj-yaml-clojure-0.7.2/debian/changelog clj-yaml-clojure-0.7.2/debian/changelog --- clj-yaml-clojure-0.7.2/debian/changelog 2024-08-30 16:51:02.000000000 +0200 +++ clj-yaml-clojure-0.7.2/debian/changelog 2025-10-10 08:40:10.000000000 +0200 @@ -1,3 +1,9 @@ +clj-yaml-clojure (0.7.2-3) UNRELEASED; urgency=medium + + * Building against snakeyaml 2.x + + -- Pierre Gruet <[email protected]> Fri, 10 Oct 2025 08:40:10 +0200 + clj-yaml-clojure (0.7.2-2) unstable; urgency=medium * Team upload. diff -Nru clj-yaml-clojure-0.7.2/debian/control clj-yaml-clojure-0.7.2/debian/control --- clj-yaml-clojure-0.7.2/debian/control 2024-08-30 16:51:02.000000000 +0200 +++ clj-yaml-clojure-0.7.2/debian/control 2025-10-10 08:40:10.000000000 +0200 @@ -10,7 +10,7 @@ leiningen, maven-repo-helper, libordered-clojure <!nocheck>, - libyaml-snake-java <!nocheck>, + libyaml-snake-java (>= 2.5+ds) <!nocheck>, Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/clojure-team/clj-yaml-clojure Vcs-Git: https://salsa.debian.org/clojure-team/clj-yaml-clojure.git diff -Nru clj-yaml-clojure-0.7.2/debian/patches/0001-Lein-Local.patch clj-yaml-clojure-0.7.2/debian/patches/0001-Lein-Local.patch --- clj-yaml-clojure-0.7.2/debian/patches/0001-Lein-Local.patch 2024-08-30 16:51:02.000000000 +0200 +++ clj-yaml-clojure-0.7.2/debian/patches/0001-Lein-Local.patch 2025-10-10 08:40:03.000000000 +0200 @@ -20,7 +20,7 @@ - [[org.yaml/snakeyaml "1.26"] - [org.flatland/ordered "1.5.9"]] - :profiles {:provided {:dependencies [[org.clojure/clojure "1.10.1"]]}}) -+ [[org.yaml/snakeyaml "1.x"] ++ [[org.yaml/snakeyaml "2.x"] + [org.flatland/ordered "debian"]] + :profiles {:provided {:dependencies [[org.clojure/clojure "1.x"]]}} + :local-repo "debian/maven-repo") diff -Nru clj-yaml-clojure-0.7.2/debian/patches/series clj-yaml-clojure-0.7.2/debian/patches/series --- clj-yaml-clojure-0.7.2/debian/patches/series 2024-08-30 16:51:02.000000000 +0200 +++ clj-yaml-clojure-0.7.2/debian/patches/series 2025-10-10 08:40:10.000000000 +0200 @@ -1,2 +1,3 @@ 0001-Lein-Local.patch use-java-target-source-from-java-common.patch +snakeyaml2.patch diff -Nru clj-yaml-clojure-0.7.2/debian/patches/snakeyaml2.patch clj-yaml-clojure-0.7.2/debian/patches/snakeyaml2.patch --- clj-yaml-clojure-0.7.2/debian/patches/snakeyaml2.patch 1970-01-01 01:00:00.000000000 +0100 +++ clj-yaml-clojure-0.7.2/debian/patches/snakeyaml2.patch 2025-10-10 08:40:10.000000000 +0200 @@ -0,0 +1,35 @@ +Description: constructing Representer with a DumperOptions instance to comply + with the interface of snakeyaml 2.x +Author: Pierre Gruet <[email protected]> +Forwarded: no +Last-Update: 2025-10-12 + +--- a/src/java/clj_yaml/MarkedConstructor.java ++++ b/src/java/clj_yaml/MarkedConstructor.java +@@ -1,5 +1,6 @@ + package clj_yaml; + ++import org.yaml.snakeyaml.LoaderOptions; + import org.yaml.snakeyaml.constructor.Construct; + import org.yaml.snakeyaml.constructor.Constructor; + import org.yaml.snakeyaml.constructor.SafeConstructor; +@@ -21,7 +22,7 @@ + public MarkedConstructor() { + // Make sure SafeConstructor's constructor is called first, + // so that we overwrite the keys that SafeConstructor sets. +- super(); ++ super(new LoaderOptions()); + // Wrap all the constructors with Marking constructors. + for (Tag tag : tags) { + Construct old = this.yamlConstructors.get(tag); +--- a/src/clojure/clj_yaml/core.clj ++++ b/src/clojure/clj_yaml/core.clj +@@ -60,7 +60,7 @@ + dumper (if dumper-options + (make-dumper-options :flow-style (:flow-style dumper-options)) + (default-dumper-options))] +- (Yaml. constructor (Representer.) dumper loader))) ++ (Yaml. constructor (Representer. dumper) dumper loader))) + + (defrecord Marked + [start end unmark]) diff -Nru clj-yaml-clojure-0.7.2/debian/patches/use-java-target-source-from-java-common.patch clj-yaml-clojure-0.7.2/debian/patches/use-java-target-source-from-java-common.patch --- clj-yaml-clojure-0.7.2/debian/patches/use-java-target-source-from-java-common.patch 2024-08-30 16:51:02.000000000 +0200 +++ clj-yaml-clojure-0.7.2/debian/patches/use-java-target-source-from-java-common.patch 2025-10-10 08:40:10.000000000 +0200 @@ -2,10 +2,8 @@ Author: Jérôme Charaoui <[email protected]> Forwarded: not-needed Bug-Debian: #1052576 -Index: clj-yaml-clojure/project.clj -=================================================================== ---- clj-yaml-clojure.orig/project.clj -+++ clj-yaml-clojure/project.clj +--- a/project.clj ++++ b/project.clj @@ -9,7 +9,7 @@ :global-vars {*warn-on-reflection* true} :source-paths ["src/clojure"] @@ -13,5 +11,5 @@ - :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.yaml/snakeyaml "2.x"] [org.flatland/ordered "debian"]]
OpenPGP_signature.asc
Description: OpenPGP digital signature
