From 75fb31c220a43260ee07063aa409ca9bb75e41f0 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 17 Apr 2024 03:53:00 -0700 Subject: [PATCH] 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 00000000000..f1e70f2a343 --- /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 00000000000..666947a5784 --- /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 fbf1d551bd5..33fb7d92bd0 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"