From ce7d93ceda06f0332617a29fe0181f13d2c0b369 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 12 Nov 2021 22:12:33 -0500 Subject: gnu: evolution-data-server: Update to 3.42.1. * gnu/packages/gnome.scm (evolution-data-server): Update to 3.42.1. Delete trailing #t. [origin]: Remove patches. [phases]{adjust-webkitgtk-version}: New phase. * gnu/packages/patches/evolution-data-server-CVE-2020-14928.patch: Likewise. * gnu/packages/patches/evolution-data-server-CVE-2020-16117.patch: Likewise. * gnu/packages/patches/evolution-data-server-libical-compat.patch: Likewise. * gnu/packages/patches/evolution-data-server-locales.patch: Likewise. * gnu/packages/patches/evolution-data-server-printableoptions.patch: Likewise. * gnu/local.mk (dist_patch_DATA): De-register them. --- .../evolution-data-server-libical-compat.patch | 36 ---------------------- 1 file changed, 36 deletions(-) delete mode 100644 gnu/packages/patches/evolution-data-server-libical-compat.patch (limited to 'gnu/packages/patches/evolution-data-server-libical-compat.patch') diff --git a/gnu/packages/patches/evolution-data-server-libical-compat.patch b/gnu/packages/patches/evolution-data-server-libical-compat.patch deleted file mode 100644 index da4302d42e..0000000000 --- a/gnu/packages/patches/evolution-data-server-libical-compat.patch +++ /dev/null @@ -1,36 +0,0 @@ -Prevent test failure and possible data loss due to API change in libical 3.0.7. - -https://gitlab.gnome.org/GNOME/evolution-data-server/issues/185 -https://lists.infradead.org/pipermail/libical-devel/2020-January/000907.html - -Adapted from upstream: - -https://gitlab.gnome.org/GNOME/evolution-data-server/commit/77384ab552c19bf374dbeda53dc37f98d07bd4ec - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e16b8b225..b3c881967 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -111,7 +111,7 @@ add_definitions(-DSOUP_VERSION_MIN_REQUIRED=${soup_encoded_version}) - - set(gcr_minimum_version 3.4) - set(libgdata_minimum_version 0.15.1) --set(libical_glib_minimum_version 3.0.5) -+set(libical_glib_minimum_version 3.0.7) - set(libsecret_minimum_version 0.5) - set(libxml_minimum_version 2.0.0) - set(sqlite_minimum_version 3.7.17) -diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c -index 7501f2a43..93f4806ba 100644 ---- a/src/calendar/libedata-cal/e-cal-meta-backend.c -+++ b/src/calendar/libedata-cal/e-cal-meta-backend.c -@@ -4067,8 +4067,7 @@ e_cal_meta_backend_inline_local_attachments_sync (ECalMetaBackend *meta_backend, - gchar *base64; - - base64 = g_base64_encode ((const guchar *) content, len); -- new_attach = i_cal_attach_new_from_data (base64, NULL, NULL); -+ new_attach = i_cal_attach_new_from_data (base64, (GFunc) g_free, NULL); - g_free (content); -- g_free (base64); - - ecmb_remove_all_but_filename_parameter (prop); -- cgit v1.2.3