guix: emacs-geiser 0.11.2 -> 0.12

This commit also add patches required for emacs-guix to work with this
version of emacs-geiser.

4 files changed, 45 insertions, 10 deletions

diff --git a/guix/emacs-geiser/emacs-geiser-default-guile-2.2.patch b/guix/emacs-geiser/emacs-geiser-default-guile-2.2.patch
index abc392c..653f477 100644
--- a/guix/emacs-geiser/emacs-geiser-default-guile-2.2.patch
+++ b/guix/emacs-geiser/emacs-geiser-default-guile-2.2.patch
@@ -1,13 +1,13 @@
 diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el
-index 160f40c..c9387db 100644
+index 522c4eb..75e33c7 100644
 --- a/elisp/geiser-guile.el
 +++ b/elisp/geiser-guile.el
-@@ -36,7 +36,7 @@
+@@ -37,7 +37,7 @@
  (geiser-custom--defcustom geiser-guile-binary
-   (cond ((eq system-type 'windows-nt) "guile.exe")
-         ((eq system-type 'darwin) "guile")
--        (t "guile"))
-+        (t "guile2.2"))
+     (cond ((eq system-type 'windows-nt) "guile.exe")
+           ((eq system-type 'darwin) "guile")
+-          (t "guile"))
++          (t "guile2.2"))
    "Name to use to call the Guile executable when starting a REPL."
    :type '(choice string (repeat string))
    :group 'geiser-guile)
diff --git a/guix/emacs-geiser/emacs-geiser.spec b/guix/emacs-geiser/emacs-geiser.spec
index 06a8c29..dd3ef50 100644
--- a/guix/emacs-geiser/emacs-geiser.spec
+++ b/guix/emacs-geiser/emacs-geiser.spec
@@ -2,18 +2,19 @@
 %global pkgname Geiser
 
 Name:           emacs-%{pkg}
-Version:        0.11.2
-Release:        2%{?dist}
+Version:        0.12
+Release:        1%{?dist}
 Summary:        Geiser is an Emacs environment to hack and have fun in Scheme
 
 License:        BSD
 URL:            https://nongnu.org/geiser
-Source0:        https://gitlab.com/jaor/geiser/uploads/56b0cd60b99f78359bba0042421ac0a6/%{pkg}-%{version}.tar.gz
+Source0:        https://gitlab.com/jaor/geiser/-/archive/%{version}/%{pkg}-%{version}.tar.gz
 
 # Use guile2.2 instead of guile because Guile 2.0 support has been dropped.
 Patch0:         emacs-geiser-default-guile-2.2.patch
 
 BuildArch:      noarch
+BuildRequires:  autoconf, automake, texinfo
 BuildRequires:  emacs
 Requires:       emacs(bin) >= %{_emacs_version}
 Requires(post): info
@@ -35,8 +36,10 @@ keep the Lisp Machine Spirit alive.
 
 
 %build
+./autogen.sh
 %configure --with-lispdir=%{_emacs_sitelispdir}/geiser
 %make_build
+%{__make} README
 
 
 %install
@@ -72,6 +75,9 @@ fi
 
 
 %changelog
+* Mon Feb 15 2021 Ting-Wei Lan <lantw44@gmail.com> - 0.12-1
+- Update to 0.12
+
 * Sun Nov  1 2020 Ting-Wei Lan <lantw44@gmail.com> - 0.11.2-2
 - Rebuilt for Fedora 33 and 34
 
diff --git a/guix/emacs-guix/emacs-guix-0.5.2-geiser-0.12.patch b/guix/emacs-guix/emacs-guix-0.5.2-geiser-0.12.patch
new file mode 100644
index 0000000..adff29c
--- /dev/null
+++ b/guix/emacs-guix/emacs-guix-0.5.2-geiser-0.12.patch
@@ -0,0 +1,25 @@
+From bb2a0539f8d68b2292b3d0f3174c139b4c304028 Mon Sep 17 00:00:00 2001
+From: John Soo <jsoo1@asu.edu>
+Date: Fri, 13 Nov 2020 06:02:01 -0800
+Subject: [PATCH] elisp/repl: Support geiser 0.12.x
+
+* elisp/guix-repl.el (guix-start-repl): Set 'geiser-repl-buffer-project'.
+---
+ elisp/guix-repl.el | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/elisp/guix-repl.el b/elisp/guix-repl.el
+index c0bb3e2..5dd446f 100644
+--- a/elisp/guix-repl.el
++++ b/elisp/guix-repl.el
+@@ -309,6 +309,7 @@ this address (it should be defined by
+     (with-current-buffer buffer
+       (geiser-repl-mode)
+       (geiser-impl--set-buffer-implementation impl)
++      (geiser-repl--set-this-buffer-project 'guix)
+       (geiser-repl--autodoc-mode -1)
+       (goto-char (point-max))
+       (let ((prompt (geiser-con--combined-prompt
+-- 
+GitLab
+
diff --git a/guix/emacs-guix/emacs-guix.spec b/guix/emacs-guix/emacs-guix.spec
index 5c69d8d..9f32cd5 100644
--- a/guix/emacs-guix/emacs-guix.spec
+++ b/guix/emacs-guix/emacs-guix.spec
@@ -3,7 +3,7 @@
 
 Name:           emacs-%{pkg}
 Version:        0.5.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Emacs-Guix is an Emacs interface for GNU Guix package manager
 
 License:        GPLv3+
@@ -14,6 +14,7 @@ Source0:        https://emacs-guix.gitlab.io/website/releases/%{name}-%{version}
 # https://gitlab.com/emacs-guix/emacs-guix/-/issues/18
 Patch0:         emacs-guix-0.5.2-guix-api-change.patch
 Patch1:         emacs-guix-0.5.2-emacs-27.patch
+Patch2:         emacs-guix-0.5.2-geiser-0.12.patch
 
 %global debug_package    %{nil}
 %global guile_source_dir %{_datadir}/guile/site/2.2
@@ -106,6 +107,9 @@ fi
 
 
 %changelog
+* Mon Feb 15 2021 Ting-Wei Lan <lantw44@gmail.com> - 0.5.2-4
+- Make it compatible with Geiser 0.12
+
 * Sun Nov  1 2020 Ting-Wei Lan <lantw44@gmail.com> - 0.5.2-3
 - Fix build with Emacs 27