guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit 81c93f441015283ce85c50ce905d9c5f0885c83b
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Wed Aug 26 23:00:00 2026 +0900
gnu: gnome-contacts: Update to 50.0.
* gnu/packages/gnome.scm (gnome-contacts): Update to 50.0.
[source]: Delete patches.
[#:configure-flags]: Delete.
[inputs]: Add libglycin.
* gnu/packages/patches/gnome-contacts-evolution-compat.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
Signed-off-by: Liliana Marie Prikler <[email protected]>
---
gnu/local.mk | 1 -
gnu/packages/gnome.scm | 11 +---
.../patches/gnome-contacts-evolution-compat.patch | 71 ----------------------
3 files changed, 3 insertions(+), 80 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index f5f96143af2..af61adbfa2e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1536,7 +1536,6 @@ dist_patch_DATA =
\
%D%/packages/patches/gmime-disable-tests.patch \
%D%/packages/patches/gmp-arm-asm-nothumb.patch \
%D%/packages/patches/gmp-faulty-test.patch \
- %D%/packages/patches/gnome-contacts-evolution-compat.patch \
%D%/packages/patches/gnome-control-center-firmware-security.patch \
%D%/packages/patches/gnome-control-center-libexecdir.patch \
%D%/packages/patches/gnome-dictionary-meson-i18n.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9dc9a72ab7d..6029ad7173a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2030,7 +2030,7 @@ commonly used macros.")
(define-public gnome-contacts
(package
(name "gnome-contacts")
- (version "49.0")
+ (version "50.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gnome-contacts/"
@@ -2038,17 +2038,11 @@ commonly used macros.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1bz4hns4vd9ifw0s4j7jgys143a650ny5lww5pppvmr9pikirwi5"))
- (patches
- ;; TODO: Remove when bumping to version 50.alpha or newer.
- (search-patches "gnome-contacts-evolution-compat.patch"))))
+ "1cysq2di7b78ylx3k44qx8nsks9qr901mhmp297j9gki64sflfra"))))
(build-system meson-build-system)
(arguments
(list
#:glib-or-gtk? #t
- ;; FIXME: Cannot build the Valadoc, because both gtk+ and gtk are in the
- ;; same profile (evolution-data-server propagates both).
- #:configure-flags #~'("-Ddocs=false")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
@@ -2075,6 +2069,7 @@ commonly used macros.")
gtk
libadwaita
libgee
+ libglycin
libportal
qrencode
telepathy-glib
diff --git a/gnu/packages/patches/gnome-contacts-evolution-compat.patch
b/gnu/packages/patches/gnome-contacts-evolution-compat.patch
deleted file mode 100644
index c0472ba4e15..00000000000
--- a/gnu/packages/patches/gnome-contacts-evolution-compat.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 45cb9a2d7e8cffd17bab05e29ee38f0463743a9c Mon Sep 17 00:00:00 2001
-From: Milan Crha <[email protected]>
-Date: Fri, 17 Oct 2025 11:10:09 +0200
-Subject: [PATCH] vcard-export: Adapt to evolution-data-server 3.59.1 EVCard
- API changes
-
-The e_vcard_to_string() newly does not have any argument, the vCard
-is saved in a version it is stored in the structure. To export in
-a specific version, one can use e_vcard_convert_to_string().
-
-Upstream-Status: Merged in version 50.alpha
----
- meson.build | 3 +++
- src/io/contacts-io-vcard-export-operation.vala | 10 ++++++++++
- 2 files changed, 13 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index e2a70a98..b90cb36d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -52,6 +52,9 @@ libadwaita_dep = dependency('libadwaita-1', version: '>=
1.8.alpha')
- # E-D-S
- libebook = dependency('libebook-1.2', version: '>=' + min_eds_version)
- libedataserver = dependency('libedataserver-1.2', version: '>=' +
min_eds_version)
-+if libebook.version().version_compare('>=3.59.1')
-+ add_project_arguments('-D', 'HAVE_EDS_3_59_1', language: 'vala')
-+endif
- # Camera
- libportal_dep = dependency('libportal-gtk4', version: '>= 0.7')
- gstreamer_dep = dependency('gstreamer-1.0')
-diff --git a/src/io/contacts-io-vcard-export-operation.vala
b/src/io/contacts-io-vcard-export-operation.vala
-index 74ed6572..a692a67d 100644
---- a/src/io/contacts-io-vcard-export-operation.vala
-+++ b/src/io/contacts-io-vcard-export-operation.vala
-@@ -16,7 +16,9 @@ public class Contacts.Io.VCardExportOperation :
ExportOperation {
-
- // We _could_ parameterize this with our own enum, but there's no need for
- // that at the moment.
-+#if !HAVE_EDS_3_59_1
- private E.VCardFormat vcard_format = E.VCardFormat.@30;
-+#endif
-
- // This should always be on false, except for debugging/troubleshooting
- // purposes. It forces E-D-S personas to use our manual serialization
instead
-@@ -53,7 +55,11 @@ public class Contacts.Io.VCardExportOperation :
ExportOperation {
- // that's an E.VCard already
- if (persona is Edsf.Persona && !avoid_eds) {
- unowned var contact = ((Edsf.Persona) persona).contact;
-+#if HAVE_EDS_3_59_1
-+ return contact.to_string ();
-+#else
- return contact.to_string (this.vcard_format);
-+#endif
- }
-
- var vcard = new E.VCard ();
-@@ -104,7 +110,11 @@ public class Contacts.Io.VCardExportOperation :
ExportOperation {
- vcard_set_webservice_details (vcard, (WebServiceDetails) persona);
- */
-
-+#if HAVE_EDS_3_59_1
-+ return vcard.to_string ();
-+#else
- return vcard.to_string (this.vcard_format);
-+#endif
- }
-
- private void vcard_set_avatar_details (E.VCard vcard,
---
-GitLab
-
