Bug#924869: unblock: geiser/0.8.1-4

To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: Bug#924869: unblock: geiser/0.8.1-4
From: David Bremner <bremner@debian.org>
Date: Sun, 17 Mar 2019 17:12:24 -0300
Message-id: <[🔎] 155285354402.24540.11391689839635545636.reportbug@convex.localnet>
Reply-to: David Bremner <bremner@debian.org>, 924869@bugs.debian.org

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Please unblock package geiser

The version in buster is afaict completely unusable due to
incompatibility with emacs 26.x (this is reported in Debian as
#924866).

unblock geiser/0.8.1-4

- -- System Information:
Debian Release: buster/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.19.0-2-amd64 (SMP w/8 CPU cores)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8), LANGUAGE=en_CA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

-----BEGIN PGP SIGNATURE-----

iQGzBAEBCAAdFiEE3VS2dnyDRXKVCQCp8gKXHaSnniwFAlyOqiYACgkQ8gKXHaSn
nizgHQv+Ki16FlBWNldbIpDL50pv+88DKpNjIwEZKCr/QO/yu8yypnbitG3NSFTY
A523ENZFJtKxN3zv3NJ5NAA0Lc3SdntlnGC0PDokzauy5Qesu1fbQd5By4DJErpw
XjYT/VQmW9z295x6St7ZO3oHFKGTLilpn68naymrXNqU7QQY8+1w2OWpctMvmssg
SVMjVRHPkfr16xqySKtTBVULUH2ZB7qD0NNsLCV1L9qE3IMxTzgRPuAanmU63H+E
IUkl69A8tsLsFhNpGOuxsKSzxKVdo1+YbzAScARllf0cBX5Yh3BStMO1QhHfx7Uf
zsn+pF70kHvQJhy8mF2dwxPUxen0wBsJ4Q+BDxvs1Ke1BYX4HOEznG1GnKhAoRWo
n0GesdGBfikWS5M43UyEYqqJwHKNgrr57clI3xb4D9CnAHJ9ZTVvcWoCD7c0GbJ4
jRbDzyf/m3oAIiMSYbOvuIpXOa2K+ywhe9tCu1W5IZed0HB5fzFSXnQvEXk1cRdU
ZBxHQAwF
=65w4
-----END PGP SIGNATURE-----

diff -Nru geiser-0.8.1/debian/changelog geiser-0.8.1/debian/changelog
--- geiser-0.8.1/debian/changelog	2018-05-31 20:15:11.000000000 -0300
+++ geiser-0.8.1/debian/changelog	2019-03-17 16:57:31.000000000 -0300
@@ -1,3 +1,11 @@
+geiser (0.8.1-4) unstable; urgency=medium
+
+  * Cherry pick commit ae895088 from upstream to restore compatibility
+    with emacs 26 (Closes: #924866)
+  * Point Vcs-* to salsa
+
+ -- David Bremner <bremner@debian.org>  Sun, 17 Mar 2019 16:57:31 -0300
+
 geiser (0.8.1-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru geiser-0.8.1/debian/control geiser-0.8.1/debian/control
--- geiser-0.8.1/debian/control	2018-05-31 20:15:11.000000000 -0300
+++ geiser-0.8.1/debian/control	2019-03-17 16:57:31.000000000 -0300
@@ -7,8 +7,8 @@
 	       dh-elpa (>= 0.0.12)
 Standards-Version: 3.9.6
 Homepage: http://www.nongnu.org/geiser/
-Vcs-Git: git://anonscm.debian.org/pkg-emacsen/pkg/geiser.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-emacsen/pkg/geiser.git/
+Vcs-Git: https://salsa.debian.org/emacsen-team/geiser.git
+Vcs-Browser: https://salsa.debian.org/emacsen-team/geiser
 
 Package: elpa-geiser
 Architecture: all
diff -Nru geiser-0.8.1/debian/patches/0001-fix-malformed-argument-lists.patch geiser-0.8.1/debian/patches/0001-fix-malformed-argument-lists.patch
--- geiser-0.8.1/debian/patches/0001-fix-malformed-argument-lists.patch	1969-12-31 20:00:00.000000000 -0400
+++ geiser-0.8.1/debian/patches/0001-fix-malformed-argument-lists.patch	2019-03-17 16:57:31.000000000 -0300
@@ -0,0 +1,38 @@
+From 225b69f0c1867c9da40d9bbbfbe52083c3d8b4f0 Mon Sep 17 00:00:00 2001
+From: Peter Wang <ptr.wang@gmail.com>
+Date: Sat, 26 Nov 2016 17:06:38 +0800
+Subject: [PATCH] fix malformed argument lists.
+
+Emacs trunk does not support arguments list like (lambda (&rest) nil)
+anymore, which breaks geiser and errors with "Invalid function: "
+---
+ elisp/geiser-eval.el | 2 +-
+ elisp/geiser-impl.el | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/elisp/geiser-eval.el b/elisp/geiser-eval.el
+index 29797e6..291b017 100644
+--- a/elisp/geiser-eval.el
++++ b/elisp/geiser-eval.el
+@@ -29,7 +29,7 @@
+ 
+ (defvar geiser-eval--get-impl-module nil)
+ (geiser-impl--register-local-method
+- 'geiser-eval--get-impl-module 'find-module '(lambda (&rest) nil)
++ 'geiser-eval--get-impl-module 'find-module '(lambda (&rest args) nil)
+  "Function used to obtain the module for current buffer. It takes
+ an optional argument, for cases where we want to force its
+ value.")
+diff --git a/elisp/geiser-impl.el b/elisp/geiser-impl.el
+index aadfef7..b6d5977 100644
+--- a/elisp/geiser-impl.el
++++ b/elisp/geiser-impl.el
+@@ -157,7 +157,7 @@ determine its scheme flavour."
+              (= 2 (length m))
+              (symbolp (car m)))
+     (if (functionp (cadr m)) m
+-      `(,(car m) (lambda (&rest) ,(cadr m))))))
++      `(,(car m) (lambda (&rest args) ,(cadr m))))))
+ 
+ (defun geiser-impl--define (file name parent methods)
+   (let* ((methods (mapcar 'geiser-impl--normalize-method methods))
diff -Nru geiser-0.8.1/debian/patches/series geiser-0.8.1/debian/patches/series
--- geiser-0.8.1/debian/patches/series	1969-12-31 20:00:00.000000000 -0400
+++ geiser-0.8.1/debian/patches/series	2019-03-17 16:57:31.000000000 -0300
@@ -0,0 +1,2 @@
+# exported from git by git-debcherry
+0001-fix-malformed-argument-lists.patch

diff --git a/debian/changelog b/debian/changelog
index da6e005..633ed06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+geiser (0.8.1-4) unstable; urgency=medium
+
+  * Cherry pick commit ae895088 from upstream to restore compatibility
+    with emacs 26 (Closes: #924866)
+  * Point Vcs-* to salsa
+
+ -- David Bremner <bremner@debian.org>  Sun, 17 Mar 2019 16:57:31 -0300
+
 geiser (0.8.1-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 645a79f..c92d105 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 7.0.50~), autotools-dev, dh-autoreconf, install-inf
 	       dh-elpa (>= 0.0.12)
 Standards-Version: 3.9.6
 Homepage: http://www.nongnu.org/geiser/
-Vcs-Git: git://anonscm.debian.org/pkg-emacsen/pkg/geiser.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-emacsen/pkg/geiser.git/
+Vcs-Git: https://salsa.debian.org/emacsen-team/geiser.git
+Vcs-Browser: https://salsa.debian.org/emacsen-team/geiser
 
 Package: elpa-geiser
 Architecture: all
diff --git a/elisp/geiser-eval.el b/elisp/geiser-eval.el
index 29797e6..291b017 100644
--- a/elisp/geiser-eval.el
+++ b/elisp/geiser-eval.el
@@ -29,7 +29,7 @@
 
 (defvar geiser-eval--get-impl-module nil)
 (geiser-impl--register-local-method
- 'geiser-eval--get-impl-module 'find-module '(lambda (&rest) nil)
+ 'geiser-eval--get-impl-module 'find-module '(lambda (&rest args) nil)
  "Function used to obtain the module for current buffer. It takes
 an optional argument, for cases where we want to force its
 value.")
diff --git a/elisp/geiser-impl.el b/elisp/geiser-impl.el
index aadfef7..b6d5977 100644
--- a/elisp/geiser-impl.el
+++ b/elisp/geiser-impl.el
@@ -157,7 +157,7 @@ determine its scheme flavour."
              (= 2 (length m))
              (symbolp (car m)))
     (if (functionp (cadr m)) m
-      `(,(car m) (lambda (&rest) ,(cadr m))))))
+      `(,(car m) (lambda (&rest args) ,(cadr m))))))
 
 (defun geiser-impl--define (file name parent methods)
   (let* ((methods (mapcar 'geiser-impl--normalize-method methods))

Reply to:

Prev by Date: geiser
Next by Date: ediprolog-el is marked for autoremoval from testing
Previous by thread: geiser
Next by thread: ediprolog-el is marked for autoremoval from testing
Index(es):
- Date
- Thread