Subject: [bug#71319] [PATCH v4 1/3] gnu: emacs-ddskk: Update to 17.1 revision 0.

From: gemmaro <[email-masked]>
Date: Sat, 22 Jun 2024 08:02:54 +0900

* gnu/packages/emacs-xyz.scm (emacs-ddskk): Update to 17.1 revision 0 (commit 8c47f46).
[arguments]: The SKK-MK and the doc files are now not explicitly made writable.
The rm in nicola/Makefile is fixed.
(emacs-ddskk-nicola)[arguments]: Move the chdir phase after the fix-test phase.
The NICOLA-DDSKK-CFG file is now not explicitly made writable.

Change-Id: I7a312f1dbbeb93666121646dd79becdd08f16b79
---
 gnu/packages/emacs-xyz.scm | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index d000e7fd02..ae6f1ed3d9 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -141,6 +141,7 @@
 ;;; Copyright © 2024 Ilya Chernyshov <[email-masked]>
 ;;; Copyright © 2024 Wilko Meyer <[email-masked]>
 ;;; Copyright © 2024 Noé Lopez <[email-masked]>
+;;; Copyright © 2024 gemmaro <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37016,22 +37017,20 @@ (define-public emacs-org-static-blog
     (license license:bsd-3)))
 
 (define-public emacs-ddskk
-  ;; XXX: Upstream adds code names to their release tags, so version and code
-  ;; name below need to be updated together.
-  (let ((version "17.1")
-        (code-name "Neppu"))
+  (let ((commit "8c47f46e38a29a0f3eabcd524268d20573102467")
+        (revision "0"))
     (package
       (name "emacs-ddskk")
-      (version version)
+      (version (git-version "17.1" revision commit))
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
                (url "https://github.com/skk-dev/ddskk")
-               (commit (string-append "ddskk-" version "_" code-name))))
+               (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0xm53rybxki2784gyjkafg6956viyhhcq51kbmnrwc6aw3yzh7aw"))))
+          (base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72"))))
       (build-system gnu-build-system)
       (arguments
        `(#:modules ((guix build gnu-build-system)
@@ -37044,17 +37043,17 @@ (define-public emacs-ddskk
          (modify-phases %standard-phases
            (replace 'configure
              (lambda* (#:key outputs #:allow-other-keys)
-               (make-file-writable "SKK-MK")
                (emacs-substitute-variables "SKK-MK"
                  ("PREFIX" (assoc-ref outputs "out"))
                  ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX))
                  ("SKK_PREFIX" "")
                  ("SKK_INFODIR" '(expand-file-name "info" PREFIX)))
-               (for-each make-file-writable (find-files "./doc"))
                #t))
            (add-after 'unpack 'fix-test
              (lambda _
                (substitute* "Makefile"
+                 (("/bin/rm") (which "rm")))
+               (substitute* "nicola/Makefile"
                  (("/bin/rm") (which "rm"))))))))
       (native-inputs
        (list emacs-minimal ruby))
@@ -37081,13 +37080,12 @@ (define-public emacs-ddskk-nicola
        ,@(substitute-keyword-arguments (package-arguments emacs-ddskk)
            ((#:phases phases)
             `(modify-phases ,phases
-               (add-after 'unpack 'chdir
+               (add-after 'fix-test 'chdir
                  (lambda _
                    (chdir "nicola")
                    #t))
                (replace 'configure
                  (lambda* (#:key outputs #:allow-other-keys)
-                   (make-file-writable "NICOLA-DDSKK-CFG")
                    (emacs-substitute-sexps "NICOLA-DDSKK-CFG"
                      ("setq NICOLA-DDSKK_PREFIX" ""))
                    #t)))))))

base-commit: 594419b09e124b84d3d6141f1e47b5c346eeb704
-- 
2.45.1