[bug#62635] [PATCH 0/2] gnu: geary: Add missing dependency, use g-expressions.

[bug#62635] [PATCH 0/2] gnu: geary: Add missing dependency, use g-expressions.

[J. Sims via Guix-patches via]

Hello,

It turns out Geary needs `evolution-data-server' to launch. These patches 1. add that as an input; and 2. migrate it to g-expressions.

Thanks,
Juli

[bug#62635] [PATCH 1/2] gnu: geary: Add missing input to fix launch bug.

[J. Sims via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 13 bytes --]

Empty Message

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-geary-Add-missing-input-to-fix-launch-bug.patch --]
[-- Type: text/x-patch; name=0001-gnu-geary-Add-missing-input-to-fix-launch-bug.patch, Size: 754 bytes --]

From fe17ac22c2b97489aad997f706a42da4dcfa5bb8 Mon Sep 17 00:00:00 2001
From: Juliana Sims <jtsims@protonmail.com>
Date: Sun, 2 Apr 2023 21:46:01 -0400
Subject: [PATCH 1/2] gnu: geary: Add missing input to fix launch bug.

* gnu/packages/gnome.scm (geary): Add missing dependency to fix launch bug.
---
 gnu/packages/gnome.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8c38b94a21..515a242ed0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12638,6 +12638,7 @@ (define gmime
                       (setenv "DISPLAY" ":1"))))))
     (inputs
      (list enchant
+           evolution-data-server
            folks-with-libsoup2
            gcr
            glib
-- 
2.39.2

[bug#62635] [PATCH 2/2] gnu: geary: Use g-expressions.

[J. Sims via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 13 bytes --]

Empty Message

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-geary-Use-g-expressions.patch --]
[-- Type: text/x-patch; name=0002-gnu-geary-Use-g-expressions.patch, Size: 6678 bytes --]

From 4b10d7f81c379f47ba9c83b62d59d5c3727b2df1 Mon Sep 17 00:00:00 2001
From: Juliana Sims <jtsims@protonmail.com>
Date: Sun, 2 Apr 2023 21:51:31 -0400
Subject: [PATCH 2/2] gnu: geary: Use g-expressions.

* gnu/packages/gnome.scm (geary): Use g-expressions.
---
 gnu/packages/gnome.scm | 143 ++++++++++++++++++++---------------------
 1 file changed, 70 insertions(+), 73 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 515a242ed0..acdfbb7d59 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12604,79 +12604,76 @@ (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\\);")
-                         ""))))
-                  (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"))))))
-    (inputs
-     (list enchant
-           evolution-data-server
-           folks-with-libsoup2
-           gcr
-           glib
-           gmime
-           gnome-online-accounts-3.44
-           gsettings-desktop-schemas
-           gspell
-           gsound
-           gtk+
-           iso-codes
-           json-glib
-           libcanberra
-           libgee
-           libhandy
-           libpeas
-           libsecret
-           libstemmer
-           libunwind
-           sqlite
-           webkitgtk-with-libsoup2
-           ytnef))
-    (native-inputs
-     (list appstream-glib
-           cmake-minimal
-           desktop-file-utils
-           gettext-minimal
-           glib
-           `(,glib "bin")
-           gmime
-           gobject-introspection
-           gsettings-desktop-schemas
-           itstool
-           libarchive
-           libxml2
-           pkg-config
-           python-minimal
-           vala
-           xorg-server-for-tests))
+     (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\\);")
+                               ""))))
+                        (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 (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"))))))
+    (inputs (list enchant
+                  evolution-data-server
+                  folks-with-libsoup2
+                  gcr
+                  glib
+                  gmime
+                  gnome-online-accounts-3.44
+                  gsettings-desktop-schemas
+                  gspell
+                  gsound
+                  gtk+
+                  iso-codes
+                  json-glib
+                  libcanberra
+                  libgee
+                  libhandy
+                  libpeas
+                  libsecret
+                  libstemmer
+                  libunwind
+                  sqlite
+                  webkitgtk-with-libsoup2
+                  ytnef))
+    (native-inputs (list appstream-glib
+                         cmake-minimal
+                         desktop-file-utils
+                         gettext-minimal
+                         glib
+                         `(,glib "bin")
+                         gmime
+                         gobject-introspection
+                         gsettings-desktop-schemas
+                         itstool
+                         libarchive
+                         libxml2
+                         pkg-config
+                         python-minimal
+                         vala
+                         xorg-server-for-tests))
     (synopsis "GNOME email application built around conversations")
     (description
      "Geary collects related messages together into conversations,
-- 
2.39.2

[bug#62635] [PATCH 0/2] gnu: geary: Add missing dependency, use g-expressions.

[Ludovic Courtès]

Hi Juliana,

"J. Sims" <jtsims@protonmail.com> skribis:

> It turns out Geary needs `evolution-data-server' to launch. These patches 1. add that as an input; and 2. migrate it to g-expressions.

The patches LGTM.

However, in the meantime, the ‘core-updates’ branch was merged and now
‘geary’ fails to build (both before and after applying your patches).
Could you take a look and send a second version?

Thank you and apologies for the delay!

Ludo’.

[bug#62635] [PATCH v1 1/3] gnu: geary: Fix failing build.

[Juliana Sims]

Hello,

This set of patches will fix Geary's build as well as apply the same changes
mentioned previously. For whatever reason, I had deleted the original
branch I made, so this is a clean patchset.

Let me know if I need to make any changes :)

Thanks,
Juli

* gnu/packages/gnome.scm (geary): Fix failing build.
[arguments]: Disable failing test.
[native-inputs]: Use older version of vala.
---
 gnu/packages/gnome.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b3c954d849..d0e4efc416 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -74,6 +74,7 @@
 ;;; Copyright © 2022 Alexandros Theodotou <alex@zrythm.org>
 ;;; Copyright © 2022 Arjan Adriaanse <arjan@adriaan.se>
 ;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
+;;; Copyright © 2023 Juliana Sims <juli@incana.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -234,6 +235,7 @@ (define-module (gnu packages gnome)
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
+  #:use-module (guix transformations)
   #:use-module (guix utils)
   #:use-module (guix gexp)
   #:use-module (ice-9 match)
@@ -12314,6 +12316,9 @@ (define-public geary
                     (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)
@@ -12376,7 +12381,7 @@ (define-public geary
            libxml2
            pkg-config
            python-minimal
-           vala
+           vala-0.52
            xorg-server-for-tests))
     (synopsis "GNOME email application built around conversations")
     (description

base-commit: d16826cc32ba821e17236dea0536da7200947c97
-- 
2.39.2

[bug#62635] [PATCH v1 2/3] gnu: geary: Add evolution-data-server as input.

[Juliana Sims]

* gnu/packages/gnome.scm (geary) [inputs]: Add evolution-data-server.
---
 gnu/packages/gnome.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d0e4efc416..c1b3514d13 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12345,6 +12345,7 @@ (define-public geary
                       (setenv "DISPLAY" ":1"))))))
     (inputs
      (list enchant
+           evolution-data-server
            folks-with-libsoup2
            gcr
            glib
-- 
2.39.2

[bug#62635] [PATCH v1 3/3] gnu: geary: Use g-expressions.

[Juliana Sims]

* 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 c1b3514d13..57291791a6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12308,41 +12308,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
            evolution-data-server
-- 
2.39.2

[bug#62635] [PATCH v2 1/3] gnu: geary: Fix failing build.

[Juliana Sims]

Woops, had a leftover bit of code in there from trying to figure out how to fix
the package build... This version removes that.

* gnu/packages/gnome.scm (geary): Fix failing build.
[arguments]: Disable failing test.
[native-inputs]: Use older version of vala.
---
 gnu/packages/gnome.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b3c954d849..4c1d197e56 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -74,6 +74,7 @@
 ;;; Copyright © 2022 Alexandros Theodotou <alex@zrythm.org>
 ;;; Copyright © 2022 Arjan Adriaanse <arjan@adriaan.se>
 ;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
+;;; Copyright © 2023 Juliana Sims <juli@incana.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -12314,6 +12315,9 @@ (define-public geary
                     (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)
@@ -12376,7 +12380,7 @@ (define-public geary
            libxml2
            pkg-config
            python-minimal
-           vala
+           vala-0.52
            xorg-server-for-tests))
     (synopsis "GNOME email application built around conversations")
     (description

base-commit: d1aba42ad4e1909faa21d484975c5954c778e002
-- 
2.39.2

[bug#62635] [PATCH v2 2/3] gnu: geary: Add evolution-data-server as input.

[Juliana Sims]

* gnu/packages/gnome.scm (geary) [inputs]: Add evolution-data-server.
---
 gnu/packages/gnome.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4c1d197e56..bc439619cd 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12344,6 +12344,7 @@ (define-public geary
                       (setenv "DISPLAY" ":1"))))))
     (inputs
      (list enchant
+           evolution-data-server
            folks-with-libsoup2
            gcr
            glib
-- 
2.39.2

[bug#62635] [PATCH v2 2/3] gnu: geary: Add evolution-data-server as input.

[Liliana Marie Prikler]

Hi Juliana,

Am Sonntag, dem 07.05.2023 um 15:21 -0400 schrieb Juliana Sims:
> * gnu/packages/gnome.scm (geary) [inputs]: Add evolution-data-server.
> ---
>  gnu/packages/gnome.scm | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 4c1d197e56..bc439619cd 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -12344,6 +12344,7 @@ (define-public geary
>                        (setenv "DISPLAY" ":1"))))))
>      (inputs
>       (list enchant
> +           evolution-data-server
>             folks-with-libsoup2
>             gcr
>             glib
Possibly stupid question: Don't you need evolution-data-server to build
geary?  If so, this patch would need to be squashed on top of the
preceding one.

Cheers

[bug#62635] [PATCH v2 2/3] gnu: geary: Add evolution-data-server as input.

[Juliana Sims]

Hi,

Le 7 mai 2023 15:44:22 GMT-04:00, Liliana Marie Prikler <liliana.prikler@gmail.com> a écrit :
>Hi Juliana,
>
>Possibly stupid question:

No such thing :)

>Don't you need evolution-data-server to build
>geary?  If so, this patch would need to be squashed on top of the
>preceding one.

Interestingly, evolution-data-server seems to be a runtime-only dependency. I discovered this when I first installed Geary and found it would not launch - I only figured out the issue because a Debian developer friend had apparently run into the error message it threw and knew the cause. As far as I can tell, not even the Geary git repository itself makes any mention of this - perhaps because it's considered a core part of GNOME? I couldn't say. Regardless, the package does in fact build fine without evolution-data-server.

- Juli

[bug#62635] [PATCH v2 3/3] gnu: geary: Use g-expressions.

[Juliana Sims]

* 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 bc439619cd..9da20fee2a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12307,41 +12307,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
            evolution-data-server
-- 
2.39.2

[bug#62635] Ping

[Juliana Sims]

Hi there,

Just wanted to ping this patch thread so it doesn't get forgotten for 
too long.

Thanks,
Juli

[bug#62635] Ping

[Liliana Marie Prikler]

Hi Juliana,

Am Montag, dem 15.05.2023 um 09:55 -0400 schrieb Juliana Sims:
> Hi there,
> 
> Just wanted to ping this patch thread so it doesn't get forgotten for
> too long.
I still don't understand what exactly we gain or lose from adding
evolution-data-server as an input.  Have you looked into that?

Cheers

[bug#62635] Ping

[Juliana Sims]

Hello,

> I still don't understand what exactly we gain or lose from adding
> evolution-data-server as an input.  Have you looked into that?

When I submitted the initial patch series, Geary was failing to launch 
despite building successfully and being run under a GNOME environment. 
Adding evolution-data-server to the profile solved the issue, and given 
the lack of indication in the error message that that would resolve the 
problem, I thought it would be helpful to add as an input.

However. In attempting to reproduce this problem just now by running a 
version of Geary without evolution-data-server as an input or in the 
profile, it appears this problem... No longer exists? Which is a bit 
bizarre... Regardless, I'm happy to remove evolution-data-server as an 
input.

While I'm here, I've noticed there are some inputs in both 
native-inputs and inputs; namely, glib, gsettings-desktop-schemas, and 
gmime. Do you happen to know if these are likely to actually be 
required in both sets of inputs? Removing glib and 
gsettings-desktop-schemas from inputs seems not to cause issues - the 
program builds and launches fine - but this may simply be because I'm 
on GNOME; because these are dependencies of dependencies and thus 
exposed in the environment of the package; or it may be that this would 
cause issues in specific functionality that isn't tested in the tests 
that are run and isn't invoked except in specific situations. I'm not 
experienced enough with GNOME applications to know; I mostly just 
wanted to be able to read and write my email and my preferred 
application for doing so had stopped working XD If you happen to know 
if they can be safely removed from one or the other set of inputs, I 
would like to minimize the set of inputs; if you don't happen to know, 
I'll just leave it alone.

Thanks for asking more about evolution-data-server. I don't know why it 
was required before, but it's good to know it's not now; I'll go ahead 
and remove the commit adding it from my local branch and send up a new 
patch set when you get back to me.

- Juli

[bug#62635] Ping

[Liliana Marie Prikler]

Am Montag, dem 15.05.2023 um 21:36 -0400 schrieb Juliana Sims:
> When I submitted the initial patch series, Geary was failing to
> launch despite building successfully and being run under a GNOME
> environment.  Adding evolution-data-server to the profile solved the
> issue, and given the lack of indication in the error message that
> that would resolve the problem, I thought it would be helpful to add
> as an input.
It is true that Geary, like Evolution, needs a running Evolution Data
Server to function correctly.  However, this dependency is most often
met by adding evolution-data-server to the operating-system packages,
as not doing so causes other evolution-data-server-related issues IIRC.

> While I'm here, I've noticed there are some inputs in both 
> native-inputs and inputs; namely, glib, gsettings-desktop-schemas,
> and gmime.  Do you happen to know if these are likely to actually be 
> required in both sets of inputs?  Removing glib and 
> gsettings-desktop-schemas from inputs seems not to cause issues - the
> program builds and launches fine - but this may simply be because I'm
> on GNOME; because these are dependencies of dependencies and thus 
> exposed in the environment of the package; or it may be that this
> would cause issues in specific functionality that isn't tested in the
> tests that are run and isn't invoked except in specific situations.
It makes a difference for cross-builds, so you would have to check
those.  In my personal experience, glib:bin and gobject-introspection
often come up as native inputs in the GNOME world, whereas glib sans
bin, gsettings-desktop-schemas and gmime are mostly regular inputs.


Cheers

[bug#62635] Ping

[Juliana Sims]

Hi,
Le mar, mai 16 2023 at 06:19:13 +0200, Liliana Marie Prikler 
<liliana.prikler@gmail.com> a écrit :
>> It is true that Geary, like Evolution, needs a running Evolution Data
> Server to function correctly.  However, this dependency is most often
> met by adding evolution-data-server to the operating-system packages,
> as not doing so causes other evolution-data-server-related issues 
> IIRC.

It's probably beyond the scope of this current patch set, but is this 
something that should be communicated to users somehow? I would never 
have figured out about evolution-data-server if my friend hadn't 
recognized the error message. (There are similar situations where other 
packages require some non-dependency package to work/use all 
functionality, so the solution to this would ideally be bigger than 
just Geary and thus out of scope.)

>> It makes a difference for cross-builds, so you would have to check
> those.

Apparently librsvg is in the dependency graph for Geary, which is a 
Rust library, meaning cross builds are not currently an option. So in 
addition to removing the commit adding evolution-data-server as an 
input, I've added another commit removing the redundant native-input 
packages; feel free to simply drop the patch if the patch set looks 
good otherwise and this is deemed a frivolous or unnecessary change. I 
know dropping these native-inputs doesn't cause any issues because I'm 
sending this email using the very Geary package I am about to submit 
patches for :D

Anyway, patches incoming!

Thanks,
Juli

[bug#62635] Ping

[Liliana Marie Prikler]

Am Dienstag, dem 16.05.2023 um 01:10 -0400 schrieb Juliana Sims:
> Hi,
> Le mar, mai 16 2023 at 06:19:13 +0200, Liliana Marie Prikler 
> <liliana.prikler@gmail.com> a écrit :
> > > It is true that Geary, like Evolution, needs a running Evolution
> > > Data
> > Server to function correctly.  However, this dependency is most
> > often met by adding evolution-data-server to the operating-system
> > packages, as not doing so causes other evolution-data-server-
> > related issues IIRC.
> 
> It's probably beyond the scope of this current patch set, but is this
> something that should be communicated to users somehow? I would never
> have figured out about evolution-data-server if my friend hadn't 
> recognized the error message. (There are similar situations where
> other packages require some non-dependency package to work/use all 
> functionality, so the solution to this would ideally be bigger than 
> just Geary and thus out of scope.)
The bigger picture here are services: combinations of packages and
configuration to ensure that "everything" functions as intended.

> > It makes a difference for cross-builds, so you would have to check
> > those.
> 
> Apparently librsvg is in the dependency graph for Geary, which is a 
> Rust library, meaning cross builds are not currently an option. So in
> addition to removing the commit adding evolution-data-server as an 
> input, I've added another commit removing the redundant native-input 
> packages; feel free to simply drop the patch if the patch set looks 
> good otherwise and this is deemed a frivolous or unnecessary change.
> I  know dropping these native-inputs doesn't cause any issues because
> I'm sending this email using the very Geary package I am about to
> submit patches for :D
LGTM, just running some checks and afterwards scheduling for push on
Sunday.

Cheers

[bug#62635] [PATCH v4 1/4] gnu: geary: Fix build failure.

[Juliana Sims]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1656 bytes --]

* gnu/packages/gnome.scm (geary)[arguments]: Disable failing test.
[native-inputs]: Use vala-0.52 instead of vala.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/gnome.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 754bb668ba..2ba299d308 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -74,6 +74,7 @@
 ;;; Copyright © 2022 Alexandros Theodotou <alex@zrythm.org>
 ;;; Copyright © 2022 Arjan Adriaanse <arjan@adriaan.se>
 ;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
+;;; Copyright © 2023 Juliana Sims <juli@incana.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -12325,6 +12326,9 @@ (define-public geary
                     (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)
@@ -12387,7 +12391,7 @@ (define-public geary
            libxml2
            pkg-config
            python-minimal
-           vala
+           vala-0.52
            xorg-server-for-tests))
     (synopsis "GNOME email application built around conversations")
     (description

base-commit: 242cc93438d67f5b35602d5add02e230850b0b43
-- 
2.40.1

[bug#62635] [PATCH v4 2/4] gnu: geary: Use G-Expressions.

[Juliana Sims]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 4238 bytes --]

* gnu/packages/gnome.scm (geary)[arguments]: Convert to list of
G-Expressions.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 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

[bug#62635] [PATCH v4 3/4] gnu: geary: Remove redundant native-inputs.

[Juliana Sims]

* gnu/packages/gnome.scm (geary)[native-inputs]: Remove glib, gmime,
and gsettings-desktop-schemas.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/gnome.scm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index bb3266b05a..81bc6c04e9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12380,11 +12380,8 @@ (define-public geary
            cmake-minimal
            desktop-file-utils
            gettext-minimal
-           glib
            `(,glib "bin")
-           gmime
            gobject-introspection
-           gsettings-desktop-schemas
            itstool
            libarchive
            libxml2
-- 
2.40.1

[bug#62635] [PATCH v4 4/4] gnu: geary: Update to 43.0.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (geary): Update to 43.0.
[arguments]<#:phases>: Drop ‘disable-failing-tests’ and ‘generate-vapis’.
Rename ‘disable-postinstall-script’ to ‘skip-gtk-update-icon-cache’ and adjust
accordingly.
[inputs]: Replace folks-with-libsoup2 with folks.
Replace gnome-online-accounts-3.44 with gnome-online-accounts.
Replace webkitgtk-with-libsoup2 with webkitgtk.
[native-inputs]: Replace vala-0.52 with vala.
Add gnutls.
---
Hi Juliana,

1..3/4 have my rewordings for the commit messages, but more importantly,
it turns out that geary can be refreshed to a newer version with fewer
issues to fix :)
Please confirm that this Geary also works for you.

Cheers

 gnu/packages/gnome.scm | 40 +++++++++++++---------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 81bc6c04e9..bf5420b1f0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12306,16 +12306,16 @@ (define-public gnome-boxes
 (define-public geary
   (package
     (name "geary")
-    (version "40.0")
+    (version "43.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://gitlab.gnome.org/GNOME/geary.git")
-                    (commit (string-append "gnome-" version))))
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "04hvw86r8sczvjm1z3ls5y5y5h6nyfb648rjkfx05ib00mqq5v1x"))))
+                "05b8c5ljzx1ly7wq8jzpv8psxmsdlz395sr17xwj49nh495nflz5"))))
     (build-system meson-build-system)
     (arguments
      (list #:glib-or-gtk? #t
@@ -12323,27 +12323,12 @@ (define-public geary
            #~(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
+               (add-after 'unpack 'skip-gtk-update-icon-cache
+                 ;; Don't create 'icon-theme.cache'.
                  (lambda _
-                   (substitute* "build-aux/post_install.py"
-                     (("gtk-update-icon-cache")
-                      "true"))))
+                   (substitute* "meson.build"
+                     (("gtk_update_icon_cache: true")
+                      "gtk_update_icon_cache: false"))))
                (add-before 'check 'setup-home
                  (lambda _
                    ;; Tests require a writable HOME.
@@ -12354,11 +12339,11 @@ (define-public geary
                    (setenv "DISPLAY" ":1"))))))
     (inputs
      (list enchant
-           folks-with-libsoup2
+           folks
            gcr
            glib
            gmime
-           gnome-online-accounts-3.44
+           gnome-online-accounts
            gsettings-desktop-schemas
            gspell
            gsound
@@ -12373,7 +12358,7 @@ (define-public geary
            libstemmer
            libunwind
            sqlite
-           webkitgtk-with-libsoup2
+           webkitgtk
            ytnef))
     (native-inputs
      (list appstream-glib
@@ -12381,13 +12366,14 @@ (define-public geary
            desktop-file-utils
            gettext-minimal
            `(,glib "bin")
+           gnutls                       ; for certtool
            gobject-introspection
            itstool
            libarchive
            libxml2
            pkg-config
            python-minimal
-           vala-0.52
+           vala
            xorg-server-for-tests))
     (synopsis "GNOME email application built around conversations")
     (description
-- 
2.40.1

[bug#62635] [PATCH v4 4/4] gnu: geary: Update to 43.0.

[Juliana Sims]

Hello,

> 1..3/4 have my rewordings for the commit messages, but more 
> importantly,
> it turns out that geary can be refreshed to a newer version with fewer
> issues to fix :)
> Please confirm that this Geary also works for you.
I can confirm that this Geary also works for me! For some reason it was 
failing to build when I tried to update it before, so I'm glad you 
thought to try this now :D

Thanks so much,
Juli

bug#62635: [PATCH v4 4/4] gnu: geary: Update to 43.0.

[Liliana Marie Prikler]

Am Mittwoch, dem 17.05.2023 um 08:49 -0400 schrieb Juliana Sims:
> Hello,
> 
> > 1..3/4 have my rewordings for the commit messages, but more 
> > importantly,
> > it turns out that geary can be refreshed to a newer version with
> > fewer
> > issues to fix :)
> > Please confirm that this Geary also works for you.
> I can confirm that this Geary also works for me! For some reason it
> was failing to build when I tried to update it before, so I'm glad
> you thought to try this now :D
Thanks, should now be updated for everyone.

Cheers

[bug#62635] [PATCH v3 1/3] gnu: geary: Fix failing build.

[Juliana Sims]

* gnu/packages/gnome.scm (geary): Fix failing build.
[arguments]: Disable failing test.
[native-inputs]: Use older version of vala.
---
 gnu/packages/gnome.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 754bb668ba..2ba299d308 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -74,6 +74,7 @@
 ;;; Copyright © 2022 Alexandros Theodotou <alex@zrythm.org>
 ;;; Copyright © 2022 Arjan Adriaanse <arjan@adriaan.se>
 ;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
+;;; Copyright © 2023 Juliana Sims <juli@incana.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -12325,6 +12326,9 @@ (define-public geary
                     (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)
@@ -12387,7 +12391,7 @@ (define-public geary
            libxml2
            pkg-config
            python-minimal
-           vala
+           vala-0.52
            xorg-server-for-tests))
     (synopsis "GNOME email application built around conversations")
     (description

base-commit: 35cf72651742ffbbf9e55e3b02db916e1574186d
-- 
2.40.1

[bug#62635] [PATCH v3 2/3] gnu: geary: Use g-expressions.

[Juliana Sims]

* 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

[bug#62635] [PATCH v3 3/3] gnu: geary: Remove redundant native-inputs.

[Juliana Sims]

* gnu/packages/gnome.scm (geary) [native-inputs]: Remove redundant
native-inputs.
---
 gnu/packages/gnome.scm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index bb3266b05a..81bc6c04e9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12380,11 +12380,8 @@ (define-public geary
            cmake-minimal
            desktop-file-utils
            gettext-minimal
-           glib
            `(,glib "bin")
-           gmime
            gobject-introspection
-           gsettings-desktop-schemas
            itstool
            libarchive
            libxml2
-- 
2.40.1