From 206250561513340c3004c42b33d25cc37d268bfe39ca569eec6eec9495147f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 8 Jun 2019 20:05:32 +0000 Subject: [PATCH 1/3] Accepting request 708746 from home:mcepl:branches:GNOME:Factory - Add eds-issue296-test.patch to fix https://gitlab.gnome.org/GNOME/evolution/issues/296 (or actually https://gitlab.gnome.org/GNOME/evolution-data-server/issues/108). OBS-URL: https://build.opensuse.org/request/show/708746 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=352 --- eds-issue296-test.patch | 60 +++++++++++++++++++++++++++++++++++ evolution-data-server.changes | 8 +++++ evolution-data-server.spec | 2 +- 3 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 eds-issue296-test.patch diff --git a/eds-issue296-test.patch b/eds-issue296-test.patch new file mode 100644 index 0000000..90691f6 --- /dev/null +++ b/eds-issue296-test.patch @@ -0,0 +1,60 @@ +From 90a03746553352b776dd49959f7d235b137de543 Mon Sep 17 00:00:00 2001 +From: Milan Crha +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 + diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 16b7ca1..be93280 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jun 4 08:34:20 CEST 2019 - Matej Cepl + +- Add eds-issue296-test.patch to fix + https://gitlab.gnome.org/GNOME/evolution/issues/296 (or + actually + https://gitlab.gnome.org/GNOME/evolution-data-server/issues/108). + ------------------------------------------------------------------- Mon May 6 18:06:24 UTC 2019 - Bjørn Lie diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 4b29692..4d2cd2a 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -38,7 +38,7 @@ Group: Development/Libraries/GNOME URL: https://wiki.gnome.org/Apps/Evolution Source0: https://download.gnome.org/sources/evolution-data-server/3.32/%{name}-%{version}.tar.xz Source99: baselibs.conf - +Patch0: eds-issue296-test.patch BuildRequires: cmake BuildRequires: db-devel BuildRequires: fdupes From 42398bcc0ba3e6a1997b48d43fbe47128b3af8ddfcad2ae406c2642bdd7a4bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 8 Jun 2019 20:14:02 +0000 Subject: [PATCH 2/3] Tweak sub OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=353 --- eds-issue296-test.patch => eds-issue-108.patch | 0 evolution-data-server.changes | 7 +++---- evolution-data-server.spec | 4 +++- 3 files changed, 6 insertions(+), 5 deletions(-) rename eds-issue296-test.patch => eds-issue-108.patch (100%) diff --git a/eds-issue296-test.patch b/eds-issue-108.patch similarity index 100% rename from eds-issue296-test.patch rename to eds-issue-108.patch diff --git a/evolution-data-server.changes b/evolution-data-server.changes index be93280..57c0d7e 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,10 +1,9 @@ ------------------------------------------------------------------- Tue Jun 4 08:34:20 CEST 2019 - Matej Cepl -- Add eds-issue296-test.patch to fix - https://gitlab.gnome.org/GNOME/evolution/issues/296 (or - actually - https://gitlab.gnome.org/GNOME/evolution-data-server/issues/108). +- Add eds-issue-108.patch: Folder changes could be claimed in a + wrong folder after APPEND, fixes glgo#GNOME/evolution#296, + glgo#GNOME/evolution-data-server#108. ------------------------------------------------------------------- Mon May 6 18:06:24 UTC 2019 - Bjørn Lie diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 4d2cd2a..41f8aa2 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -38,7 +38,9 @@ Group: Development/Libraries/GNOME URL: https://wiki.gnome.org/Apps/Evolution Source0: https://download.gnome.org/sources/evolution-data-server/3.32/%{name}-%{version}.tar.xz Source99: baselibs.conf -Patch0: eds-issue296-test.patch +# 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: db-devel BuildRequires: fdupes From 2bbbdcc52476d23aa9506b9d3ae83a7910384fff4deca973fe602cd609a35ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 19 Jun 2019 15:51:08 +0000 Subject: [PATCH 3/3] 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 --- eds-issue-108.patch | 60 ----------------------------- evolution-data-server-3.32.2.tar.xz | 3 -- evolution-data-server-3.32.3.tar.xz | 3 ++ evolution-data-server.changes | 33 ++++++++++++++++ evolution-data-server.spec | 6 +-- 5 files changed, 38 insertions(+), 67 deletions(-) delete mode 100644 eds-issue-108.patch delete mode 100644 evolution-data-server-3.32.2.tar.xz create mode 100644 evolution-data-server-3.32.3.tar.xz diff --git a/eds-issue-108.patch b/eds-issue-108.patch deleted file mode 100644 index 90691f6..0000000 --- a/eds-issue-108.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 90a03746553352b776dd49959f7d235b137de543 Mon Sep 17 00:00:00 2001 -From: Milan Crha -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 - diff --git a/evolution-data-server-3.32.2.tar.xz b/evolution-data-server-3.32.2.tar.xz deleted file mode 100644 index e0332a2..0000000 --- a/evolution-data-server-3.32.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ea7491065fd0382f2268cf6bf95331a75dfda587d5940deb47f9e74be1ab3c9 -size 4583068 diff --git a/evolution-data-server-3.32.3.tar.xz b/evolution-data-server-3.32.3.tar.xz new file mode 100644 index 0000000..8e77fae --- /dev/null +++ b/evolution-data-server-3.32.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6481f385dd9977b6d8442f356210921ac63244cb5a188c6986b72ebe37f7a2eb +size 4584992 diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 57c0d7e..e4b2c4c 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Mon Jun 17 15:38:16 UTC 2019 - Bjørn Lie + +- 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 diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 41f8aa2..fe282c8 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -30,7 +30,7 @@ %bcond_without introspection Name: evolution-data-server -Version: 3.32.2 +Version: 3.32.3 Release: 0 Summary: Evolution Data Server License: LGPL-2.0-only @@ -38,8 +38,6 @@ Group: Development/Libraries/GNOME URL: https://wiki.gnome.org/Apps/Evolution Source0: https://download.gnome.org/sources/evolution-data-server/3.32/%{name}-%{version}.tar.xz 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: db-devel @@ -287,7 +285,7 @@ translation-update-upstream -DENABLE_INTROSPECTION=ON} \ -DENABLE_DBUS_SESSION_TOOL=OFF \ %{nil} -%make_jobs +%cmake_build %install %cmake_install