diff --git a/gnome-settings-daemon-3.20.1.tar.xz b/gnome-settings-daemon-3.20.1.tar.xz deleted file mode 100644 index ed9a4c9..0000000 --- a/gnome-settings-daemon-3.20.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e84a075d895ca3baeefb8508e0a901027b66f7d5a7ee8c966e31d301b38e78e7 -size 1650928 diff --git a/gnome-settings-daemon-3.22.0.tar.xz b/gnome-settings-daemon-3.22.0.tar.xz new file mode 100644 index 0000000..1e8db28 --- /dev/null +++ b/gnome-settings-daemon-3.22.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:430e42c4f2cc4cb72b669a44c744343f1592ec00d26d2168745a878afe73f82b +size 1649924 diff --git a/gnome-settings-daemon-more-power-button-actions.patch b/gnome-settings-daemon-more-power-button-actions.patch new file mode 100644 index 0000000..b574c0e --- /dev/null +++ b/gnome-settings-daemon-more-power-button-actions.patch @@ -0,0 +1,43 @@ +From 3d9c3ecda9c68039c309bfb6bfc93830c4a0e20e Mon Sep 17 00:00:00 2001 +From: Felix Zhang +Date: Mon, 12 Sep 2016 18:00:07 +0800 +Subject: [PATCH] more power button actions + +--- + data/gsd-enums.h | 2 ++ + plugins/media-keys/gsd-media-keys-manager.c | 6 ++++++ + 2 files changed, 8 insertions(+) + +diff --git a/data/gsd-enums.h b/data/gsd-enums.h +index 4a0356a..87fd158 100644 +--- a/data/gsd-enums.h ++++ b/data/gsd-enums.h +@@ -113,6 +113,8 @@ typedef enum + typedef enum + { + GSD_POWER_BUTTON_ACTION_NOTHING, ++ GSD_POWER_BUTTON_ACTION_INTERACTIVE, ++ GSD_POWER_BUTTON_ACTION_SHUTDOWN, + GSD_POWER_BUTTON_ACTION_SUSPEND, + GSD_POWER_BUTTON_ACTION_HIBERNATE + } GsdPowerButtonActionType; +diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c +index d77ed10..e9611b9 100644 +--- a/plugins/media-keys/gsd-media-keys-manager.c ++++ b/plugins/media-keys/gsd-media-keys-manager.c +@@ -1929,6 +1929,12 @@ do_config_power_button_action (GsdMediaKeysManager *manager, + + action_type = g_settings_get_enum (manager->priv->power_settings, "power-button-action"); + switch (action_type) { ++ case GSD_POWER_BUTTON_ACTION_INTERACTIVE: ++ do_config_power_action (manager, GSD_POWER_ACTION_INTERACTIVE, in_lock_screen); ++ break; ++ case GSD_POWER_BUTTON_ACTION_SHUTDOWN: ++ do_config_power_action (manager, GSD_POWER_ACTION_SHUTDOWN, in_lock_screen); ++ break; + case GSD_POWER_BUTTON_ACTION_SUSPEND: + do_config_power_action (manager, GSD_POWER_ACTION_SUSPEND, in_lock_screen); + break; +-- +2.6.6 + diff --git a/gnome-settings-daemon-revert-libinput-mandatory.patch b/gnome-settings-daemon-revert-libinput-mandatory.patch index 8d1d65e..1cc63c0 100644 --- a/gnome-settings-daemon-revert-libinput-mandatory.patch +++ b/gnome-settings-daemon-revert-libinput-mandatory.patch @@ -1781,6 +1781,7 @@ index 954ac30..e78f463 100644 GList *devices, *l; - gboolean has_touchpad, has_touchscreen; + gboolean has_touchpad, has_touchscreen, has_trackball; + gboolean has_mouse; gtk_init (&argc, &argv); diff --git a/sle-configure-timeout-blank.patch b/gnome-settings-daemon-sle-configure-timeout-blank.patch similarity index 100% rename from sle-configure-timeout-blank.patch rename to gnome-settings-daemon-sle-configure-timeout-blank.patch diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index e5ab421..438c7b6 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,87 @@ +------------------------------------------------------------------- +Tue Sep 20 16:10:11 UTC 2016 - dimstar@opensuse.org + +- Update to version 3.22.0: + + Fix possible problem with battery and mains timeouts. + + Updated translations. + +------------------------------------------------------------------- +Wed Sep 14 13:38:34 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.92.1: + + Fix a build problem in the smartcard plugin. + +------------------------------------------------------------------- +Tue Sep 13 21:06:34 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.92: + + Use systemd to track running services in the Sharing plugin. + + Updated translations. +- Only apply gnome-settings-daemon-shutdown-with-power-button.patch + on SLE and Leap. Following this, conditionally BuildRequires + gnome-common for SLE and Leap only. +- Add gtk-doc BuildRequires: gnome-common was pulling it in before. +- Rename sle-configure-timeout-blank.patch to + gnome-settings-daemon-sle-configure-timeout-blank.patch, align + patchname with our standard. +- Stop passing V=1 to make, we do debugging locally. + +------------------------------------------------------------------- +Mon Sep 12 11:19:11 UTC 2016 - fezhang@suse.com + +- Rebase gnome-settings-daemon-revert-libinput-mandatory.patch + for version 3.21.90. + +------------------------------------------------------------------- +Mon Sep 12 10:07:53 UTC 2016 - fezhang@suse.com + +- Rename gnome-settings-daemon-shutdown-with-power-button.patch to + gnome-settings-daemon-more-power-button-actions.patch: + Also add back the "interactive" power button action for + consistency with SLES11 behavior (bsc#996342). + +------------------------------------------------------------------- +Thu Sep 8 12:39:50 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.90: + + Color: Ignore fake VNC devices. + + Housekeeping: Code cleanups. + + Media keys: + - Add Super+F1 as a hardcoded shortcut for launching Help. + - Update gvc to fix a crash setting a headset. + + Power: Don't claim the light sensor if we're not active. + + Smartcard: + - Complete activation task right away if no drivers. + - Fix crash on startup. + + Wacom: + - Fix hot(un)plug related crashes. + - Fix memory leaks. + + XSettings: Fix keynav-use-caret setting not working. + +------------------------------------------------------------------- +Thu Sep 8 11:49:13 UTC 2016 - dimstar@opensuse.org + +- Also apply gnome-settings-daemon-shutdown-with-power-button.patch + on openSUSE (boo#993381). + +------------------------------------------------------------------- +Wed Sep 7 12:44:12 UTC 2016 - fezhang@suse.com + +- Add gnome-settings-daemon-shutdown-with-power-button.patch: + Bring back "shutdown" as a configurable choice for power button. + Even though upstream removed it due to "too destructive" and + recommends using a custom shortcut, we still need it for bare + metal servers without keyboards attched (bsc#996342). + Check bgo#753713, bgo#755953 to learn why upstream removed the + power button actions. + +------------------------------------------------------------------- +Fri Aug 26 11:55:29 UTC 2016 - dimstar@opensuse.org + +- Call autoreconf on SLE12 and Leap 42.x: + gnome-settings-daemon-bring-back-updates-plugin.patch is also + applied on Leap, hence autoreconf needs to run there too. + ------------------------------------------------------------------- Fri Aug 10 02:24:44 UTC 2016 - sckang@suse.com @@ -63,10 +147,7 @@ Mon Apr 18 11:16:19 CDT 2016 - federico@suse.com Mon Apr 18 08:33:57 UTC 2016 - alarrosa@suse.com - Update to GNOME 3.20.1 Fate#318572 - - Rebased gnome-settings-daemon-notify-idle-resumed.patch. -- Add gnome-settings-daemon-revert-libinput-mandatory.patch: do not - force libinput driver on SLE. - Drop SLE patch: gnome-settings-daemon-bnc862603-remove-battery-recall-code.patch: fixed upstream. diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 4a3a8f2..45e2590 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -30,28 +30,33 @@ %endif Name: gnome-settings-daemon -Version: 3.20.1 +Version: 3.22.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.20/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-settings-daemon/3.22/%{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 -# PATCH-FIX-SLE sle-configure-timeout-blank.patch bnc#869685 bgo#710904 cxiong@suse.com -- monitor off timeout is too short, extends it to 5 min -Patch24: sle-configure-timeout-blank.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 # PATCH-FIX-SLE gnome-settings-daemon-initial-keyboard.patch bsc#979051 federico@suse.com -- Deal with the default keyboard being set from xkb instead of GNOME Patch29: 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 +# 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 BuildRequires: cups-devel BuildRequires: fdupes +BuildRequires: gtk-doc +%if 0%{?suse_version} == 1315 BuildRequires: gnome-common +%endif %if !0%{?is_opensuse} BuildRequires: gnome-patch-translation BuildRequires: translation-update-upstream @@ -156,10 +161,11 @@ gnome-patch-translation-prepare %endif %if 0%{?suse_version} == 1315 %patch31 -p1 +%patch32 -p1 %endif %build -%if !0%{?is_opensuse} +%if 0%{?suse_version} == 1315 autoreconf -f -i %endif %configure\ @@ -174,7 +180,7 @@ autoreconf -f -i %{nil} # work around a racing condition in plugins/common, which does not always build properly using parallel build (cd plugins/common; make -j 1 gsd-common-enums.h) -make %{?jobs:-j%jobs} V=1 +make %{?jobs:-j%jobs} %install %makeinstall