[bug#52246] [PATCH] [core-updates-frozen] Build evolution with libsoup 2

[bug#52246] [PATCH] [core-updates-frozen] Build evolution with libsoup 2

[Vivien Kraus via Guix-patches via]

[-- Attachment #1.1: Type: text/plain, Size: 293 bytes --]


Dear guix,

Maxim Cournoyer upgraded evolution in
acd827be09a5d15734be9a09a88e1892d54f8dc4, but used webkitgtk with
libsoup 3, which conflicts with libsoup 2 as used by
evolution-data-server.

I propose that we use the libsoup 2 variant everywhere, what do you
think?

Best regards,

Vivien


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Use libsoup 2 for evolution --]
[-- Type: text/x-patch, Size: 1652 bytes --]

From 5ed766f7f4a0a475200422603be400920f2a2c9d Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Thu, 2 Dec 2021 16:34:11 +0100
Subject: [PATCH] gnu: evolution: Build with libsoup 2.

* gnu/packages/gnome.scm (evolution) [phase adjust-webkitgtk-version]: Remove
it.
[inputs]: Depend on webkitgtk-with-libsoup2 instead of webkitgtk.
---
 gnu/packages/gnome.scm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index bada1e866b..f29f74de68 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11265,11 +11265,6 @@ (define-public evolution
                                           ; in four years and cannot be built.
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'adjust-webkitgtk-version
-           (lambda _
-             (substitute* '("CMakeLists.txt" "evolution-shell.pc.in")
-               (("webkit2gtk-4.0")
-                "webkit2gtk-4.1"))))
          ;; The build system attempts to install user interface modules to the
          ;; output directory of the "evolution-data-server" package.  This
          ;; change redirects that change.
@@ -11303,7 +11298,7 @@ (define-public evolution
        ("libsoup" ,libsoup)
        ("nss" ,nss)
        ("openldap" ,openldap)
-       ("webkitgtk" ,webkitgtk)
+       ("webkitgtk" ,webkitgtk-with-libsoup2) ; because of evolution-data-server
        ("ytnef" ,ytnef)))
     (home-page "https://gitlab.gnome.org/GNOME/evolution")
     (synopsis "Manage your email, contacts and schedule")
-- 
2.34.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 658 bytes --]

bug#52246: [PATCH] [core-updates-frozen] Build evolution with libsoup 2

[Mathieu Othacehe]

Hey,

> I propose that we use the libsoup 2 variant everywhere, what do you
> think?

Seems fair, pushed as f8490817e70c78502ba7bcb9aa98164d0e72b66c.

Thanks,

Mathieu