Accepting request 1171399 from GNOME:Factory

- Drop boo1221868.patch: fixed upstream.
- Add boo1221868.patch, fixing a crash when hiding completed tasks (forwarded request 1171338 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/1171399
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=277
This commit is contained in:
Ana Guerrero 2024-05-03 17:43:52 +00:00 committed by Git OBS Bridge
commit 1275e72bb4
7 changed files with 26 additions and 65 deletions

View File

@ -3,7 +3,7 @@
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/evolution.git</param>
<param name="revision">3.52.0</param>
<param name="revision">3.52.1</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>

View File

@ -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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d520e31df539da8dba74229cf4602ab224eaf0886e1aa5a3f2ee5e3ae6c2b7be
size 129659918

3
evolution-3.52.1.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0e239f6908c9edc15c82ef5c09f1d89ac5994b16cb2d7740ee5eb3bb0e3f0028
size 129855502

View File

@ -1,7 +1,24 @@
-------------------------------------------------------------------
Fri Apr 19 12:59:57 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 3.52.1:
+ Bug Fixes:
- Wrong weeks in Month view when returning from different page
of dates.
- Mail: Prefer saving original message instead of re-encode.
- EHeaderBar: Report correct minimum width.
- Subject line in message pane not bold anymore in Wide view.
- Crash when hiding completed tasks.
- EMailBrowser: Hide Print preview menu option.
+ Miscellaneous:
- data: Fix circular-component-relation in .appdata file.
+ Updated translations.
- Drop boo1221868.patch: fixed upstream.
-------------------------------------------------------------------
Thu Apr 4 14:20:03 UTC 2024 - M K <tux93@opensuse.org>
- Add boo1221868.patch, fixing a crash when hiding competed tasks
- Add boo1221868.patch, fixing a crash when hiding completed tasks
(boo#1221868, glgo#GNOME/evolution#2712)
-------------------------------------------------------------------

View File

@ -1,4 +1,4 @@
name: evolution
version: 3.52.0
mtime: 1710484378
commit: b86d791a22a4abc0183ca4258a46977d6f6cf548
version: 3.52.1
mtime: 1713507200
commit: 73f6ebab227b0c8e1200740800d247a9f466816a

View File

@ -20,7 +20,7 @@
%define _version %(echo %{version} | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')
Name: evolution
Version: 3.52.0
Version: 3.52.1
Release: 0
# FIXME: check if note on license is still valid (comment before license)
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
@ -29,8 +29,6 @@ License: CC-BY-SA-3.0 AND LGPL-2.0-only AND LGPL-3.0-only AND OLDAP-2.8 A
Group: Productivity/Networking/Email/Clients
URL: https://wiki.gnome.org/Apps/Evolution/
Source0: %{name}-%{version}.tar.zst
# PATCH-FIX-UPSTREAM boo1221868.patch glgo#GNOME/evolution#2712
Patch0: boo1221868.patch
BuildRequires: bison
BuildRequires: bogofilter