From c87b4e4732456e064484a4b2d9d517105351eac3 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Feb 09 2015 08:51:18 +0000 Subject: Update to 3.12.11 --- diff --git a/.gitignore b/.gitignore index 7a1168e..ebeabdb 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ evolution-data-server-2.31.5.tar.bz2 /evolution-data-server-3.12.8.tar.xz /evolution-data-server-3.12.9.tar.xz /evolution-data-server-3.12.10.tar.xz +/evolution-data-server-3.12.11.tar.xz diff --git a/evolution-data-server-3.12.10-crash-backend-finalize-online-change.patch b/evolution-data-server-3.12.10-crash-backend-finalize-online-change.patch deleted file mode 100644 index bd2c188..0000000 --- a/evolution-data-server-3.12.10-crash-backend-finalize-online-change.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff --git a/camel/camel-network-service.c b/camel/camel-network-service.c -index 3e6462d..25ce965 100644 ---- a/camel/camel-network-service.c -+++ b/camel/camel-network-service.c -@@ -514,6 +514,8 @@ network_service_update_host_reachable (CamelNetworkService *service) - { - CamelNetworkServicePrivate *priv; - CamelSession *session; -+ GMainContext *main_context; -+ GSource *timeout_source; - - priv = CAMEL_NETWORK_SERVICE_GET_PRIVATE (service); - -@@ -525,31 +527,29 @@ network_service_update_host_reachable (CamelNetworkService *service) - - g_mutex_lock (&priv->update_host_reachable_lock); - -+ /* Reference the service before destroying any already scheduled GSource, -+ in case the service's last reference is held by that GSource. */ -+ g_object_ref (service); -+ - if (priv->update_host_reachable) { - g_source_destroy (priv->update_host_reachable); - g_source_unref (priv->update_host_reachable); - priv->update_host_reachable = NULL; - } - -- if (priv->update_host_reachable == NULL) { -- GMainContext *main_context; -- GSource *timeout_source; -- -- main_context = camel_session_ref_main_context (session); -+ main_context = camel_session_ref_main_context (session); - -- timeout_source = g_timeout_source_new_seconds (5); -- g_source_set_priority (timeout_source, G_PRIORITY_LOW); -- g_source_set_callback ( -- timeout_source, -- network_service_update_host_reachable_timeout_cb, -- g_object_ref (service), -- (GDestroyNotify) g_object_unref); -- g_source_attach (timeout_source, main_context); -- priv->update_host_reachable = g_source_ref (timeout_source); -- g_source_unref (timeout_source); -+ timeout_source = g_timeout_source_new_seconds (5); -+ g_source_set_priority (timeout_source, G_PRIORITY_LOW); -+ g_source_set_callback ( -+ timeout_source, -+ network_service_update_host_reachable_timeout_cb, -+ service, (GDestroyNotify) g_object_unref); -+ g_source_attach (timeout_source, main_context); -+ priv->update_host_reachable = g_source_ref (timeout_source); -+ g_source_unref (timeout_source); - -- g_main_context_unref (main_context); -- } -+ g_main_context_unref (main_context); - - g_mutex_unlock (&priv->update_host_reachable_lock); - -diff --git a/libebackend/e-backend.c b/libebackend/e-backend.c -index 46045c4..13fadd2 100644 ---- a/libebackend/e-backend.c -+++ b/libebackend/e-backend.c -@@ -191,34 +191,35 @@ backend_update_online_state_timeout_cb (gpointer user_data) - static void - backend_update_online_state (EBackend *backend) - { -+ GMainContext *main_context; -+ GSource *timeout_source; -+ - g_mutex_lock (&backend->priv->update_online_state_lock); - -+ /* Reference the backend before destroying any already scheduled GSource, -+ in case the backend's last reference is held by that GSource. */ -+ g_object_ref (backend); -+ - if (backend->priv->update_online_state) { - g_source_destroy (backend->priv->update_online_state); - g_source_unref (backend->priv->update_online_state); - backend->priv->update_online_state = NULL; - } - -- if (backend->priv->update_online_state == NULL) { -- GMainContext *main_context; -- GSource *timeout_source; -- -- main_context = e_backend_ref_main_context (backend); -- -- timeout_source = g_timeout_source_new_seconds (5); -- g_source_set_priority (timeout_source, G_PRIORITY_LOW); -- g_source_set_callback ( -- timeout_source, -- backend_update_online_state_timeout_cb, -- g_object_ref (backend), -- (GDestroyNotify) g_object_unref); -- g_source_attach (timeout_source, main_context); -- backend->priv->update_online_state = -- g_source_ref (timeout_source); -- g_source_unref (timeout_source); -- -- g_main_context_unref (main_context); -- } -+ main_context = e_backend_ref_main_context (backend); -+ -+ timeout_source = g_timeout_source_new_seconds (5); -+ g_source_set_priority (timeout_source, G_PRIORITY_LOW); -+ g_source_set_callback ( -+ timeout_source, -+ backend_update_online_state_timeout_cb, -+ backend, (GDestroyNotify) g_object_unref); -+ g_source_attach (timeout_source, main_context); -+ backend->priv->update_online_state = -+ g_source_ref (timeout_source); -+ g_source_unref (timeout_source); -+ -+ g_main_context_unref (main_context); - - g_mutex_unlock (&backend->priv->update_online_state_lock); - } diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 15859ad..cb1a23f 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -31,8 +31,8 @@ ### Abstract ### Name: evolution-data-server -Version: 3.12.10 -Release: 2%{?dist} +Version: 3.12.11 +Release: 1%{?dist} Group: System Environment/Libraries Summary: Backend data server for Evolution License: LGPLv2+ @@ -53,9 +53,6 @@ Obsoletes: compat-evolution-data-server310-libcamel < 3.12 # RH bug #243296 Patch01: evolution-data-server-1.11.5-fix-64bit-acinclude.patch -# GNOME bug #736006 -Patch02: evolution-data-server-3.12.10-crash-backend-finalize-online-change.patch - ### Dependencies ### Requires: dconf @@ -143,7 +140,6 @@ This package contains developer documentation for %{name}. %setup -q %patch01 -p1 -b .fix-64bit-acinclude -%patch02 -p1 -b .crash-backend-finalize-online-change %build %if %{ldap_support} @@ -386,6 +382,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %endif %changelog +* Mon Feb 09 2015 Milan Crha - 3.12.11-1 +- Update to 3.12.11 +- Remove patch for GNOME bug #736006 (fixed upstream) + * Mon Jan 12 2015 Milan Crha - 3.12.10-2 - Add patch for GNOME bug #736006 (Crash under backend_finalize() during online state change) diff --git a/sources b/sources index ae93d12..5b9a8cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3069c344bd9af0e92db66f123958ea9d evolution-data-server-3.12.10.tar.xz +a05df58de484bb6ff6fe23e3eee71db3 evolution-data-server-3.12.11.tar.xz