Accepting request 710600 from GNOME:Next

New stable rel, resub with tiny tweak

OBS-URL: https://build.opensuse.org/request/show/710600
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=354
This commit is contained in:
Bjørn Lie 2019-06-19 15:51:08 +00:00 committed by Git OBS Bridge
parent 42398bcc0b
commit 2bbbdcc524
5 changed files with 38 additions and 67 deletions

View File

@ -1,60 +0,0 @@
From 90a03746553352b776dd49959f7d235b137de543 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Wed, 29 May 2019 10:47:12 +0200
Subject: [PATCH] I#108 - [IMAPx] Folder changes could be claimed in a wrong
folder after APPEND
Closes https://gitlab.gnome.org/GNOME/evolution-data-server/issues/108
---
src/camel/providers/imapx/camel-imapx-server.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c
index 0eae047e7..e86d4e605 100644
--- a/src/camel/providers/imapx/camel-imapx-server.c
+++ b/src/camel/providers/imapx/camel-imapx-server.c
@@ -4852,6 +4852,7 @@ camel_imapx_server_copy_message_sync (CamelIMAPXServer *is,
if (camel_folder_change_info_changed (dest_changes)) {
camel_folder_summary_touch (destination_summary);
camel_folder_summary_save (destination_summary, NULL);
+ imapx_update_store_summary (destination_folder);
camel_folder_changed (destination_folder, dest_changes);
}
@@ -5107,6 +5108,7 @@ camel_imapx_server_append_message_sync (CamelIMAPXServer *is,
if (ic->status && ic->status->condition == IMAPX_APPENDUID) {
c (is->priv->tagprefix, "Got appenduid %u %u\n", (guint32) ic->status->u.appenduid.uidvalidity, ic->status->u.appenduid.uid);
if (ic->status->u.appenduid.uidvalidity == uidvalidity) {
+ CamelFolderChangeInfo *dest_changes;
gchar *uid;
uid = g_strdup_printf ("%u", ic->status->u.appenduid.uid);
@@ -5127,11 +5129,13 @@ camel_imapx_server_append_message_sync (CamelIMAPXServer *is,
camel_folder_summary_add (camel_folder_get_folder_summary (folder), clone, TRUE);
- g_mutex_lock (&is->priv->changes_lock);
- camel_folder_change_info_add_uid (is->priv->changes, camel_message_info_get_uid (clone));
- g_mutex_unlock (&is->priv->changes_lock);
+ dest_changes = camel_folder_change_info_new ();
+ camel_folder_change_info_add_uid (dest_changes, camel_message_info_get_uid (clone));
camel_folder_summary_save (camel_folder_get_folder_summary (folder), NULL);
+ imapx_update_store_summary (folder);
+ camel_folder_changed (folder, dest_changes);
+ camel_folder_change_info_free (dest_changes);
if (appended_uid)
*appended_uid = uid;
@@ -6403,7 +6407,7 @@ camel_imapx_server_expunge_sync (CamelIMAPXServer *is,
camel_folder_summary_remove_uids (folder_summary, removed);
camel_folder_summary_save (folder_summary, NULL);
-
+ imapx_update_store_summary (folder);
camel_folder_changed (folder, changes);
camel_folder_change_info_free (changes);
--
2.21.0

View File

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

View File

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

View File

@ -1,3 +1,36 @@
-------------------------------------------------------------------
Mon Jun 17 15:38:16 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 3.32.3:
+ [IMAPx]
- Fix a leak of CamelMessageInfo when downloading message from
a server.
- Prefer local search in folders fully synchronized for
offline.
+ EDataBook/EDataCal: Flush GDBus connection on backend property
change.
+ Add workaround for D-Bus property change into get-revision
tests.
+ Expose E-Book/Cal-BackendSExp lock.
+ Change buffer size argument value in call of
icalvalue_decode_ical_string().
+ Update overdue time immediately after the reminders' window is
mapped.
+ Correct test for file writable test in On This Computer
backend.
+ CamelOperation can be used by other thread while in its
finalize().
+ Change how CamelOfflineStore goes online.
+ Bugs fixed: glgo#GNOME/evolution-data-server#108,
glgo#GNOME/evolution-data-server#112,
glgo#GNOME/evolution-data-server#114,
glgo#GNOME/evolution-data-server#116,
glgo#GNOME/evolution-data-server#123,
glgo#GNOME/evolution-data-server#190,
glgo#GNOME/evolution-data-server#479.
- Drop eds-issue-108.patch: Fixed upstream.
- Use modern cmake_build macro.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 4 08:34:20 CEST 2019 - Matej Cepl <mcepl@suse.com> Tue Jun 4 08:34:20 CEST 2019 - Matej Cepl <mcepl@suse.com>

View File

@ -30,7 +30,7 @@
%bcond_without introspection %bcond_without introspection
Name: evolution-data-server Name: evolution-data-server
Version: 3.32.2 Version: 3.32.3
Release: 0 Release: 0
Summary: Evolution Data Server Summary: Evolution Data Server
License: LGPL-2.0-only License: LGPL-2.0-only
@ -38,8 +38,6 @@ Group: Development/Libraries/GNOME
URL: https://wiki.gnome.org/Apps/Evolution URL: https://wiki.gnome.org/Apps/Evolution
Source0: https://download.gnome.org/sources/evolution-data-server/3.32/%{name}-%{version}.tar.xz Source0: https://download.gnome.org/sources/evolution-data-server/3.32/%{name}-%{version}.tar.xz
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-UPSTREAM eds-issue-108.patch -- Folder changes could be claimed in a wrong folder after APPEND
Patch0: eds-issue-108.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: db-devel BuildRequires: db-devel
@ -287,7 +285,7 @@ translation-update-upstream
-DENABLE_INTROSPECTION=ON} \ -DENABLE_INTROSPECTION=ON} \
-DENABLE_DBUS_SESSION_TOOL=OFF \ -DENABLE_DBUS_SESSION_TOOL=OFF \
%{nil} %{nil}
%make_jobs %cmake_build
%install %install
%cmake_install %cmake_install