diff mbox series

[bug#71989,1/2] gnu: guile-emacs: Remove variable.

Message ID 8734ojivz1.fsf@gnu.org
State New
Headers show
Series [bug#71989,1/2] gnu: guile-emacs: Remove variable. | expand

Commit Message

Janneke Nieuwenhuizen July 8, 2024, 6:23 p.m. UTC 
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
diff mbox series

Patch

From ff0603076b23010834573d922566dea978f75c64 Mon Sep 17 00:00:00 2001
Message-ID: <ff0603076b23010834573d922566dea978f75c64.1720462624.git.janneke@gnu.org>
From: Janneke Nieuwenhuizen <janneke@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@gmail.com>
 ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2017, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2017, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2018, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice <me@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