From 3106077895aeb53edb1ac73356937ae28af3e449 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 06 2021 05:24:10 +0000 Subject: import gnome-settings-daemon-3.32.0-15.el8 --- diff --git a/SOURCES/0001-power-Only-disable-Suspend-Hibernate-actions-inside-.patch b/SOURCES/0001-power-Only-disable-Suspend-Hibernate-actions-inside-.patch new file mode 100644 index 0000000..ea4fa26 --- /dev/null +++ b/SOURCES/0001-power-Only-disable-Suspend-Hibernate-actions-inside-.patch @@ -0,0 +1,53 @@ +From fbe9b7dba44cb284f649a1e916b2cf3ce8281211 Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Tue, 7 May 2019 15:40:20 +0200 +Subject: [PATCH] power: Only disable Suspend/Hibernate actions inside VM + +While we theoretically only want a different default value inside a VM, +we currently hack this by never doing a suspend action inside VMs. +However, that also breaks automatic logout, which is an unintended side +effect. + +Move the check to not install the corresponding timeout (preventing +sleep warnings from being displayed) and also only enforce the VM +specific hack for the Suspend and Hibernate actions. +--- + plugins/power/gsd-power-manager.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c +index f965f6f..dbaa262 100644 +--- a/plugins/power/gsd-power-manager.c ++++ b/plugins/power/gsd-power-manager.c +@@ -1520,13 +1520,6 @@ idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode) + return; + } + +- /* don't do any power saving if we're a VM */ +- if (manager->priv->is_virtual_machine) { +- g_debug ("ignoring state transition to %s as virtual machine", +- idle_mode_to_string (mode)); +- return; +- } +- + manager->priv->current_idle_mode = mode; + g_debug ("Doing a state transition: %s", idle_mode_to_string (mode)); + +@@ -1727,6 +1720,14 @@ idle_configure (GsdPowerManager *manager) + clear_idle_watch (manager->priv->idle_monitor, + &manager->priv->idle_sleep_warning_id); + ++ /* don't do any power saving if we're a VM */ ++ if (manager->priv->is_virtual_machine && ++ (action_type == GSD_POWER_ACTION_SUSPEND || ++ action_type == GSD_POWER_ACTION_HIBERNATE)) { ++ g_debug ("Ignoring sleep timeout with suspend action inside VM"); ++ timeout_sleep = 0; ++ } ++ + if (timeout_sleep != 0) { + g_debug ("setting up sleep callback %is", timeout_sleep); + +-- +2.31.1 + diff --git a/SOURCES/0016-subman-Update-POTFILES.in.patch b/SOURCES/0016-subman-Update-POTFILES.in.patch new file mode 100644 index 0000000..f2882e1 --- /dev/null +++ b/SOURCES/0016-subman-Update-POTFILES.in.patch @@ -0,0 +1,25 @@ +From ff1278ecdebb5b23c80589a65f053d535a4d4f6a Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Fri, 12 Feb 2021 14:51:29 +0100 +Subject: [PATCH 16/16] subman: Update POTFILES.in + +--- + po/POTFILES.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 7f17d5b5..9b94dc0f 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -25,6 +25,8 @@ plugins/print-notifications/gsd-printer.c + plugins/print-notifications/gsd-print-notifications-manager.c + plugins/smartcard/gsd-smartcard-manager.c + plugins/smartcard/gsd-smartcard-service.c ++plugins/subman/gsd-subscription-manager.c ++plugins/subman/org.gnome.settings-daemon.plugins.subman.policy.in.in + plugins/wacom/gsd-wacom-manager.c + plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in + plugins/xsettings/gsd-xsettings-manager.c +-- +2.29.2 + diff --git a/SPECS/gnome-settings-daemon.spec b/SPECS/gnome-settings-daemon.spec index 3faa344..d1c2e56 100644 --- a/SPECS/gnome-settings-daemon.spec +++ b/SPECS/gnome-settings-daemon.spec @@ -12,7 +12,7 @@ Name: gnome-settings-daemon Version: 3.32.0 -Release: 13%{?dist} +Release: 15%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications License: GPLv2+ @@ -114,6 +114,8 @@ Patch50012: 0012-subman-Add-DBus-API-to-subscribe-for-updates-on-alre.patch Patch50013: 0013-subman-Improve-subscription-status-handling.patch Patch50014: 0014-subman-Drop-LAST-from-status-enum.patch Patch50015: 0015-subman-Clean-up-notification-behavior.patch +Patch50016: 0016-subman-Update-POTFILES.in.patch +Patch50017: 0001-power-Only-disable-Suspend-Hibernate-actions-inside-.patch %description A daemon to share settings from GNOME to other applications. It also @@ -245,6 +247,14 @@ mkdir $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-modules %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog +* Tue Aug 11 2021 Carlos Garnacho - 3.32.0-15 +- Bump version + Related: #1904139 + +* Fri Aug 06 2021 Carlos Garnacho - 3.32.0-14 +- Keep auto-logout working inside VMs + Resolves: #1904139 + * Thu Jan 21 2021 Ray Strode - 3.32.0-13 - Add back subscription-manager plugin Related: #1870837