* [PR PATCH] evolution: update to 3.52.2.
@ 2024-05-31 19:40 fanyx
2024-06-02 9:44 ` [PR PATCH] [Merged]: " Hoshpak
0 siblings, 1 reply; 2+ messages in thread
From: fanyx @ 2024-05-31 19:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 485 bytes --]
There is a new pull request by fanyx against master on the void-packages repository
https://github.com/fanyx/void-packages evolution
https://github.com/void-linux/void-packages/pull/50630
evolution: update to 3.52.2.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/50630.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-evolution-50630.patch --]
[-- Type: text/x-diff, Size: 8859 bytes --]
From 8244ee7e5900ecd18e4062ce0b2bd2f48049f187 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Mon, 27 May 2024 13:11:32 +0200
Subject: [PATCH 1/2] evolution-data-server: update to 3.52.2.
---
...d321532ea80a8e204c0d97dd06771c9d4646.patch | 45 -------------------
srcpkgs/evolution-data-server/template | 4 +-
2 files changed, 2 insertions(+), 47 deletions(-)
delete mode 100644 srcpkgs/evolution-data-server/patches/d845d321532ea80a8e204c0d97dd06771c9d4646.patch
diff --git a/srcpkgs/evolution-data-server/patches/d845d321532ea80a8e204c0d97dd06771c9d4646.patch b/srcpkgs/evolution-data-server/patches/d845d321532ea80a8e204c0d97dd06771c9d4646.patch
deleted file mode 100644
index 7dbe72d6961585..00000000000000
--- a/srcpkgs/evolution-data-server/patches/d845d321532ea80a8e204c0d97dd06771c9d4646.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d845d321532ea80a8e204c0d97dd06771c9d4646 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-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 7258ec8ad13c93..2f301f40e04ab7 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.52.0
+version=3.52.2
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -20,7 +20,7 @@ license="LGPL-2.1-only"
homepage="https://wiki.gnome.org/Apps/Evolution"
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=a5d5e11c7a1e585846efe260f3c1c61a78399bd8b623bfd79ac1c0ffea7bde06
+checksum=a006a44edcb38d26ffb1c62e1d5d0a31d1f2e59075565e26c79a2ee01c45a7e5
make_check=ci-skip # flaky in CI
build_options="gir"
From 67995a3ab130e3044133e694aedf6c701b8c1f3c Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Fri, 31 May 2024 21:35:12 +0200
Subject: [PATCH 2/2] evolution: update to 3.52.2.
---
...0ab7cdf74ac73e4e3448e4fb29d4e7731f74.patch | 54 -------------------
...cf27cd8a903acdf9c6ed7b746903bbda9e6d.patch | 27 ----------
srcpkgs/evolution/template | 4 +-
3 files changed, 2 insertions(+), 83 deletions(-)
delete mode 100644 srcpkgs/evolution/patches/a7fe0ab7cdf74ac73e4e3448e4fb29d4e7731f74.patch
delete mode 100644 srcpkgs/evolution/patches/e290cf27cd8a903acdf9c6ed7b746903bbda9e6d.patch
diff --git a/srcpkgs/evolution/patches/a7fe0ab7cdf74ac73e4e3448e4fb29d4e7731f74.patch b/srcpkgs/evolution/patches/a7fe0ab7cdf74ac73e4e3448e4fb29d4e7731f74.patch
deleted file mode 100644
index f1e70f2a343985..00000000000000
--- a/srcpkgs/evolution/patches/a7fe0ab7cdf74ac73e4e3448e4fb29d4e7731f74.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a7fe0ab7cdf74ac73e4e3448e4fb29d4e7731f74 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-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
deleted file mode 100644
index 666947a5784e9a..00000000000000
--- a/srcpkgs/evolution/patches/e290cf27cd8a903acdf9c6ed7b746903bbda9e6d.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e290cf27cd8a903acdf9c6ed7b746903bbda9e6d Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-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 33fb7d92bd063e..7688f6c872033b 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.52.0
+version=3.52.2
revision=1
build_style=cmake
build_helper="qemu"
@@ -20,7 +20,7 @@ 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-46/NEWS"
distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=5ef708d7c0e40582e271b30e2a07625b648c32c6340cb5488df44177c7c946a9
+checksum=a48b7412d13edac74f6c09acfa676656e6a12edf0030cddc26029ac04da3e551
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"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: evolution: update to 3.52.2.
2024-05-31 19:40 [PR PATCH] evolution: update to 3.52.2 fanyx
@ 2024-06-02 9:44 ` Hoshpak
0 siblings, 0 replies; 2+ messages in thread
From: Hoshpak @ 2024-06-02 9:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 388 bytes --]
There's a merged pull request on the void-packages repository
evolution: update to 3.52.2.
https://github.com/void-linux/void-packages/pull/50630
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
Previous patches have all been merged into upstream.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-06-02 9:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-31 19:40 [PR PATCH] evolution: update to 3.52.2 fanyx
2024-06-02 9:44 ` [PR PATCH] [Merged]: " Hoshpak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).