Accepting request 695695 from GNOME:Factory

Scripted push of project GNOME:Next (forwarded request 695646 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/695695
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=155
This commit is contained in:
Dominique Leuenberger 2019-05-03 20:11:31 +00:00 committed by Git OBS Bridge
commit f86786e9a3
5 changed files with 75 additions and 67 deletions

View File

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

View File

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

View File

@ -1,56 +0,0 @@
From 78305bcaf7e72beaded5cfb87a37f8b3b8943489 Mon Sep 17 00:00:00 2001
From: Xiaoguang Wang <xwang@suse.com>
Date: Sun, 8 Apr 2018 17:05:34 +0800
Subject: [PATCH] power: Add touch screen input switch
Use this switch to disable or enable touch screen
input when screen is off.
https://bugzilla.gnome.org/show_bug.cgi?id=778961#c4
---
data/org.gnome.settings-daemon.plugins.power.gschema.xml.in | 5 +++++
plugins/power/gsd-power-manager.c | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
index 93c704e9..a6aee267 100644
--- a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
+++ b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
@@ -41,5 +41,10 @@
<summary>Power button action</summary>
<description>The action to take when the system power button is pressed. This action is hard-coded (and the setting ignored) on virtual machines (power off) and tablets (suspend).</description>
</key>
+ <key name="disable-touch-screen" type="b">
+ <default>true</default>
+ <summary>Disable touch screen input when screen is off</summary>
+ <description>Disable touch screen input when screen is off</description>
+ </key>
</schema>
</schemalist>
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 82d81e96..37f8fa94 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -937,6 +937,9 @@ screen_devices_disable (GsdPowerManager *manager)
GdkDeviceManager *device_manager;
GList *devices, *l;
+ if (!g_settings_get_boolean (manager->priv->settings, "disable-touch-screen"))
+ return;
+
/* This will be managed by the compositor eventually on X11 too:
* https://bugzilla.gnome.org/show_bug.cgi?id=742598
*/
@@ -975,6 +978,9 @@ screen_devices_enable (GsdPowerManager *manager)
{
GList *l, *disabled_devices;
+ if (!g_settings_get_boolean (manager->priv->settings, "disable-touch-screen"))
+ return;
+
if (gnome_settings_is_wayland ())
return;
--
2.12.3

View File

@ -1,3 +1,71 @@
-------------------------------------------------------------------
Wed Mar 20 02:43:38 UTC 2019 - xwang@suse.com
- Drop gnome-settings-daemon-touch-screen-switch.patch:
The function has been moved to mutter(commit d30301c0).
-------------------------------------------------------------------
Tue Mar 12 06:25:01 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 3.32.0:
+ Stable release version bump.
-------------------------------------------------------------------
Wed Mar 6 18:49:14 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 3.31.92:
+ Power: Only test backlight on linux.
+ Updated translations.
-------------------------------------------------------------------
Thu Feb 21 09:31:09 UTC 2019 - bjorn.lie@gmail.com
- Update to version 3.31.91:
+ Media-keys: Ignore key repeat on certain shortcuts (Needs
up-to-date mutter and gnome-shell).
+ Housekeeping: Fix overflow.
+ Updated translations.
-------------------------------------------------------------------
Fri Feb 15 19:11:43 UTC 2019 - bjorn.lie@gmail.com
- Update to version 3.31.90:
+ Remove libXtst as a dependency.
+ Keyboard: Enable ibus for OSK purposes on X11.
+ Power:
- Add x-gnome-privacy-scope hints to power notifications.
- Define brightness to be -1 if builtin display is disabled.
+ Smartcard:
- Wait until smartcards are inspected before locking screen.
- Handle a smartcard getting removed very shortly after login.
- Drop pkgconfig(xtst) BuildRequires: No longer needed.
-------------------------------------------------------------------
Wed Jan 9 17:31:32 UTC 2019 - bjorn.lie@gmail.com
- Update to version 3.31.2:
+ Color: Add DBus API to preview Night Light for a few seconds.
+ Media-keys: Default to interactive shutdown action for power
button if the action is not supported.
+ Power:
- Avoid setting GError twice.
- Speed up tests by splitting into chunks.
+ Print-notification: Ignore Server* messages from CUPS not meant
to us.
+ Rfkill: Use GUdev to monitor rfkill device pressence.
+ Updated translations.
-------------------------------------------------------------------
Wed Jan 9 17:31:31 UTC 2019 - bjorn.lie@gmail.com
- Update to version 3.31.1:
+ Xsettings: Always use mutter-computed UI scaling value.
+ Wacom: Drop tablet/touchscreen mapping to outputs. Mutter now
handles this entirely.
+ Updated translations.
- Disable gnome-settings-daemon-touch-screen-switch.patch: Needs
rebase.
-------------------------------------------------------------------
Wed Jan 9 17:08:30 UTC 2019 - bjorn.lie@gmail.com

View File

@ -28,13 +28,13 @@
%endif
Name: gnome-settings-daemon
Version: 3.30.2
Version: 3.32.0
Release: 0
Summary: Settings daemon for the GNOME desktop
License: GPL-2.0-or-later AND LGPL-2.1-only
Group: System/GUI/GNOME
URL: https://www.gnome.org
Source0: https://download.gnome.org/sources/gnome-settings-daemon/3.30/%{name}-%{version}.tar.xz
URL: https://gitlab.gnome.org/GNOME/gnome-settings-daemon
Source0: https://download.gnome.org/sources/gnome-settings-daemon/3.32/%{name}-%{version}.tar.xz
# 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
Patch1: gnome-settings-daemon-initial-keyboard.patch
@ -42,8 +42,6 @@ Patch1: gnome-settings-daemon-initial-keyboard.patch
Patch2: gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-bgo793253.patch bgo#793253 dimstar@opensuse.org -- Fix no-return-in-nonvoid-function
Patch3: gnome-settings-daemon-bgo793253.patch
# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-touch-screen-switch.patch bsc#1086496 xwang@suse.com -- Add touch screen input switch.
Patch4: gnome-settings-daemon-touch-screen-switch.patch
## SLE-only patches start at 1000
# 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
@ -96,7 +94,6 @@ BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xkbfile)
BuildRequires: pkgconfig(xtst)
Requires: gsettings-desktop-schemas
# g-s-d uses the pkexec binary
Requires: polkit
@ -152,7 +149,6 @@ gnome-patch-translation-prepare po %{name}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
# SLE-only patches start at 1000
%if !0%{?is_opensuse}
%patch1000 -p1
@ -188,7 +184,7 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.deskt
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-backlight-helper
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-locate-pointer
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-printer
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-test-*
#%%{_libexecdir}/gnome-settings-daemon-3.0/gsd-test-*
# From patch2
#%%{_libexecdir}/novell-sysconfig-proxy-helper
%dir %{_libdir}/gnome-settings-daemon-3.0/