* [bug#57013] [PATCH] Fix mu4e in mu 1.8.7.
@ 2022-08-06 2:36 Zhu Zihao
2022-08-06 3:11 ` [bug#57013] Acknowledgement ([PATCH] Fix mu4e in mu 1.8.7.) Zhu Zihao
0 siblings, 1 reply; 4+ messages in thread
From: Zhu Zihao @ 2022-08-06 2:36 UTC (permalink / raw)
To: 57013
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: 0001-gnu-mu-Fix-autoloads-generation.patch --]
[-- Type: text/x-patch, Size: 985 bytes --]
From 54da98d99779030dd4b74f6e4dfeb796b4f9cae4 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@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 ca4b3e819e..544e5cc247 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1203,7 +1203,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
[-- Attachment #3: 0002-gnu-mu-Use-G-expressions.patch --]
[-- Type: text/x-patch, Size: 2868 bytes --]
From d3b7c19aa63d1585cb0a063fa1757d8974c1756d Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sat, 6 Aug 2022 00:11:29 +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 544e5cc247..6544a8dd7c 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1181,29 +1181,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-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-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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#57013] Acknowledgement ([PATCH] Fix mu4e in mu 1.8.7.)
2022-08-06 2:36 [bug#57013] [PATCH] Fix mu4e in mu 1.8.7 Zhu Zihao
@ 2022-08-06 3:11 ` Zhu Zihao
2022-08-19 5:35 ` Zhu Zihao
0 siblings, 1 reply; 4+ messages in thread
From: Zhu Zihao @ 2022-08-06 3:11 UTC (permalink / raw)
To: 57013
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
For maintainers: Please also cc to this mail address for discussion. :)
--
Retrieve my PGP public key:
gpg --recv-keys 481F5EEEBA425ADC13247C76A6E672D981B8E744
Zihao
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#57013] Acknowledgement ([PATCH] Fix mu4e in mu 1.8.7.)
2022-08-06 3:11 ` [bug#57013] Acknowledgement ([PATCH] Fix mu4e in mu 1.8.7.) Zhu Zihao
@ 2022-08-19 5:35 ` Zhu Zihao
2022-08-19 17:59 ` bug#57013: [PATCH] Fix mu4e in mu 1.8.7 Tobias Geerinckx-Rice via Guix-patches via
0 siblings, 1 reply; 4+ messages in thread
From: Zhu Zihao @ 2022-08-19 5:35 UTC (permalink / raw)
To: 57013
[-- Attachment #1: Type: text/plain, Size: 19 bytes --]
Rebase on master.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-mu-Fix-autoloads-generation.patch --]
[-- Type: text/x-patch, Size: 985 bytes --]
From f5b3a6e3ae7b6ca5d84f3f6a01459bdea40bb4cf Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-mu-Use-G-expressions.patch --]
[-- Type: text/x-patch, Size: 2879 bytes --]
From 10c6a67905d784da4173a05c7ea6d331cf8fd88d Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@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
[-- Attachment #4: Type: text/plain, Size: 100 bytes --]
--
Retrieve my PGP public key:
gpg --recv-keys 481F5EEEBA425ADC13247C76A6E672D981B8E744
Zihao
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#57013: [PATCH] Fix mu4e in mu 1.8.7.
2022-08-19 5:35 ` Zhu Zihao
@ 2022-08-19 17:59 ` Tobias Geerinckx-Rice via Guix-patches via
0 siblings, 0 replies; 4+ messages in thread
From: Tobias Geerinckx-Rice via Guix-patches via @ 2022-08-19 17:59 UTC (permalink / raw)
To: Zhu Zihao; +Cc: 57013-done
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-08-19 18:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-06 2:36 [bug#57013] [PATCH] Fix mu4e in mu 1.8.7 Zhu Zihao
2022-08-06 3:11 ` [bug#57013] Acknowledgement ([PATCH] Fix mu4e in mu 1.8.7.) Zhu Zihao
2022-08-19 5:35 ` Zhu Zihao
2022-08-19 17:59 ` bug#57013: [PATCH] Fix mu4e in mu 1.8.7 Tobias Geerinckx-Rice via Guix-patches via
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).