From 71c04b6e5670a30710e6dbd96c70237e2f8c4044 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 17 Apr 2024 03:52:34 -0700 Subject: [PATCH] evolution-data-server: update to 3.52.0. --- common/shlibs | 2 +- ...d321532ea80a8e204c0d97dd06771c9d4646.patch | 45 +++++++++++++++++++ srcpkgs/evolution-data-server/template | 8 ++-- 3 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/evolution-data-server/patches/d845d321532ea80a8e204c0d97dd06771c9d4646.patch diff --git a/common/shlibs b/common/shlibs index 4767aa42e92..31a843e0030 100644 --- a/common/shlibs +++ b/common/shlibs @@ -606,7 +606,7 @@ libcamel-1.2.so.64 evolution-data-server-3.46.0_1 libebackend-1.2.so.11 evolution-data-server-3.46.0_1 libebook-1.2.so.21 evolution-data-server-3.46.0_1 libebook-contacts-1.2.so.4 evolution-data-server-3.46.0_1 -libecal-2.0.so.2 evolution-data-server-3.46.0_1 +libecal-2.0.so.3 evolution-data-server-3.52.0_1 libedata-book-1.2.so.27 evolution-data-server-3.46.0_1 libedataserver-1.2.so.27 evolution-data-server-3.46.0_1 libedataserverui-1.2.so.4 evolution-data-server-3.46.0_1 diff --git a/srcpkgs/evolution-data-server/patches/d845d321532ea80a8e204c0d97dd06771c9d4646.patch b/srcpkgs/evolution-data-server/patches/d845d321532ea80a8e204c0d97dd06771c9d4646.patch new file mode 100644 index 00000000000..7dbe72d6961 --- /dev/null +++ b/srcpkgs/evolution-data-server/patches/d845d321532ea80a8e204c0d97dd06771c9d4646.patch @@ -0,0 +1,45 @@ +From d845d321532ea80a8e204c0d97dd06771c9d4646 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Tue, 9 Apr 2024 17:11:16 +0200 +Subject: [PATCH] I#534 - Google Task stale item cannot be deleted + +Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/534 +--- + src/calendar/backends/gtasks/e-cal-backend-gtasks.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/calendar/backends/gtasks/e-cal-backend-gtasks.c b/src/calendar/backends/gtasks/e-cal-backend-gtasks.c +index 81bb18d8c6..ff3e255d25 100644 +--- a/src/calendar/backends/gtasks/e-cal-backend-gtasks.c ++++ b/src/calendar/backends/gtasks/e-cal-backend-gtasks.c +@@ -883,6 +883,7 @@ ecb_gtasks_remove_component_sync (ECalMetaBackend *meta_backend, + GError **error) + { + ECalBackendGTasks *cbgtasks; ++ GError *local_error = NULL; + gboolean success; + + g_return_val_if_fail (E_IS_CAL_BACKEND_GTASKS (meta_backend), FALSE); +@@ -893,10 +894,18 @@ ecb_gtasks_remove_component_sync (ECalMetaBackend *meta_backend, + + g_rec_mutex_lock (&cbgtasks->priv->conn_lock); + +- success = e_gdata_session_tasks_delete_sync (cbgtasks->priv->gdata, cbgtasks->priv->tasklist_id, uid, cancellable, error); ++ success = e_gdata_session_tasks_delete_sync (cbgtasks->priv->gdata, cbgtasks->priv->tasklist_id, uid, cancellable, &local_error); + + g_rec_mutex_unlock (&cbgtasks->priv->conn_lock); + ++ if (g_error_matches (local_error, E_SOUP_SESSION_ERROR, SOUP_STATUS_NOT_FOUND)) { ++ g_clear_error (&local_error); ++ success = TRUE; ++ } ++ ++ if (local_error) ++ g_propagate_error (error, local_error); ++ + return success; + } + +-- +GitLab + diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 3e4a3a11b7b..7258ec8ad13 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,6 +1,6 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.50.4 +version=3.52.0 revision=1 build_style=cmake build_helper="gir qemu" @@ -12,15 +12,15 @@ hostmakedepends="flex glib-devel gperf gettext pkg-config libglib-devel makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkitgtk60-devel libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel - libgweather-devel" + libgweather-devel nspr-devel nss-devel" checkdepends="dbus" short_desc="Centralized access to appointments and contacts" maintainer="Enno Boland " license="LGPL-2.1-only" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-45/NEWS" +changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-46/NEWS" distfiles="${GNOME_SITE}/evolution-data-server/${version%.*}/evolution-data-server-${version}.tar.xz" -checksum=d7edffbe03a0bbcecbee67393214b831c7b18cd895b84c4dbfe1387776e257c5 +checksum=a5d5e11c7a1e585846efe260f3c1c61a78399bd8b623bfd79ac1c0ffea7bde06 make_check=ci-skip # flaky in CI build_options="gir"