aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2024-03-12 01:16:09 +0100
committerAndy Postnikov <apostnikov@gmail.com>2024-03-19 02:25:16 +0000
commitb0a6b4f7e8c0e7544cdc18b5c87981d351ead6f6 (patch)
treebb63721cfff307d16f2d8ee4939d1191fba70526
parent2197235df28db9323f176e8051a7ef916df23e02 (diff)
community/gnome-settings-daemon: upgrade to 46.0
-rw-r--r--community/gnome-settings-daemon/338.patch89
-rw-r--r--community/gnome-settings-daemon/APKBUILD7
2 files changed, 3 insertions, 93 deletions
diff --git a/community/gnome-settings-daemon/338.patch b/community/gnome-settings-daemon/338.patch
deleted file mode 100644
index 5451907955c..00000000000
--- a/community/gnome-settings-daemon/338.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From d304ae4ed6b8e8e0a56e7e1a4eac4a1698e166c7 Mon Sep 17 00:00:00 2001
-From: undef <gitlab@undef.tools>
-Date: Sat, 23 Sep 2023 10:37:01 +0000
-Subject: [PATCH] power-manager: Show sleep warning conditional to chassis type
-
-Currently, GNOME settings daemon displays a notification warning
-the user before the sleeping the device. This is generally a very
-useful feature. However, with the adoption of new platforms in GNOME
-like phones and tablets, this can be a problem. In such devices,
-the desired behavior is to sleep as soon as possible and by default.
-Therefore, having a notification pop-up (which can potentially trigger
-some other haptic feedback like a LED) just because the device is
-doing what it is supposed to do (go to sleep) can be problematic.
-
-Discussion in a previous MR indicated that using the system's chassis
-type was a preferred option for deciding this behaviour. This commit
-builds upon the work by Pablo Correa Gomez in !285 to provide the same
-outcome using the chassis type value.
-
-Closes #656
----
- plugins/power/gsd-power-manager.c | 29 +++++++++++++++++++++--------
- 1 file changed, 21 insertions(+), 8 deletions(-)
-
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 0aa3b546d..c71437ece 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -220,6 +220,9 @@ struct _GsdPowerManager
- GsdPowerIdleMode previous_idle_mode;
-
- guint xscreensaver_watchdog_timer_id;
-+
-+ /* Device Properties */
-+ gboolean show_sleep_warnings;
- };
-
- enum {
-@@ -2508,15 +2511,17 @@ idle_triggered_idle_cb (GnomeIdleMonitor *monitor,
- } else if (watch_id == manager->idle_sleep_id) {
- idle_set_mode_no_temp (manager, GSD_POWER_IDLE_MODE_SLEEP);
- } else if (watch_id == manager->idle_sleep_warning_id) {
-- show_sleep_warning (manager);
--
-+ if (manager->show_sleep_warnings) {
-+ show_sleep_warning (manager);
-+ }
- if (manager->user_active_id < 1) {
-- manager->user_active_id = gnome_idle_monitor_add_user_active_watch (manager->idle_monitor,
-- idle_became_active_cb,
-- manager,
-- NULL);
-- g_debug ("installing idle_became_active_cb to clear sleep warning on activity (%i)",
-- manager->user_active_id);
-+ manager->user_active_id =
-+ gnome_idle_monitor_add_user_active_watch (manager->idle_monitor,
-+ idle_became_active_cb,
-+ manager,
-+ NULL);
-+ g_debug ("installing idle_became_active_cb to clear sleep warning on activity (%i)",
-+ manager->user_active_id);
- }
- }
- }
-@@ -3052,6 +3057,7 @@ gboolean
- gsd_power_manager_start (GsdPowerManager *manager,
- GError **error)
- {
-+ g_autofree char *chassis_type = NULL;
- g_debug ("Starting power manager");
- gnome_settings_profile_start (NULL);
-
-@@ -3079,6 +3085,13 @@ gsd_power_manager_start (GsdPowerManager *manager,
- return FALSE;
- }
-
-+ chassis_type = gnome_settings_get_chassis_type ();
-+ if (g_strcmp0 (chassis_type, "tablet") == 0 || g_strcmp0 (chassis_type, "handset") == 0) {
-+ manager->show_sleep_warnings = FALSE;
-+ } else {
-+ manager->show_sleep_warnings = TRUE;
-+ }
-+
- /* coldplug the list of screens */
- gnome_rr_screen_new_async (gdk_screen_get_default (),
- on_rr_screen_acquired, manager);
---
-GitLab
-
diff --git a/community/gnome-settings-daemon/APKBUILD b/community/gnome-settings-daemon/APKBUILD
index 8581cb594cf..cdb4e967820 100644
--- a/community/gnome-settings-daemon/APKBUILD
+++ b/community/gnome-settings-daemon/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: team/gnome <ablocorrea@hotmail.com>
pkgname=gnome-settings-daemon
-pkgver=45.1
+pkgver=46.0
pkgrel=0
pkgdesc="GNOME settings daemon"
url="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
@@ -13,6 +13,7 @@ depends_dev="
alsa-lib-dev
colord-dev
cups-dev
+ elogind-dev
geoclue-dev
geocode-glib-dev>=3.26.4-r1
libcanberra-dev
@@ -45,7 +46,6 @@ checkdepends="
"
subpackages="$pkgname-dev $pkgname-lang"
source="https://download.gnome.org/sources/gnome-settings-daemon/${pkgver%.*}/gnome-settings-daemon-$pkgver.tar.xz
- 338.patch
dont-use-logind-for-brightness-changing.patch
"
@@ -66,7 +66,6 @@ package() {
}
sha512sums="
-ccec193f3f2acdfb5eefda697d6ef2ac0edca18e85d934a83cc34fd5af6c78c56469ffeebbd1c64e8c392462686663c2dd55000bc962beac472580fdfa0717a8 gnome-settings-daemon-45.1.tar.xz
-00773925fd5d7f92d567ab77392ab67f37d2633b63da1e338cd0c721030c46cc804e19e45ce59939f454cb31a63e762b622a405394cd61a5c3cb2d40e473301b 338.patch
+445e9ee4709af7a67ded55733d4041357995fe9746bcf00fa81f52f6dddc2071e7114e9bf836bcf464bc0f04da3b3c08be04c1942963c1910d1a14b4434f6633 gnome-settings-daemon-46.0.tar.xz
fd80b939a14bbc5dd502afda0bc6511f2d9c045018680e5ae7fbec32efadb564c5060ec91d374330f246d70571aad5979ce8c175175a29b5ccec3443c8286dc6 dont-use-logind-for-brightness-changing.patch
"