From 720592740ad5d88696b05d9a5b0ff8ed3c7b388680690d5c71de2422e3c218c5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 5 Dec 2023 07:40:32 +0000 Subject: [PATCH] Accepting request 1130901 from home:rjain:branches:GNOME:Factory submission from rjain OBS-URL: https://build.opensuse.org/request/show/1130901 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=411 --- gnome-settings-daemon-bgo793253.patch | 18 +++++----- ...ngs-daemon-more-power-button-actions.patch | 30 +++++++---------- ...-settings-daemon-notify-idle-resumed.patch | 33 +++++++++---------- gnome-settings-daemon.changes | 7 ++++ 4 files changed, 43 insertions(+), 45 deletions(-) diff --git a/gnome-settings-daemon-bgo793253.patch b/gnome-settings-daemon-bgo793253.patch index 49500ae..99804e9 100644 --- a/gnome-settings-daemon-bgo793253.patch +++ b/gnome-settings-daemon-bgo793253.patch @@ -1,7 +1,7 @@ -Index: b/plugins/media-keys/gsd-media-keys-manager.c +Index: gnome-settings-daemon-45.0/plugins/media-keys/gsd-media-keys-manager.c =================================================================== ---- a/plugins/media-keys/gsd-media-keys-manager.c -+++ b/plugins/media-keys/gsd-media-keys-manager.c +--- gnome-settings-daemon-45.0.orig/plugins/media-keys/gsd-media-keys-manager.c ++++ gnome-settings-daemon-45.0/plugins/media-keys/gsd-media-keys-manager.c @@ -350,7 +350,7 @@ get_key_string (MediaKey *key) else if (key->custom_path != NULL) return g_strdup_printf ("custom:%s", key->custom_path); @@ -20,10 +20,10 @@ Index: b/plugins/media-keys/gsd-media-keys-manager.c array = g_ptr_array_new (); g_ptr_array_add (array, binding); -Index: b/plugins/rfkill/rfkill-glib.c +Index: gnome-settings-daemon-45.0/plugins/rfkill/rfkill-glib.c =================================================================== ---- a/plugins/rfkill/rfkill-glib.c -+++ b/plugins/rfkill/rfkill-glib.c +--- gnome-settings-daemon-45.0.orig/plugins/rfkill/rfkill-glib.c ++++ gnome-settings-daemon-45.0/plugins/rfkill/rfkill-glib.c @@ -268,7 +268,7 @@ op_to_string (unsigned int op) case RFKILL_OP_CHANGE_ALL: return "CHANGE_ALL"; @@ -33,10 +33,10 @@ Index: b/plugins/rfkill/rfkill-glib.c } } -Index: b/plugins/xsettings/xsettings-manager.c +Index: gnome-settings-daemon-45.0/plugins/xsettings/xsettings-manager.c =================================================================== ---- a/plugins/xsettings/xsettings-manager.c -+++ b/plugins/xsettings/xsettings-manager.c +--- gnome-settings-daemon-45.0.orig/plugins/xsettings/xsettings-manager.c ++++ gnome-settings-daemon-45.0/plugins/xsettings/xsettings-manager.c @@ -271,7 +271,7 @@ xsettings_get_typecode (GVariant *value) case G_VARIANT_CLASS_TUPLE: return XSETTINGS_TYPE_COLOR; diff --git a/gnome-settings-daemon-more-power-button-actions.patch b/gnome-settings-daemon-more-power-button-actions.patch index fc66a4c..b211b40 100644 --- a/gnome-settings-daemon-more-power-button-actions.patch +++ b/gnome-settings-daemon-more-power-button-actions.patch @@ -1,16 +1,7 @@ -From 3d9c3ecda9c68039c309bfb6bfc93830c4a0e20e Mon Sep 17 00:00:00 2001 -From: Felix Zhang -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 +Index: gnome-settings-daemon-45.0/data/gsd-enums.h +=================================================================== +--- gnome-settings-daemon-45.0.orig/data/gsd-enums.h ++++ gnome-settings-daemon-45.0/data/gsd-enums.h @@ -105,6 +105,7 @@ typedef enum typedef enum { @@ -19,14 +10,15 @@ diff -urp gnome-settings-daemon-3.33.90.orig/data/gsd-enums.h gnome-settings-dae 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 +Index: gnome-settings-daemon-45.0/plugins/media-keys/gsd-media-keys-manager.c +=================================================================== +--- gnome-settings-daemon-45.0.orig/plugins/media-keys/gsd-media-keys-manager.c ++++ gnome-settings-daemon-45.0/plugins/media-keys/gsd-media-keys-manager.c +@@ -2053,6 +2053,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: ++ 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: diff --git a/gnome-settings-daemon-notify-idle-resumed.patch b/gnome-settings-daemon-notify-idle-resumed.patch index b9cdc08..c6e4eed 100644 --- a/gnome-settings-daemon-notify-idle-resumed.patch +++ b/gnome-settings-daemon-notify-idle-resumed.patch @@ -1,10 +1,10 @@ -Index: gnome-settings-daemon-41.0/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in +Index: gnome-settings-daemon-45.0/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in =================================================================== ---- gnome-settings-daemon-41.0.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in -+++ gnome-settings-daemon-41.0/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in +--- gnome-settings-daemon-45.0.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in ++++ gnome-settings-daemon-45.0/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in @@ -41,6 +41,11 @@ Power button action - 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). + The action to take when the system power button is pressed. Virtual machines only honor the 'nothing' action, and will shutdown otherwise. Tablets always suspend, ignoring all the other action options. + + true @@ -14,27 +14,27 @@ Index: gnome-settings-daemon-41.0/data/org.gnome.settings-daemon.plugins.power.g true Enable power-saver profile when battery is low -Index: gnome-settings-daemon-41.0/plugins/power/gsd-power-manager.c +Index: gnome-settings-daemon-45.0/plugins/power/gsd-power-manager.c =================================================================== ---- gnome-settings-daemon-41.0.orig/plugins/power/gsd-power-manager.c -+++ gnome-settings-daemon-41.0/plugins/power/gsd-power-manager.c -@@ -164,6 +164,7 @@ struct _GsdPowerManager +--- gnome-settings-daemon-45.0.orig/plugins/power/gsd-power-manager.c ++++ gnome-settings-daemon-45.0/plugins/power/gsd-power-manager.c +@@ -165,6 +165,7 @@ struct _GsdPowerManager NotifyNotification *notification_ups_discharging; NotifyNotification *notification_low; NotifyNotification *notification_sleep_warning; -+ NotifyNotification *notification_resumed; ++ NotifyNotification *notification_resumed; GsdPowerActionType sleep_action_type; GHashTable *devices_notified_ht; /* key = serial str, value = UpDeviceLevel */ gboolean battery_is_low; /* battery low, or UPS discharging */ -@@ -205,6 +206,7 @@ struct _GsdPowerManager +@@ -206,6 +207,7 @@ struct _GsdPowerManager gboolean inhibit_suspend_taken; guint inhibit_lid_switch_timer_id; gboolean is_virtual_machine; -+ GsdPowerActionType last_idle_power_action; ++ GsdPowerActionType last_idle_power_action; /* Idles */ GnomeIdleMonitor *idle_monitor; -@@ -1744,6 +1746,49 @@ is_session_active (GsdPowerManager *mana +@@ -1730,6 +1732,49 @@ is_session_active (GsdPowerManager *mana } static void @@ -84,24 +84,23 @@ Index: gnome-settings-daemon-41.0/plugins/power/gsd-power-manager.c idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode) { gboolean ret = FALSE; -@@ -1824,6 +1869,7 @@ idle_set_mode (GsdPowerManager *manager, +@@ -1810,6 +1855,7 @@ idle_set_mode (GsdPowerManager *manager, action_type = g_settings_get_enum (manager->settings, "sleep-inactive-ac-type"); } -+ manager->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 */ -@@ -2777,6 +2823,12 @@ handle_suspend_actions (GsdPowerManager +@@ -2784,6 +2830,11 @@ handle_suspend_actions (GsdPowerManager static void handle_resume_actions (GsdPowerManager *manager) { -+ if (manager->last_idle_power_action == GSD_POWER_ACTION_SUSPEND || ++ 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); diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 40c6b78..84279dc 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -19,6 +19,13 @@ Thu Oct 26 08:40:13 UTC 2023 - Bjørn Lie - Add 538816ff42f682fc4b541810ca107486abab9976.patch: smartcard: Steal error when propagating through GTask. +------------------------------------------------------------------- +Wed Oct 18 03:01:27 UTC 2023 - Rahul Jain + +- Rebase patches on gnome-settings-daemon 45(bsc#1216073) + + Patch1000:gnome-settings-daemon-notify-idle-resumed.patch + + Patch1001:gnome-settings-daemon-more-power-button-actions.patch + ------------------------------------------------------------------- Sat Sep 16 15:31:51 UTC 2023 - Bjørn Lie