From 14b8ac9dac73cf2ad26050c70f81567c5fb1d66688dd4cd81b02d07a9dbf9f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 26 Oct 2023 18:45:21 +0000 Subject: [PATCH] Accepting request 1120494 from GNOME:Next Add upstream patch OBS-URL: https://build.opensuse.org/request/show/1120494 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=406 --- ...16ff42f682fc4b541810ca107486abab9976.patch | 28 +++++++++++++++++++ gnome-settings-daemon.changes | 6 ++++ gnome-settings-daemon.spec | 3 ++ 3 files changed, 37 insertions(+) create mode 100644 538816ff42f682fc4b541810ca107486abab9976.patch diff --git a/538816ff42f682fc4b541810ca107486abab9976.patch b/538816ff42f682fc4b541810ca107486abab9976.patch new file mode 100644 index 0000000..d2eace7 --- /dev/null +++ b/538816ff42f682fc4b541810ca107486abab9976.patch @@ -0,0 +1,28 @@ +From 538816ff42f682fc4b541810ca107486abab9976 Mon Sep 17 00:00:00 2001 +From: Carlos Garnacho +Date: Tue, 26 Sep 2023 19:16:17 +0200 +Subject: [PATCH] smartcard: Steal error when propagating through GTask + +The g_task_return_error() function wants ownership of the error, +which here is also held by the g_autoptr(). Steal the error when +propagating, so the ownership is transferred. +--- + plugins/smartcard/gsd-smartcard-manager.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/smartcard/gsd-smartcard-manager.c b/plugins/smartcard/gsd-smartcard-manager.c +index abce6ef3e..c049f4922 100644 +--- a/plugins/smartcard/gsd-smartcard-manager.c ++++ b/plugins/smartcard/gsd-smartcard-manager.c +@@ -554,7 +554,7 @@ on_modules_initialized (GObject *source_object, + modules = gck_modules_initialize_registered_finish (result, &error); + + if (error) { +- g_task_return_error (task, error); ++ g_task_return_error (task, g_steal_pointer (&error)); + return; + } + +-- +GitLab + diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 581e56d..7e35e25 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 26 08:40:13 UTC 2023 - Bjørn Lie + +- Add 538816ff42f682fc4b541810ca107486abab9976.patch: smartcard: + Steal error when propagating through GTask. + ------------------------------------------------------------------- Sat Sep 16 15:31:51 UTC 2023 - Bjørn Lie diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 75ae642..6283d1b 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -44,6 +44,8 @@ Patch1: gnome-settings-daemon-initial-keyboard.patch Patch2: gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch # PATCH-FIX-UPSTREAM gnome-settings-daemon-bgo793253.patch bgo#793253 dimstar@opensuse.org -- Fix no-return-in-nonvoid-function Patch3: gnome-settings-daemon-bgo793253.patch +# PATCH-FIX-UPSTREAM 538816ff42f682fc4b541810ca107486abab9976.patch -- smartcard: Steal error when propagating through GTask +Patch0: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/538816ff42f682fc4b541810ca107486abab9976.patch ## SLE/LEAP-only patches start at 1000 # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo#575467 hpj@suse.com -- notify user about auto suspend when returning from sleep @@ -149,6 +151,7 @@ contact the settings daemon via its DBus interface. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %endif # Enable the patches for both Leap 15 and SLE 15, please find the clarification at bsc#1158476.