From 4714290ce12221f29f85c22f762d568dcef22317 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 17 Apr 2024 03:52:34 -0700 Subject: [PATCH 01/10] 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 4767aa42e92858..31a843e0030b09 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 00000000000000..7dbe72d6961585 --- /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 3e4a3a11b7b154..7258ec8ad13c93 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" From cf49bd84ae50fa13c014f8fe159911f1edfa9892 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 17 Apr 2024 03:53:00 -0700 Subject: [PATCH 02/10] evolution: update to 3.52.0. --- ...0ab7cdf74ac73e4e3448e4fb29d4e7731f74.patch | 54 +++++++++++++++++++ ...cf27cd8a903acdf9c6ed7b746903bbda9e6d.patch | 27 ++++++++++ srcpkgs/evolution/template | 6 +-- 3 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/evolution/patches/a7fe0ab7cdf74ac73e4e3448e4fb29d4e7731f74.patch create mode 100644 srcpkgs/evolution/patches/e290cf27cd8a903acdf9c6ed7b746903bbda9e6d.patch diff --git a/srcpkgs/evolution/patches/a7fe0ab7cdf74ac73e4e3448e4fb29d4e7731f74.patch b/srcpkgs/evolution/patches/a7fe0ab7cdf74ac73e4e3448e4fb29d4e7731f74.patch new file mode 100644 index 00000000000000..f1e70f2a343985 --- /dev/null +++ b/srcpkgs/evolution/patches/a7fe0ab7cdf74ac73e4e3448e4fb29d4e7731f74.patch @@ -0,0 +1,54 @@ +From a7fe0ab7cdf74ac73e4e3448e4fb29d4e7731f74 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Thu, 4 Apr 2024 08:52:40 +0200 +Subject: [PATCH] I#2712 - Crash when hiding completed tasks + +Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/2712 +--- + src/calendar/gui/e-task-table.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/calendar/gui/e-task-table.c b/src/calendar/gui/e-task-table.c +index a8e906e3e4..d92b279cb2 100644 +--- a/src/calendar/gui/e-task-table.c ++++ b/src/calendar/gui/e-task-table.c +@@ -1376,7 +1376,7 @@ hide_completed_rows_ready (GObject *source_object, + { + ECalModel *model = user_data; + ECalClient *cal_client; +- GSList *m, *objects; ++ GSList *m, *objects = NULL; + gboolean changed = FALSE; + gint pos; + GPtrArray *comp_objects; +@@ -1384,7 +1384,8 @@ hide_completed_rows_ready (GObject *source_object, + + cal_client = E_CAL_CLIENT (source_object); + +- e_cal_client_get_object_list_finish (cal_client, result, &objects, &error); ++ if (!e_cal_client_get_object_list_finish (cal_client, result, &objects, &error)) ++ objects = NULL; + + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { + g_error_free (error); +@@ -1448,14 +1449,15 @@ show_completed_rows_ready (GObject *source_object, + { + ECalClient *cal_client; + ECalModel *model = user_data; +- GSList *m, *objects; ++ GSList *m, *objects = NULL; + GPtrArray *comp_objects; + GError *error = NULL; + + cal_client = E_CAL_CLIENT (source_object); + g_return_if_fail (cal_client != NULL); + +- e_cal_client_get_object_list_finish (cal_client, result, &objects, &error); ++ if (!e_cal_client_get_object_list_finish (cal_client, result, &objects, &error)) ++ objects = NULL; + + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { + g_error_free (error); +-- +GitLab + diff --git a/srcpkgs/evolution/patches/e290cf27cd8a903acdf9c6ed7b746903bbda9e6d.patch b/srcpkgs/evolution/patches/e290cf27cd8a903acdf9c6ed7b746903bbda9e6d.patch new file mode 100644 index 00000000000000..666947a5784e9a --- /dev/null +++ b/srcpkgs/evolution/patches/e290cf27cd8a903acdf9c6ed7b746903bbda9e6d.patch @@ -0,0 +1,27 @@ +From e290cf27cd8a903acdf9c6ed7b746903bbda9e6d Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Thu, 11 Apr 2024 10:47:28 +0200 +Subject: [PATCH] I#2617 - Wrong weeks in Month view when returning from + different page of dates + +Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/2617 +--- + src/modules/calendar/e-cal-shell-content.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/calendar/e-cal-shell-content.c b/src/modules/calendar/e-cal-shell-content.c +index 0eb4b41c5f..9c2a0f9c8c 100644 +--- a/src/modules/calendar/e-cal-shell-content.c ++++ b/src/modules/calendar/e-cal-shell-content.c +@@ -504,7 +504,7 @@ cal_shell_content_datepicker_selection_changed_cb (ECalendarItem *calitem, + cal_shell_content->priv->current_view == E_CAL_VIEW_KIND_LIST) { + sel_end = sel_start; + if (cal_shell_content->priv->current_view == E_CAL_VIEW_KIND_MONTH) { +- g_date_add_days (&sel_end, 7 * e_week_view_get_weeks_shown (E_WEEK_VIEW (cal_shell_content->priv->views[E_CAL_VIEW_KIND_WEEK]))); ++ g_date_add_days (&sel_end, 7 * e_week_view_get_weeks_shown (E_WEEK_VIEW (cal_shell_content->priv->views[E_CAL_VIEW_KIND_MONTH]))); + } else { + /* whole month */ + g_date_set_day (&sel_start, 1); +-- +GitLab + diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index fbf1d551bd5e7e..33fb7d92bd063e 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,6 +1,6 @@ # Template file for 'evolution' pkgname=evolution -version=3.50.4 +version=3.52.0 revision=1 build_style=cmake build_helper="qemu" @@ -18,9 +18,9 @@ short_desc="Integrated mail, addressbook and calendaring for GNOME" maintainer="Enno Boland " license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-45/NEWS" +changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-46/NEWS" distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz" -checksum=e0f955ca14dfb1b2e1682fcfa1816a03c114b8161998f96cf9d681a6a3842698 +checksum=5ef708d7c0e40582e271b30e2a07625b648c32c6340cb5488df44177c7c946a9 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so libevolution-mail-composer.so" From c354577d9c95a4a937aea32ef0150e0d821300f4 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 17 Apr 2024 03:53:25 -0700 Subject: [PATCH 03/10] evolution-ews: update to 3.52.0. --- srcpkgs/evolution-ews/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template index b9ec40c462fe9c..8804dc41421428 100644 --- a/srcpkgs/evolution-ews/template +++ b/srcpkgs/evolution-ews/template @@ -1,6 +1,6 @@ # Template file for 'evolution-ews' pkgname=evolution-ews -version=3.50.3 +version=3.52.0 revision=1 build_style=cmake configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution" @@ -11,6 +11,6 @@ short_desc="MS Exchange integration through Exchange Web Services" maintainer="Peter Kuchar " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-45/NEWS" +changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-46/NEWS" distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz" checksum=e2fa5941376ad57e07d2673f8676c31f7f2b068d49f68ea0fb8bafeabb529bed From fa083b628d4c4d7397c87f33269502f857779d8f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 17 Apr 2024 04:07:25 -0700 Subject: [PATCH 04/10] bijiben: rebuild for evolution-data-server 3.52 --- srcpkgs/bijiben/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template index 2b06861b403877..2829568c7f4b61 100644 --- a/srcpkgs/bijiben/template +++ b/srcpkgs/bijiben/template @@ -1,12 +1,12 @@ # Template file for 'bijiben' pkgname=bijiben version=40.1 -revision=4 +revision=5 build_helper="gir" build_style=meson hostmakedepends="itstool pkg-config gettext glib-devel" makedepends="clutter-gtk-devel evolution-devel tracker-devel - libwebkit2gtk41-devel libhandy1-devel" + libwebkit2gtk41-devel libhandy1-devel libcurl-devel" depends="desktop-file-utils tracker" short_desc="Intuitive note editor with strong GNOME desktop integration" maintainer="Enno Boland " From 974b645a917e4c65154228f7b88e6c528d94ae02 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 17 Apr 2024 04:09:44 -0700 Subject: [PATCH 05/10] Endeavour: rebuild for evolution-data-server 3.52 --- srcpkgs/Endeavour/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Endeavour/template b/srcpkgs/Endeavour/template index f2b8c601867751..fd8cb3068c08aa 100644 --- a/srcpkgs/Endeavour/template +++ b/srcpkgs/Endeavour/template @@ -1,7 +1,7 @@ # Template file for 'Endeavour' pkgname=Endeavour version=43.0 -revision=2 +revision=3 build_style=meson build_helper="gir" configure_args="-Dintrospection=$(vopt_if gir true false)" From 8ca299fcb2723cc2500e7d91a539cc7407d8c121 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 17 Apr 2024 04:10:01 -0700 Subject: [PATCH 06/10] gnome-calendar: rebuild for evolution-data-server 3.52 --- srcpkgs/gnome-calendar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template index 9d51bd45b67c99..87ff618a66d4e0 100644 --- a/srcpkgs/gnome-calendar/template +++ b/srcpkgs/gnome-calendar/template @@ -1,7 +1,7 @@ # Template file for 'gnome-calendar' pkgname=gnome-calendar version=46.0 -revision=1 +revision=2 build_style=meson hostmakedepends="gettext glib-devel pkg-config gtk4-update-icon-cache $(vopt_if gir 'gobject-introspection')" From c544e8dc10d2f8a27a7fce3cbc72e0f13d65d55b Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 17 Apr 2024 04:13:09 -0700 Subject: [PATCH 07/10] gnome-panel: rebuild for evolution-data-server 3.52 --- srcpkgs/gnome-panel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template index 2ef92c56c4f126..0b69384e394b15 100644 --- a/srcpkgs/gnome-panel/template +++ b/srcpkgs/gnome-panel/template @@ -1,7 +1,7 @@ # Template file for 'gnome-panel' pkgname=gnome-panel version=3.46.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo" hostmakedepends="gettext-devel glib-devel itstool pkg-config gettext" From b5d572e47ac05dc9dd3725ac8e7d0df682b34af7 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 17 Apr 2024 04:13:44 -0700 Subject: [PATCH 08/10] gnome-shell: rebuild for evolution-data-server 3.52 --- srcpkgs/gnome-shell/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 1e4a2b01fd8eca..c833283506820c 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,7 +1,7 @@ # Template file for 'gnome-shell' pkgname=gnome-shell version=45.5 -revision=1 +revision=2 build_style=meson build_helper=gir configure_args="-Dsystemd=false -Dtests=false" From 6d40f0b7261c292a76aa8a2cdcca81e4c4989bdd Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 17 Apr 2024 04:18:47 -0700 Subject: [PATCH 09/10] io.elementary.calendar: rebuild for evolution-data-server 3.52 --- srcpkgs/io.elementary.calendar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template index fd37869876fa3a..f6e18119ad8561 100644 --- a/srcpkgs/io.elementary.calendar/template +++ b/srcpkgs/io.elementary.calendar/template @@ -1,7 +1,7 @@ # Template file for 'io.elementary.calendar' pkgname=io.elementary.calendar version=6.1.2 -revision=1 +revision=2 build_style=meson build_helper="gir" hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream From 72bce109c6abb5cd3a1dd943b5d6c926968edcac Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 17 Apr 2024 04:30:23 -0700 Subject: [PATCH 10/10] planify: rebuild for evolution-data-server 3.52 --- srcpkgs/planify/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/planify/template b/srcpkgs/planify/template index 379692419d4774..8af87093268c79 100644 --- a/srcpkgs/planify/template +++ b/srcpkgs/planify/template @@ -1,7 +1,7 @@ # Template file for 'planify' pkgname=planify version=4.5.12 -revision=1 +revision=2 build_style=meson build_helper="gir" hostmakedepends="gettext pkg-config vala glib-devel curl gtk4-update-icon-cache