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

  • Done
  • quality assurance status badge
Details
2 participants
  • Mathieu Othacehe
  • Vivien Kraus
Owner
unassigned
Submitted by
Vivien Kraus
Severity
normal

Debbugs page

Vivien Kraus wrote 3 years ago
(address . guix-patches@gnu.org)
87k0gnqad5.fsf@planete-kraus.eu
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
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(-)

Toggle diff (27 lines)
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
-----BEGIN PGP SIGNATURE-----

iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGo6gYACgkQO7C8EjLY
uCwScAv/enkruu/IDB2mC3rFq6t3SJHHdf/c6PvVFRHs2CtubyeUTkNhVsgZZazT
Epa8GoMCkAyQgMDE+CwxPAWxfaO7mSQz3nbuEPpB4TU/hWDVbCadwZNItq2Ii6aH
6TXJzifREEEt0W4EaCbd7e/RADeQfZ+At+RoavWt8j5L9/VCDtNv2SQfkjk9caVX
O7MxXKdZksVwkd9VykPnBF3QuCyi+w+m09XlVFZCFjTit89WooR+pmNaUZ1huIA8
SxcotYe8jK2CeFooAEQKA7ScMUQEEVq6rYSbQOLZ70L3csRBhhbjr92obKN+T2ai
L2KQsSrENr1gk81H6UcyeadA+ip+QAYdrqwKmEBd1jKcat+QqfUPgtg/JPrMjMdU
UfHDFRsOYrQHw3vdivPz4OBz3MSE2inZ6ACpY6F8txK8hOnRg2RproWYeVB7WmS9
UetzhrbG0AX9o5fkdf5XwPIvBoUAAUM8n9/3irqWXq1M2K9JgSua2qDCEQqMAcil
FXFOQsl2
=Ze7t
-----END PGP SIGNATURE-----

Mathieu Othacehe wrote 3 years ago
(name . Vivien Kraus)(address . vivien@planete-kraus.eu)(address . 52246-done@debbugs.gnu.org)
871r2r1kb2.fsf@gnu.org
Hey,

Toggle quote (3 lines)
> I propose that we use the libsoup 2 variant everywhere, what do you
> think?

Seems fair, pushed as f8490817e70c78502ba7bcb9aa98164d0e72b66c.

Thanks,

Mathieu
Closed
?
Your comment

This issue is archived.

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

To respond to this issue using the mumi CLI, first switch to it
mumi current 52246
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