From ed3bae99fd9614dacb334bbbb618e3ed059060da Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 18 Sep 2021 22:41:01 +0200
Subject: [PATCH] evolution-data-server: update to 3.42.0.

---
 common/shlibs                                 |  2 +-
 .../patches/skip-broken-tests.patch           | 20 +++++++++++++++++++
 srcpkgs/evolution-data-server/template        | 14 +++++--------
 3 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/evolution-data-server/patches/skip-broken-tests.patch

diff --git a/common/shlibs b/common/shlibs
index d9763df049c..a720446f4a2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -595,7 +595,7 @@ libicalss.so.3 libical-3.0.4_1
 libicalss_cxx.so.3 libical-3.0.4_1
 libicalvcal.so.3 libical-3.0.4_1
 libical-glib.so.3 libical-3.0.4_1
-libcamel-1.2.so.62 evolution-data-server-3.30.0_1
+libcamel-1.2.so.63 evolution-data-server-3.42.0_1
 libedataserver-1.2.so.26 evolution-data-server-3.40.0_1
 libebackend-1.2.so.10 evolution-data-server-3.17.90_1
 libedataserverui-1.2.so.3 evolution-data-server-3.40.0_1
diff --git a/srcpkgs/evolution-data-server/patches/skip-broken-tests.patch b/srcpkgs/evolution-data-server/patches/skip-broken-tests.patch
new file mode 100644
index 00000000000..8e8ea92dd6b
--- /dev/null
+++ b/srcpkgs/evolution-data-server/patches/skip-broken-tests.patch
@@ -0,0 +1,20 @@
+the migration test fails in CI with
+
+evolution-addressbook-factory:31525): libedbus-private-WARNING **: 12:14:56.591: Error setting property 'ConnectionStatus' on interface org.gnome.evolution.dataserver.Source: The connection is closed (g-io-error-quark, 18)
+Bail out! GLib-GIO-FATAL-WARNING: Weak notify timeout, object ref_count=1
+
+(/builddir/evolution-data-server-3.42.2/build/tests/book-migration/test-migration:31511): GLib-GIO-WARNING **: 12:15:26.608: Weak notify timeout, object ref_count=1
+
+--- a/tests/book-migration/CMakeLists.txt
++++ b/tests/book-migration/CMakeLists.txt
+@@ -40,9 +40,7 @@
+ )
+ 
+ # Should be kept ordered approximately from least to most difficult/complex
+-set(TESTS
+-	test-migration
+-)
++set(TESTS)
+ 
+ foreach(_test ${TESTS})
+ 	set(SOURCES ${_test}.c)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 6501fe151cc..43514ff6541 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.40.2
-revision=3
+version=3.42.2
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
@@ -13,13 +13,14 @@ makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel
  libsecret-devel mit-krb5-devel webkit2gtk-devel libgweather-devel
  libsoup-devel $(vopt_if gir vala-devel)"
 depends="libgweather libsoup-gnome"
+checkdepends="dbus"
 short_desc="Centralized access to appointments and contacts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ec82951639f32a5cece80a8b0b9aa3f66b7d318e3ee2c1c35234f2e2bde8a418
+checksum=1c14d86e7a0d8e6e4f1a96137e31a619d2bcfbfc80ad1f0eac38dee2c0247abc
 
 build_options="gir"
 build_options_default="gir"
@@ -32,11 +33,6 @@ pre_build() {
 	LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/private"
 }
 
-# problematic
-do_check() {
-	:
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd
 }