GNU bug report logs - #57013
[PATCH] Fix mu4e in mu 1.8.7.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 57013 in the body.
You can then email your comments to 57013 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <cjpeople2013 <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] Fix mu4e in mu 1.8.7.
Date: Fri, 5 Aug 2022 21:36:00 -0500

[Message part 1 (text/plain, inline)]

[0001-gnu-mu-Fix-autoloads-generation.patch (text/x-patch, attachment)]

[0002-gnu-mu-Use-G-expressions.patch (text/x-patch, attachment)]

Message #8 received at 57013 <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: 57013 <at> debbugs.gnu.org
Subject: Re: bug#57013: Acknowledgement ([PATCH] Fix mu4e in mu 1.8.7.)
Date: Sat, 06 Aug 2022 11:11:47 +0800

[Message part 1 (text/plain, inline)]

For maintainers: Please also cc to this mail address for discussion. :)
-- 
Retrieve my PGP public key:

  gpg --recv-keys 481F5EEEBA425ADC13247C76A6E672D981B8E744

Zihao

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 57013 <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: 57013 <at> debbugs.gnu.org
Subject: Re: bug#57013: Acknowledgement ([PATCH] Fix mu4e in mu 1.8.7.)
Date: Fri, 19 Aug 2022 13:35:34 +0800

[Message part 1 (text/plain, inline)]

Rebase on master.

[0001-gnu-mu-Fix-autoloads-generation.patch (text/x-patch, inline)]

From f5b3a6e3ae7b6ca5d84f3f6a01459bdea40bb4cf Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last <at> 163.com>
Date: Sat, 6 Aug 2022 00:08:37 +0800
Subject: [PATCH 1/2] gnu: mu: Fix autoloads generation.

* gnu/packages/mail.scm (mu)[arguments]<#:phases>: In phase
'install-emacs-autoloads', fix the path to mu4e files to generate autoloads.
---
 gnu/packages/mail.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index b4b3162fff..530cd29f4d 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1201,7 +1201,7 @@ (define-public mu
              (emacs-generate-autoloads
               "mu4e"
               (string-append (assoc-ref outputs "out")
-                             "/share/emacs/site-lisp")))))))
+                             "/share/emacs/site-lisp/mu4e")))))))
     (home-page "https://www.djcbsoftware.nl/code/mu/")
     (synopsis "Quickly find emails")
     (description
-- 
2.37.1

[0002-gnu-mu-Use-G-expressions.patch (text/x-patch, inline)]

From 10c6a67905d784da4173a05c7ea6d331cf8fd88d Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last <at> 163.com>
Date: Fri, 19 Aug 2022 13:33:20 +0800
Subject: [PATCH 2/2] gnu: mu: Use G-expressions.

* gnu/packages/mail.scm (mu)[arguments]: Use G-expressions.
---
 gnu/packages/mail.scm | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 530cd29f4d..646902b4db 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1179,29 +1179,30 @@ (define-public mu
     (inputs
      (list glib gmime xapian))
     (arguments
-     `(#:modules ((guix build meson-build-system)
+     (list
+      #:modules '((guix build meson-build-system)
                   (guix build emacs-utils)
                   (guix build utils))
-       #:imported-modules (,@%meson-build-system-modules
+      #:imported-modules `(,@%meson-build-system-modules
                            (guix build emacs-utils))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-bin-references
-           (lambda _
-             (substitute* '("guile/tests/test-mu-guile.cc"
-                            "mu/tests/test-mu-cmd.cc"
-                            "mu/tests/test-mu-cmd-cfind.cc"
-                            "mu/tests/test-mu-query.cc")
-               (("/bin/sh") (which "sh")))
-             (substitute* '("lib/tests/bench-indexer.cc"
-                            "lib/utils/mu-test-utils.cc")
-               (("/bin/rm") (which "rm")))))
-         (add-after 'install 'install-emacs-autoloads
-           (lambda* (#:key outputs #:allow-other-keys)
-             (emacs-generate-autoloads
-              "mu4e"
-              (string-append (assoc-ref outputs "out")
-                             "/share/emacs/site-lisp/mu4e")))))))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-bin-references
+            (lambda _
+              (substitute* '("guile/tests/test-mu-guile.cc"
+                             "mu/tests/test-mu-cmd.cc"
+                             "mu/tests/test-mu-cmd-cfind.cc"
+                             "mu/tests/test-mu-query.cc")
+                (("/bin/sh") (which "sh")))
+              (substitute* '("lib/tests/bench-indexer.cc"
+                             "lib/utils/mu-test-utils.cc")
+                (("/bin/rm") (which "rm")))))
+          (add-after 'install 'install-emacs-autoloads
+            (lambda* (#:key outputs #:allow-other-keys)
+              (emacs-generate-autoloads
+               "mu4e"
+               (string-append (assoc-ref outputs "out")
+                              "/share/emacs/site-lisp/mu4e")))))))
     (home-page "https://www.djcbsoftware.nl/code/mu/")
     (synopsis "Quickly find emails")
     (description
-- 
2.37.1

[Message part 4 (text/plain, inline)]

-- 
Retrieve my PGP public key:

  gpg --recv-keys 481F5EEEBA425ADC13247C76A6E672D981B8E744

Zihao

Message #16 received at 57013-done <at> debbugs.gnu.org (full text, mbox):

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: Zhu Zihao <all_but_last <at> 163.com>
Cc: 57013-done <at> debbugs.gnu.org
Subject: Re: [bug#57013] [PATCH] Fix mu4e in mu 1.8.7.
Date: Fri, 19 Aug 2022 19:59:26 +0200

[Message part 1 (text/plain, inline)]

Zhu Zihao 写道：
> Rebase on master.
> Subject: [PATCH 1/2] gnu: mu: Fix autoloads generation.
> Subject: [PATCH 2/2] gnu: mu: Use G-expressions.

Pushed as 03e7df49c429e08ce6ce46cf913bcc303a9541e0 et al.

Thanks!

T G-R

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.