Update to 47.2

Related: RHEL-74269
This commit is contained in:
Felipe Borges 2025-01-16 14:33:29 +01:00
parent d4c903fe1a
commit b5d72f0220
3 changed files with 17 additions and 17 deletions

View File

@ -17,7 +17,7 @@
%global major_version %%(echo %{version} | cut -f 1 -d '~' | cut -f 1 -d '.')
Name: gnome-settings-daemon
Version: 46.0
Version: 47.2
Release: %autorelease
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications

View File

@ -1,8 +1,8 @@
From 394cbc30d8093808ddba69c6c709e20f38d9f280 Mon Sep 17 00:00:00 2001
From 9ea243434ed471df0563dae6f3f5148c7a095e36 Mon Sep 17 00:00:00 2001
From: Felipe Borges <felipeborges@gnome.org>
Date: Tue, 6 Aug 2024 15:49:21 +0200
Subject: [PATCH] power: Add "sleep-inactive-ac-type-server" as a side
setting for servers
Date: Thu, 16 Jan 2025 14:44:39 +0100
Subject: [PATCH] power: Add "sleep-inactive-ac-type-server" as a side setting
for servers
This avoids servers having the defaults from other chassis types.
@ -29,20 +29,20 @@ index 051bcf70..438cd62b 100644
<default>900</default>
<summary>Sleep timeout computer when on battery</summary>
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 268a46cc..2c2d5f8f 100644
index 449f283a..8da0dca5 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -223,6 +223,9 @@ struct _GsdPowerManager
@@ -226,6 +226,9 @@ struct _GsdPowerManager
/* Device Properties */
gboolean show_sleep_warnings;
/* Screens */
GsdDisplayConfig *display_config;
+
+ /* hostnamed chassis-type */
+ gchar *chassis_type;
};
enum {
@@ -1915,6 +1918,7 @@ idle_configure (GsdPowerManager *manager)
@@ -1913,6 +1916,7 @@ idle_configure (GsdPowerManager *manager)
guint timeout_sleep;
guint timeout_dim;
gboolean on_battery;
@ -50,7 +50,7 @@ index 268a46cc..2c2d5f8f 100644
if (!idle_is_session_inhibited (manager,
GSM_INHIBITOR_FLAG_IDLE,
@@ -1961,8 +1965,11 @@ idle_configure (GsdPowerManager *manager)
@@ -1959,8 +1963,11 @@ idle_configure (GsdPowerManager *manager)
/* only do the sleep timeout when the session is idle
* and we aren't inhibited from sleeping (or logging out, etc.) */
on_battery = up_client_get_on_battery (manager->up_client);
@ -64,7 +64,7 @@ index 268a46cc..2c2d5f8f 100644
timeout_sleep = 0;
if (!is_action_inhibited (manager, action_type)) {
gint timeout_sleep_;
@@ -3059,7 +3066,6 @@ gboolean
@@ -2927,7 +2934,6 @@ gboolean
gsd_power_manager_start (GsdPowerManager *manager,
GError **error)
{
@ -72,7 +72,7 @@ index 268a46cc..2c2d5f8f 100644
g_debug ("Starting power manager");
gnome_settings_profile_start (NULL);
@@ -3087,8 +3093,7 @@ gsd_power_manager_start (GsdPowerManager *manager,
@@ -2960,8 +2966,7 @@ gsd_power_manager_start (GsdPowerManager *manager,
return FALSE;
}
@ -82,7 +82,7 @@ index 268a46cc..2c2d5f8f 100644
manager->show_sleep_warnings = FALSE;
} else {
manager->show_sleep_warnings = TRUE;
@@ -3182,6 +3187,8 @@ gsd_power_manager_stop (GsdPowerManager *manager)
@@ -3170,6 +3175,8 @@ gsd_power_manager_stop (GsdPowerManager *manager)
g_source_remove (manager->xscreensaver_watchdog_timer_id);
manager->xscreensaver_watchdog_timer_id = 0;
}
@ -91,7 +91,7 @@ index 268a46cc..2c2d5f8f 100644
}
static void
@@ -3190,6 +3197,8 @@ gsd_power_manager_init (GsdPowerManager *manager)
@@ -3178,6 +3185,8 @@ gsd_power_manager_init (GsdPowerManager *manager)
manager->inhibit_lid_switch_fd = -1;
manager->inhibit_suspend_fd = -1;
manager->cancellable = g_cancellable_new ();
@ -101,5 +101,5 @@ index 268a46cc..2c2d5f8f 100644
/* returns new level */
--
2.45.2
2.46.2

View File

@ -1 +1 @@
SHA512 (gnome-settings-daemon-46.0.tar.xz) = 445e9ee4709af7a67ded55733d4041357995fe9746bcf00fa81f52f6dddc2071e7114e9bf836bcf464bc0f04da3b3c08be04c1942963c1910d1a14b4434f6633
SHA512 (gnome-settings-daemon-47.2.tar.xz) = fd3e358aa1f6a317dc49436965135dde204bd55fee9c96127d1208aafb60af3667fcc344a1667be1596892987f67ebab3fc7eefaeeefce82e1c65635e36c126f