From 9c43936fa27dab3b0739ca325a62a789c86df5da51051f47f9b6c1c28671179d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 26 Aug 2016 11:56:03 +0000 Subject: [PATCH 1/7] - 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. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=252 --- gnome-settings-daemon.changes | 7 +++++++ gnome-settings-daemon.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index e5ab421..75a5120 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 4a3a8f2..067e785 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -159,7 +159,7 @@ gnome-patch-translation-prepare %endif %build -%if !0%{?is_opensuse} +%if 0%{?suse_version} == 1315 autoreconf -f -i %endif %configure\ From 6b4b8e11b8e9ca8c7257f77d863ce9fe22e68dfb5e0a9ba00af5774c9cf7f593 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 8 Sep 2016 11:48:17 +0000 Subject: [PATCH 2/7] Accepting request 425671 from home:zhangxiaofei:branches:GNOME:Factory - 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. OBS-URL: https://build.opensuse.org/request/show/425671 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=254 --- ...gs-daemon-shutdown-with-power-button.patch | 39 +++++++++++++++++++ gnome-settings-daemon.changes | 11 ++++++ gnome-settings-daemon.spec | 5 +++ 3 files changed, 55 insertions(+) create mode 100644 gnome-settings-daemon-shutdown-with-power-button.patch diff --git a/gnome-settings-daemon-shutdown-with-power-button.patch b/gnome-settings-daemon-shutdown-with-power-button.patch new file mode 100644 index 0000000..66bf403 --- /dev/null +++ b/gnome-settings-daemon-shutdown-with-power-button.patch @@ -0,0 +1,39 @@ +From 8b9b19bc4259b67822ed66f15f6cfac1284ced85 Mon Sep 17 00:00:00 2001 +From: Felix Zhang +Date: Wed, 7 Sep 2016 20:14:04 +0800 +Subject: [PATCH] shutdown with power key + +--- + data/gsd-enums.h | 1 + + plugins/media-keys/gsd-media-keys-manager.c | 3 +++ + 2 files changed, 4 insertions(+) + +diff --git a/data/gsd-enums.h b/data/gsd-enums.h +index 4a0356a..710d58c 100644 +--- a/data/gsd-enums.h ++++ b/data/gsd-enums.h +@@ -113,6 +113,7 @@ typedef enum + typedef enum + { + GSD_POWER_BUTTON_ACTION_NOTHING, ++ 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..6e0514d 100644 +--- a/plugins/media-keys/gsd-media-keys-manager.c ++++ b/plugins/media-keys/gsd-media-keys-manager.c +@@ -1929,6 +1929,9 @@ 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_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.changes b/gnome-settings-daemon.changes index 75a5120..cd6a2d2 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 067e785..8e765f9 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -49,6 +49,8 @@ Patch24: sle-configure-timeout-blank.patch 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-FIX-SLE gnome-settings-daemon-shutdown-with-power-key.patch bsc#996342 fezhang@suse.com -- Bring back the shutdown option for power key +Patch32: gnome-settings-daemon-shutdown-with-power-button.patch BuildRequires: cups-devel BuildRequires: fdupes BuildRequires: gnome-common @@ -157,6 +159,9 @@ gnome-patch-translation-prepare %if 0%{?suse_version} == 1315 %patch31 -p1 %endif +%if !0%{?is_opensuse} +%patch32 -p1 +%endif %build %if 0%{?suse_version} == 1315 From 1a25f2f394e20e68869b58102930a8a88bed00256a907f78de2ee0642054b805 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 8 Sep 2016 11:49:56 +0000 Subject: [PATCH 3/7] - Also apply gnome-settings-daemon-shutdown-with-power-button.patch on openSUSE (boo#993381). OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=255 --- gnome-settings-daemon.changes | 6 ++++++ gnome-settings-daemon.spec | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index cd6a2d2..81c00c8 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 8e765f9..f941c5e 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -49,7 +49,7 @@ Patch24: sle-configure-timeout-blank.patch 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-FIX-SLE gnome-settings-daemon-shutdown-with-power-key.patch bsc#996342 fezhang@suse.com -- Bring back the shutdown option for power key +# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-shutdown-with-power-key.patch bsc#996342 fezhang@suse.com -- Bring back the shutdown option for power key Patch32: gnome-settings-daemon-shutdown-with-power-button.patch BuildRequires: cups-devel BuildRequires: fdupes @@ -159,9 +159,7 @@ gnome-patch-translation-prepare %if 0%{?suse_version} == 1315 %patch31 -p1 %endif -%if !0%{?is_opensuse} %patch32 -p1 -%endif %build %if 0%{?suse_version} == 1315 From 3b8a3e659f66265e05fcbaab0ecbc2b13517178a287b2e459c44a33a54c03d8e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 8 Sep 2016 21:25:07 +0000 Subject: [PATCH 4/7] Accepting request 425701 from GNOME:Next Resubmit - rebased post ack of SLE Sync OBS-URL: https://build.opensuse.org/request/show/425701 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=256 --- gnome-settings-daemon-3.20.1.tar.xz | 3 --- gnome-settings-daemon-3.21.90.tar.xz | 3 +++ gnome-settings-daemon.changes | 18 ++++++++++++++++++ gnome-settings-daemon.spec | 4 ++-- 4 files changed, 23 insertions(+), 5 deletions(-) delete mode 100644 gnome-settings-daemon-3.20.1.tar.xz create mode 100644 gnome-settings-daemon-3.21.90.tar.xz 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.21.90.tar.xz b/gnome-settings-daemon-3.21.90.tar.xz new file mode 100644 index 0000000..ee147a1 --- /dev/null +++ b/gnome-settings-daemon-3.21.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28e9167d4aab82b7f6b50d32683a0edae3d91196004dc079ad1940489afee4de +size 1624384 diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 81c00c8..49fc713 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +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 diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index f941c5e..f0ca6b0 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -30,13 +30,13 @@ %endif Name: gnome-settings-daemon -Version: 3.20.1 +Version: 3.21.90 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.21/%{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 From 4b894e533ee816ea6565e1312e9bfb2723c00669de01b376e0b30d6a14ae0ca0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 14 Sep 2016 16:53:23 +0000 Subject: [PATCH 5/7] Accepting request 427624 from GNOME:Next 1 OBS-URL: https://build.opensuse.org/request/show/427624 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=257 --- gnome-settings-daemon-3.21.90.tar.xz | 3 --- gnome-settings-daemon-3.21.92.1.tar.xz | 3 +++ ...s-daemon-sle-configure-timeout-blank.patch | 0 gnome-settings-daemon.changes | 21 +++++++++++++++++++ gnome-settings-daemon.spec | 13 +++++++----- 5 files changed, 32 insertions(+), 8 deletions(-) delete mode 100644 gnome-settings-daemon-3.21.90.tar.xz create mode 100644 gnome-settings-daemon-3.21.92.1.tar.xz rename sle-configure-timeout-blank.patch => gnome-settings-daemon-sle-configure-timeout-blank.patch (100%) diff --git a/gnome-settings-daemon-3.21.90.tar.xz b/gnome-settings-daemon-3.21.90.tar.xz deleted file mode 100644 index ee147a1..0000000 --- a/gnome-settings-daemon-3.21.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:28e9167d4aab82b7f6b50d32683a0edae3d91196004dc079ad1940489afee4de -size 1624384 diff --git a/gnome-settings-daemon-3.21.92.1.tar.xz b/gnome-settings-daemon-3.21.92.1.tar.xz new file mode 100644 index 0000000..2fa6369 --- /dev/null +++ b/gnome-settings-daemon-3.21.92.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60de79f0aa8a575e312841870bf9ac3b2292bfd38679c4640ab5b1579fcbce1b +size 1649064 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 49fc713..deec560 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Thu Sep 8 12:39:50 UTC 2016 - zaitor@opensuse.org diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index f0ca6b0..25cd57d 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -30,7 +30,7 @@ %endif Name: gnome-settings-daemon -Version: 3.21.90 +Version: 3.21.92.1 Release: 0 Summary: Settings daemon for the GNOME desktop License: GPL-2.0+ @@ -43,8 +43,8 @@ Patch20: gnome-settings-daemon-revert-libinput-mandatory.patch 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 @@ -53,7 +53,10 @@ Patch31: gnome-settings-daemon-bring-back-updates-plugin.patch Patch32: gnome-settings-daemon-shutdown-with-power-button.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 @@ -158,8 +161,8 @@ gnome-patch-translation-prepare %endif %if 0%{?suse_version} == 1315 %patch31 -p1 -%endif %patch32 -p1 +%endif %build %if 0%{?suse_version} == 1315 @@ -177,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 From ec5fc1cacc177d90e5fa256b59781558db769e6566f55368f9f3a9109fb07557 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 18 Sep 2016 19:58:23 +0000 Subject: [PATCH 6/7] Accepting request 428278 from home:zhangxiaofei:branches:GNOME:Factory - Rebase gnome-settings-daemon-revert-libinput-mandatory.patch for version 3.21.90. - 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). OBS-URL: https://build.opensuse.org/request/show/428278 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=258 --- ...ngs-daemon-more-power-button-actions.patch | 24 +++++++++++-------- ...ngs-daemon-revert-libinput-mandatory.patch | 1 + gnome-settings-daemon.changes | 17 ++++++++++--- gnome-settings-daemon.spec | 4 ++-- 4 files changed, 31 insertions(+), 15 deletions(-) rename gnome-settings-daemon-shutdown-with-power-button.patch => gnome-settings-daemon-more-power-button-actions.patch (60%) diff --git a/gnome-settings-daemon-shutdown-with-power-button.patch b/gnome-settings-daemon-more-power-button-actions.patch similarity index 60% rename from gnome-settings-daemon-shutdown-with-power-button.patch rename to gnome-settings-daemon-more-power-button-actions.patch index 66bf403..b574c0e 100644 --- a/gnome-settings-daemon-shutdown-with-power-button.patch +++ b/gnome-settings-daemon-more-power-button-actions.patch @@ -1,33 +1,37 @@ -From 8b9b19bc4259b67822ed66f15f6cfac1284ced85 Mon Sep 17 00:00:00 2001 +From 3d9c3ecda9c68039c309bfb6bfc93830c4a0e20e Mon Sep 17 00:00:00 2001 From: Felix Zhang -Date: Wed, 7 Sep 2016 20:14:04 +0800 -Subject: [PATCH] shutdown with power key +Date: Mon, 12 Sep 2016 18:00:07 +0800 +Subject: [PATCH] more power button actions --- - data/gsd-enums.h | 1 + - plugins/media-keys/gsd-media-keys-manager.c | 3 +++ - 2 files changed, 4 insertions(+) + 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..710d58c 100644 +index 4a0356a..87fd158 100644 --- a/data/gsd-enums.h +++ b/data/gsd-enums.h -@@ -113,6 +113,7 @@ typedef enum +@@ -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..6e0514d 100644 +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,9 @@ do_config_power_button_action (GsdMediaKeysManager *manager, +@@ -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; 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/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index deec560..30592b2 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -19,6 +19,20 @@ Tue Sep 13 21:06:34 UTC 2016 - zaitor@opensuse.org 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 @@ -126,10 +140,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 25cd57d..a732654 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -49,8 +49,8 @@ Patch24: gnome-settings-daemon-sle-configure-timeout-blank.patch 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-shutdown-with-power-key.patch bsc#996342 fezhang@suse.com -- Bring back the shutdown option for power key -Patch32: gnome-settings-daemon-shutdown-with-power-button.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 From 1c8e48e3ca8bc4607bfe9b0323bc447ceab50855c047c322dca65b47b073b77b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 20 Sep 2016 18:38:13 +0000 Subject: [PATCH 7/7] Accepting request 429024 from GNOME:Next Update to 3.22.0 OBS-URL: https://build.opensuse.org/request/show/429024 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=259 --- gnome-settings-daemon-3.21.92.1.tar.xz | 3 --- gnome-settings-daemon-3.22.0.tar.xz | 3 +++ gnome-settings-daemon.changes | 7 +++++++ gnome-settings-daemon.spec | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 gnome-settings-daemon-3.21.92.1.tar.xz create mode 100644 gnome-settings-daemon-3.22.0.tar.xz diff --git a/gnome-settings-daemon-3.21.92.1.tar.xz b/gnome-settings-daemon-3.21.92.1.tar.xz deleted file mode 100644 index 2fa6369..0000000 --- a/gnome-settings-daemon-3.21.92.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60de79f0aa8a575e312841870bf9ac3b2292bfd38679c4640ab5b1579fcbce1b -size 1649064 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.changes b/gnome-settings-daemon.changes index 30592b2..438c7b6 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index a732654..45e2590 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -30,13 +30,13 @@ %endif Name: gnome-settings-daemon -Version: 3.21.92.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.21/%{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