GNU bug report logs - #71989
[PATCH 0/2] gnu: guile-emacs: Remove variable.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 71989 in the body.
You can then email your comments to 71989 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Ada Stevenson <adanskana <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Ada Stevenson <adanskana <at> gmail.com>
Subject: [PATCH 0/2] gnu: guile-emacs: Remove variable.
Date: Mon,  8 Jul 2024 14:17:20 +0800

The `guile-emacs` package appears to be unmaintained and does not build anymore.
Thus, I think it should be removed.

Ada Stevenson (2):
  gnu: guile-emacs: Remove variable.
  gnu: guile-for-guile-emacs: Remove variable.

 gnu/packages/emacs.scm | 40 ----------------------------------------
 gnu/packages/guile.scm | 41 -----------------------------------------
 2 files changed, 81 deletions(-)


base-commit: 5217ea6d45bef053844d8360a06252b9436783b3
-- 
2.45.2

Message #8 received at 71989 <at> debbugs.gnu.org (full text, mbox):

From: Ada Stevenson <adanskana <at> gmail.com>
To: 71989 <at> debbugs.gnu.org
Cc: Ada Stevenson <adanskana <at> gmail.com>
Subject: [PATCH 1/2] gnu: guile-emacs: Remove variable.
Date: Mon,  8 Jul 2024 15:40:08 +0800

This package appears to be unmaintained, and the website that was
hosting its git repository is no longer active.

* gnu/packages/emacs.scm (guile-emacs): Remove variable.

Change-Id: I949762074acf7d9b8a3b219b26b3848db8220946
---
 gnu/packages/emacs.scm | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ed186d221c..b4aebc93d4 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -627,46 +627,6 @@ (define-public emacs-next-pgtk-xwidgets (emacs->emacs-next emacs-pgtk-xwidgets))
 (define-public emacs-next-tree-sitter
   (deprecated-package "emacs-next-tree-sitter" emacs-next))
 
-(define-public guile-emacs
-  (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")
-        (revision "0"))
-    (package
-      (inherit emacs)
-      (name "guile-emacs")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://git.hcoop.net/git/bpt/emacs.git")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (patches (search-patches "guile-emacs-fix-configure.patch"))
-                (sha256
-                 (base32
-                  "0lvcvsz0f4mawj04db35p1dvkffdqkz8pkhc0jzh9j9x2i63kcz6"))))
-      (native-inputs
-       (modify-inputs (package-native-inputs emacs)
-         (prepend autoconf automake guile-for-guile-emacs)))
-      (arguments
-       (substitute-keyword-arguments `(;; Build fails if we allow parallel build.
-                                       #:parallel-build? #f
-                                       ;; Tests aren't passing for now.
-                                       #:tests? #f
-                                       ,@(package-arguments emacs))
-         ((#:configure-flags flags ''())
-          #~(delete "--with-cairo" #$flags))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'autogen
-                (lambda _
-                  (invoke "sh" "autogen.sh")))
-              ;; Build sometimes fails: deps/dispnew.d: No such file or directory
-              (add-before 'build 'make-deps-dir
-                (lambda _
-                  (invoke "mkdir" "-p" "src/deps")))
-              (delete 'restore-emacs-pdmp)
-              (delete 'strip-double-wrap))))))))
-
 (define-public m17n-db
   (package
     (name "m17n-db")
-- 
2.45.2

Message #11 received at 71989 <at> debbugs.gnu.org (full text, mbox):

From: Ada Stevenson <adanskana <at> gmail.com>
To: 71989 <at> debbugs.gnu.org
Cc: Ada Stevenson <adanskana <at> gmail.com>
Subject: [PATCH 2/2] gnu: guile-for-guile-emacs: Remove variable.
Date: Mon,  8 Jul 2024 15:40:09 +0800

This is a dependency for a single package, `guile-emacs`, which appears
to be unmaintained.

* gnu/packages/guile.scm (guile-for-guile-emacs): Remove variable.

Change-Id: I27b82da90db37a40fa5831e453d2ebf0376b6a86
---
 gnu/packages/guile.scm | 41 -----------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index e8705dc7d2..90f024bdfc 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -589,47 +589,6 @@ (define package-for-guile-2.2
                            (guile-variant-package-name "guile2.2")
                            #:deep? #f))
 
-(define-public guile-for-guile-emacs
-  (let ((commit "15ca78482ac0dd2e3eb36dcb31765d8652d7106d")
-        (revision "1"))
-    (package (inherit guile-2.2)
-      (name "guile-for-guile-emacs")
-      (version (git-version "2.1.2" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "git://git.savannah.gnu.org/guile.git")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1l7ik4q4zk7vq4m3gnwizc0b64b1mdr31hxqlzxs94xaf2lvi7s2"))))
-      (arguments
-       (substitute-keyword-arguments (package-arguments guile-2.2)
-         ((#:phases phases)
-          #~(modify-phases #$phases
-             (replace 'bootstrap
-               (lambda _
-                 ;; Disable broken tests.
-                 ;; TODO: Fix them!
-                 (substitute* "test-suite/tests/gc.test"
-                   (("\\(pass-if \"after-gc-hook gets called\"" m)
-                    (string-append "#;" m)))
-                 (substitute* "test-suite/tests/version.test"
-                   (("\\(pass-if \"version reporting works\"" m)
-                    (string-append "#;" m)))
-
-                 (patch-shebang "build-aux/git-version-gen")
-                 (invoke "sh" "autogen.sh")))))))
-      (native-inputs
-       (modify-inputs (package-native-inputs guile-2.2)
-         (prepend autoconf
-                  automake
-                  libtool
-                  flex
-                  texinfo
-                  gettext-minimal))))))
-
 
 ;;;
 ;;; Extensions.
-- 
2.45.2

Message #14 received at 71989 <at> debbugs.gnu.org (full text, mbox):

From: Janneke Nieuwenhuizen <janneke <at> gnu.org>
To: Ada Stevenson <adanskana <at> gmail.com>
Cc: Katherine Cox-Buday <cox.katherine.e+guix <at> gmail.com>, 71989 <at> debbugs.gnu.org,
 Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 Andrew Tropin <andrew <at> trop.in>
Subject: Re: [bug#71989] [PATCH 1/2] gnu: guile-emacs: Remove variable.
Date: Mon, 08 Jul 2024 20:23:30 +0200

[Message part 1 (text/plain, inline)]

Ada Stevenson writes:

Hi!

> This package appears to be unmaintained, and the website that was
> hosting its git repository is no longer active.

So...using the attached patch, the guile-emacs build reaches

--8<---------------cut here---------------start------------->8---
prerocessing OKURI-ARI entries ...
Processing POSTFIX entries ...
Processing PREFIX entries ...
Collecting OKURI-NASI entries ...
collected 26% ...
collected 30% ...
collected 40% ...
--8<---------------cut here---------------end--------------->8---

running

--8<---------------cut here---------------start------------->8---
guixbui+ 11628 11626 99 19:15 ?        02:12:52 ../src/emacs -batch --no-site-file --no-site-lisp -batch -l ja-dic-cnv -f batch-skkdic-convert -dir ./../lisp/leim/ja-dic SKK-DIC/SKK-JISYO.L
--8<---------------cut here---------------end--------------->8---

without apparent progress for hours (at 200% CPU)...

So yeah, unless someone wants to take this up, prolly best to remove it :'-(

Janneke

[0001-gnu-guile-emacs-Update-to-0.0.0-0.8bc3ef5-and-resurr.patch (text/x-patch, inline)]

From ff0603076b23010834573d922566dea978f75c64 Mon Sep 17 00:00:00 2001
Message-ID: <ff0603076b23010834573d922566dea978f75c64.1720462624.git.janneke <at> gnu.org>
From: Janneke Nieuwenhuizen <janneke <at> gnu.org>
Date: Mon, 8 Jul 2024 08:42:22 +0200
Subject: [PATCH] gnu: guile-emacs: Update to 0.0.0-0.8bc3ef5 and resurrect
 build.

Change-Id: I7a671f0e43885bce16bab9af4a87d8577c6a31c7

* gnu/packages/emacs.scm (guile-emacs): Update to
8bc3ef5f21fd83216349fba54e3ba13ebd73828c.
[phases]: Add `allow-PATCH-PROGRAM-FILE-NAMES-to-succeed' phase.

Change-Id: Ia15983923e9a6c98f033c17ac59555a83a1e5721
---
 gnu/packages/emacs.scm | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 6557180139..ba301e8f86 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2017, 2019, 2020, 2023, 2024 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2017 Alex Vong <alexvong1995 <at> gmail.com>
 ;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado <at> elephly.net>
-;;; Copyright © 2017, 2023 Janneke Nieuwenhuizen <janneke <at> gnu.org>
+;;; Copyright © 2017, 2023, 2024 Janneke Nieuwenhuizen <janneke <at> gnu.org>
 ;;; Copyright © 2018, 2023 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe <at> gmail.com>
 ;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice <me <at> tobias.gr>
@@ -607,7 +607,7 @@ (define-public emacs-next-tree-sitter
   (deprecated-package "emacs-next-tree-sitter" emacs-next))
 
 (define-public guile-emacs
-  (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")
+  (let ((commit "8bc3ef5f21fd83216349fba54e3ba13ebd73828c")
         (revision "0"))
     (package
       (inherit emacs)
@@ -622,7 +622,7 @@ (define-public guile-emacs
                 (patches (search-patches "guile-emacs-fix-configure.patch"))
                 (sha256
                  (base32
-                  "0lvcvsz0f4mawj04db35p1dvkffdqkz8pkhc0jzh9j9x2i63kcz6"))))
+                  "1fi9gldsd2m5k6gd9q32iw1sdlb2w9kqc1jlyipvz5mc20rwq284"))))
       (native-inputs
        (modify-inputs (package-native-inputs emacs)
          (prepend autoconf automake guile-for-guile-emacs)))
@@ -643,6 +643,17 @@ (define-public guile-emacs
               (add-before 'build 'make-deps-dir
                 (lambda _
                   (invoke "mkdir" "-p" "src/deps")))
+              (add-after 'unpack 'allow-PATCH-PROGRAM-FILE-NAMES-to-succeed
+                ;;Instead of copying most of `patch-program-file-names',
+                ;;touch missing files.
+                (lambda _
+                  (define (touch file-name)
+                    (with-output-to-file file-name
+                      (lambda _ (display ""))))
+                  (for-each touch '("lisp/gnus/gnus-search.el"
+                                    "lisp/obsolete/nnir.el"
+                                    "lisp/org/ob-sed.el"))))
+              (delete 'patch-compilation-driver)
               (delete 'restore-emacs-pdmp)
               (delete 'strip-double-wrap))))))))
 

base-commit: 6eb19661c5202fdc2e6b27bb078ba4e528f3b984
-- 
2.45.1

[Message part 3 (text/plain, inline)]

-- 
Janneke Nieuwenhuizen <janneke <at> gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com

Message #17 received at 71989 <at> debbugs.gnu.org (full text, mbox):

From: Rick Huijzer <ikbenrickhuyzer <at> gmail.com>
To: 71989 <at> debbugs.gnu.org
Subject: bug: guile-emacs still doesn't build
Date: Tue, 24 Sep 2024 18:44:21 +0200

[Message part 1 (text/plain, inline)]

Bump!

Hi,

Can someone take a look at this? I came across this bug, a not building
package, when building all the dependent packages of libusb.

It seems fine to me to remove the package, at least for the time being.
Development seems to have stalled a long time ago.


-- 
Met vriendelijke groet,

Rick Huijzer

[Message part 2 (text/html, inline)]

Message #22 received at 71989-done <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 71989-done <at> debbugs.gnu.org
Cc: Ada Stevenson <adanskana <at> gmail.com>,
 Rick Huijzer <ikbenrickhuyzer <at> gmail.com>,
 Janneke Nieuwenhuizen <janneke <at> gnu.org>
Subject: Re: [PATCH 0/2] gnu: guile-emacs: Remove variable.
Date: Fri, 14 Mar 2025 17:01:41 +0000

Pushed, thanks!

Message #25 received at 71989-done <at> debbugs.gnu.org (full text, mbox):

From: Janneke Nieuwenhuizen <janneke <at> gnu.org>
To: Arun Isaac <arunisaac <at> systemreboot.net>
Cc: Ada Stevenson <adanskana <at> gmail.com>, 71989-done <at> debbugs.gnu.org,
 Rick Huijzer <ikbenrickhuyzer <at> gmail.com>
Subject: Re: [PATCH 0/2] gnu: guile-emacs: Remove variable.
Date: Fri, 14 Mar 2025 18:18:49 +0100

Arun Isaac writes:

> Pushed, thanks!

What madness is this?  The Guile-Emacs project was resurrected in
December and we were the first distro to package this new effort?

Greetings,
Janneke

-- 
Janneke Nieuwenhuizen <janneke <at> gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com

Message #28 received at 71989-done <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: Janneke Nieuwenhuizen <janneke <at> gnu.org>
Cc: Ada Stevenson <adanskana <at> gmail.com>, 71989-done <at> debbugs.gnu.org,
 Rick Huijzer <ikbenrickhuyzer <at> gmail.com>
Subject: Re: [PATCH 0/2] gnu: guile-emacs: Remove variable.
Date: Fri, 14 Mar 2025 17:34:26 +0000

Hi Janneke,

Oops, sorry! I saw the old consensus on this issue to remove
guile-emacs, and did so without looking at the new work on guile-emacs.
I have reverted my commits now.

Regards,
Arun

Message #31 received at 71989-done <at> debbugs.gnu.org (full text, mbox):

From: Janneke Nieuwenhuizen <janneke <at> gnu.org>
To: Arun Isaac <arunisaac <at> systemreboot.net>
Cc: Ada Stevenson <adanskana <at> gmail.com>, 71989-done <at> debbugs.gnu.org,
 Rick Huijzer <ikbenrickhuyzer <at> gmail.com>
Subject: Re: [PATCH 0/2] gnu: guile-emacs: Remove variable.
Date: Fri, 14 Mar 2025 18:40:05 +0100

Arun Isaac writes:

> Hi Janneke,
>
> Oops, sorry! I saw the old consensus on this issue to remove
> guile-emacs, and did so without looking at the new work on guile-emacs.
> I have reverted my commits now.

Thank you, you raced me.  I wanted to apologize for my tone...I guess I
should take some rest.

What I meant to say was: I spent two days in December to resurrect it,
sorry I failed to notice there were problems.  I'll look into this.

Greetings,
Janneke.

-- 
Janneke Nieuwenhuizen <janneke <at> gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com

Message #34 received at 71989-done <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: Janneke Nieuwenhuizen <janneke <at> gnu.org>, Arun Isaac
 <arunisaac <at> systemreboot.net>
Cc: Ada Stevenson <adanskana <at> gmail.com>, 71989-done <at> debbugs.gnu.org,
 Rick Huijzer <ikbenrickhuyzer <at> gmail.com>
Subject: Re: [bug#71989] [PATCH 0/2] gnu: guile-emacs: Remove variable.
Date: Fri, 14 Mar 2025 20:46:08 +0100

On 2025-03-14 18:40, Janneke Nieuwenhuizen wrote:

> Arun Isaac writes:
>
>> Hi Janneke,
>>
>> Oops, sorry! I saw the old consensus on this issue to remove
>> guile-emacs, and did so without looking at the new work on guile-emacs.
>> I have reverted my commits now.
>
> Thank you, you raced me.  I wanted to apologize for my tone...I guess I
> should take some rest.
>
> What I meant to say was: I spent two days in December to resurrect it,
> sorry I failed to notice there were problems.  I'll look into this.

Looked into this quickly too.  I guess what's missing is a right commit
for both guile-emacs and guile-for-guile-emacs that work together, and
have Guix development channels for both of them.

There's an email on the guile-emacs mailing list with 2 patch series in
codeberg, I guess they should work together.  It's true indeed that it's
hindering development in Guix that we don't have a "clean setup".

-- 
Best regards,
Nicolas Graves

Message #37 received at 71989-done <at> debbugs.gnu.org (full text, mbox):

From: Janneke Nieuwenhuizen <janneke <at> gnu.org>
To: Arun Isaac <arunisaac <at> systemreboot.net>
Cc: Ada Stevenson <adanskana <at> gmail.com>, 71989-done <at> debbugs.gnu.org,
 Rick Huijzer <ikbenrickhuyzer <at> gmail.com>
Subject: Re: [PATCH 0/2] gnu: guile-emacs: Remove variable.
Date: Sat, 15 Mar 2025 12:08:23 +0100

Janneke Nieuwenhuizen writes:

Hello,

> Arun Isaac writes:
>
>> Hi Janneke,
>>
>> Oops, sorry! I saw the old consensus on this issue to remove
>> guile-emacs, and did so without looking at the new work on guile-emacs.
>> I have reverted my commits now.
>
> Thank you, you raced me.  I wanted to apologize for my tone...I guess I
> should take some rest.
>
> What I meant to say was: I spent two days in December to resurrect it,
> sorry I failed to notice there were problems.  I'll look into this.

Reading this bug I now understand what caused my confusion, this bug was
filed in July 2024

> From: Ada Stevenson <adanskana <at> gmail.com>
> Date: Mon, 8 Jul 2024 14:17:20 +0800 (35 weeks, 5 days, 2 hours ago) 
> 
> The `guile-emacs` package appears to be unmaintained and does not build anymore.
> Thus, I think it should be removed.

and I even tried to ressurrect the build later, and only partially
succeeded (i.e., I failed), and I wrote

> So yeah, unless someone wants to take this up, prolly best to remove it :'-(

However, a fix for guile-for-guile-emacs a week ago missed cc'ing this bug

    <https://issues.guix.gnu.org/76752>

I saw this bug but was too busy to look...and I assumed this was the
reason guile-emacs got removed.  At Emacsconf in December 2024, Robin
Templeton announced they resurrected the Guile-Emacs project, with a new
website: https://guile-emacs.org, and a new git repository.  I updated
both guile-for-guile-emacs and guile-emacs

--8<---------------cut here---------------start------------->8---
4e8710b280c gnu: guile-emacs: Update home-page.
e46bc3d9282 gnu: guile-emacs: Support running emacs from the store.
0fae91a5ef6 gnu: guile-emacs: Remove hardcoded version from EMACSLOADPATH.
c09cd73f5cc gnu: guile-emacs: Update to 8f87cbc1dae6a9e77368afc5736df8c342e9153d.
e613e45274c gnu: guile-for-guile-emacs: Update to wip-elisp-rebased.
--8<---------------cut here---------------end--------------->8---

Sorry for the confusion and forgetting about this bug.

I'll open a new bug to update the December 2024 guile-emacs (and
possibly guile-for-guile-emacs) to a more recent version hopefully later
today.

Greetings,
Janneke

-- 
Janneke Nieuwenhuizen <janneke <at> gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com

Message #40 received at 71989 <at> debbugs.gnu.org (full text, mbox):

From: Janneke Nieuwenhuizen <janneke <at> gnu.org>
To: guix-patches <at> gnu.org
Cc: 71989 <at> debbugs.gnu.org
Subject: [PATCH 0/2] gnu: guile-emacs: Update to
 f2d0459d6a4cda8b7c38b6fb12a55f1330ba50fa.
Date: Sat, 15 Mar 2025 12:50:01 +0100

The recent confusion about guile-emacs being declared dead July 2024 and its
resurrection December 2024 (https://issues.guix.gnu.org/71989) inspired me to
update the December 2024 snapshots.

Note that guile-emacs' emacs is still best started using -Q, as not all elisp
constructs are supported.

Greetings,
Janneke

Janneke Nieuwenhuizen (2):
  gnu: guile-for-guile-emacs: Update to
    e62c0d1b32f625fcbaa733c32a88622846aee905.
  gnu: guile-emacs: Update to f2d0459d6a4cda8b7c38b6fb12a55f1330ba50fa.

 gnu/local.mk                                  |   1 -
 gnu/packages/emacs.scm                        |  25 +++--
 gnu/packages/guile.scm                        |  10 +-
 .../patches/guile-emacs-build-fixes.patch     | 100 ------------------
 4 files changed, 22 insertions(+), 114 deletions(-)
 delete mode 100644 gnu/packages/patches/guile-emacs-build-fixes.patch


base-commit: 412f411d4f8780e6b60b448caae17f01c09be0eb
-- 
2.47.1

Message #43 received at 71989 <at> debbugs.gnu.org (full text, mbox):

From: Janneke Nieuwenhuizen <janneke <at> gnu.org>
To: 77031 <at> debbugs.gnu.org
Cc: 71989 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: guile-for-guile-emacs: Update to
 e62c0d1b32f625fcbaa733c32a88622846aee905.
Date: Sat, 15 Mar 2025 12:53:36 +0100

* gnu/packages/guile.scm (guile-for-guile-emacs): Update to
e62c0d1b32f625fcbaa733c32a88622846aee905, from
https://codeberg.org/lyrra/guile.

Change-Id: Ic1a48865bfd9ee1201671b1f4b5e3659c084d71f
---
 gnu/packages/guile.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 7e1f9a7c1c6..0e600fbc092 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2014, 2016, 2018 David Thompson <davet <at> gnu.org>
 ;;; Copyright © 2014, 2017, 2018 Mark H Weaver <mhw <at> netris.org>
 ;;; Copyright © 2015, 2017 Christine Lemmer-Webber <cwebber <at> dustycloud.org>
-;;; Copyright © 2016, 2023, 2024 Janneke Nieuwenhuizen <janneke <at> gnu.org>
+;;; Copyright © 2016, 2023, 2024, 2025 Janneke Nieuwenhuizen <janneke <at> gnu.org>
 ;;; Copyright © 2016, 2017 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2016, 2019, 2020 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2017 Andy Wingo <wingo <at> igalia.com>
@@ -612,20 +612,20 @@ (define package-for-guile-2.2
                            #:deep? #f))
 
 (define-public guile-for-guile-emacs
-  (let ((commit "4b9b8277733729f5b825f78fadfead9fc3630e7e")
-        (revision "0"))
+  (let ((commit "e62c0d1b32f625fcbaa733c32a88622846aee905")
+        (revision "2"))
     (package (inherit guile-next)
       (name "guile-for-guile-emacs")
       (version (git-version "3.0.7-81" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "git://git.savannah.gnu.org/guile.git")
+                      (url "https://codeberg.org/lyrra/guile")
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0fgkcv29581kqkxqq6y48xly72970qs7016qhs6c4ilygg0gyfqb"))))
+                  "0xfnd99iws9dwk5va8bmqpysmb8pnb1w91rw7rbfzzklyfvpibh6"))))
       (arguments
        (substitute-keyword-arguments (package-arguments guile-next)
          ((#:phases phases '%standard-phases)
-- 
2.47.1

Message #46 received at 71989 <at> debbugs.gnu.org (full text, mbox):

From: Janneke Nieuwenhuizen <janneke <at> gnu.org>
To: 77031 <at> debbugs.gnu.org
Cc: 71989 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: guile-emacs: Update to
 f2d0459d6a4cda8b7c38b6fb12a55f1330ba50fa.
Date: Sat, 15 Mar 2025 12:53:37 +0100

* gnu/packages/patches/guile-emacs-build-fixes.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/emacs.scm (guile-emacs): Update to
f2d0459d6a4cda8b7c38b6fb12a55f1330ba50fa.
[inputs]: Add imagemagick.
[synopsis, description]: Update.
[arguments]: Add --with-imagemagick.  Remove #:tests? #f (upstream has
disabled the test suite).

Change-Id: I585e8884635c02f5df38d9418f04ac0ae750303d
---
 gnu/local.mk                                  |   1 -
 gnu/packages/emacs.scm                        |  25 +++--
 .../patches/guile-emacs-build-fixes.patch     | 100 ------------------
 3 files changed, 17 insertions(+), 109 deletions(-)
 delete mode 100644 gnu/packages/patches/guile-emacs-build-fixes.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index d0388126900..4cb60ade0ff 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1559,7 +1559,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/guile-lzlib-hurd64.patch			\
   %D%/packages/patches/guile-present-coding.patch		\
   %D%/packages/patches/guile-rsvg-pkgconfig.patch		\
-  %D%/packages/patches/guile-emacs-build-fixes.patch		\
   %D%/packages/patches/gtk2-fix-builder-test.patch		\
   %D%/packages/patches/gtk2-harden-list-store.patch		\
   %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch	\
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index c5e671c6a98..fb72b275444 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2017, 2019, 2020, 2023, 2024 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2017 Alex Vong <alexvong1995 <at> gmail.com>
 ;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado <at> elephly.net>
-;;; Copyright © 2017, 2023, 2024 Janneke Nieuwenhuizen <janneke <at> gnu.org>
+;;; Copyright © 2017, 2023, 2024, 2025 Janneke Nieuwenhuizen <janneke <at> gnu.org>
 ;;; Copyright © 2018, 2023 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe <at> gmail.com>
 ;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice <me <at> tobias.gr>
@@ -69,6 +69,7 @@ (define-module (gnu packages emacs)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages lesstif)   ; motif
   #:use-module (gnu packages linux)     ; alsa-lib, gpm
   #:use-module (gnu packages mail)      ; for mailutils
@@ -639,8 +640,8 @@ (define-public emacs-next-tree-sitter
 
 (define-public guile-emacs
   (let ((upstream-version "31.0.50")
-        (commit "8f87cbc1dae6a9e77368afc5736df8c342e9153d")
-        (revision "0"))
+        (commit "f2d0459d6a4cda8b7c38b6fb12a55f1330ba50fa")
+        (revision "2"))
     (package
       (inherit emacs)
       (name "guile-emacs")
@@ -651,18 +652,25 @@ (define-public guile-emacs
                       (url "https://codeberg.org/lyrra/guilemacs")
                       (commit commit)))
                 (file-name (git-file-name name version))
-                (patches (search-patches "guile-emacs-build-fixes.patch"))
                 (sha256
                  (base32
-                  "1yhxy6d5i673y35i66d2x975zih3cw6p59ylsb8xk68wds6s7xrl"))))
+                  "0ry0dn9xrndpz54hs92dnnsw4xa4qn4lz898ldlh2rs47ah1f4wl"))))
       (native-inputs
        (modify-inputs (package-native-inputs emacs)
          (prepend autoconf automake guile-for-guile-emacs)))
+      (inputs
+       (modify-inputs (package-inputs emacs)
+         (prepend imagemagick)))
       (home-page "https://guile-emacs.org")
+      (synopsis "Emacs text editor powered by Guile('s elisp implementation)")
+      (description
+       "Guile-Emacs brings Emacs and Guile together by providing a new Elisp
+implementation based on Guile's compiler technology, serving as the basis for
+a more expressive and extensible version of Elisp.
+
+Started in 2014 as a GSOC project, Guile-Emacs was resurrected in 2024.")
       (arguments
-       (substitute-keyword-arguments `(;; Tests aren't passing for now.
-                                       #:tests? #f
-                                       #:strip-binaries? #f
+       (substitute-keyword-arguments `(#:strip-binaries? #f
                                        ,@(package-arguments emacs))
          ((#:configure-flags flags ''())
           #~`("CFLAGS=-Og -ggdb3"
@@ -672,6 +680,7 @@ (define-public guile-emacs
               "--with-jpeg=no"
               "--without-cairo"
               "--without-tree-sitter"
+              "--with-imagemagick"
               ,@(fold delete #$flags '("--with-cairo"
                                        "--with-modules"
                                        "--with-native-compilation=aot"))))
diff --git a/gnu/packages/patches/guile-emacs-build-fixes.patch b/gnu/packages/patches/guile-emacs-build-fixes.patch
deleted file mode 100644
index 3fb173b4900..00000000000
--- a/gnu/packages/patches/guile-emacs-build-fixes.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 49e8725b66cb721931a9a5f0f35405e19ccee956 Mon Sep 17 00:00:00 2001
-From: Janneke Nieuwenhuizen <janneke <at> gnu.org>
-Date: Sat, 7 Dec 2024 20:52:04 +0100
-Subject: [PATCH 1/3] robin's patch.
-
----
- src/gtkutil.c | 4 ++--
- src/print.c   | 5 ++---
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/gtkutil.c b/src/gtkutil.c
-index b1471d56eb9..be72b50c9ef 100644
---- a/src/gtkutil.c
-+++ b/src/gtkutil.c
-@@ -241,13 +241,13 @@ xg_display_open (char *display_name, GdkDisplay **dpy)
- {
-   GdkDisplay *gdpy;
- 
--  unrequest_sigio ();  /* See comment in x_display_ok, xterm.c.  */
-+  // unrequest_sigio ();  /* See comment in x_display_ok, xterm.c.  */
- #ifndef HAVE_PGTK
-   gdpy = gdk_display_open (display_name);
- #else
-   gdpy = gdk_display_open (strlen (display_name) == 0 ? NULL : display_name);
- #endif
--  request_sigio ();
-+  // request_sigio ();
-   if (!gdpy_def && gdpy)
-     {
-       gdpy_def = gdpy;
-diff --git a/src/print.c b/src/print.c
-index 002274bd7da..e2c2251bf5c 100644
---- a/src/print.c
-+++ b/src/print.c
-@@ -2532,9 +2532,8 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag)
-         else
-           scm_write (obj, port);
-         scm_display (SCM_MAKE_CHAR ('>'), port);
--        //guilemacs: this looks wrong (size_byte = -1)
--        //strout (scm_to_locale_string (scm_get_output_string (port)),
--        //        -1, -1, printcharfun);
-+	char* str = scm_to_locale_string (scm_get_output_string (port));
-+	strout (str, strlen(str), strlen(str), printcharfun);
-         scm_close_port (port);
-       }
-       break;
--- 
-2.46.0
-
-From 325fc39906198c33d78e33895e385916099a283f Mon Sep 17 00:00:00 2001
-From: Janneke Nieuwenhuizen <janneke <at> gnu.org>
-Date: Sat, 7 Dec 2024 19:00:45 +0100
-Subject: [PATCH 2/3] src/xfns.c: Link fix.
-
----
- src/xfns.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/xfns.c b/src/xfns.c
-index 858402613b4..94fde4b9e84 100644
---- a/src/xfns.c
-+++ b/src/xfns.c
-@@ -8921,7 +8921,8 @@ x_hide_tip (bool delete)
-       else
- 	tip_frame = Qnil;
- 
--      return unbind_to (count, was_open);
-+      dynwind_end ();
-+      return was_open;
-     }
- #else /* not USE_GTK */
-   if (NILP (tip_frame)
--- 
-2.46.0
-
-From 7754d875df5c9cb8fefa44604061479108429bce Mon Sep 17 00:00:00 2001
-From: Janneke Nieuwenhuizen <janneke <at> gnu.org>
-Date: Sat, 7 Dec 2024 20:14:17 +0100
-Subject: [PATCH 3/3] dump fix: comment use of cl-function-documentation.
-
----
- lisp/simple.el | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lisp/simple.el b/lisp/simple.el
-index 15c790226b5..d1ceded84ae 100644
---- a/lisp/simple.el
-+++ b/lisp/simple.el
-@@ -2800,7 +2800,7 @@ command-completion--command-for-this-buffer-function
- '(cl-defmethod function-documentation ((function accessor))
-   (oclosure--accessor-docstring function)) ;; FIXME: η-reduce!
- 
--(cl-defmethod function-documentation ((f cconv--interactive-helper))
-+'(cl-defmethod function-documentation ((f cconv--interactive-helper))
-   (function-documentation (cconv--interactive-helper--fun f)))
- 
- ;; This should be in `oclosure.el' but that file is loaded before `cl-generic'.
--- 
-2.46.0
-
-- 
2.47.1

Message #49 received at 71989 <at> debbugs.gnu.org (full text, mbox):

From: Ian Eure <ian <at> retrospec.tv>
To: Janneke Nieuwenhuizen <janneke <at> gnu.org>
Cc: 71989 <at> debbugs.gnu.org, 77031 <at> debbugs.gnu.org,
 Katherine Cox-Buday <cox.katherine.e+guix <at> gmail.com>,
 Cayetano Santos <csantosb <at> inventati.org>, Andrew Tropin <andrew <at> trop.in>,
 Divya Ranjan Pattanaik <divya <at> subvertising.org>,
 Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Subject: Re: [bug#77031] [PATCH 0/2] gnu: guile-emacs: Update to
 f2d0459d6a4cda8b7c38b6fb12a55f1330ba50fa.
Date: Sat, 15 Mar 2025 08:26:29 -0700

Hi Janneke,

Thanks for the patches.  Pushed!

 -- Ian

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.