29/108: gnu: evolution-data-server: Update to 3.36.1.

[guix-commits]

kkebreau pushed a commit to branch wip-gnome3.36
in repository guix.

commit a54a298af1a8143a12e0c80023404d84f24db8c6
Author: Kei Kebreau <address@hidden>
AuthorDate: Sat Apr 18 19:46:22 2020 -0400

    gnu: evolution-data-server: Update to 3.36.1.
    
    * gnu/packages/gnome.scm (evolution-data-server): Update to 3.36.1.
    [source]: Remove obsolete patch.
    [arguments]: Adjust 'disable-failing-tests' phase accordingly.
    * gnu/packages/patches/evolution-data-server-libical-compat.patch: Delete 
file.
    * gnu/local.mk: Remove it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/gnome.scm                             | 16 +++++-----
 .../evolution-data-server-libical-compat.patch     | 36 ----------------------
 3 files changed, 7 insertions(+), 46 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 2780434..40a6538 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -885,7 +885,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/eudev-rules-directory.patch             \
   %D%/packages/patches/evilwm-lost-focus-bug.patch             \
   %D%/packages/patches/evolution-data-server-locales.patch     \
-  %D%/packages/patches/evolution-data-server-libical-compat.patch      \
   %D%/packages/patches/exiv2-CVE-2017-14860.patch              \
   %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch  \
   %D%/packages/patches/extundelete-e2fsprogs-1.44.patch                \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c0484ea..1d37659 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6196,17 +6196,16 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and 
Kerberos.")
 (define-public evolution-data-server
   (package
     (name "evolution-data-server")
-    (version "3.34.2")
+    (version "3.36.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
                                   (version-major+minor version) "/"
                                   name "-" version ".tar.xz"))
-              (patches (search-patches "evolution-data-server-locales.patch"
-                                       
"evolution-data-server-libical-compat.patch"))
+              (patches (search-patches "evolution-data-server-locales.patch"))
               (sha256
                (base32
-                "16z85y6hhazcrp5ngw47w4x9r0j8zrj7awv5im58hhp0xs19zf1y"))))
+                "15k7k225jfv5a45hmjk94xq90np2r9f5v8yj0xi3166vvlp2n4hk"))))
     (build-system cmake-build-system)
     (arguments
      '(#:configure-flags
@@ -6228,11 +6227,10 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and 
Kerberos.")
        (modify-phases %standard-phases
          (add-after 'unpack 'disable-failing-tests
            (lambda _
-             ;; tests/book-migration/test-migration.c:160:test_fetch_contacts:
-             ;; assertion failed (g_slist_length (contacts) == 20): (0 == 20)
-             (delete-file-recursively "tests/book-migration")
-             (substitute* "tests/CMakeLists.txt"
-               (("add_subdirectory\\(book-migration\\)") ""))
+             ;; (test-book-client-custom-summary:7593): GLib-GIO-WARNING **:
+             ;; 21:48:37.554: Weak notify timeout, object ref_count=4
+             (substitute* "tests/libebook/client/CMakeLists.txt"
+               (("test-book-client-custom-summary") ""))
              #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
deleted file mode 100644
index da4302d..0000000
--- 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);