From f8490817e70c78502ba7bcb9aa98164d0e72b66c Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Thu, 2 Dec 2021 16:34:11 +0100
Subject: 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(-)

(limited to 'gnu/packages/gnome.scm')

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3e607dc7df..f2b663a477 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")
-- 
cgit v1.2.3

ype='hidden' name='id' value='7d728294481620e90f7b5e7a76e02e8032be578a'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=7d728294481620e90f7b5e7a76e02e8032be578a'>root</a>/<a href='/guix/log/tests?id=7d728294481620e90f7b5e7a76e02e8032be578a'>tests</a>/<a href='/guix/log/tests/store-roots.scm?id=7d728294481620e90f7b5e7a76e02e8032be578a'>store-roots.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/store-roots.scm?id=7d728294481620e90f7b5e7a76e02e8032be578a&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-04-10 17:09:47 +0200'>2019-04-10</span></td><td><a href='/guix/commit/tests/store-roots.scm?id=72eda0624be89ed18302fd7d7f22976071ab020c'>Add (guix store roots).</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>