Accepting request 586211 from GNOME:Factory

Update to 3.28.0 (forwarded request 586010 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/586211
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=147

gnome-settings-daemon-3.26.2.tar.xz

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

gnome-settings-daemon-3.28.0.tar.xz

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

gnome-settings-daemon-bgo793253.patch

@@ -0,0 +1,44 @@
+diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
+index 1ad3f3df..5e2eb7e3 100644
+--- a/plugins/media-keys/gsd-media-keys-manager.c
++++ b/plugins/media-keys/gsd-media-keys-manager.c
+@@ -335,6 +335,7 @@ get_key_string (MediaKey *key)
+ 		return g_strdup_printf ("custom:%s", key->custom_path);
+ 	else
+ 		g_assert_not_reached ();
++                return NULL;
+ }
+ 
+ static char *
+@@ -353,6 +354,7 @@ get_binding (GsdMediaKeysManager *manager,
+ 		return g_settings_get_string (settings, "binding");
+ 	} else
+ 		g_assert_not_reached ();
++                return NULL;
+ }
+ 
+ static void
+diff --git a/plugins/rfkill/rfkill-glib.c b/plugins/rfkill/rfkill-glib.c
+index 450e6533..6b2df693 100644
+--- a/plugins/rfkill/rfkill-glib.c
++++ b/plugins/rfkill/rfkill-glib.c
+@@ -254,6 +254,7 @@ op_to_string (unsigned int op)
+ 		return "CHANGE_ALL";
+ 	default:
+ 		g_assert_not_reached ();
++                return "NULL";
+ 	}
+ }
+ 
+diff --git a/plugins/xsettings/xsettings-manager.c b/plugins/xsettings/xsettings-manager.c
+index 947cc9ee..18fbf599 100644
+--- a/plugins/xsettings/xsettings-manager.c
++++ b/plugins/xsettings/xsettings-manager.c
+@@ -269,6 +269,7 @@ xsettings_get_typecode (GVariant *value)
+       return XSETTINGS_TYPE_COLOR;
+     default:
+       g_assert_not_reached ();
++      return NULL;
+     }
+ }
+ 

gnome-settings-daemon.changes

@@ -1,3 +1,74 @@
+-------------------------------------------------------------------
+Mon Mar 12 16:04:30 UTC 2018 - dimstar@opensuse.org
+
+- Update to version 3.28.0:
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon Mar  5 18:32:31 UTC 2018 - dimstar@opensuse.org
+
+- Update to version 3.27.92:
+  + Build: Don't remove assertions in code.
+  + Print-notifications: Notify user about need for authentication.
+  + Power:
+    - Fix divide by zero when there is no keyboard brightness to
+      control.
+    - When the the sleep timeout is too short, don't throw errors.
+  + XSettings:
+    - Hardcode GTK+ 3.x deprecated settings.
+    - Expose monitored settings through D-Bus.
+
+-------------------------------------------------------------------
+Wed Feb 28 16:29:35 UTC 2018 - dimstar@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
+-------------------------------------------------------------------
+Wed Feb 21 16:44:32 UTC 2018 - dimstar@opensuse.org
+
+- Update to version 3.27.91:
+  + Fix error when doing non-debug builds.
+  + Fix runtime linkage to libgsd and libcommon.
+  + Apply a workaround for D-Bus code generation.
+- Drop gnome-settings-daemon-fix-nondebug-build.patch and
+  gnome-settings-daemon-libcommon.patch: fixed upstream.
+
+-------------------------------------------------------------------
+Wed Feb  7 12:44:33 UTC 2018 - dimstar@opensuse.org
+
+- Update to version 3.27.90:
+  + Remove a11y-keyboard plugin, the functionality was merged into
+    mutter.
+  + Port to meson.
+  + Clipboard: Fix memory leak.
+  + Media-keys:
+    - Suppress power-button presses during suspend.
+    - Prefer MPRIS clients to g-s-d ones.
+  + Power:
+    - Don't react to light changes if not at console.
+    - Many regression test suite fixes.
+    - Default to suspend after 20 minutes of inactivity
+      (bgo#681869).
+  + Rfkill: Fix property notification warning for
+    rfkill-input-inhibited.
+  + Wacom:
+    - Ensure screen integrated devices get remapped on hotplug.
+    - Fix screen mapping for Cintiqs and others.
+  + Updated translations.
+- Switch to meson build system:
+  + Add meson BuildRequires.
+  + Drop intltool BuildRequires: no longer in use.
+  + Replace configure/make/make_install macros with
+    meson/meson_build/meson_install macros.
+- Add pkgconfig(udev) BuildRequires: new dependency.
+- Drop gnome-settings-daemon-nb-translations.patch: fixed upstream.
+- Add gnome-settings-daemon-fix-nondebug-build.patch: Fix build for
+  non-debug targets.
+- Add gnome-settings-daemon-bgo793253.patch: Fix
+  no-return-in-nonvoid-function (bgo#793253).
+- Add gnome-settings-daemon-libcommon.patch: install libcommon,
+  which is linked by the other plugins, as a private library.
+
 -------------------------------------------------------------------
 Thu Dec 28 19:22:40 UTC 2017 - zaitor@opensuse.org
 

gnome-settings-daemon.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-settings-daemon
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,13 +27,13 @@
 %bcond_without wacom
 %endif
 Name:           gnome-settings-daemon
-Version:        3.26.2
+Version:        3.28.0
 Release:        0
 Summary:        Settings daemon for the GNOME desktop
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/GUI/GNOME
-Url:            http://www.gnome.org
+URL:            http://www.gnome.org
-Source:         http://download.gnome.org/sources/gnome-settings-daemon/3.26/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gnome-settings-daemon/3.28/%{name}-%{version}.tar.xz
 # 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
 Patch1:         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
@@ -48,12 +48,12 @@ Patch5:         gnome-settings-daemon-bring-back-updates-plugin.patch
 Patch6:         gnome-settings-daemon-more-power-button-actions.patch
 # PATCH-FIX-OPENSUSE gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch bnc#1029083 boo#1056289 qzhao@suse.com -- Switch new user's default input engine from "anthy" to "mozc" in gnome-desktop with Japanese language and ibus input frame-work condition.
 Patch7:         gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch
-# PATCH-FIX-UPSTREAM gnome-settings-daemon-nb-translations.patch zaitor@opensuse.org -- Update Norwegian Bokmål translations
+# PATCH-FIX-UPSTREAM gnome-settings-daemon-bgo793253.patch bgo#793253 dimstar@opensuse.org -- Fix no-return-in-nonvoid-function
-Patch8:         gnome-settings-daemon-nb-translations.patch
+Patch9:         gnome-settings-daemon-bgo793253.patch
 BuildRequires:  cups-devel
 BuildRequires:  fdupes
 BuildRequires:  gtk-doc
-BuildRequires:  intltool
+BuildRequires:  meson
 BuildRequires:  pkgconfig
 # For directory ownership; it's fine to BuildRequire it since it's also a Requires
 BuildRequires:  polkit
@@ -84,6 +84,7 @@ BuildRequires:  pkgconfig(librsvg-2.0) >= 2.36.2
 BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(pango) >= 1.20.0
 BuildRequires:  pkgconfig(polkit-gobject-1) >= 0.103
+BuildRequires:  pkgconfig(udev)
 BuildRequires:  pkgconfig(upower-glib) >= 0.99.0
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
@@ -100,10 +101,7 @@ Recommends:     nautilus
 BuildRequires:  gnome-common
 %endif
 %if !0%{?is_opensuse}
-BuildRequires:  autoconf
-BuildRequires:  automake
 BuildRequires:  gnome-patch-translation
-BuildRequires:  libtool
 BuildRequires:  translation-update-upstream
 %endif
 %if 0%{?suse_version} == 1315
@@ -168,39 +166,32 @@ gnome-patch-translation-prepare
 %patch6 -p1
 %endif
 %patch7 -p1
-%patch8 -p1
+%patch9 -p1
 
 %build
-# need autoreconf if patch translation has run
+%meson \
-%if 0%{?suse_version} == 1315 || !0%{?is_opensuse}
-autoreconf -f -i
-%endif
-%configure\
-%if %{with wayland}
-        --enable-wayland \
-%else
-        --disable-wayland \
-%endif
-        --enable-alsa \
-        --disable-static \
   --libexecdir=%{_libexecdir}/gnome-settings-daemon-3.0 \
-        %{nil}
+  -D alsa=true \
-# work around a racing condition in plugins/common, which does not always build properly using parallel build
+%if %{with wayland}
-(cd plugins/common; make -j 1 gsd-common-enums.h)
+  -D wayland=true
-make %{?_smp_mflags}
+%else
+  -D wayland=false
+%endif
+%meson_build
 
 %install
-%make_install
+%meson_install
+
 %if %{without wacom}
 rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop
 %endif
-find %{buildroot} -type f -name "*.la" -delete -print
 
 %find_lang %{name} %{?no_lang_C}
 %fdupes %{buildroot}/%{_prefix}
 
 %files
-%doc AUTHORS COPYING ChangeLog NEWS
+%license COPYING
+%doc AUTHORS ChangeLog NEWS
 %{_datadir}/gnome-settings-daemon/
 %dir %{_libexecdir}/gnome-settings-daemon-3.0/
 %{_libexecdir}/gnome-settings-daemon-3.0/gsd-backlight-helper
@@ -213,8 +204,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_libdir}/gnome-settings-daemon-3.0/libgsd.so
 # Explicitly list all the plugins so we know we don't lose any
 
-%{_libexecdir}/gnome-settings-daemon-3.0/gsd-a11y-keyboard
-%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.A11yKeyboard.desktop
 %{_libexecdir}/gnome-settings-daemon-3.0/gsd-a11y-settings
 %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop
 %{_libexecdir}/gnome-settings-daemon-3.0/gsd-clipboard