From ff0603076b23010834573d922566dea978f75c64 Mon Sep 17 00:00:00 2001 Message-ID: From: Janneke Nieuwenhuizen 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 ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017, 2018 Ricardo Wurmus -;;; Copyright © 2017, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2017, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2018, 2023 Efraim Flashner ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice @@ -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