Hello community,
here is the log from the commit of package gnome-settings-daemon for
openSUSE:Leap:15.2 checked in at 2020-01-30 14:49:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/gnome-settings-daemon (Old)
and /work/SRC/openSUSE:Leap:15.2/.gnome-settings-daemon.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-settings-daemon"
Thu Jan 30 14:49:47 2020 rev:53 rq:757854 version:3.34.1+3
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/gnome-settings-daemon/gnome-settings-daemon.changes
2020-01-15 15:04:53.621887364 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.gnome-settings-daemon.new.26092/gnome-settings-daemon.changes
2020-01-30 14:50:35.378908502 +0100
@@ -1,0 +2,149 @@
+Thu Dec 5 02:12:43 UTC 2019 - Yifan Jiang <yfji...@suse.com>
+
+- Enable the patches for both Leap and SLE (bsc#1158243):
+ + gnome-settings-daemon-notify-idle-resumed.patch
+ + gnome-settings-daemon-bnc873545-hide-warnings.patch
+ + gnome-settings-daemon-sle-configure-timeout-blank.patch
+ + gnome-settings-daemon-more-power-button-actions.patch
+
+-------------------------------------------------------------------
+Fri Nov 29 12:52:13 UTC 2019 - Frederic Crozat <fcro...@suse.com>
+
+- Update to version 3.34.1+3:
+ * media-keys: Add guard to map_keybinding()
+ * media-keys: Fix crash on key bindings migration
+ * media-keys: Use X11 display for clipboard
+- Fix build on s390x (ie without wacom support)
+
+-------------------------------------------------------------------
+Thu Nov 21 14:38:45 UTC 2019 - Frederic Crozat <fcro...@suse.com>
+
+- Update gnome-settings-daemon-notify-idle-resumed.patch with
+ proper xml tag names.
+
+-------------------------------------------------------------------
+Sat Oct 12 16:56:25 UTC 2019 - bjorn....@gmail.com
+
+- Update to version 3.34.1+0:
+ + power: Fix rounding of brightness value.
+
+-------------------------------------------------------------------
+Wed Oct 09 19:45:45 UTC 2019 - bjorn....@gmail.com
+
+- Update to version 3.34.0+10:
+ + smartcard:
+ - Change timeout on spurious event error
+ - Change manager to non-blocking
+ + GsdSmartcardService: Use correct parent type for structs
+ + media-keys: Divide keyboard brightness value by 100
+ + Updated translations.
+- Switch to git checkout via source service, use upstream stable
+ branch.
+- Drop gsd-smartcard-parent-type.patch: Fixed upstream.
+
+-------------------------------------------------------------------
+Tue Oct 8 10:36:50 UTC 2019 - Yifan Jiang <yfji...@suse.com>
+
+- Rebase gnome-settings-daemon-notify-idle-resumed.patch:
+ Add the newly added parameter NOTIFICATION_PRIVACY_SYSTEM for the
+ function of create_notification.
+
+-------------------------------------------------------------------
+Fri Sep 20 17:19:51 UTC 2019 - Felix Zhang <fezh...@suse.com>
+
+- Apply gnome-settings-daemon-sle-configure-timeout-blank.patch
+ correctly.
+- Rebase gnome-settings-daemon-notify-idle-resumed.patch.
+
+-------------------------------------------------------------------
+Tue Sep 17 19:33:05 UTC 2019 - Michael Gorse <mgo...@suse.com>
+
+- Add gsd-smartcard-parent-type.patch: use correct parent type for
+ structs.
+
+-------------------------------------------------------------------
+Tue Sep 10 05:51:17 CDT 2019 - mgo...@suse.com
+
+- Update to version 3.34.0:
+ + Updated translations.
+
+-------------------------------------------------------------------
+Fri Sep 6 11:40:02 NZST 2019 - l...@ljones.dev
+
+- Update to version 3.33.92:
+ + Media-keys: Fix MPRIS controller no longer working.
+ + XSettings: Make plugin able to run on demand.
+ + Ensure plugin is started after the shell.
+ + Replace deprecated 'g_type_class_add_private' in
+ GnomeSettingsPluginInfo.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Sat Aug 31 05:37:59 CDT 2019 - mgo...@suse.com
+
+- Update to version 3.33.90:
+ + Add systemd user service files for all the plugins.
+ - With the exception of gsd-xsettings, daemons do not use the
+ GDK X11 backend anymore.
+ + WWAN: New daemon, handles WWAN device settings.
+ + Mouse: Removed daemon, everything is now implemented in mutter.
+ + Clipboard: - Removed daemon, everything is now implemented in
+ mutter.
+ + Color: Use Planckian calculations on night light.
+ + Rfkill: - Handle airplane mode for WWAN interfaces.
+ + XSettings: Round Xft.dpi setting to an integer.
+ + Add entry for overlay scrolling setting.
+ + Media-keys: - Use device node from AcceleratorActivated
+ arguments.
+ + Updated translations.
+- Changes from version 3.33.0:
+ + Compile warning fixes.
+ + Media-keys:
+ - Keygrabbing has been reworked. The new UngrabAccelerators
+ DBus API on the shell is now required. Non-GNOME Desktops
+ using g-s-d will need to be updated for this.
+ - Add mapping for screen brightness cycle key.
+ - Fix launched clients inheriting DESKTOP_AUTOSTART_ID.
+ - Allow mapping of hard-coded keys.
+ + Power:
+ - Fix memory leak.
+ - Remove special handling of tablet devices.
+ + Mouse:
+ - Remove locate-pointer, in favor of gnome-shell handling.
+ - Remove mousetweaks support, in favor of gnome-shell handling.
+ + Keyboard: Remove numlock persistence, in favor of gnome-shell
+ handling.
+ + Updated translations.
+- Up colord, gsettings-desktop-schemas, polkit-gobject, and
+ upower-glib dependencies.
+- Add systemd dependency.
+- Add gcr and mm-glib dependencies for wwan.
+- Drop gnome-settings-daemon-round-xft_dpi-to-integer.patch: fixed
+ upstream.
+- Rebase patches: gnome-settings-daemon-initial-keyboard.patch,
+ gnome-settings-daemon-bgo793253.patch., and SLED patches:
+ gnome-settings-daemon-bnc873545-hide-warnings.patch,
+ gnome-settings-daemon-more-power-button-actions.patch,
+ gnome-settings-daemon-notify-idle-resumed.patch, and
+ gnome-settings-daemon-sle-configure-timeout-blank.patch.
+- Add gsd-wwan to files, and remove gsd-clipboard, gsd-mouse, and
+ gsd-locate-pointer.
+- Add systemd services and targets to files.
+
+-------------------------------------------------------------------
+Fri Aug 2 20:08:18 UTC 2019 - Bjørn Lie <bjorn....@gmail.com>
+
+- Refresh patches with quilt.
+
+-------------------------------------------------------------------
+Wed Jun 19 14:03:25 UTC 2019 - Bjørn Lie <bjorn....@gmail.com>
+
+- Update to version 3.32.1:
+ + Signal connector rather than output ID for OSDs.
+ + Media-keys: Fix MPRIS issues with disconnecting clients.
+ + Color: Allow night light to be always on.
+ + Power: Only disable Suspend/Hibernate actions inside VM.
+ + Smartcard: Fix cancellation issues.
+ + Updated translations.
+
+-------------------------------------------------------------------
@@ -9 +158,43 @@
-Mon May 14 11:50:57 UTC 2018 - dims...@opensuse.org
+Wed Mar 20 02:43:38 UTC 2019 - xw...@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....@gmail.com>
+
+- Update to version 3.32.0:
+ + Stable release version bump.
+
+-------------------------------------------------------------------
+Wed Mar 6 18:49:14 UTC 2019 - Bjørn Lie <bjorn....@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....@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....@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....@gmail.com
@@ -11,2 +202,129 @@
-- Apply gnome-settings-daemon-more-power-button-actions.patch also
- on Leap.
++++ 211 more lines (skipped)
++++ between
/work/SRC/openSUSE:Leap:15.2/gnome-settings-daemon/gnome-settings-daemon.changes
++++ and
/work/SRC/openSUSE:Leap:15.2/.gnome-settings-daemon.new.26092/gnome-settings-daemon.changes
Old:
----
gnome-settings-daemon-3.26.2.tar.xz
gnome-settings-daemon-nb-translations.patch
gnome-settings-daemon-round-xft_dpi-to-integer.patch
gnome-settings-daemon-timeout-grabbing-keys.patch
gnome-settings-daemon-touch-screen-switch.patch
New:
----
_service
_servicedata
gnome-settings-daemon-3.34.1+3.obscpio
gnome-settings-daemon-bgo793253.patch
gnome-settings-daemon.obsinfo
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.KFAsG6/_old 2020-01-30 14:50:36.318909002 +0100
+++ /var/tmp/diff_new_pack.KFAsG6/_new 2020-01-30 14:50:36.318909002 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gnome-settings-daemon
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -26,53 +26,54 @@
%else
%bcond_without wacom
%endif
+
Name: gnome-settings-daemon
-Version: 3.26.2
+Version: 3.34.1+3
Release: 0
Summary: Settings daemon for the GNOME desktop
-License: GPL-2.0+
+License: GPL-2.0-or-later AND LGPL-2.1-only
Group: System/GUI/GNOME
-Url: http://www.gnome.org
-Source:
http://download.gnome.org/sources/gnome-settings-daemon/3.26/%{name}-%{version}.tar.xz
-# PATCH-FEATURE-SLE gnome-settings-daemon-notify-idle-resumed.patch bnc#439018
bnc#708182 bgo#575467 h...@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
fezh...@suse.com -- hide the warnings when g-s-d cannot find colord running,
which is expected on SLES
-Patch2: gnome-settings-daemon-bnc873545-hide-warnings.patch
-# PATCH-FIX-SLE gnome-settings-daemon-sle-configure-timeout-blank.patch
bnc#869685 bgo#710904 cxi...@suse.com -- monitor off timeout is too short,
extends it to 5 min
-Patch3: gnome-settings-daemon-sle-configure-timeout-blank.patch
+URL: https://gitlab.gnome.org/GNOME/gnome-settings-daemon
+Source0: %{name}-%{version}.tar.xz
+
# PATCH-FIX-OPENSUSE gnome-settings-daemon-initial-keyboard.patch bsc#979051
boo#1009515 feder...@suse.com -- Deal with the default keyboard being set from
xkb instead of GNOME
-Patch4: gnome-settings-daemon-initial-keyboard.patch
-# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-more-power-button-actions.patch
bsc#996342 fezh...@suse.com -- Bring back the "shutdown" and "interactive"
power button actions.
-Patch6: gnome-settings-daemon-more-power-button-actions.patch
+Patch1: gnome-settings-daemon-initial-keyboard.patch
# PATCH-FIX-OPENSUSE
gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch bnc#1029083
boo#1056289 qz...@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
zai...@opensuse.org -- Update Norwegian Bokmål translations
-Patch8: gnome-settings-daemon-nb-translations.patch
-# PATCH-FIX-UPSTREAM gnome-settings-daemon-timeout-grabbing-keys.patch
bgo#792353 fezh...@suse.com -- Retry grabbing media-key accelerators when timed
out
-Patch9: gnome-settings-daemon-timeout-grabbing-keys.patch
-# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-touch-screen-switch.patch
bsc#1086496 xw...@suse.com -- Add touch screen input switch.
-Patch10: gnome-settings-daemon-touch-screen-switch.patch
-# PATCH-FIX-UPSTREAM gnome-settings-daemon-round-xft_dpi-to-integer.patch
bsc#1086789 glgo#GNOME#gnome-settings-daemon!99 yfji...@suse.com -- Round the
Xft.dpi setting to an integer
-Patch11: gnome-settings-daemon-round-xft_dpi-to-integer.patch
+Patch2:
gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch
+# PATCH-FIX-UPSTREAM gnome-settings-daemon-bgo793253.patch bgo#793253
dims...@opensuse.org -- Fix no-return-in-nonvoid-function
+Patch3: gnome-settings-daemon-bgo793253.patch
+# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-notify-idle-resumed.patch
bnc#439018 bnc#708182 bgo#575467 h...@suse.com -- notify user about auto
suspend when returning from sleep
+Patch4: gnome-settings-daemon-notify-idle-resumed.patch
+# PATCH-FIX-OPENSUSE gnome-settings-daemon-bnc873545-hide-warnings.patch
bnc#873545 fezh...@suse.com -- hide the warnings when g-s-d cannot find colord
running, which is expected on SLES
+Patch5: gnome-settings-daemon-bnc873545-hide-warnings.patch
+# PATCH-FIX-OPENSUSE gnome-settings-daemon-sle-configure-timeout-blank.patch
bnc#869685 bgo#710904 cxi...@suse.com -- monitor off timeout is too short,
extends it to 5 min
+Patch6: gnome-settings-daemon-sle-configure-timeout-blank.patch
+# PATCH-FIX-OPENSUSE gnome-settings-daemon-more-power-button-actions.patch
bsc#996342 fezh...@suse.com -- Bring back the "shutdown" and "interactive"
power button actions.
+Patch7: gnome-settings-daemon-more-power-button-actions.patch
+
+## SLE-only patches start at 1000
+
BuildRequires: cups-devel
BuildRequires: fdupes
+BuildRequires: gnome-patch-translation
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
-BuildRequires: update-desktop-files
+BuildRequires: translation-update-upstream
BuildRequires: xsltproc
BuildRequires: pkgconfig(alsa)
-BuildRequires: pkgconfig(colord) >= 1.0.2
+BuildRequires: pkgconfig(colord) >= 1.3.5
BuildRequires: pkgconfig(fontconfig)
-BuildRequires: pkgconfig(gconf-2.0) >= 2.6.1
+BuildRequires: pkgconfig(gcr-3) >= 3.7.5
BuildRequires: pkgconfig(geoclue-2.0) >= 2.1.2
BuildRequires: pkgconfig(geocode-glib-1.0) >= 3.10.0
BuildRequires: pkgconfig(gio-2.0)
-BuildRequires: pkgconfig(glib-2.0) >= 2.53.0
+BuildRequires: pkgconfig(gio-unix-2.0)
+BuildRequires: pkgconfig(glib-2.0) >= 2.56
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.11.1
-BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.23.3
+BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.33.0
BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.3
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(gweather-3.0) >= 3.9.5
@@ -85,28 +86,23 @@
BuildRequires: pkgconfig(libpulse) >= 2.0
BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0
BuildRequires: pkgconfig(librsvg-2.0) >= 2.36.2
+BuildRequires: pkgconfig(mm-glib) >= 1.0
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(pango) >= 1.20.0
-BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103
-BuildRequires: pkgconfig(upower-glib) >= 0.99.0
+BuildRequires: pkgconfig(polkit-gobject-1) >= 0.114
+BuildRequires: pkgconfig(systemd)
+BuildRequires: pkgconfig(udev)
+BuildRequires: pkgconfig(upower-glib) >= 0.99.8
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
Recommends: %{name}-lang
# For housekeeping plugin, that uses the nautilus dbus service
Recommends: nautilus
-%if !0%{?is_opensuse}
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: gnome-patch-translation
-BuildRequires: libtool
-BuildRequires: translation-update-upstream
-%endif
%if %{with wacom}
BuildRequires: pkgconfig(libwacom) >= 0.7
%endif
@@ -150,108 +146,113 @@
%lang_package
%prep
-%setup -q
-%if !0%{?is_opensuse}
-translation-update-upstream
-gnome-patch-translation-prepare
+%autosetup -N
+translation-update-upstream po %{name}
+gnome-patch-translation-prepare po %{name}
%patch1 -p1
%patch2 -p1
-%patch3
-%endif
+%patch3 -p1
+# Enable the patches by now for both Leap 15 and SLE 15, meanwhile we should
justify the patches upstream.
+%if 0%{?sle_version} >= 150000
%patch4 -p1
-%if 0%{?sle_version}
+%patch5 -p1
%patch6 -p1
-%endif
%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
+%endif
%build
-# need autoreconf if patch translation has run
-%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 \
+%meson \
--libexecdir=%{_libexecdir}/gnome-settings-daemon-3.0 \
+ -Dalsa=true \
+ %{!?with_wayland: -D wayland=false} \
+ %{!?with_smartcard: -D smartcard=false} \
%{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 %{?_smp_mflags}
+%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 COPYING.LIB
+%doc NEWS
%{_datadir}/gnome-settings-daemon/
%dir %{_libexecdir}/gnome-settings-daemon-3.0/
%{_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-*
-# From patch2
-#%%{_libexecdir}/novell-sysconfig-proxy-helper
%dir %{_libdir}/gnome-settings-daemon-3.0/
%{_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
-%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Clipboard.desktop
+%{_userunitdir}/gsd-a11y-settings.service
+%{_userunitdir}/gsd-a11y-settings.target
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-color
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Color.desktop
+%{_userunitdir}/gsd-color.service
+%{_userunitdir}/gsd-color.target
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-datetime
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Datetime.desktop
+%{_userunitdir}/gsd-datetime.service
+%{_userunitdir}/gsd-datetime.target
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-dummy
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-housekeeping
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Housekeeping.desktop
+%{_userunitdir}/gsd-housekeeping.service
+%{_userunitdir}/gsd-housekeeping.target
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-keyboard
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop
+%{_userunitdir}/gsd-keyboard.service
+%{_userunitdir}/gsd-keyboard.target
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-media-keys
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.MediaKeys.desktop
-%{_libexecdir}/gnome-settings-daemon-3.0/gsd-mouse
-%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Mouse.desktop
+%{_userunitdir}/gsd-media-keys.service
+%{_userunitdir}/gsd-media-keys.target
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-power
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Power.desktop
+%{_userunitdir}/gsd-power.service
+%{_userunitdir}/gsd-power.target
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-print-notifications
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.PrintNotifications.desktop
+%{_userunitdir}/gsd-print-notifications.service
+%{_userunitdir}/gsd-print-notifications.target
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-rfkill
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Rfkill.desktop
+%{_userunitdir}/gsd-rfkill.service
+%{_userunitdir}/gsd-rfkill.target
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-screensaver-proxy
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop
+%{_userunitdir}/gsd-screensaver-proxy.service
+%{_userunitdir}/gsd-screensaver-proxy.target
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-sharing
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Sharing.desktop
+%{_userunitdir}/gsd-sharing.service
+%{_userunitdir}/gsd-sharing.target
%if %{with smartcard}
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-smartcard
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Smartcard.desktop
+%{_userunitdir}/gsd-smartcard.service
+%{_userunitdir}/gsd-smartcard.target
%endif
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-sound
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Sound.desktop
-%if 0%{?suse_version} == 1315
-%{_libexecdir}/gnome-settings-daemon-3.0/gsd-updates
-%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Updates.desktop
-%endif
+%{_userunitdir}/gsd-sound.service
+%{_userunitdir}/gsd-sound.target
+%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wwan
+%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wwan.desktop
+%{_userunitdir}/gsd-wwan.service
+%{_userunitdir}/gsd-wwan.target
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-xsettings
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop
+%{_userunitdir}/gsd-xsettings.service
+%{_userunitdir}/gsd-xsettings.target
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.enums.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.wacom.gschema.xml
@@ -260,14 +261,8 @@
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.media-keys.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.power.gschema.xml
-# From patch2
-#%%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.proxy.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.sharing.gschema.xml
-%if 0%{?suse_version} == 1315
-%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
-%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.update.policy
-%{_libexecdir}/gnome-settings-daemon-3.0/pk-clear-offline-update
-%endif
+%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.wwan.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xsettings.gschema.xml
%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy
# Own the directory since we can't depend on gconf providing them
@@ -280,13 +275,19 @@
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-oled-helper
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop
+%{_userunitdir}/gsd-wacom.service
+%{_userunitdir}/gsd-wacom.target
%endif
%{_udevrulesdir}/61-gnome-settings-daemon-rfkill.rules
-
-%files lang -f %{name}.lang
+%{_userunitdir}/gnome-session-initialized.target.wants/
+%dir %{_userunitdir}/gnome-session-x11-services.target.wants/
+%{_userunitdir}/gnome-session-x11-services.target.wants/gsd-xsettings.target
%files devel
+%doc AUTHORS ChangeLog
%{_includedir}/gnome-settings-daemon-3.0/
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
+%files lang -f %{name}.lang
+
%changelog
++++++ _service ++++++
<services>
<service name="obs_scm" mode="disabled">
<param
name="url">https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git</param>
<param name="scm">git</param>
<param name="revision">gnome-3-34</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param
name="versionrewrite-pattern">GNOME_SETTINGS_DAEMON_(\d+)_(\d+)_(\d+)</param>
<param name="versionrewrite-replacement">\1.\2.\3</param>
<param name="changesgenerate">enable</param>
</service>
<service mode="buildtime" name="tar" />
<service mode="buildtime" name="recompress">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service mode="disabled" name="set_version" />
</services>
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param
name="url">https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git</param>
<param
name="changesrevision">6e26304b6afb9028d733e75d120d5b9b795e61a5</param></service></servicedata>++++++
gnome-settings-daemon-bgo793253.patch ++++++
diff -urp
gnome-settings-daemon-3.33.90.orig/plugins/media-keys/gsd-media-keys-manager.c
gnome-settings-daemon-3.33.90/plugins/media-keys/gsd-media-keys-manager.c
---
gnome-settings-daemon-3.33.90.orig/plugins/media-keys/gsd-media-keys-manager.c
2019-08-05 18:40:19.000000000 -0500
+++ gnome-settings-daemon-3.33.90/plugins/media-keys/gsd-media-keys-manager.c
2019-08-31 06:38:56.889827801 -0500
@@ -374,7 +374,7 @@ get_key_string (MediaKey *key)
else if (key->custom_path != NULL)
return g_strdup_printf ("custom:%s", key->custom_path);
else
- g_assert_not_reached ();
+ return NULL;
}
static GStrv
@@ -416,7 +416,7 @@ get_bindings (GsdMediaKeysManager *manag
key->custom_path);
binding = g_settings_get_string (settings, "binding");
} else
- g_assert_not_reached ();
+ return NULL;
array = g_ptr_array_new ();
g_ptr_array_add (array, binding);
diff -urp gnome-settings-daemon-3.33.90.orig/plugins/rfkill/rfkill-glib.c
gnome-settings-daemon-3.33.90/plugins/rfkill/rfkill-glib.c
--- gnome-settings-daemon-3.33.90.orig/plugins/rfkill/rfkill-glib.c
2019-08-05 18:40:19.000000000 -0500
+++ gnome-settings-daemon-3.33.90/plugins/rfkill/rfkill-glib.c 2019-08-31
06:39:55.674139424 -0500
@@ -268,7 +268,7 @@ op_to_string (unsigned int op)
case RFKILL_OP_CHANGE_ALL:
return "CHANGE_ALL";
default:
- g_assert_not_reached ();
+ return "NULL";
}
}
diff -urp
gnome-settings-daemon-3.33.90.orig/plugins/xsettings/xsettings-manager.c
gnome-settings-daemon-3.33.90/plugins/xsettings/xsettings-manager.c
--- gnome-settings-daemon-3.33.90.orig/plugins/xsettings/xsettings-manager.c
2019-08-05 18:40:19.000000000 -0500
+++ gnome-settings-daemon-3.33.90/plugins/xsettings/xsettings-manager.c
2019-08-31 06:40:54.030448794 -0500
@@ -268,7 +268,7 @@ xsettings_get_typecode (GVariant *value)
case G_VARIANT_CLASS_TUPLE:
return XSETTINGS_TYPE_COLOR;
default:
- g_assert_not_reached ();
+ return NULL;
}
}
++++++ gnome-settings-daemon-bnc873545-hide-warnings.patch ++++++
--- /var/tmp/diff_new_pack.KFAsG6/_old 2020-01-30 14:50:36.358909023 +0100
+++ /var/tmp/diff_new_pack.KFAsG6/_new 2020-01-30 14:50:36.362909025 +0100
@@ -4,17 +4,12 @@
Subject: [PATCH] hide warnings
---
- plugins/color/gsd-color-profiles.c | 2 ++
- plugins/color/gsd-color-state.c | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/plugins/color/gsd-color-profiles.c
b/plugins/color/gsd-color-profiles.c
-index 2b01faa..05a728a 100644
---- a/plugins/color/gsd-color-profiles.c
-+++ b/plugins/color/gsd-color-profiles.c
-@@ -73,7 +73,9 @@ gcm_session_client_connect_cb (GObject *source_object,
+diff -urp
gnome-settings-daemon-3.33.90.orig/plugins/color/gsd-color-profiles.c
gnome-settings-daemon-3.33.90/plugins/color/gsd-color-profiles.c
+--- gnome-settings-daemon-3.33.90.orig/plugins/color/gsd-color-profiles.c
2019-08-05 18:40:19.000000000 -0500
++++ gnome-settings-daemon-3.33.90/plugins/color/gsd-color-profiles.c
2019-08-31 19:41:32.942733480 -0500
+@@ -71,7 +71,9 @@ gcm_session_client_connect_cb (GObject *
profiles = GSD_COLOR_PROFILES (user_data);
- ret = cd_client_get_has_server (profiles->priv->client);
+ ret = cd_client_get_has_server (profiles->client);
if (!ret) {
+ /* hide this warning for SLES
g_warning ("There is no colord server available");
@@ -22,13 +17,12 @@
return;
}
-diff --git a/plugins/color/gsd-color-state.c b/plugins/color/gsd-color-state.c
-index 04823e4..20e8a2b 100644
---- a/plugins/color/gsd-color-state.c
-+++ b/plugins/color/gsd-color-state.c
-@@ -1297,7 +1297,9 @@ gcm_session_client_connect_cb (GObject *source_object,
+diff -urp gnome-settings-daemon-3.33.90.orig/plugins/color/gsd-color-state.c
gnome-settings-daemon-3.33.90/plugins/color/gsd-color-state.c
+--- gnome-settings-daemon-3.33.90.orig/plugins/color/gsd-color-state.c
2019-08-05 18:40:19.000000000 -0500
++++ gnome-settings-daemon-3.33.90/plugins/color/gsd-color-state.c
2019-08-31 19:42:00.470879362 -0500
+@@ -1359,7 +1359,9 @@ gcm_session_client_connect_cb (GObject *
/* is there an available colord instance? */
- ret = cd_client_get_has_server (state->priv->client);
+ ret = cd_client_get_has_server (state->client);
if (!ret) {
+ /* hide this warning for SLES
g_warning ("There is no colord server available");
@@ -36,6 +30,3 @@
return;
}
---
-1.7.12.4
-
++++++ gnome-settings-daemon-initial-keyboard.patch ++++++
--- /var/tmp/diff_new_pack.KFAsG6/_old 2020-01-30 14:50:36.366909027 +0100
+++ /var/tmp/diff_new_pack.KFAsG6/_new 2020-01-30 14:50:36.366909027 +0100
@@ -13,31 +13,30 @@
plugins/keyboard/gsd-keyboard-manager.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
-Index: gnome-settings-daemon-3.26.0/plugins/keyboard/gsd-keyboard-manager.c
-===================================================================
---- gnome-settings-daemon-3.26.0.orig/plugins/keyboard/gsd-keyboard-manager.c
2017-09-14 13:42:53.415421010 +0200
-+++ gnome-settings-daemon-3.26.0/plugins/keyboard/gsd-keyboard-manager.c
2017-09-14 13:42:58.455409895 +0200
-@@ -433,7 +433,7 @@
+diff -urp
gnome-settings-daemon-3.33.90.orig/plugins/keyboard/gsd-keyboard-manager.c
gnome-settings-daemon-3.33.90/plugins/keyboard/gsd-keyboard-manager.c
+--- gnome-settings-daemon-3.33.90.orig/plugins/keyboard/gsd-keyboard-manager.c
2019-08-05 18:40:19.000000000 -0500
++++ gnome-settings-daemon-3.33.90/plugins/keyboard/gsd-keyboard-manager.c
2019-08-31 06:29:26.930806593 -0500
+@@ -331,7 +331,7 @@ update_gtk_im_module (GsdKeyboardManager
}
static void
-get_sources_from_xkb_config (GsdKeyboardManager *manager)
+get_sources_from_xkb_config (GsdKeyboardManager *manager, gboolean
running_under_gdm)
{
- GsdKeyboardManagerPrivate *priv = manager->priv;
GVariantBuilder builder;
-@@ -452,7 +452,7 @@
+ GVariant *v;
+@@ -349,7 +349,7 @@ get_sources_from_xkb_config (GsdKeyboard
- init_builder_with_sources (&builder, priv->input_sources_settings);
+ init_builder_with_sources (&builder, manager->input_sources_settings);
- if (!layouts) {
+ if (!layouts && running_under_gdm) {
g_variant_builder_add (&builder, "(ss)",
INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT);
goto out;
}
-@@ -632,15 +632,23 @@
+@@ -528,15 +528,23 @@ maybe_create_initial_settings (GsdKeyboa
- settings = manager->priv->input_sources_settings;
+ settings = manager->input_sources_settings;
- if (g_getenv ("RUNNING_UNDER_GDM"))
- return;
++++++ gnome-settings-daemon-more-power-button-actions.patch ++++++
--- /var/tmp/diff_new_pack.KFAsG6/_old 2020-01-30 14:50:36.374909031 +0100
+++ /var/tmp/diff_new_pack.KFAsG6/_new 2020-01-30 14:50:36.374909031 +0100
@@ -8,11 +8,10 @@
plugins/media-keys/gsd-media-keys-manager.c | 6 ++++++
2 files changed, 8 insertions(+)
-Index: gnome-settings-daemon-3.26.0/data/gsd-enums.h
-===================================================================
---- gnome-settings-daemon-3.26.0.orig/data/gsd-enums.h 2017-09-14
14:20:52.202275466 +0200
-+++ gnome-settings-daemon-3.26.0/data/gsd-enums.h 2017-09-14
14:21:26.602338266 +0200
-@@ -105,6 +105,7 @@
+diff -urp gnome-settings-daemon-3.33.90.orig/data/gsd-enums.h
gnome-settings-daemon-3.33.90/data/gsd-enums.h
+--- gnome-settings-daemon-3.33.90.orig/data/gsd-enums.h 2019-08-05
18:40:19.000000000 -0500
++++ gnome-settings-daemon-3.33.90/data/gsd-enums.h 2019-08-31
19:45:22.123948132 -0500
+@@ -105,6 +105,7 @@ typedef enum
typedef enum
{
GSD_POWER_BUTTON_ACTION_NOTHING,
@@ -20,17 +19,16 @@
GSD_POWER_BUTTON_ACTION_SUSPEND,
GSD_POWER_BUTTON_ACTION_HIBERNATE,
GSD_POWER_BUTTON_ACTION_INTERACTIVE
-Index: gnome-settings-daemon-3.26.0/plugins/media-keys/gsd-media-keys-manager.c
-===================================================================
----
gnome-settings-daemon-3.26.0.orig/plugins/media-keys/gsd-media-keys-manager.c
2017-09-14 14:20:52.202275466 +0200
-+++ gnome-settings-daemon-3.26.0/plugins/media-keys/gsd-media-keys-manager.c
2017-09-14 14:26:14.074784955 +0200
-@@ -1953,6 +1953,9 @@
+diff -urp
gnome-settings-daemon-3.33.90.orig/plugins/media-keys/gsd-media-keys-manager.c
gnome-settings-daemon-3.33.90/plugins/media-keys/gsd-media-keys-manager.c
+---
gnome-settings-daemon-3.33.90.orig/plugins/media-keys/gsd-media-keys-manager.c
2019-08-31 19:31:09.939430941 -0500
++++ gnome-settings-daemon-3.33.90/plugins/media-keys/gsd-media-keys-manager.c
2019-08-31 19:45:22.127948152 -0500
+@@ -2230,6 +2230,9 @@ do_config_power_button_action (GsdMediaK
- action_type = g_settings_get_enum (manager->priv->power_settings,
"power-button-action");
+ action_type = g_settings_get_enum (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);
+ action = GSD_POWER_ACTION_SUSPEND;
break;
++++++ gnome-settings-daemon-notify-idle-resumed.patch ++++++
--- /var/tmp/diff_new_pack.KFAsG6/_old 2020-01-30 14:50:36.378909034 +0100
+++ /var/tmp/diff_new_pack.KFAsG6/_new 2020-01-30 14:50:36.378909034 +0100
@@ -1,23 +1,23 @@
-Index:
gnome-settings-daemon-3.26.0/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+Index:
gnome-settings-daemon-3.34.1+3/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
===================================================================
----
gnome-settings-daemon-3.26.0.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
2017-09-01 14:12:11.000000000 +0200
-+++
gnome-settings-daemon-3.26.0/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
2017-09-14 13:46:40.155168354 +0200
-@@ -40,5 +40,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>
+---
gnome-settings-daemon-3.34.1+3.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
2019-11-21 15:37:24.539068623 +0100
++++
gnome-settings-daemon-3.34.1+3/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
2019-11-21 15:37:54.099067245 +0100
+@@ -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="notify-idle-resumed" type="b">
+ <default>true</default>
-+ <_summary>If an information message should be displayed when returning
from idle sleep.</_summary>
-+ <_description>If an information message should be displayed when
returning from idle sleep.</_description>
++ <summary>If an information message should be displayed when returning
from idle sleep.</summary>
++ <description>If an information message should be displayed when
returning from idle sleep.</description>
+ </key>
</schema>
</schemalist>
-Index: gnome-settings-daemon-3.26.0/plugins/power/gsd-power-manager.c
+Index: gnome-settings-daemon-3.34.1+3/plugins/power/gsd-power-manager.c
===================================================================
---- gnome-settings-daemon-3.26.0.orig/plugins/power/gsd-power-manager.c
2017-09-01 14:12:11.000000000 +0200
-+++ gnome-settings-daemon-3.26.0/plugins/power/gsd-power-manager.c
2017-09-14 13:46:40.155168354 +0200
-@@ -153,6 +153,7 @@
+--- gnome-settings-daemon-3.34.1+3.orig/plugins/power/gsd-power-manager.c
2019-11-21 15:37:24.539068623 +0100
++++ gnome-settings-daemon-3.34.1+3/plugins/power/gsd-power-manager.c
2019-11-21 15:37:35.435068115 +0100
+@@ -157,6 +157,7 @@
NotifyNotification *notification_ups_discharging;
NotifyNotification *notification_low;
NotifyNotification *notification_sleep_warning;
@@ -25,15 +25,15 @@
GsdPowerActionType sleep_action_type;
gboolean battery_is_low; /* laptop battery low, or
UPS discharging */
-@@ -188,6 +189,7 @@
+@@ -191,6 +192,7 @@
+ gboolean inhibit_suspend_taken;
guint inhibit_lid_switch_timer_id;
gboolean is_virtual_machine;
- gboolean is_tablet;
+ GsdPowerActionType last_idle_power_action;
/* Idles */
GnomeIdleMonitor *idle_monitor;
-@@ -1514,6 +1516,49 @@
+@@ -1497,6 +1499,49 @@
}
static void
@@ -48,34 +48,34 @@
+ return;
+ }
+
-+ ret = g_settings_get_boolean (manager->priv->settings,
"notify-idle-resumed");
++ ret = g_settings_get_boolean (manager->settings,
"notify-idle-resumed");
+ if (!ret)
+ return;
+
+ /* close any existing notification of this class */
-+ notify_close_if_showing (&manager->priv->notification_resumed);
++ notify_close_if_showing (&manager->notification_resumed);
+
+ /* create a new notification */
+ create_notification (_("System resumed from sleep"),
+ _("The system automatically went to sleep
because the system was idle."),
-+ NULL,
-+ &manager->priv->notification_resumed);
-+ notify_notification_set_timeout (manager->priv->notification_resumed,
++ NULL, NOTIFICATION_PRIVACY_SYSTEM,
++ &manager->notification_resumed);
++ notify_notification_set_timeout (manager->notification_resumed,
+
GSD_POWER_MANAGER_NOTIFY_TIMEOUT_SHORT);
-+ notify_notification_set_urgency (manager->priv->notification_resumed,
++ notify_notification_set_urgency (manager->notification_resumed,
+ NOTIFY_URGENCY_NORMAL);
+ /* TRANSLATORS: this is the notification application name */
-+ notify_notification_set_app_name
(manager->priv->notification_resumed, _("Power"));
-+ notify_notification_set_hint (manager->priv->notification_resumed,
++ notify_notification_set_app_name (manager->notification_resumed,
_("Power"));
++ notify_notification_set_hint (manager->notification_resumed,
+ "transient", g_variant_new_boolean
(TRUE));
+
+ /* try to show */
-+ ret = notify_notification_show (manager->priv->notification_resumed,
++ ret = notify_notification_show (manager->notification_resumed,
+ &error);
+ if (!ret) {
+ g_warning ("failed to show notification: %s", error->message);
+ g_error_free (error);
-+ g_object_unref (manager->priv->notification_resumed);
++ g_object_unref (manager->notification_resumed);
+ }
+}
+
@@ -83,23 +83,23 @@
idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
{
gboolean ret = FALSE;
-@@ -1603,6 +1648,7 @@
- action_type = g_settings_get_enum
(manager->priv->settings,
+@@ -1573,6 +1618,7 @@
+ action_type = g_settings_get_enum (manager->settings,
"sleep-inactive-ac-type");
}
-+ manager->priv->last_idle_power_action = action_type;
++ manager->last_idle_power_action = action_type;
do_power_action_type (manager, action_type);
/* turn on screen and restore user-selected brightness level */
-@@ -2382,6 +2428,12 @@
+@@ -2353,6 +2399,12 @@
static void
handle_resume_actions (GsdPowerManager *manager)
{
-+ if (manager->priv->last_idle_power_action == GSD_POWER_ACTION_SUSPEND
||
-+ manager->priv->last_idle_power_action ==
GSD_POWER_ACTION_HIBERNATE)
++ if (manager->last_idle_power_action == GSD_POWER_ACTION_SUSPEND ||
++ manager->last_idle_power_action == GSD_POWER_ACTION_HIBERNATE)
+ show_resumed_notification (manager);
+
-+ manager->priv->last_idle_power_action = GSD_POWER_ACTION_NOTHING;
++ manager->last_idle_power_action = GSD_POWER_ACTION_NOTHING;
+
/* ensure we turn the panel back on after resume */
backlight_enable (manager);
++++++ gnome-settings-daemon-sle-configure-timeout-blank.patch ++++++
--- /var/tmp/diff_new_pack.KFAsG6/_old 2020-01-30 14:50:36.382909036 +0100
+++ /var/tmp/diff_new_pack.KFAsG6/_new 2020-01-30 14:50:36.382909036 +0100
@@ -1,12 +1,11 @@
-Index: plugins/power/gsd-power-constants.h
-===================================================================
---- plugins/power/gsd-power-constants.h.orig 2013-11-12 01:25:13.000000000
+0800
-+++ plugins/power/gsd-power-constants.h 2014-03-27 11:39:34.100125030
+0800
+diff -urp
gnome-settings-daemon-3.33.90.orig/plugins/power/gsd-power-constants.h
gnome-settings-daemon-3.33.90/plugins/power/gsd-power-constants.h
+--- gnome-settings-daemon-3.33.90.orig/plugins/power/gsd-power-constants.h
2019-08-05 18:40:19.000000000 -0500
++++ gnome-settings-daemon-3.33.90/plugins/power/gsd-power-constants.h
2019-08-31 19:43:57.783501103 -0500
@@ -18,7 +18,7 @@
*/
/* The blank delay when the screensaver is active */
--#define SCREENSAVER_TIMEOUT_BLANK 15 /* seconds */
+-#define SCREENSAVER_TIMEOUT_BLANK 30 /* seconds */
+#define SCREENSAVER_TIMEOUT_BLANK 300 /* seconds */
/* The dim delay when dimming on idle is requested but idle-delay
++++++ gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch ++++++
--- /var/tmp/diff_new_pack.KFAsG6/_old 2020-01-30 14:50:36.390909040 +0100
+++ /var/tmp/diff_new_pack.KFAsG6/_new 2020-01-30 14:50:36.390909040 +0100
@@ -1,7 +1,8 @@
-diff -Nura
gnome-settings-daemon-3.24.3/plugins/keyboard/gsd-keyboard-manager.c
gnome-settings-daemon-3.24.3_new/plugins/keyboard/gsd-keyboard-manager.c
---- gnome-settings-daemon-3.24.3/plugins/keyboard/gsd-keyboard-manager.c
2017-08-28 17:44:30.078220888 +0800
-+++ gnome-settings-daemon-3.24.3_new/plugins/keyboard/gsd-keyboard-manager.c
2017-08-28 17:49:05.435064987 +0800
-@@ -478,7 +478,11 @@
+Index: gnome-settings-daemon-3.32.1/plugins/keyboard/gsd-keyboard-manager.c
+===================================================================
+--- gnome-settings-daemon-3.32.1.orig/plugins/keyboard/gsd-keyboard-manager.c
++++ gnome-settings-daemon-3.32.1/plugins/keyboard/gsd-keyboard-manager.c
+@@ -524,7 +524,11 @@ get_sources_from_xkb_config (GsdKeyboard
else
id = g_strdup (layouts[i]);
++++++ gnome-settings-daemon.obsinfo ++++++
name: gnome-settings-daemon
version: 3.34.1+3
mtime: 1573930586
commit: 6e26304b6afb9028d733e75d120d5b9b795e61a5
