guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch core-updates-frozen updated: gnu: evolution: Build with libsoup 2


From: guix-commits
Subject: branch core-updates-frozen updated: gnu: evolution: Build with libsoup 2.
Date: Sun, 05 Dec 2021 02:42:10 -0500

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch core-updates-frozen
in repository guix.

The following commit(s) were added to refs/heads/core-updates-frozen by this 
push:
     new f849081  gnu: evolution: Build with libsoup 2.
f849081 is described below

commit f8490817e70c78502ba7bcb9aa98164d0e72b66c
Author: Vivien Kraus <vivien@planete-kraus.eu>
AuthorDate: Thu Dec 2 16:34:11 2021 +0100

    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.
    
    Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
 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 3e607dc..f2b663a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11265,11 +11265,6 @@ generic enough to work for everyone.")
                                           ; 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 @@ generic enough to work for everyone.")
        ("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")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]