[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
16/47: gnu: evolution-data-server: Update to 3.34.2.
From: |
guix-commits |
Subject: |
16/47: gnu: evolution-data-server: Update to 3.34.2. |
Date: |
Mon, 23 Mar 2020 15:50:49 -0400 (EDT) |
kkebreau pushed a commit to branch wip-gnome3.34
in repository guix.
commit 603a4c536754916ca9a4bd57ad265ee50fefbc11
Author: Kei Kebreau <address@hidden>
AuthorDate: Tue Dec 17 11:01:23 2019 -0500
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.
---
gnu/packages/gnome.scm | 11 ++---------
.../patches/evolution-data-server-libical-compat.patch | 16 ++++++++--------
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7706612..9a5cb2b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6098,7 +6098,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
(define-public evolution-data-server
(package
(name "evolution-data-server")
- (version "3.32.4")
+ (version "3.34.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -6108,7 +6108,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
"evolution-data-server-libical-compat.patch"))
(sha256
(base32
- "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3"))))
+ "16z85y6hhazcrp5ngw47w4x9r0j8zrj7awv5im58hhp0xs19zf1y"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
@@ -6135,13 +6135,6 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
(delete-file-recursively "tests/book-migration")
(substitute* "tests/CMakeLists.txt"
(("add_subdirectory\\(book-migration\\)") ""))
- ;; tests/libebook/client/test-book-client-view-operations:8077):
- ;; e-data-server-WARNING **:
- ;;
(src/libedataserver/e-source-registry.c:264):thread_closure_free:
- ;; runtime check failed:
- ;; (!g_main_context_pending (closure->main_context))
- (substitute* "tests/libebook/client/CMakeLists.txt"
- (("test-book-client-view-operations") ""))
#t))
(add-after 'unpack 'patch-paths
(lambda _
diff --git a/gnu/packages/patches/evolution-data-server-libical-compat.patch
b/gnu/packages/patches/evolution-data-server-libical-compat.patch
index a988519..da4302d 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);
-
- 04/47: gnu: dconf-editor: Update to 3.34.2., (continued)
- 04/47: gnu: dconf-editor: Update to 3.34.2., guix-commits, 2020/03/23
- 05/47: gnu: eog: Update to 3.34.1., guix-commits, 2020/03/23
- 06/47: gnu: gnome-desktop: Update to 3.34.2., guix-commits, 2020/03/23
- 07/47: gnu: gnome-backgrounds: Update to 3.34.0., guix-commits, 2020/03/23
- 09/47: gnu: libdazzle: Update to 3.34.1., guix-commits, 2020/03/23
- 12/47: gnu: glib-networking: Update to 2.62.2., guix-commits, 2020/03/23
- 15/47: gnu: gnome-online-accounts: Update to 3.34.1., guix-commits, 2020/03/23
- 13/47: gnu: gnome-bluetooth: Update to 3.34.0., guix-commits, 2020/03/23
- 17/47: gnu: gnome-autoar: Update to 0.2.4., guix-commits, 2020/03/23
- 14/47: gnu: libgweather: Update to 3.34.0., guix-commits, 2020/03/23
- 16/47: gnu: evolution-data-server: Update to 3.34.2.,
guix-commits <=
- 23/47: gnu: gnome-settings-daemon: Update to 3.34.1., guix-commits, 2020/03/23
- 18/47: gnu: evolution: Update to 3.34.2., guix-commits, 2020/03/23
- 24/47: gnu: gnome-control-center: Update to 3.34.2., guix-commits, 2020/03/23
- 22/47: gnu: gnome-session: Update to 3.34.2., guix-commits, 2020/03/23
- 25/47: gnu: gnome-disk-utility: Update to 3.34.0., guix-commits, 2020/03/23
- 26/47: gnu: gnome-keyring: Update to 3.34.0., guix-commits, 2020/03/23
- 27/47: gnu: gnome-screenshot: Update to 3.34.0., guix-commits, 2020/03/23
- 28/47: gnu: gnome-terminal: Update to 3.34.2., guix-commits, 2020/03/23
- 30/47: gnu: totem: Update to 3.34.1., guix-commits, 2020/03/23
- 33/47: gnu: telepathy-glib: Disable failing tests., guix-commits, 2020/03/23