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

Previous Next

Package: guix-patches;

Reported by: "J. Sims" <jtsims <at> protonmail.com>

Date: Mon, 3 Apr 2023 01:59:01 UTC

Severity: normal

Tags: patch

Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>

Bug is archived. No further changes may be made.

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

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

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Mon, 03 Apr 2023 01:59:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to "J. Sims" <jtsims <at> protonmail.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Mon, 03 Apr 2023 01:59:01 GMT) Full text and rfc822 format available.

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

From: "J. Sims" <jtsims <at> protonmail.com>
To: "guix-patches <at> gnu.org" <guix-patches <at> gnu.org>
Subject: [PATCH 0/2] gnu: geary: Add missing dependency, use g-expressions.
Date: Mon, 03 Apr 2023 01:58:29 +0000
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




Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Mon, 03 Apr 2023 02:01:02 GMT) Full text and rfc822 format available.

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

From: "J. Sims" <jtsims <at> protonmail.com>
To: "62635 <at> debbugs.gnu.org" <62635 <at> debbugs.gnu.org>
Subject: [PATCH 1/2] gnu: geary: Add missing input to fix launch bug.
Date: Mon, 03 Apr 2023 02:00:21 +0000
[Message part 1 (text/plain, inline)]
Empty Message
[0001-gnu-geary-Add-missing-input-to-fix-launch-bug.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Mon, 03 Apr 2023 02:02:02 GMT) Full text and rfc822 format available.

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

From: "J. Sims" <jtsims <at> protonmail.com>
To: "62635 <at> debbugs.gnu.org" <62635 <at> debbugs.gnu.org>
Subject: [PATCH 2/2] gnu: geary: Use g-expressions.
Date: Mon, 03 Apr 2023 02:01:04 +0000
[Message part 1 (text/plain, inline)]
Empty Message
[0002-gnu-geary-Use-g-expressions.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Sat, 06 May 2023 16:21:02 GMT) Full text and rfc822 format available.

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: "J. Sims" <jtsims <at> protonmail.com>
Cc: 62635 <at> debbugs.gnu.org
Subject: Re: bug#62635: [PATCH 0/2] gnu: geary: Add missing dependency, use
 g-expressions.
Date: Sat, 06 May 2023 18:20:09 +0200
Hi Juliana,

"J. Sims" <jtsims <at> 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’.




Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Sun, 07 May 2023 19:07:01 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <juli <at> incana.org>
To: 62635 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, Juliana Sims <juli <at> incana.org>
Subject: [PATCH v1 1/3] gnu: geary: Fix failing build.
Date: Sun,  7 May 2023 15:06:04 -0400
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 <at> zrythm.org>
 ;;; Copyright © 2022 Arjan Adriaanse <arjan <at> adriaan.se>
 ;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
+;;; Copyright © 2023 Juliana Sims <juli <at> 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





Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Sun, 07 May 2023 19:07:01 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <juli <at> incana.org>
To: 62635 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, Juliana Sims <juli <at> incana.org>
Subject: [PATCH v1 2/3] gnu: geary: Add evolution-data-server as input.
Date: Sun,  7 May 2023 15:06:05 -0400
* 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





Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Sun, 07 May 2023 19:08:02 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <juli <at> incana.org>
To: 62635 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, Juliana Sims <juli <at> incana.org>
Subject: [PATCH v1 3/3] gnu: geary: Use g-expressions.
Date: Sun,  7 May 2023 15:06:06 -0400
* 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





Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Sun, 07 May 2023 19:22:02 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <juli <at> incana.org>
To: 62635 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, Juliana Sims <juli <at> incana.org>
Subject: [PATCH v2 1/3] gnu: geary: Fix failing build.
Date: Sun,  7 May 2023 15:21:03 -0400
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 <at> zrythm.org>
 ;;; Copyright © 2022 Arjan Adriaanse <arjan <at> adriaan.se>
 ;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
+;;; Copyright © 2023 Juliana Sims <juli <at> 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





Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Sun, 07 May 2023 19:22:02 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <juli <at> incana.org>
To: 62635 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, Juliana Sims <juli <at> incana.org>
Subject: [PATCH v2 2/3] gnu: geary: Add evolution-data-server as input.
Date: Sun,  7 May 2023 15:21:04 -0400
* 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





Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Sun, 07 May 2023 19:22:03 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <juli <at> incana.org>
To: 62635 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, Juliana Sims <juli <at> incana.org>
Subject: [PATCH v2 3/3] gnu: geary: Use g-expressions.
Date: Sun,  7 May 2023 15:21:05 -0400
* 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





Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Sun, 07 May 2023 19:45:02 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Juliana Sims <juli <at> incana.org>, 62635 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org
Subject: Re: [PATCH v2 2/3] gnu: geary: Add evolution-data-server as input.
Date: Sun, 07 May 2023 21:44:22 +0200
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

Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Sun, 07 May 2023 21:12:02 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <juli <at> incana.org>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 62635 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org
Subject: Re: [PATCH v2 2/3] gnu: geary: Add evolution-data-server as input.
Date: Sun, 07 May 2023 17:10:53 -0400
Hi,

Le 7 mai 2023 15:44:22 GMT-04:00, Liliana Marie Prikler <liliana.prikler <at> 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




Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Mon, 15 May 2023 13:56:01 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <juli <at> incana.org>
To: 62635 <at> debbugs.gnu.org
Cc: ludo <ludo <at> gnu.org>, Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Subject: Ping
Date: Mon, 15 May 2023 09:55:00 -0400
Hi there,

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

Thanks,
Juli






Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Mon, 15 May 2023 18:21:01 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Juliana Sims <juli <at> incana.org>, 62635 <at> debbugs.gnu.org
Cc: ludo <ludo <at> gnu.org>
Subject: Re: Ping
Date: Mon, 15 May 2023 20:20:12 +0200
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




Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Tue, 16 May 2023 01:38:02 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <juli <at> incana.org>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 62635 <at> debbugs.gnu.org, ludo <ludo <at> gnu.org>
Subject: Re: Ping
Date: Mon, 15 May 2023 21:36:37 -0400
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






Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Tue, 16 May 2023 04:20:02 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Juliana Sims <juli <at> incana.org>
Cc: 62635 <at> debbugs.gnu.org, ludo <ludo <at> gnu.org>
Subject: Re: Ping
Date: Tue, 16 May 2023 06:19:13 +0200
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




Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Tue, 16 May 2023 05:11:02 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <juli <at> incana.org>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 62635 <at> debbugs.gnu.org, ludo <ludo <at> gnu.org>
Subject: Re: Ping
Date: Tue, 16 May 2023 01:10:30 -0400
Hi,
Le mar, mai 16 2023 at 06:19:13 +0200, Liliana Marie Prikler 
<liliana.prikler <at> 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






Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Tue, 16 May 2023 05:14:02 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <juli <at> incana.org>
To: 62635 <at> debbugs.gnu.org
Cc: Juliana Sims <juli <at> incana.org>
Subject: [PATCH v3 1/3] gnu: geary: Fix failing build.
Date: Tue, 16 May 2023 01:12:58 -0400
* 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 <at> zrythm.org>
 ;;; Copyright © 2022 Arjan Adriaanse <arjan <at> adriaan.se>
 ;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
+;;; Copyright © 2023 Juliana Sims <juli <at> 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





Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Tue, 16 May 2023 05:14:02 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <juli <at> incana.org>
To: 62635 <at> debbugs.gnu.org
Cc: Juliana Sims <juli <at> incana.org>
Subject: [PATCH v3 2/3] gnu: geary: Use g-expressions.
Date: Tue, 16 May 2023 01:12:59 -0400
* 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





Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Tue, 16 May 2023 05:14:02 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <juli <at> incana.org>
To: 62635 <at> debbugs.gnu.org
Cc: Juliana Sims <juli <at> incana.org>
Subject: [PATCH v3 3/3] gnu: geary: Remove redundant native-inputs.
Date: Tue, 16 May 2023 01:13:00 -0400
* 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





Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Tue, 16 May 2023 15:26:02 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Juliana Sims <juli <at> incana.org>
Cc: 62635 <at> debbugs.gnu.org, ludo <ludo <at> gnu.org>
Subject: Re: Ping
Date: Tue, 16 May 2023 17:25:08 +0200
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 <at> 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




Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Tue, 16 May 2023 16:47:02 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <liliana.prikler <at> gmail.com>
To: 62635 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, Juliana Sims <juli <at> incana.org>
Subject: [PATCH v4 2/4] gnu: geary: Use G-Expressions.
Date: Tue, 16 May 2023 01:12:59 -0400
* gnu/packages/gnome.scm (geary)[arguments]: Convert to list of
G-Expressions.

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





Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Tue, 16 May 2023 16:47:02 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <liliana.prikler <at> gmail.com>
To: 62635 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, Juliana Sims <juli <at> incana.org>
Subject: [PATCH v4 3/4] gnu: geary: Remove redundant native-inputs.
Date: Tue, 16 May 2023 01:13:00 -0400
* gnu/packages/gnome.scm (geary)[native-inputs]: Remove glib, gmime,
and gsettings-desktop-schemas.

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





Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Tue, 16 May 2023 16:47:02 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 62635 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, Juliana Sims <juli <at> incana.org>
Subject: [PATCH v4 4/4] gnu: geary: Update to 43.0.
Date: Tue, 16 May 2023 18:24:14 +0200
* 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





Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Tue, 16 May 2023 16:47:03 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <liliana.prikler <at> gmail.com>
To: 62635 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, Juliana Sims <juli <at> incana.org>
Subject: [PATCH v4 1/4] gnu: geary: Fix build failure.
Date: Tue, 16 May 2023 01:12:58 -0400
* 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 <at> 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 <at> zrythm.org>
 ;;; Copyright © 2022 Arjan Adriaanse <arjan <at> adriaan.se>
 ;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
+;;; Copyright © 2023 Juliana Sims <juli <at> 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





Information forwarded to guix-patches <at> gnu.org:
bug#62635; Package guix-patches. (Wed, 17 May 2023 12:50:02 GMT) Full text and rfc822 format available.

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

From: Juliana Sims <juli <at> incana.org>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 62635 <at> debbugs.gnu.org
Subject: Re: [PATCH v4 4/4] gnu: geary: Update to 43.0.
Date: Wed, 17 May 2023 08:49:01 -0400
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






Reply sent to Liliana Marie Prikler <liliana.prikler <at> gmail.com>:
You have taken responsibility. (Sun, 21 May 2023 20:37:01 GMT) Full text and rfc822 format available.

Notification sent to "J. Sims" <jtsims <at> protonmail.com>:
bug acknowledged by developer. (Sun, 21 May 2023 20:37:01 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Juliana Sims <juli <at> incana.org>
Cc: 62635-done <at> debbugs.gnu.org
Subject: Re: [PATCH v4 4/4] gnu: geary: Update to 43.0.
Date: Sun, 21 May 2023 22:35:54 +0200
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 archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Mon, 19 Jun 2023 11:24:06 GMT) Full text and rfc822 format available.

This bug report was last modified 312 days ago.

Previous Next


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