guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit 280afc6e8982431d542a659fcefcede46b157ab9
Author: Liliana Marie Prikler <[email protected]>
AuthorDate: Sun Oct 5 17:45:03 2025 +0200
gnu: gnome-settings-daemon: Update to 48.1.
* gnu/packages/gnome.scm (gnome-settings-daemon): Update to 48.1.
[patches]: Remove “gnome-settings-daemon-screensaver-error.patch”.
* gnu/packages/patches/gnome-settings-daemon-screensaver-error.patch: Also
remove the file…
* gnu/local.mk (dist_patch_DATA): … and deregister it.
---
gnu/local.mk | 1 -
gnu/packages/gnome.scm | 8 +++-----
.../patches/gnome-settings-daemon-screensaver-error.patch | 14 --------------
3 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index c201f5a5a3..026980bbef 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1502,7 +1502,6 @@ dist_patch_DATA =
\
%D%/packages/patches/gnome-dictionary-meson-i18n.patch \
%D%/packages/patches/gnome-online-miners-tracker-3.patch \
%D%/packages/patches/gnome-settings-daemon-gc.patch \
- %D%/packages/patches/gnome-settings-daemon-screensaver-error.patch \
%D%/packages/patches/gnome-session-support-elogind.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \
%D%/packages/patches/gnulib-bootstrap.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9a7762f1e9..7c1d8f6fc3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5957,7 +5957,7 @@ services for numerous locations.")
(define-public gnome-settings-daemon
(package
(name "gnome-settings-daemon")
- (version "47.2")
+ (version "48.1")
(source
(origin
(method url-fetch)
@@ -5966,10 +5966,8 @@ services for numerous locations.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0nka7zfl4hzzk4066kk5cc8pmk7v3izhi4wihsh5b3w85s35idqy"))
- (patches (search-patches "gnome-settings-daemon-gc.patch"
- ;; See
https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/issues/792
-
"gnome-settings-daemon-screensaver-error.patch"))))
+ "0bh6xsx8fgzfgjjf9hvv10ar4f55b0riwymf01kcpjsd47ma4q1q"))
+ (patches (search-patches "gnome-settings-daemon-gc.patch"))))
(build-system meson-build-system)
(arguments
(list
diff --git a/gnu/packages/patches/gnome-settings-daemon-screensaver-error.patch
b/gnu/packages/patches/gnome-settings-daemon-screensaver-error.patch
deleted file mode 100644
index 6707502261..0000000000
--- a/gnu/packages/patches/gnome-settings-daemon-screensaver-error.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/plugins/usb-protection/gsd-usb-protection-manager.c
b/plugins/usb-protection/gsd-usb-protection-manager.c
-index 43644408..fef13645 100644
---- a/plugins/usb-protection/gsd-usb-protection-manager.c
-+++ b/plugins/usb-protection/gsd-usb-protection-manager.c
-@@ -1089,8 +1089,7 @@ usb_protection_proxy_ready (GObject *source_object,
-
- manager->screensaver_proxy =
gnome_settings_bus_get_screen_saver_proxy ();
- if (!manager->screensaver_proxy) {
-- if (!g_error_matches (error, G_IO_ERROR,
G_IO_ERROR_CANCELLED))
-- g_warning ("Failed to connect to screensaver service:
%s", error->message);
-+ g_warning ("Failed to connect to screensaver service");
- g_clear_object (&manager->usb_protection);
- return;
- }
