[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#925052: marked as done (unblock: cider/0.19.0+dfsg-2)

Your message dated Wed, 20 Mar 2019 11:51:24 +0000
with message-id <E1h6Zki-0000Sw-Bm@respighi.debian.org>
and subject line unblock cider
has caused the Debian Bug report #925052,
regarding unblock: cider/0.19.0+dfsg-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
925052: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925052
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package cider.  leiningen-clojure 2.9.0 has migrated to
buster, which has broken the cider in buster (the RC bug is #924697).
My -2 upload contains a cherry-picked upstream commit fixing the
problem.  I've tried it out manually and the test suite passes.

unblock cider/0.19.0+dfsg-2

-- 
Sean Whitton

diff -Nru cider-0.19.0+dfsg/debian/changelog cider-0.19.0+dfsg/debian/changelog
--- cider-0.19.0+dfsg/debian/changelog	2019-01-10 12:11:39.000000000 -0700
+++ cider-0.19.0+dfsg/debian/changelog	2019-03-15 15:55:43.000000000 -0700
@@ -1,3 +1,10 @@
+cider (0.19.0+dfsg-2) UNRELEASED; urgency=medium
+
+  * Cherry pick upstream commit a48af155d8acf64e7c3025146027ef2d62f1cc2e
+    (Closes: #924697).
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Fri, 15 Mar 2019 15:55:43 -0700
+
 cider (0.19.0+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru cider-0.19.0+dfsg/debian/patches/debian-changes cider-0.19.0+dfsg/debian/patches/debian-changes
--- cider-0.19.0+dfsg/debian/patches/debian-changes	2019-01-10 12:11:39.000000000 -0700
+++ cider-0.19.0+dfsg/debian/patches/debian-changes	2019-03-15 15:55:43.000000000 -0700
@@ -14,6 +14,54 @@
 (If you have dgit, use `dgit clone cider`, rather than plain `git clone`.)
 
 A single combined diff, containing all the changes, follows.
+--- cider-0.19.0+dfsg.orig/cider-client.el
++++ cider-0.19.0+dfsg/cider-client.el
+@@ -235,9 +235,12 @@ with respect to the bound values of \\=`
+ PPRINT-FN is the name of the Clojure function to use.
+ RIGHT-MARGIN specifies the maximum column-width of the pretty-printed
+ result, and is included in the request if non-nil."
+-  (nconc `("pprint" "true"
+-           "pprint-fn" ,(or pprint-fn (cider--pprint-fn)))
+-         (and right-margin `("print-right-margin" ,right-margin))))
++  (let* ((print-options (or cider-pprint-options (nrepl-dict))))
++    (when right-margin
++      (setq print-options (nrepl-dict-put print-options (cider--pprint-option "right-margin" cider-pprint-fn) right-margin)))
++    (append `("nrepl.middleware.print/print" ,(or pprint-fn (cider--pprint-fn))
++              "nrepl.middleware.print/stream?" "1")
++            (and (not (nrepl-dict-empty-p print-options)) `("nrepl.middleware.print/options" ,print-options)))))
+ 
+ (defun cider--nrepl-content-type-plist ()
+   "Plist to be appended to an eval request to make it use content-types."
+--- cider-0.19.0+dfsg.orig/cider-eval.el
++++ cider-0.19.0+dfsg/cider-eval.el
+@@ -278,11 +278,9 @@ into a new error buffer."
+     (cider-nrepl-send-request
+      (nconc '("op" "stacktrace")
+             (when (cider--pprint-fn)
+-              `("pprint-fn" ,(cider--pprint-fn)))
+-            (when cider-stacktrace-print-length
+-              `("print-length" ,cider-stacktrace-print-length))
+-            (when cider-stacktrace-print-level
+-              `("print-level" ,cider-stacktrace-print-level)))
++              `("nrepl.middleware.print/print" ,(cider--pprint-fn)))
++            (when cider-stacktrace-print-options
++              `("nrepl.middleware.print/options" ,cider-stacktrace-print-options)))
+      (lambda (response)
+        ;; While the return value of `cider--handle-stacktrace-response' is not
+        ;; meaningful for the last message, we do not need the value of `causes'
+--- cider-0.19.0+dfsg.orig/cider-ns.el
++++ cider-0.19.0+dfsg/cider-ns.el
+@@ -249,7 +249,9 @@ refresh functions (defined in `cider-ns-
+                     "print-length" ,cider-stacktrace-print-length
+                     "print-level" ,cider-stacktrace-print-level)
+                   (when (cider--pprint-fn)
+-                    `("pprint-fn" ,(cider--pprint-fn)))
++                    `("nrepl.middleware.print/print" ,(cider--pprint-fn)))
++                  (when cider-stacktrace-print-options
++                    `("nrepl.middleware.print/options" ,cider-stacktrace-print-options))
+                   (when (and (not inhibit-refresh-fns) cider-ns-refresh-before-fn)
+                     `("before" ,cider-ns-refresh-before-fn))
+                   (when (and (not inhibit-refresh-fns) cider-ns-refresh-after-fn)
 --- cider-0.19.0+dfsg.orig/cider-repl.el
 +++ cider-0.19.0+dfsg/cider-repl.el
 @@ -368,7 +368,9 @@ client process connection.  Unless NO-BA
@@ -27,6 +75,32 @@
  ;; In case you're seeing any warnings you should consult the manual's
  ;; \"Troubleshooting\" section.
  ;;
+@@ -871,7 +873,7 @@ nREPL ops, it may be convenient to preve
+     (nrepl-make-response-handler
+      buffer
+      (lambda (buffer value)
+-       (cider-repl-emit-result buffer value (not after-first-result-chunk) t)
++       (cider-repl-emit-result buffer value (not after-first-result-chunk))
+        (setq after-first-result-chunk t))
+      (lambda (buffer out)
+        (cider-repl-emit-stdout buffer out))
+--- cider-0.19.0+dfsg.orig/cider-test.el
++++ cider-0.19.0+dfsg/cider-test.el
+@@ -283,11 +283,9 @@ prompt and whether to use a new window.
+               "var" ,var
+               "index" ,index)
+             (when (cider--pprint-fn)
+-              `("pprint-fn" ,(cider--pprint-fn)))
+-            (when cider-stacktrace-print-length
+-              `("print-length" ,cider-stacktrace-print-length))
+-            (when cider-stacktrace-print-level
+-              `("print-level" ,cider-stacktrace-print-level)))
++              `("nrepl.middleware.print/print" ,(cider--pprint-fn)))
++            (when cider-stacktrace-print-options
++              `("nrepl.middleware.print/options" ,cider-stacktrace-print-options)))
+      (lambda (response)
+        (nrepl-dbind-response response (class status)
+          (cond (class  (setq causes (cons response causes)))
 --- cider-0.19.0+dfsg.orig/cider-util.el
 +++ cider-0.19.0+dfsg/cider-util.el
 @@ -404,7 +404,7 @@ plugin or dependency with:
@@ -58,6 +132,28 @@
    "When nil, do not inject repl dependencies (most likely nREPL middlewares) at `cider-jack-in' time."
    :type 'boolean
    :safe #'booleanp
+@@ -377,7 +377,7 @@ Throws an error if PROJECT-TYPE is unkno
+ ;; We inject the newest known version of nREPL just in case
+ ;; your version of Boot or Leiningen is bundling an older one.
+ (cider-add-to-alist 'cider-jack-in-dependencies
+-                    "nrepl" "0.5.3")
++                    "nrepl" "0.6.0")
+ 
+ (defvar cider-jack-in-cljs-dependencies nil
+   "List of dependencies where elements are lists of artifact name and version.
+@@ -401,10 +401,10 @@ Elements of the list are artifact name a
+ (defconst cider-latest-clojure-version "1.10.0"
+   "Latest supported version of Clojure.")
+ 
+-(defconst cider-required-middleware-version "0.18.0"
++(defconst cider-required-middleware-version "0.21.0"
+   "The minimum CIDER nREPL version that's known to work properly with CIDER.")
+ 
+-(defconst cider-latest-middleware-version "0.19.0"
++(defconst cider-latest-middleware-version "0.21.0"
+   "The latest CIDER nREPL version that's known to work properly with CIDER.")
+ 
+ (defcustom cider-jack-in-auto-inject-clojure nil
 --- cider-0.19.0+dfsg.orig/doc/about/contributing.md
 +++ cider-0.19.0+dfsg/doc/about/contributing.md
 @@ -71,7 +71,7 @@ You can support the development of CIDER

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Unblocked.

--- End Message ---
Reply to: