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

  • Done
  • quality assurance status badge
Details
4 participants
  • J. Sims
  • Juliana Sims
  • Liliana Marie Prikler
  • Ludovic Courtès
Owner
unassigned
Submitted by
J. Sims
Severity
normal

Debbugs page

J. Sims wrote 2 years ago
(name . guix-patches@gnu.org)(address . guix-patches@gnu.org)
9uT-ndM-7Ha4KhKGJfuVdxauTOVx993n3g2pOtQdAPYEaMdytH_QMe-5yw1mc3f3QDraZKqVwUadOYVIFJjIEk9aRvuMDVwmv3VyYiPCUKE=@protonmail.com
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
J. Sims wrote 2 years ago
[PATCH 1/2] gnu: geary: Add missing input to fix launch bug.
(name . 62635@debbugs.gnu.org)(address . 62635@debbugs.gnu.org)
pd5XtVIg66jVfm66SgraaY2WmGyHTdV5Xwlo1ViJM-p-7vg6C1eEsFU7B9jOGKNQp47HW-adrqTQYK8UZ6Lnb4mfS-uihUdD3U_ISkkoXbE=@protonmail.com
Empty Message
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(+)

Toggle diff (14 lines)
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
J. Sims wrote 2 years ago
[PATCH 2/2] gnu: geary: Use g-expressions.
(name . 62635@debbugs.gnu.org)(address . 62635@debbugs.gnu.org)
YIiOFmWCGkWU4NO4vA5R_uBcY_79jOhsFZ3D46HHMKKUgyuXl0zHNbmyRi4T0FTc17E0KLthNyKhh_UFQgzLVimhei2a7JupZpl7ufRsV0A=@protonmail.com
Empty Message
Ludovic Courtès wrote 2 years ago
Re: bug#62635: [PATCH 0/2] gnu: geary: Add missing dependency, use g-expressions.
(name . J. Sims)(address . jtsims@protonmail.com)(address . 62635@debbugs.gnu.org)
87ttwpjuti.fsf@gnu.org
Hi Juliana,

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

Toggle quote (2 lines)
> 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’.
Juliana Sims wrote 2 years ago
[PATCH v1 1/3] gnu: geary: Fix failing build.
(address . 62635@debbugs.gnu.org)
6ad35adb328d9dd26c7c15478efebf0076c65fda.1683486235.git.juli@incana.org
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(-)

Toggle diff (43 lines)
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
Juliana Sims wrote 2 years ago
[PATCH v1 2/3] gnu: geary: Add evolution-data-server as input.
(address . 62635@debbugs.gnu.org)
6412cfa5a37091ba068adb6de9dad970b6f0cde7.1683486235.git.juli@incana.org
* gnu/packages/gnome.scm (geary) [inputs]: Add evolution-data-server.
---
gnu/packages/gnome.scm | 1 +
1 file changed, 1 insertion(+)

Toggle diff (14 lines)
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
Juliana Sims wrote 2 years ago
[PATCH v1 3/3] gnu: geary: Use g-expressions.
(address . 62635@debbugs.gnu.org)
3015763ed081ecd89e68784e0dd3bc4e92d3e75f.1683486235.git.juli@incana.org
* gnu/packages/gnome.scm (geary) [arguments]: Use g-expressions.
---
gnu/packages/gnome.scm | 69 +++++++++++++++++++++---------------------
1 file changed, 34 insertions(+), 35 deletions(-)

Toggle diff (82 lines)
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
Juliana Sims wrote 2 years ago
[PATCH v2 1/3] gnu: geary: Fix failing build.
(address . 62635@debbugs.gnu.org)
62ebc50b3814bf335ec5862fef86f0a24c941395.1683487214.git.juli@incana.org
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(-)

Toggle diff (35 lines)
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
Juliana Sims wrote 2 years ago
[PATCH v2 2/3] gnu: geary: Add evolution-data-server as input.
(address . 62635@debbugs.gnu.org)
2e0a4a31add87dc634c89bb641b247e3171d4c14.1683487214.git.juli@incana.org
* gnu/packages/gnome.scm (geary) [inputs]: Add evolution-data-server.
---
gnu/packages/gnome.scm | 1 +
1 file changed, 1 insertion(+)

Toggle diff (14 lines)
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
Juliana Sims wrote 2 years ago
[PATCH v2 3/3] gnu: geary: Use g-expressions.
(address . 62635@debbugs.gnu.org)
503eb5c706bdeed59c56ca5933bab84de705b95c.1683487214.git.juli@incana.org
* gnu/packages/gnome.scm (geary) [arguments]: Use g-expressions.
---
gnu/packages/gnome.scm | 69 +++++++++++++++++++++---------------------
1 file changed, 34 insertions(+), 35 deletions(-)

Toggle diff (82 lines)
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
Liliana Marie Prikler wrote 2 years ago
Re: [PATCH v2 2/3] gnu: geary: Add evolution-data-server as input.
(address . ludo@gnu.org)
08054ed05df89cc0daa9148c9ff47cf1ae7ddc57.camel@gmail.com
Hi Juliana,

Am Sonntag, dem 07.05.2023 um 15:21 -0400 schrieb Juliana Sims:
Toggle quote (17 lines)
> * 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
Juliana Sims wrote 2 years ago
(address . ludo@gnu.org)
0ED9D1AF-312B-4C45-A2D3-0C3786DFBC8F@incana.org
Hi,

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

No such thing :)

Toggle quote (4 lines)
>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
Juliana Sims wrote 2 years ago
Ping
(address . 62635@debbugs.gnu.org)
OBDPUR.TJEM4MUV736Q@incana.org
Hi there,

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

Thanks,
Juli
Liliana Marie Prikler wrote 2 years ago
(name . ludo)(address . ludo@gnu.org)
66a62f63660cf3a0bc948fdd067c7edf2c8ec66e.camel@gmail.com
Hi Juliana,

Am Montag, dem 15.05.2023 um 09:55 -0400 schrieb Juliana Sims:
Toggle quote (4 lines)
> 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
Juliana Sims wrote 2 years ago
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
1T9QUR.VBC9UVJ56M2M1@incana.org
Hello,

Toggle quote (3 lines)
> 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
Liliana Marie Prikler wrote 2 years ago
(name . Juliana Sims)(address . juli@incana.org)
52a8debc25fc85c96e2268f500e716e1f4a9f469.camel@gmail.com
Am Montag, dem 15.05.2023 um 21:36 -0400 schrieb Juliana Sims:
Toggle quote (6 lines)
> 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.

Toggle quote (10 lines)
> 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
Juliana Sims wrote 2 years ago
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
IPJQUR.XBL6DDIT12572@incana.org
Hi,
Le mar, mai 16 2023 at 06:19:13 +0200, Liliana Marie Prikler
<liliana.prikler@gmail.com> a écrit :
Toggle quote (6 lines)
>> 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.)

Toggle quote (3 lines)
>> 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
Juliana Sims wrote 2 years ago
[PATCH v3 1/3] gnu: geary: Fix failing build.
(address . 62635@debbugs.gnu.org)(name . Juliana Sims)(address . juli@incana.org)
c7901654e7f1646eaa812911bfb0a57f78cc1b76.1684213970.git.juli@incana.org
* 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(-)

Toggle diff (35 lines)
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
Juliana Sims wrote 2 years ago
[PATCH v3 2/3] gnu: geary: Use g-expressions.
(address . 62635@debbugs.gnu.org)(name . Juliana Sims)(address . juli@incana.org)
9a74909d4f018363a134dc9bf6ebcf92605f884f.1684213970.git.juli@incana.org
* gnu/packages/gnome.scm (geary) [arguments]: Use g-expressions.
---
gnu/packages/gnome.scm | 69 +++++++++++++++++++++---------------------
1 file changed, 34 insertions(+), 35 deletions(-)

Toggle diff (82 lines)
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
Juliana Sims wrote 2 years ago
[PATCH v3 3/3] gnu: geary: Remove redundant native-inputs.
(address . 62635@debbugs.gnu.org)(name . Juliana Sims)(address . juli@incana.org)
a13a097cd0bfe8431c71654ae504dc7da930e5de.1684213970.git.juli@incana.org
* gnu/packages/gnome.scm (geary) [native-inputs]: Remove redundant
native-inputs.
---
gnu/packages/gnome.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (18 lines)
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
Liliana Marie Prikler wrote 2 years ago
Re: Ping
(name . Juliana Sims)(address . juli@incana.org)
b7bbd7273efbbea51acdeea46ec4f3652e8e12cc.camel@gmail.com
Am Dienstag, dem 16.05.2023 um 01:10 -0400 schrieb Juliana Sims:
Toggle quote (17 lines)
> 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.

Toggle quote (12 lines)
> > 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
Juliana Sims wrote 2 years ago
[PATCH v4 2/4] gnu: geary: Use G-Expressions.
(address . 62635@debbugs.gnu.org)
b616d4adf0504a268a42dd9f4a2e585afb086618.1684254549.git.liliana.prikler@gmail.com
* 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(-)

Toggle diff (82 lines)
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
Juliana Sims wrote 2 years ago
[PATCH v4 3/4] gnu: geary: Remove redundant native-inputs.
(address . 62635@debbugs.gnu.org)
da615ede406bf73605a436cb0ed17cc2f9f7ac08.1684254549.git.liliana.prikler@gmail.com
* 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(-)

Toggle diff (18 lines)
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
Liliana Marie Prikler wrote 2 years ago
[PATCH v4 4/4] gnu: geary: Update to 43.0.
(address . 62635@debbugs.gnu.org)
db845a37cc47a0dc853db3da3c7930735bbc45ea.1684254549.git.liliana.prikler@gmail.com
* 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(-)

Toggle diff (98 lines)
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
Juliana Sims wrote 2 years ago
[PATCH v4 1/4] gnu: geary: Fix build failure.
(address . 62635@debbugs.gnu.org)
bebdcd5f1885bb969a383929b0a6a2e1c935b10a.1684254549.git.liliana.prikler@gmail.com
* 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(-)

Toggle diff (35 lines)
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
Juliana Sims wrote 2 years ago
Re: [PATCH v4 4/4] gnu: geary: Update to 43.0.
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)(address . 62635@debbugs.gnu.org)
PLZSUR.31OPR64NK7LE1@incana.org
Hello,

Toggle quote (5 lines)
> 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
Liliana Marie Prikler wrote 2 years ago
(name . Juliana Sims)(address . juli@incana.org)(address . 62635-done@debbugs.gnu.org)
a17c81968a63a3340a1fcccb1a64835128eb258c.camel@gmail.com
Am Mittwoch, dem 17.05.2023 um 08:49 -0400 schrieb Juliana Sims:
Toggle quote (11 lines)
> 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
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 62635@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 62635
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help