Please consider the attached debdiff which basically applies the
upstream fix and adds a dep3 header to it.
diff -Nru clojure1.8-1.8.0/debian/changelog clojure1.8-1.8.0/debian/changelog
--- clojure1.8-1.8.0/debian/changelog	2018-08-04 17:56:45.000000000 -0300
+++ clojure1.8-1.8.0/debian/changelog	2018-10-10 13:47:36.000000000 -0300
@@ -1,3 +1,11 @@
+clojure1.8 (1.8.0-8) cosmic; urgency=medium
+
+  * debian/patches/03-add-toarray-hint-type-68d8b83138437c18.patch:
+    Add hint type to toArray method to resolve ambiguity introduced by
+    JDK 11. (Closes: #910773, LP: #1796985).
+
+ -- Tiago Stürmer Daitx <tiago.da...@ubuntu.com>  Wed, 11 Oct 2018 02:12:55 +0000
+
 clojure1.8 (1.8.0-7) unstable; urgency=medium
 
   * Update Vcs-* links to point to the clojure-team repo.
diff -Nru clojure1.8-1.8.0/debian/patches/03-add-toarray-hint-type-68d8b83138437c18.patch clojure1.8-1.8.0/debian/patches/03-add-toarray-hint-type-68d8b83138437c18.patch
--- clojure1.8-1.8.0/debian/patches/03-add-toarray-hint-type-68d8b83138437c18.patch	1969-12-31 21:00:00.000000000 -0300
+++ clojure1.8-1.8.0/debian/patches/03-add-toarray-hint-type-68d8b83138437c18.patch	2018-10-10 13:45:50.000000000 -0300
@@ -0,0 +1,37 @@
+Description: Add hint to overloaded toArray method
+ OpenJDK 11 added a new overload to the toArray method that
+ causes a slight API breakage. This requires calls to toArray
+ to set a type hint in order to prevent the exception
+ java.lang.IllegalArgumentException.
+Origin: https://github.com/clojure/clojure/commit/68d8b83138437c18f1d5cf9ba46c056aa2701d23
+Bug: https://dev.clojure.org/jira/browse/CLJ-2374
+Bug-Ubuntu: https://launchpad.net/bugs/1796985
+Applied-Upstream: https://github.com/clojure/clojure/commit/68d8b83138437c18f1d5cf9ba46c056aa2701d23
+Last-Update: 2018-10-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+From 68d8b83138437c18f1d5cf9ba46c056aa2701d23 Mon Sep 17 00:00:00 2001
+From: Alex Miller <alex.mil...@cognitect.com>
+Date: Mon, 1 Oct 2018 09:29:37 -0500
+Subject: [PATCH] CLJ-2374 Add type hint to toArray to resolve ambiguity in JDK
+ 11
+
+Signed-off-by: Stuart Halloway <s...@cognitect.com>
+---
+ src/clj/clojure/gvec.clj | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/clj/clojure/gvec.clj b/src/clj/clojure/gvec.clj
+index 3c4007379..6208f5539 100644
+--- a/src/clj/clojure/gvec.clj
++++ b/src/clj/clojure/gvec.clj
+@@ -397,7 +397,7 @@
+   (containsAll [this c] (every? #(.contains this %) c))
+   (isEmpty [_] (zero? cnt))
+   (toArray [this] (into-array Object this))
+-  (toArray [this arr]
++  (^objects toArray [this ^objects arr]
+     (if (>= (count arr) cnt)
+       (do
+         (dotimes [i cnt]
diff -Nru clojure1.8-1.8.0/debian/patches/series clojure1.8-1.8.0/debian/patches/series
--- clojure1.8-1.8.0/debian/patches/series	2018-03-19 16:31:31.000000000 -0300
+++ clojure1.8-1.8.0/debian/patches/series	2018-10-10 13:46:55.000000000 -0300
@@ -1 +1,2 @@
 02-modify-cli-usage.patch
+03-add-toarray-hint-type-68d8b83138437c18.patch

Reply via email to