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

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

[Ada Stevenson]

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

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

[Ada Stevenson]

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

[bug#71989] [PATCH 2/2] gnu: guile-for-guile-emacs: Remove variable.

[Ada Stevenson]

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))))))
-
 \f
 ;;;
 ;;; Extensions.
-- 
2.45.2

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

[Janneke Nieuwenhuizen]

[-- Attachment #1: Type: text/plain, Size: 999 bytes --]

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


[-- Attachment #2: 0001-gnu-guile-emacs-Update-to-0.0.0-0.8bc3ef5-and-resurr.patch --]
[-- Type: text/x-patch, Size: 3242 bytes --]

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


[-- Attachment #3: Type: text/plain, Size: 164 bytes --]


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