diff --git a/325.patch b/325.patch deleted file mode 100644 index 3418bcc..0000000 --- a/325.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ab5004079080bc9bdfb17bd6e8c43d0d702716dd Mon Sep 17 00:00:00 2001 -From: Felipe Borges -Date: Tue, 21 Mar 2023 11:46:44 +0100 -Subject: [PATCH] power: Initialize check for VM environment earlier - -Otherwise it will be called uninitialized when auto suspending. - -Fixes #736 ---- - plugins/power/gsd-power-manager.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index 0263e9f6..2b27af0b 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -2871,9 +2871,6 @@ on_rr_screen_acquired (GObject *object, - if (!gnome_settings_is_wayland ()) - manager->xscreensaver_watchdog_timer_id = gsd_power_enable_screensaver_watchdog (); - -- /* don't blank inside a VM */ -- manager->is_virtual_machine = gsd_power_is_hardware_a_vm (); -- - /* queue a signal in case the proxy from gnome-shell was created before we got here - (likely, considering that to get here we need a reply from gnome-shell) - */ -@@ -3003,6 +3000,9 @@ gsd_power_manager_start (GsdPowerManager *manager, - g_debug ("Starting power manager"); - gnome_settings_profile_start (NULL); - -+ /* Check whether we are running in a VM */ -+ manager->is_virtual_machine = gsd_power_is_hardware_a_vm (); -+ - /* Check whether we have a lid first */ - manager->up_client = up_client_new (); - manager->lid_is_present = up_client_get_lid_is_present (manager->up_client); --- -GitLab - diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 205e10d..7e00b27 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -17,18 +17,13 @@ %global major_version %%(echo %{version} | cut -f 1 -d '~' | cut -f 1 -d '.') Name: gnome-settings-daemon -Version: 44.0 +Version: 44.1 Release: %autorelease Summary: The daemon sharing settings from GNOME to GTK+/KDE applications License: GPL-2.0-or-later AND LGPL-2.1-or-later URL: https://gitlab.gnome.org/GNOME/gnome-settings-daemon Source0: https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{tarball_version}.tar.xz -# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/325 -# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/issues/736 -# https://bugzilla.redhat.com/show_bug.cgi?id=2180047 -# Ensure auto-suspend does not apply to VMs -Patch0: 325.patch BuildRequires: gcc BuildRequires: gettext diff --git a/sources b/sources index 3c583e1..a7f97c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-settings-daemon-44.0.tar.xz) = 276d1c2e559e0297855cfc9fc7bd2ce4ae55e2b711222f1f1aae4802dc6499f51ea09bff8f44c5d7b9f0f5a32ab187c2ac4d8ee8e5f1754a186ac189b4e885da +SHA512 (gnome-settings-daemon-44.1.tar.xz) = a955d74a594d49f67a5c27ac60d6f1e9b4aba7b12cbd0af8d3be02c4b2e8385f1abfbe08b62177b69851e9202960a17429373bf5533adbd73699232fefea6c79