diff --git a/gnu/local.mk b/gnu/local.mk index d32990258f..0b1ea6e8dc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1509,7 +1509,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 a2346be226..4a176e6a97 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5953,7 +5953,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) @@ -5962,10 +5962,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; - }