Accepting request 376692 from GNOME:Next

Update to 3.20.0

OBS-URL: https://build.opensuse.org/request/show/376692
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=242

gnome-settings-daemon-3.19.92.tar.xz

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

gnome-settings-daemon-3.20.0.tar.xz

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

gnome-settings-daemon-bnc873545-hide-warnings.patch

@@ -0,0 +1,41 @@
+From fd0df3003ba7c0ae4d04a8314358db7f82dd2ab1 Mon Sep 17 00:00:00 2001
+From: Felix Zhang <fezhang@suse.com>
+Date: Tue, 6 May 2014 16:13:04 +0800
+Subject: [PATCH] hide warnings
+
+---
+ plugins/color/gsd-color-profiles.c | 2 ++
+ plugins/color/gsd-color-state.c    | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/plugins/color/gsd-color-profiles.c b/plugins/color/gsd-color-profiles.c
+index 2b01faa..05a728a 100644
+--- a/plugins/color/gsd-color-profiles.c
++++ b/plugins/color/gsd-color-profiles.c
+@@ -71,7 +71,9 @@ gcm_session_client_connect_cb (GObject *source_object,
+         /* is there an available colord instance? */
+         ret = cd_client_get_has_server (profiles->priv->client);
+         if (!ret) {
++                /* hide this warning for SLES
+                 g_warning ("There is no colord server available");
++                */
+                 return;
+         }
+ 
+diff --git a/plugins/color/gsd-color-state.c b/plugins/color/gsd-color-state.c
+index 04823e4..20e8a2b 100644
+--- a/plugins/color/gsd-color-state.c
++++ b/plugins/color/gsd-color-state.c
+@@ -1297,7 +1297,9 @@ gcm_session_client_connect_cb (GObject *source_object,
+         /* is there an available colord instance? */
+         ret = cd_client_get_has_server (state->priv->client);
+         if (!ret) {
++                /* hide this warning for SLES
+                 g_warning ("There is no colord server available");
++                */
+                 goto out;
+         }
+ 
+-- 
+1.7.12.4
+

gnome-settings-daemon.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Mar 21 15:09:07 UTC 2016 - dimstar@opensuse.org
+
+- Update to version 3.20.0:
+  + Fix cancellation handling and possible crashes in all plugins.
+
+-------------------------------------------------------------------
+Fri Mar 18 17:53:18 UTC 2016 - fezhang@suse.com
+
+- Add gnome-settings-daemon-bnc873545-hide-warnings.patch: Hide the
+  warnings when failed to find a colord instance on SLES
+  (bnc873545).
+
 -------------------------------------------------------------------
 Thu Mar 17 09:53:38 UTC 2016 - dimstar@opensuse.org
 

gnome-settings-daemon.spec

@@ -30,17 +30,19 @@
 %endif
 
 Name:           gnome-settings-daemon
-Version:        3.19.92
+Version:        3.20.0
 Release:        0
 Summary:        Settings daemon for the GNOME desktop
 License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            http://www.gnome.org
-Source:         http://download.gnome.org/sources/gnome-settings-daemon/3.19/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gnome-settings-daemon/3.20/%{name}-%{version}.tar.xz
 # PATCH-FEATURE-SLE gnome-settings-daemon-revert-libinput-mandatory.patch fcrozat@suse.com -- ensure libinput is not mandatory
 Patch20:        gnome-settings-daemon-revert-libinput-mandatory.patch
 # PATCH-FEATURE-SLE gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo#575467 hpj@suse.com -- notify user about auto suspend when returning from sleep
 Patch21:        gnome-settings-daemon-notify-idle-resumed.patch
+# PATCH-FIX-SLE gnome-settings-daemon-bnc873545-hide-warnings.patch bnc#873545 fezhang@suse.com -- hide the warnings when g-s-d cannot find colord running, which is expected on SLES
+Patch22:        gnome-settings-daemon-bnc873545-hide-warnings.patch
 BuildRequires:  cups-devel
 BuildRequires:  fdupes
 BuildRequires:  gnome-common
@@ -136,6 +138,9 @@ translation-update-upstream
 %patch20 -p1
 %patch21 -p1
 %endif
+%if 0%{?sles_version} > 0
+%patch22 -p1
+%endif
 
 %build
 %if !0%{?is_opensuse}