summaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorKei Kebreau <kkebreau@posteo.net>2019-12-17 11:01:23 -0500
committerKei Kebreau <kkebreau@posteo.net>2020-04-18 16:49:54 -0400
commit162048be3b838e221e5256b0f670ac6f884f607a (patch)
tree3772f17d095214674af202425245ade2c81b3dfc /gnu/packages/patches
parent462d3416a871f97ae3de867e725f8c6e4f976731 (diff)
gnu: evolution-data-server: Update to 3.34.2.
* gnu/packages/gnome.scm (evolution-data-server): Update to 3.34.2. [arguments]: Adjust 'disable-failing-tests' phase. * gnu/packages/patches/evolution-data-server-libical-compat.patch: Update patch. (cherry picked from commit 3febbdc80004c907507dbf4162bf6e7bfde74d28)
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/evolution-data-server-libical-compat.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/gnu/packages/patches/evolution-data-server-libical-compat.patch b/gnu/packages/patches/evolution-data-server-libical-compat.patch
index a988519ea0..da4302d42e 100644
--- a/gnu/packages/patches/evolution-data-server-libical-compat.patch
+++ b/gnu/packages/patches/evolution-data-server-libical-compat.patch
@@ -8,29 +8,29 @@ 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
-@@ -108,7 +108,7 @@
+@@ -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_minimum_version 2.0)
-+set(libical_minimum_version 3.0.7)
+-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 7501f2a43dcc3af91e93e89751caf76e77c2ac23..93f4806ba2c5193f746e9fae5bf74d08ad05f8bf 100644
+index 7501f2a43..93f4806ba 100644
--- a/src/calendar/libedata-cal/e-cal-meta-backend.c
+++ b/src/calendar/libedata-cal/e-cal-meta-backend.c
-@@ -3958,9 +3958,8 @@
+@@ -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 = icalattach_new_from_data (base64, NULL, NULL);
-+ new_attach = icalattach_new_from_data (base64, (GFunc) g_free, NULL);
+- 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);
-