diff --git a/gnome-settings-daemon-bnc873545-hide-warnings.patch b/gnome-settings-daemon-bnc873545-hide-warnings.patch index a87bafb..c22ac1f 100644 --- a/gnome-settings-daemon-bnc873545-hide-warnings.patch +++ b/gnome-settings-daemon-bnc873545-hide-warnings.patch @@ -33,7 +33,7 @@ index 04823e4..20e8a2b 100644 + /* hide this warning for SLES g_warning ("There is no colord server available"); + */ - goto out; + return; } -- diff --git a/gnome-settings-daemon-bring-back-updates-plugin.patch b/gnome-settings-daemon-bring-back-updates-plugin.patch index 7ff5a3b..990558f 100644 --- a/gnome-settings-daemon-bring-back-updates-plugin.patch +++ b/gnome-settings-daemon-bring-back-updates-plugin.patch @@ -4465,9 +4465,9 @@ Index: gnome-settings-daemon-3.23.2/po/POTFILES.in +plugins/updates/gsd-updates-firmware.c +plugins/updates/gsd-updates-manager.c +plugins/updates/updates.gnome-settings-plugin.in - plugins/wacom/gsd-wacom-button-editor.c - plugins/wacom/gsd-wacom-device.c - plugins/wacom/gsd-wacom-key-shortcut-button.c + plugins/wacom/gsd-wacom-manager.c + plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in + plugins/xrandr/gsd-xrandr-manager.c Index: gnome-settings-daemon-3.23.2/po/POTFILES.skip =================================================================== --- gnome-settings-daemon-3.23.2.orig/po/POTFILES.skip diff --git a/gnome-settings-daemon-revert-libinput-mandatory.patch b/gnome-settings-daemon-revert-libinput-mandatory.patch index 1cc63c0..57ee472 100644 --- a/gnome-settings-daemon-revert-libinput-mandatory.patch +++ b/gnome-settings-daemon-revert-libinput-mandatory.patch @@ -1828,7 +1828,7 @@ index f4120e9..6a65f08 100644 @@ -67,6 +68,13 @@ - <_summary>Whether the tablet's orientation is locked, or rotated automatically. + <_summary>Whether the tablet’s orientation is locked, or rotated automatically. + @@ -1845,14 +1845,14 @@ diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am index 0331226..0f85351 100644 --- a/plugins/common/Makefile.am +++ b/plugins/common/Makefile.am -@@ -82,6 +82,9 @@ test_egg_key_parsing_SOURCES = test-egg-key-parsing.c - test_egg_key_parsing_LDADD = libcommon.la $(COMMON_LIBS) - test_egg_key_parsing_CFLAGS = $(libcommon_la_CFLAGS) +@@ -64,6 +64,9 @@ gsd_test_input_helper_SOURCES = test-input-helper.c + gsd_test_input_helper_LDADD = libcommon.la + gsd_test_input_helper_CFLAGS = $(libcommon_la_CFLAGS) +scriptsdir = $(datadir)/gnome-settings-daemon-@GSD_API_VERSION@ +scripts_DATA = input-device-example.sh + - EXTRA_DIST = $(scripts_DATA) test-plugin.h + EXTRA_DIST = $(scripts_DATA) daemon-skeleton.h daemon-skeleton-gtk.h CLEANFILES = \ diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index e42ae04..b830e74 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jul 13 08:06:33 UTC 2017 - fezhang@suse.com + +- Update SLE patches: + + gnome-settings-daemon-bnc873545-hide-warnings.patch + + gnome-settings-daemon-bring-back-updates-plugin.patch + + gnome-settings-daemon-revert-libinput-mandatory.patch +- Cleanup specfile. + ------------------------------------------------------------------- Thu May 25 19:21:55 UTC 2017 - zaitor@opensuse.org @@ -203,7 +212,7 @@ Thu Sep 8 12:39:50 UTC 2016 - zaitor@opensuse.org + Housekeeping: Code cleanups. + Media keys: - Add Super+F1 as a hardcoded shortcut for launching Help. - - Update gvc to fix a crash setting a headset. + - Update gvc to fix a crash setting a headset (bsc#1045780). + Power: Don't claim the light sensor if we're not active. + Smartcard: - Complete activation task right away if no drivers. diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 5634739..e35ddec 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -38,19 +38,19 @@ Group: System/GUI/GNOME Url: http://www.gnome.org Source: http://download.gnome.org/sources/gnome-settings-daemon/3.24/%{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 +Patch0: 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 +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 -Patch22: gnome-settings-daemon-bnc873545-hide-warnings.patch +Patch2: gnome-settings-daemon-bnc873545-hide-warnings.patch # PATCH-FIX-SLE gnome-settings-daemon-sle-configure-timeout-blank.patch bnc#869685 bgo#710904 cxiong@suse.com -- monitor off timeout is too short, extends it to 5 min -Patch24: gnome-settings-daemon-sle-configure-timeout-blank.patch +Patch3: gnome-settings-daemon-sle-configure-timeout-blank.patch # PATCH-FIX-OPENSUSE gnome-settings-daemon-initial-keyboard.patch bsc#979051 boo#1009515 federico@suse.com -- Deal with the default keyboard being set from xkb instead of GNOME -Patch29: gnome-settings-daemon-initial-keyboard.patch +Patch4: gnome-settings-daemon-initial-keyboard.patch # PATCH-FIX-OPENSUSE gnome-settings-daemon-bring-back-updates-plugin.patch bsc#991024 sckang@suse.com -- Add the updates plugin back -Patch31: gnome-settings-daemon-bring-back-updates-plugin.patch +Patch5: gnome-settings-daemon-bring-back-updates-plugin.patch # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-more-power-button-actions.patch bsc#996342 fezhang@suse.com -- Bring back the "shutdown" and "interactive" power button actions. -Patch32: gnome-settings-daemon-more-power-button-actions.patch +Patch6: gnome-settings-daemon-more-power-button-actions.patch BuildRequires: cups-devel BuildRequires: fdupes BuildRequires: gtk-doc @@ -154,15 +154,15 @@ contact the settings daemon via its DBus interface. %if !0%{?is_opensuse} translation-update-upstream gnome-patch-translation-prepare -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch24 -p0 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p0 %endif -%patch29 -p1 +%patch4 -p1 %if 0%{?suse_version} == 1315 -%patch31 -p1 -%patch32 -p1 +%patch5 -p1 +%patch6 -p1 %endif %build