Subject: [bug#71592] [PATCH 1/3] gnu: emacs-org: Update to 9.7.4.

From: "Suhail Singh" <[email-masked]>
Date: Sun, 16 Jun 2024 11:29:25 -0400

* gnu/packages/emacs-xyz.scm (emacs-org): Update to 9.7.4.

Change-Id: Iec5f62a5d4a8c23f939aef118473b81a2dc9122b
---
 gnu/packages/emacs-xyz.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index da4a2340fe..9a57a0fbf7 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17118,7 +17118,7 @@ (define-public emacs-neotree
 (define-public emacs-org
   (package
     (name "emacs-org")
-    (version "9.6.30")
+    (version "9.7.4")
     (source
      (origin
        (method git-fetch)
@@ -17127,7 +17127,7 @@ (define-public emacs-org
              (commit (string-append "release_" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0v4b3yl4limrq3jgf0jvvx73cs7d36p14c2x93pdvn50mjykii3f"))))
+        (base32 "00crs2q4yvmv2jgzmcfyl2g6m7g42zpggyssmcj8anwrsp748z9b"))))
     (build-system emacs-build-system)
     (arguments
      (list
@@ -17156,8 +17156,7 @@ (define-public emacs-org
                 (for-each make-file-writable
                           '("babel.org"
                             "ob-awk-test.org"
-                            "ob-sed-test.org"
-                            "ob-shell-test.org"))
+                            "ob-sed-test.org"))
                 ;; Specify where sh executable is.
                 (let ((sh (search-input-file inputs "/bin/sh")))
                   (substitute* "babel.org"
@@ -17166,6 +17165,11 @@ (define-public emacs-org
               (substitute* "testing/lisp/test-ob-shell.el"
                 (("ob-shell/remote-with-stdin-or-cmdline .*" all)
                  (string-append all "  (skip-unless nil)\n")))
+              ;; XXX: ob-tangle/collect-blocks fails because the test assumes
+              ;; that ~/../.. corresponds to /.  This isn't true in our case.
+              (substitute* "testing/lisp/test-ob-tangle.el"
+                (("ob-tangle/collect-blocks .*" all)
+                 (string-append all "  (skip-unless nil)\n")))
               (substitute* "testing/lisp/test-org.el"
                 (("test-org/org-(encode-time|time-string-to-time) .*" all)
                  (string-append all "  (skip-unless nil)\n")))))
-- 
2.45.2