From 9a55b89f937eb2322a1abddb5717d130d6f06c6b5ad9aaf2bd85db242d237e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 16 Dec 2014 10:16:30 +0000 Subject: [PATCH] Accepting request 265331 from home:badshah400:branches:GNOME:Factory Update to 3.12.9 [copypac from home:Zaitor:boo906687 and then remove boo reference in .changes] OBS-URL: https://build.opensuse.org/request/show/265331 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-ews?expand=0&rev=82 --- evolution-ews-3.12.8.tar.xz | 3 -- evolution-ews-3.12.9.tar.xz | 3 ++ evolution-ews-reuse-from-EmailSession.patch | 38 +++++++++++++++++++++ evolution-ews.changes | 10 ++++++ evolution-ews.spec | 5 ++- 5 files changed, 55 insertions(+), 4 deletions(-) delete mode 100644 evolution-ews-3.12.8.tar.xz create mode 100644 evolution-ews-3.12.9.tar.xz create mode 100644 evolution-ews-reuse-from-EmailSession.patch diff --git a/evolution-ews-3.12.8.tar.xz b/evolution-ews-3.12.8.tar.xz deleted file mode 100644 index 3f77866..0000000 --- a/evolution-ews-3.12.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:808783683bef9fd0c41b0c27f94669418c95ebf7bc62120e10f674f1f2f686b5 -size 662132 diff --git a/evolution-ews-3.12.9.tar.xz b/evolution-ews-3.12.9.tar.xz new file mode 100644 index 0000000..21b3050 --- /dev/null +++ b/evolution-ews-3.12.9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2b5325edb137a6384f05ac1e57e82044f55da380ada9843a42e6fb34855ba96 +size 662752 diff --git a/evolution-ews-reuse-from-EmailSession.patch b/evolution-ews-reuse-from-EmailSession.patch new file mode 100644 index 0000000..c610cf2 --- /dev/null +++ b/evolution-ews-reuse-from-EmailSession.patch @@ -0,0 +1,38 @@ +From 6a5a2d75a9484b482546d4ed51fa6488d7e2c95a Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Fri, 12 Dec 2014 11:14:05 +0100 +Subject: Bug 695754 - Reuse existing ESourceRegistry from EMailSession, if + possible + +Using a new ESourceRegistry and freeing is slightly afterwards could +left some unfinished operations in the sourec registry's main_context. +A change for this lands in evolution-data-server, but better to change +also evolution-ews, to not create the source registry when not necessary. + +diff --git a/src/camel/camel-ews-store.c b/src/camel/camel-ews-store.c +index ad82405..5cd46dc 100644 +--- a/src/camel/camel-ews-store.c ++++ b/src/camel/camel-ews-store.c +@@ -1603,12 +1603,19 @@ static void + ews_store_maybe_update_sent_and_drafts (CamelEwsStore *ews_store, + /* const */ GSList *ews_folders) + { ++ CamelSession *session; + ESourceRegistry *registry; + ESource *sibling, *source = NULL; + + g_return_if_fail (CAMEL_IS_EWS_STORE (ews_store)); + +- registry = e_source_registry_new_sync (NULL, NULL); ++ session = camel_service_ref_session (CAMEL_SERVICE (ews_store)); ++ if (session && E_IS_MAIL_SESSION (session)) ++ registry = g_object_ref (e_mail_session_get_registry (E_MAIL_SESSION (session))); ++ else ++ registry = e_source_registry_new_sync (NULL, NULL); ++ g_clear_object (&session); ++ + g_return_if_fail (registry != NULL); + + sibling = e_source_registry_ref_source (registry, camel_service_get_uid (CAMEL_SERVICE (ews_store))); +-- +cgit v0.10.1 diff --git a/evolution-ews.changes b/evolution-ews.changes index 2629587..62812f5 100644 --- a/evolution-ews.changes +++ b/evolution-ews.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Dec 14 06:23:48 UTC 2014 - badshah400@gmail.com + +- Update to version 3.12.9: + + Set max-width-chars to wrapped GtkLabel-s. + + Bugs fixed: bgo#738945, bgo#738093, bgo#734747, bgo#740772. +- Add post-release fix from upstream: + + evolution-ews-reuse-from-EmailSession.patch: Reuse existing + ESourceRegistry from EMailSession, if possible (bgo#695754). + ------------------------------------------------------------------- Tue Nov 11 21:25:40 UTC 2014 - zaitor@opensuse.org diff --git a/evolution-ews.spec b/evolution-ews.spec index a721a4a..1a3e442 100644 --- a/evolution-ews.spec +++ b/evolution-ews.spec @@ -19,13 +19,15 @@ Name: evolution-ews # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. %define evolution_base_version 3.12 -Version: 3.12.8 +Version: 3.12.9 Release: 0 Summary: Exchange Connector for Evolution, compatible with Exchange 2007 and later License: LGPL-2.1 Group: Productivity/Networking/Email/Clients Url: http://projects.gnome.org/evolution/ Source: http://download.gnome.org/sources/evolution-ews/3.12/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM evolution-ews-reuse-from-EmailSession.patch bgo#695754 badshah400@gmail.com -- Reuse existing ESourceRegistry from EMailSession, if possible; patch taken from upstream git +Patch0: evolution-ews-reuse-from-EmailSession.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: translation-update-upstream @@ -85,6 +87,7 @@ later). %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build