Hello community,
here is the log from the commit of package gnome-settings-daemon.14892 for
openSUSE:Leap:15.2:Update checked in at 2020-11-07 06:25:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2:Update/gnome-settings-daemon.14892 (Old)
and
/work/SRC/openSUSE:Leap:15.2:Update/.gnome-settings-daemon.14892.new.11331 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-settings-daemon.14892"
Sat Nov 7 06:25:44 2020 rev:1 rq:845845 version:3.34.2+0
Changes:
--------
New Changes file:
--- /dev/null 2020-10-22 01:51:33.322291705 +0200
+++
/work/SRC/openSUSE:Leap:15.2:Update/.gnome-settings-daemon.14892.new.11331/gnome-settings-daemon.changes
2020-11-07 06:25:45.890276018 +0100
@@ -0,0 +1,4788 @@
+-------------------------------------------------------------------
+Tue Oct 13 02:29:11 UTC 2020 - QK ZHU <[email protected]>
+
+- Add gnome-settings-daemon-jscSLE16518-update-subprojects-libgvc.patch:
+ Update libgvc to revision 7a621180. This update is necessary to
+ add support for recent UCM related changes in ALSA and PulseAudio.
+- Add gnome-settings-daemon-media-keys-warnings-cleanup-for-gvc-update.patch:
+ Don't throw warnings when we can't find a default source or sink
+ and the PulseAudio daemon is restarting (jsc#SLE-16518,
+ glgo#GNOME/gnome-settings-daemon!203).
+
+-------------------------------------------------------------------
+Wed Jun 10 03:21:16 UTC 2020 - Xiaoguang Wang <[email protected]>
+
+- Add gnome-settings-daemon-not-warn-about-starting-stopping-services.patch:
+ Don’t warn about starting/stopping services which don’t exist,
+ backport upstream commit 523ffa14 (bsc#1172760).
+
+-------------------------------------------------------------------
+Wed Apr 29 03:15:16 UTC 2020 - Yifan Jiang <[email protected]>
+
+- Remove unecessary conditional BuildRequires pkgconfig(udev),
+ Tumbleweed needs it as well from 3.27.90. Meanwhile an explict
+ unconditional BuildRequires pkgconfig(udev) has been already
+ stated in spec a couple of lines before the removal.
+
+- Recommends iio-sensor-proxy and xf86-input-libinput to both
+ openSUSE and SLE (jsc#SLE-11710). The condition does not make
+ sense today when gnome-settings-daemon 3.34 and above are only
+ built on SLE/Leap 15 and above.
+
+-------------------------------------------------------------------
+Sat Jan 25 14:11:45 UTC 2020 - Dominique Leuenberger <[email protected]>
+
+- No longer recommend -lang: supplements are in use
+
+-------------------------------------------------------------------
+Mon Jan 13 07:39:37 UTC 2020 - QK ZHU <[email protected]>
+
+- Drop gnome-settings-daemon-sle-configure-timeout-blank.patch:
+ Drop this for SLE and Leap to align with upstream(bsc#1158476).
+
+-------------------------------------------------------------------
+Wed Dec 18 10:31:47 UTC 2019 - [email protected]
+
+- Update to version 3.34.2+0:
+ + media-keys: Place spawned processes into a systemd scope
+ + smartcard: Initialize a pointer before use
+
+-------------------------------------------------------------------
+Thu Dec 5 02:12:43 UTC 2019 - Yifan Jiang <[email protected]>
+
+- 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 <[email protected]>
+
+- 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 <[email protected]>
+
+- Update gnome-settings-daemon-notify-idle-resumed.patch with
+ proper xml tag names.
+
+-------------------------------------------------------------------
+Sat Oct 12 16:56:25 UTC 2019 - [email protected]
+
+- Update to version 3.34.1+0:
+ + power: Fix rounding of brightness value.
+
+-------------------------------------------------------------------
+Wed Oct 09 19:45:45 UTC 2019 - [email protected]
+
+- 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 <[email protected]>
+
+- 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 <[email protected]>
+
+- 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 <[email protected]>
+
+- Add gsd-smartcard-parent-type.patch: use correct parent type for
+ structs.
+
+-------------------------------------------------------------------
+Tue Sep 10 05:51:17 CDT 2019 - [email protected]
+
+- Update to version 3.34.0:
+ + Updated translations.
+
+-------------------------------------------------------------------
+Fri Sep 6 11:40:02 NZST 2019 - [email protected]
+
+- 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 - [email protected]
+
+- 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 <[email protected]>
+
+- Refresh patches with quilt.
+
+-------------------------------------------------------------------
+Wed Jun 19 14:03:25 UTC 2019 - Bjørn Lie <[email protected]>
+
+- 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.
++++ 4591 more lines (skipped)
++++ between /dev/null
++++ and
/work/SRC/openSUSE:Leap:15.2:Update/.gnome-settings-daemon.14892.new.11331/gnome-settings-daemon.changes
New:
----
_service
_servicedata
gnome-settings-daemon-3.34.2+0.obscpio
gnome-settings-daemon-bgo793253.patch
gnome-settings-daemon-bnc873545-hide-warnings.patch
gnome-settings-daemon-initial-keyboard.patch
gnome-settings-daemon-jscSLE16518-update-subprojects-libgvc.patch
gnome-settings-daemon-media-keys-warnings-cleanup-for-gvc-update.patch
gnome-settings-daemon-more-power-button-actions.patch
gnome-settings-daemon-not-warn-about-starting-stopping-services.patch
gnome-settings-daemon-notify-idle-resumed.patch
gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch
gnome-settings-daemon.changes
gnome-settings-daemon.obsinfo
gnome-settings-daemon.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-settings-daemon.spec ++++++
#
# spec file for package gnome-settings-daemon
#
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
# Allow to disable wayland components
%bcond_without wayland
# Smart-Card support was not available from version 3.7.3 to 3.9.5; allow to
easily disable it
%bcond_without smartcard
# Wacom input support is not available on all platforms
%ifarch s390 s390x
%bcond_with wacom
%else
%bcond_without wacom
%endif
Name: gnome-settings-daemon
Version: 3.34.2+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://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 [email protected] -- Deal with the default keyboard being set from
xkb instead of GNOME
Patch1: gnome-settings-daemon-initial-keyboard.patch
# PATCH-FIX-OPENSUSE
gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch bnc#1029083
boo#1056289 [email protected] -- Switch new user's default input engine from
"anthy" to "mozc" in gnome-desktop with Japanese language and ibus input
frame-work condition.
Patch2:
gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-bgo793253.patch bgo#793253
[email protected] -- 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 [email protected] -- 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 [email protected] -- 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-more-power-button-actions.patch
bsc#996342 [email protected] -- Bring back the "shutdown" and "interactive"
power button actions.
Patch7: gnome-settings-daemon-more-power-button-actions.patch
# PATCH-FIX-UPSTREAM
gnome-settings-daemon-not-warn-about-starting-stopping-services.patch
bsc#1172760 [email protected] -- Don’t warn about starting/stopping services
which don’t exist
Patch8:
gnome-settings-daemon-not-warn-about-starting-stopping-services.patch
# PATCH-FIX-UPSTREAM
gnome-settings-daemon-jscSLE16518-update-subprojects-libgvc.patch jsc#SLE-16518
glgo#GNOME/gnome-settings-daemon!203 [email protected] -- Update libgvc to
revision 7a621180
Patch9:
gnome-settings-daemon-jscSLE16518-update-subprojects-libgvc.patch
# PATCH-FIX-UPSTREAM
gnome-settings-daemon-media-keys-warnings-cleanup-for-gvc-update.patch
jsc#SLE-16518 glgo#GNOME/gnome-settings-daemon!203 [email protected] -- Don't
throw unnecessary warnings
Patch10:
gnome-settings-daemon-media-keys-warnings-cleanup-for-gvc-update.patch
## SLE-only patches start at 1000
BuildRequires: cups-devel
BuildRequires: fdupes
BuildRequires: gnome-patch-translation
BuildRequires: gtk-doc
BuildRequires: meson
BuildRequires: pkgconfig
# For directory ownership; it's fine to BuildRequire it since it's also a
Requires
BuildRequires: polkit
BuildRequires: translation-update-upstream
BuildRequires: xsltproc
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(colord) >= 1.3.5
BuildRequires: pkgconfig(fontconfig)
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(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.33.0
BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.3
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(gweather-3.0) >= 3.9.5
BuildRequires: pkgconfig(kbproto)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libgeoclue-2.0) >= 2.3.1
BuildRequires: pkgconfig(libnm) >= 1.0
BuildRequires: pkgconfig(libnotify) >= 0.7.3
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.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)
Requires: gsettings-desktop-schemas
# g-s-d uses the pkexec binary
Requires: polkit
# For housekeeping plugin, that uses the nautilus dbus service
Recommends: nautilus
%if %{with wacom}
BuildRequires: pkgconfig(libwacom) >= 0.7
%endif
%if %{with wayland}
BuildRequires: pkgconfig(wayland-client)
%endif
Recommends: iio-sensor-proxy
# g-s-d only support configurtion of libinput based pointer drivers now.
Recommends: xf86-input-libinput
%description
gnome-settings-daemon provides a daemon run by all GNOME sessions to
provide live access to configuration settings and the changes done to
them as well as basic services like a clipboard manager, controlling
the startup of the screensaver, etc.
This module was previously part of GNOME Control Center, but has been
split for a more general use.
%package devel
Summary: Development package for the GNOME settings daemon
Group: Development/Languages/C and C++
Requires: %{name} = %{version}
%description devel
gnome-settings-daemon provides a daemon run by all GNOME sessions to
provide live access to configuration settings and the changes done to
them as well as basic services like a clipboard manager, controlling
the startup of the screensaver, etc.
This package includes header files used for client applications to
contact the settings daemon via its DBus interface.
%lang_package
%prep
%autosetup -N
translation-update-upstream po %{name}
gnome-patch-translation-prepare po %{name}
%patch1 -p1
%patch2 -p1
%patch3 -p1
# Enable the patches for both Leap 15 and SLE 15, please find the clarification
at bsc#1158476.
%if 0%{?sle_version} >= 150000
%patch4 -p1
%patch5 -p1
%patch7 -p1
%endif
%patch8 -p1
%patch9 -p1
%patch10 -p1
%build
%meson \
--libexecdir=%{_libexecdir}/gnome-settings-daemon-3.0 \
-Dalsa=true \
%{!?with_wayland: -D wayland=false} \
%{!?with_smartcard: -D smartcard=false} \
%{nil}
%meson_build
%install
%meson_install
%if %{without wacom}
rm
%{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop
%endif
%find_lang %{name} %{?no_lang_C}
%fdupes %{buildroot}/%{_prefix}
%files
%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-printer
%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-settings
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.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
%{_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
%{_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
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.color.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml
%{_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
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.sharing.gschema.xml
%{_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
%dir %{_datadir}/GConf
%dir %{_datadir}/GConf/gsettings
%{_datadir}/GConf/gsettings/gnome-settings-daemon.convert
%if %{with wacom}
%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.wacom.policy
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-led-helper
%{_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
%{_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">85ca4e25051742ede54763cfd02dccd44242acf4</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 ++++++
>From fd0df3003ba7c0ae4d04a8314358db7f82dd2ab1 Mon Sep 17 00:00:00 2001
From: Felix Zhang <[email protected]>
Date: Tue, 6 May 2014 16:13:04 +0800
Subject: [PATCH] hide warnings
---
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->client);
if (!ret) {
+ /* hide this warning for SLES
g_warning ("There is no colord server available");
+ */
return;
}
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->client);
if (!ret) {
+ /* hide this warning for SLES
g_warning ("There is no colord server available");
+ */
return;
}
++++++ gnome-settings-daemon-initial-keyboard.patch ++++++
>From c2e0c03c03f47da9b117db0ba876732e84dcf0c4 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <[email protected]>
Date: Mon, 16 May 2016 19:18:43 -0500
Subject: [PATCH] Resurrect the code from upstream to set the default keyboard
from XKB if there is one.
Suse works differently than GNOME here; we set a default keyboard from
the system's configuration instead of letting GNOME take care of
everything itself.
https://bugzilla.suse.com/show_bug.cgi?id=979051
---
plugins/keyboard/gsd-keyboard-manager.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
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)
{
GVariantBuilder builder;
GVariant *v;
@@ -349,7 +349,7 @@ get_sources_from_xkb_config (GsdKeyboard
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;
}
@@ -528,15 +528,23 @@ maybe_create_initial_settings (GsdKeyboa
settings = manager->input_sources_settings;
- if (g_getenv ("RUNNING_UNDER_GDM"))
- return;
+ if (g_getenv ("RUNNING_UNDER_GDM")) {
+ GVariantBuilder builder;
+ /* clean the settings and get them from the "system" */
+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)"));
+ g_settings_set_value (settings, KEY_INPUT_SOURCES,
g_variant_builder_end (&builder));
+ get_sources_from_xkb_config (manager, TRUE);
+
+ g_settings_set_strv (settings, KEY_KEYBOARD_OPTIONS, NULL);
+ get_options_from_xkb_config (manager);
+ }
maybe_convert_old_settings (settings);
/* if we still don't have anything do some educated guesses */
sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
if (g_variant_n_children (sources) < 1)
- get_sources_from_xkb_config (manager);
+ get_sources_from_xkb_config (manager, FALSE);
g_variant_unref (sources);
options = g_settings_get_strv (settings, KEY_KEYBOARD_OPTIONS);
++++++ gnome-settings-daemon-jscSLE16518-update-subprojects-libgvc.patch ++++++
++++ 1987 lines (skipped)
++++++ gnome-settings-daemon-media-keys-warnings-cleanup-for-gvc-update.patch
++++++
commit 2053684523a102b9febb41840b350c1d8f05c93c
Author: Bastien Nocera <[email protected]>
Date: Wed Sep 30 17:01:07 2020 +0200
media-keys: Don't throw unnecessary warnings
Don't throw warnings when we can't find a default source or sink and the
PulseAudio daemon is restarting.
diff --git a/plugins/media-keys/gsd-media-keys-manager.c
b/plugins/media-keys/gsd-media-keys-manager.c
index ae5411eb..42fa14da 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -1622,7 +1622,8 @@ do_sound_action (GsdMediaKeysManager *manager,
}
static void
-update_default_sink (GsdMediaKeysManager *manager)
+update_default_sink (GsdMediaKeysManager *manager,
+ gboolean warn)
{
GsdMediaKeysManagerPrivate *priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE
(manager);
GvcMixerStream *stream;
@@ -1636,12 +1637,16 @@ update_default_sink (GsdMediaKeysManager *manager)
if (stream != NULL) {
priv->sink = g_object_ref (stream);
} else {
- g_warning ("Unable to get default sink");
+ if (warn)
+ g_warning ("Unable to get default sink");
+ else
+ g_debug ("Unable to get default sink");
}
}
static void
-update_default_source (GsdMediaKeysManager *manager)
+update_default_source (GsdMediaKeysManager *manager,
+ gboolean warn)
{
GsdMediaKeysManagerPrivate *priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE
(manager);
GvcMixerStream *stream;
@@ -1655,7 +1660,10 @@ update_default_source (GsdMediaKeysManager *manager)
if (stream != NULL) {
priv->source = g_object_ref (stream);
} else {
- g_warning ("Unable to get default source");
+ if (warn)
+ g_warning ("Unable to get default source");
+ else
+ g_debug ("Unable to get default source");
}
}
@@ -1664,8 +1672,8 @@ on_control_state_changed (GvcMixerControl *control,
GvcMixerControlState new_state,
GsdMediaKeysManager *manager)
{
- update_default_sink (manager);
- update_default_source (manager);
+ update_default_sink (manager, new_state == GVC_STATE_READY);
+ update_default_source (manager, new_state == GVC_STATE_READY);
}
static void
@@ -1673,7 +1681,7 @@ on_control_default_sink_changed (GvcMixerControl
*control,
guint id,
GsdMediaKeysManager *manager)
{
- update_default_sink (manager);
+ update_default_sink (manager, TRUE);
}
static void
@@ -1681,7 +1689,7 @@ on_control_default_source_changed (GvcMixerControl
*control,
guint id,
GsdMediaKeysManager *manager)
{
- update_default_source (manager);
+ update_default_source (manager, TRUE);
}
#if HAVE_GUDEV
++++++ gnome-settings-daemon-more-power-button-actions.patch ++++++
>From 3d9c3ecda9c68039c309bfb6bfc93830c4a0e20e Mon Sep 17 00:00:00 2001
From: Felix Zhang <[email protected]>
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 -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,
+ GSD_POWER_BUTTON_ACTION_SHUTDOWN,
GSD_POWER_BUTTON_ACTION_SUSPEND,
GSD_POWER_BUTTON_ACTION_HIBERNATE,
GSD_POWER_BUTTON_ACTION_INTERACTIVE
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 (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:
action = GSD_POWER_ACTION_SUSPEND;
break;
++++++ gnome-settings-daemon-not-warn-about-starting-stopping-services.patch
++++++
>From 523ffa148ce16773c2d9f711edb2c0424411d7ac Mon Sep 17 00:00:00 2001
From: Philip Withnall <[email protected]>
Date: Fri, 6 Mar 2020 12:53:00 +0000
Subject: [PATCH] =?UTF-8?q?sharing:=20Don=E2=80=99t=20warn=20about=20start?=
=?UTF-8?q?ing/stopping=20services=20which=20don=E2=80=99t=20exist?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This squashes the following warning from the journal:
```
Mar 06 12:37:52 endless gsd-sharing[33186]: Failed to StopUnit service:
GDBus.Error:org.freedesktop.systemd1.NoSuchUnit: Unit rygel.service not loaded.
Mar 06 12:37:52 endless gsd-sharing[33186]: Failed to StopUnit service:
GDBus.Error:org.freedesktop.systemd1.NoSuchUnit: Unit
gnome-remote-desktop.service not loaded.
```
Signed-off-by: Philip Withnall <[email protected]>
---
plugins/sharing/gsd-sharing-manager.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/plugins/sharing/gsd-sharing-manager.c
b/plugins/sharing/gsd-sharing-manager.c
index ab3d83c2..43067ccd 100644
--- a/plugins/sharing/gsd-sharing-manager.c
+++ b/plugins/sharing/gsd-sharing-manager.c
@@ -114,7 +114,10 @@ handle_unit_cb (GObject *source_object,
ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object),
res, &error);
if (!ret) {
- if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+ g_autofree gchar *remote_error = g_dbus_error_get_remote_error
(error);
+
+ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)
&&
+ g_strcmp0 (remote_error,
"org.freedesktop.systemd1.NoSuchUnit") != 0)
g_warning ("Failed to %s service: %s", operation,
error->message);
g_error_free (error);
return;
--
2.26.2
++++++ gnome-settings-daemon-notify-idle-resumed.patch ++++++
Index:
gnome-settings-daemon-3.34.1+3/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
===================================================================
---
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>
+ </key>
</schema>
</schemalist>
Index: gnome-settings-daemon-3.34.1+3/plugins/power/gsd-power-manager.c
===================================================================
--- 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;
+ NotifyNotification *notification_resumed;
GsdPowerActionType sleep_action_type;
gboolean battery_is_low; /* laptop battery low, or UPS
discharging */
@@ -191,6 +192,7 @@
gboolean inhibit_suspend_taken;
guint inhibit_lid_switch_timer_id;
gboolean is_virtual_machine;
+ GsdPowerActionType last_idle_power_action;
/* Idles */
GnomeIdleMonitor *idle_monitor;
@@ -1497,6 +1499,49 @@
}
static void
+show_resumed_notification (GsdPowerManager *manager)
+{
+ GError *error = NULL;
+ gboolean ret;
+
+ /* don't show when running under GDM */
+ if (g_getenv ("RUNNING_UNDER_GDM") != NULL) {
+ g_debug ("running under gdm, so no notification");
+ return;
+ }
+
+ 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->notification_resumed);
+
+ /* create a new notification */
+ create_notification (_("System resumed from sleep"),
+ _("The system automatically went to sleep because
the system was idle."),
+ 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->notification_resumed,
+ NOTIFY_URGENCY_NORMAL);
+ /* TRANSLATORS: this is the notification application name */
+ 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->notification_resumed,
+ &error);
+ if (!ret) {
+ g_warning ("failed to show notification: %s", error->message);
+ g_error_free (error);
+ g_object_unref (manager->notification_resumed);
+ }
+}
+
+static void
idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
{
gboolean ret = FALSE;
@@ -1573,6 +1618,7 @@
action_type = g_settings_get_enum (manager->settings,
"sleep-inactive-ac-type");
}
+ manager->last_idle_power_action = action_type;
do_power_action_type (manager, action_type);
/* turn on screen and restore user-selected brightness level */
@@ -2353,6 +2399,12 @@
static void
handle_resume_actions (GsdPowerManager *manager)
{
+ if (manager->last_idle_power_action == GSD_POWER_ACTION_SUSPEND ||
+ manager->last_idle_power_action == GSD_POWER_ACTION_HIBERNATE)
+ show_resumed_notification (manager);
+
+ manager->last_idle_power_action = GSD_POWER_ACTION_NOTHING;
+
/* ensure we turn the panel back on after resume */
backlight_enable (manager);
++++++ gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch ++++++
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]);
- g_variant_builder_add (&builder, "(ss)",
INPUT_SOURCE_TYPE_XKB, id);
+ if (!g_strcmp0 (id, "jp"))
+ g_variant_builder_add (&builder, "(ss)",
INPUT_SOURCE_TYPE_IBUS, "mozc-jp");
+ else
+ g_variant_builder_add (&builder, "(ss)",
INPUT_SOURCE_TYPE_XKB, id);
+
g_free (id);
}
++++++ gnome-settings-daemon.obsinfo ++++++
name: gnome-settings-daemon
version: 3.34.2+0
mtime: 1576619745
commit: 85ca4e25051742ede54763cfd02dccd44242acf4
