From: Juliana Sims <juli@incana.org>
To: 62635@debbugs.gnu.org
Cc: Juliana Sims <juli@incana.org>
Subject: [bug#62635] [PATCH v3 2/3] gnu: geary: Use g-expressions.
Date: Tue, 16 May 2023 01:12:59 -0400 [thread overview]
Message-ID: <9a74909d4f018363a134dc9bf6ebcf92605f884f.1684213970.git.juli@incana.org> (raw)
In-Reply-To: <c7901654e7f1646eaa812911bfb0a57f78cc1b76.1684213970.git.juli@incana.org>
* gnu/packages/gnome.scm (geary) [arguments]: Use g-expressions.
---
gnu/packages/gnome.scm | 69 +++++++++++++++++++++---------------------
1 file changed, 34 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2ba299d308..bb3266b05a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12318,41 +12318,40 @@ (define-public geary
"04hvw86r8sczvjm1z3ls5y5y5h6nyfb648rjkfx05ib00mqq5v1x"))))
(build-system meson-build-system)
(arguments
- `(#:glib-or-gtk? #t
- #:configure-flags
- '("-Dprofile=release")
- #:phases (modify-phases %standard-phases
- (add-after 'unpack 'disable-failing-tests
- (lambda _
- (substitute* "test/test-client.vala"
- (("client.add_suite\\(new Application.CertificateManagerTest\\(\\).suite\\);")
- ""))
- (substitute* "test/test-engine.vala"
- (("engine.add_suite\\(new Geary.RFC822.MessageDataTest\\(\\).suite\\);")
- ""))))
- (add-after 'unpack 'generate-vapis
- (lambda* (#:key inputs #:allow-other-keys)
- ;; It’s not possible to generate the GMime vapi, because
- ;; there’s custom metadata that gmime didn’t
- ;; install. Thus, the vapi should be built and installed
- ;; with gmime.
- (define gmime
- (assoc-ref inputs "gmime"))
- (copy-file (string-append gmime "/share/vala/vapi/gmime-3.0.vapi")
- "bindings/vapi/gmime-3.0.vapi")))
- (add-after 'unpack 'disable-postinstall-script
- (lambda _
- (substitute* "build-aux/post_install.py"
- (("gtk-update-icon-cache")
- "true"))))
- (add-before 'check 'setup-home
- (lambda _
- ;; Tests require a writable HOME.
- (setenv "HOME" (getcwd))))
- (add-before 'check 'setup-xvfb
- (lambda _
- (system "Xvfb :1 &")
- (setenv "DISPLAY" ":1"))))))
+ (list #:glib-or-gtk? #t
+ #:configure-flags
+ #~(list "-Dprofile=release")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda _
+ (substitute* "test/test-client.vala"
+ (("client.add_suite\\(new Application.CertificateManagerTest\\(\\).suite\\);")
+ ""))
+ (substitute* "test/test-engine.vala"
+ (("engine.add_suite\\(new Geary.RFC822.MessageDataTest\\(\\).suite\\);")
+ ""))))
+ (add-after 'unpack 'generate-vapis
+ (lambda _
+ ;; It’s not possible to generate the GMime vapi, because
+ ;; there’s custom metadata that gmime didn’t
+ ;; install. Thus, the vapi should be built and installed
+ ;; with gmime.
+ (copy-file #$(file-append gmime "/share/vala/vapi/gmime-3.0.vapi")
+ "bindings/vapi/gmime-3.0.vapi")))
+ (add-after 'unpack 'disable-postinstall-script
+ (lambda _
+ (substitute* "build-aux/post_install.py"
+ (("gtk-update-icon-cache")
+ "true"))))
+ (add-before 'check 'setup-home
+ (lambda _
+ ;; Tests require a writable HOME.
+ (setenv "HOME" (getcwd))))
+ (add-before 'check 'setup-xvfb
+ (lambda _
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1"))))))
(inputs
(list enchant
folks-with-libsoup2
--
2.40.1
next prev parent reply other threads:[~2023-05-16 5:14 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-03 1:58 [bug#62635] [PATCH 0/2] gnu: geary: Add missing dependency, use g-expressions J. Sims via Guix-patches via
2023-04-03 2:00 ` [bug#62635] [PATCH 1/2] gnu: geary: Add missing input to fix launch bug J. Sims via Guix-patches via
2023-04-03 2:01 ` [bug#62635] [PATCH 2/2] gnu: geary: Use g-expressions J. Sims via Guix-patches via
2023-05-06 16:20 ` [bug#62635] [PATCH 0/2] gnu: geary: Add missing dependency, use g-expressions Ludovic Courtès
2023-05-07 19:06 ` [bug#62635] [PATCH v1 1/3] gnu: geary: Fix failing build Juliana Sims
2023-05-07 19:06 ` [bug#62635] [PATCH v1 2/3] gnu: geary: Add evolution-data-server as input Juliana Sims
2023-05-07 19:06 ` [bug#62635] [PATCH v1 3/3] gnu: geary: Use g-expressions Juliana Sims
2023-05-07 19:21 ` [bug#62635] [PATCH v2 1/3] gnu: geary: Fix failing build Juliana Sims
2023-05-07 19:21 ` [bug#62635] [PATCH v2 2/3] gnu: geary: Add evolution-data-server as input Juliana Sims
2023-05-07 19:44 ` Liliana Marie Prikler
2023-05-07 21:10 ` Juliana Sims
2023-05-07 19:21 ` [bug#62635] [PATCH v2 3/3] gnu: geary: Use g-expressions Juliana Sims
2023-05-15 13:55 ` [bug#62635] Ping Juliana Sims
2023-05-15 18:20 ` Liliana Marie Prikler
2023-05-16 1:36 ` Juliana Sims
2023-05-16 4:19 ` Liliana Marie Prikler
2023-05-16 5:10 ` Juliana Sims
2023-05-16 15:25 ` Liliana Marie Prikler
2023-05-16 5:12 ` [bug#62635] [PATCH v4 1/4] gnu: geary: Fix build failure Juliana Sims
2023-05-16 5:12 ` [bug#62635] [PATCH v4 2/4] gnu: geary: Use G-Expressions Juliana Sims
2023-05-16 5:13 ` [bug#62635] [PATCH v4 3/4] gnu: geary: Remove redundant native-inputs Juliana Sims
2023-05-16 16:24 ` [bug#62635] [PATCH v4 4/4] gnu: geary: Update to 43.0 Liliana Marie Prikler
2023-05-17 12:49 ` Juliana Sims
2023-05-21 20:35 ` bug#62635: " Liliana Marie Prikler
2023-05-16 5:12 ` [bug#62635] [PATCH v3 1/3] gnu: geary: Fix failing build Juliana Sims
2023-05-16 5:12 ` Juliana Sims [this message]
2023-05-16 5:13 ` [bug#62635] [PATCH v3 3/3] gnu: geary: Remove redundant native-inputs Juliana Sims
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9a74909d4f018363a134dc9bf6ebcf92605f884f.1684213970.git.juli@incana.org \
--to=juli@incana.org \
--cc=62635@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.