forked from pool/gnome-settings-daemon
Accepting request 1136890 from GNOME:Next
- Update to version 45.1: + Power: Compiler warning fixes. + Smartcard: Error handling fix. + USB Protection: Comment clean up. + Updated translations. - Drop upstream fixed patches: + 41d0dc1db4d75c37ba67fe903105b4e162d42f1a.patch + 538816ff42f682fc4b541810ca107486abab9976.patch + a059909d62da0c11774f1089d02937699fabf150.patch + Patch1000:gnome-settings-daemon-notify-idle-resumed.patch OBS-URL: https://build.opensuse.org/request/show/1136890 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=414
This commit is contained in:
Git OBS Bridge
parent
d14e957ba4
commit
e085acd456
@ -1,44 +0,0 @@
|
|||||||
From 41d0dc1db4d75c37ba67fe903105b4e162d42f1a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bastien Nocera <hadess@hadess.net>
|
|
||||||
Date: Mon, 20 Nov 2023 11:31:31 +0100
|
|
||||||
Subject: [PATCH] power: Fix uninitialised variable warning
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
In function ‘do_lid_closed_action’,
|
|
||||||
inlined from ‘logind_proxy_changed_cb’ at plugins/power/gsd-power-manager.c:1579:17:
|
|
||||||
plugins/power/gsd-power-manager.c:1538:20: warning: ‘is_inhibited’ may be used uninitialized [-Wmaybe-uninitialized]
|
|
||||||
1538 | if (is_inhibited) {
|
|
||||||
| ^
|
|
||||||
plugins/power/gsd-power-manager.c: In function ‘logind_proxy_changed_cb’:
|
|
||||||
plugins/power/gsd-power-manager.c:1533:26: note: ‘is_inhibited’ was declared here
|
|
||||||
1533 | gboolean is_inhibited;
|
|
||||||
| ^~~~~~~~~~~~
|
|
||||||
plugins/power/gsd-power-manager.c: In function ‘idle_configure’:
|
|
||||||
plugins/power/gsd-power-manager.c:1977:12: warning: ‘is_inhibited’ may be used uninitialized [-Wmaybe-uninitialized]
|
|
||||||
1977 | if (!is_action_inhibited (manager, action_type)) {
|
|
||||||
| ^
|
|
||||||
plugins/power/gsd-power-manager.c:1354:18: note: ‘is_inhibited’ was declared here
|
|
||||||
1354 | gboolean is_inhibited;
|
|
||||||
| ^~~~~~~~~~~~
|
|
||||||
---
|
|
||||||
plugins/power/gsd-power-manager.c | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
|
|
||||||
index f0ca3aee..b3da23a8 100644
|
|
||||||
--- a/plugins/power/gsd-power-manager.c
|
|
||||||
+++ b/plugins/power/gsd-power-manager.c
|
|
||||||
@@ -1861,6 +1861,8 @@ idle_is_session_inhibited (GsdPowerManager *manager,
|
|
||||||
GVariant *variant;
|
|
||||||
GsmInhibitorFlag inhibited_actions;
|
|
||||||
|
|
||||||
+ *is_inhibited = FALSE;
|
|
||||||
+
|
|
||||||
/* not yet connected to gnome-session */
|
|
||||||
if (manager->session == NULL)
|
|
||||||
return FALSE;
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
From 538816ff42f682fc4b541810ca107486abab9976 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Carlos Garnacho <carlosg@gnome.org>
|
|
||||||
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
|
|
||||||
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
From a059909d62da0c11774f1089d02937699fabf150 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bastien Nocera <hadess@hadess.net>
|
|
||||||
Date: Mon, 20 Nov 2023 11:29:48 +0100
|
|
||||||
Subject: [PATCH] power: Fix enum mismatch warning
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
[1/2] Compiling C object plugins/power/gsd-power.p/gsd-power-manager.c.o
|
|
||||||
plugins/power/gsd-power-manager.c:1872:1: warning: conflicting types for ‘idle_is_session_inhibited’ due to enum/integer mismatch; have ‘gboolean(GsdPowerManager *, GsmInhibitorFlag, gboolean *)’ {aka ‘int(struct _GsdPowerManager *, GsmInhibitorFlag, int *)’} [-Wenum-int-mismatch]
|
|
||||||
1872 | idle_is_session_inhibited (GsdPowerManager *manager,
|
|
||||||
| ^~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
plugins/power/gsd-power-manager.c:237:18: note: previous declaration of ‘idle_is_session_inhibited’ with type ‘gboolean(GsdPowerManager *, guint, gboolean *)’ {aka ‘int(struct _GsdPowerManager *, unsigned int, int *)’}
|
|
||||||
237 | static gboolean idle_is_session_inhibited (GsdPowerManager *manager, guint mask, gboolean *is_inhibited);
|
|
||||||
| ^~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
---
|
|
||||||
plugins/power/gsd-power-manager.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
|
|
||||||
index 0aa3b546d..f0ca3aee4 100644
|
|
||||||
--- a/plugins/power/gsd-power-manager.c
|
|
||||||
+++ b/plugins/power/gsd-power-manager.c
|
|
||||||
@@ -235,7 +235,7 @@ static void uninhibit_lid_switch (GsdPowerManager *manager);
|
|
||||||
static void stop_inhibit_lid_switch_timer (GsdPowerManager *manager);
|
|
||||||
static void sync_lid_inhibitor (GsdPowerManager *manager);
|
|
||||||
static void main_battery_or_ups_low_changed (GsdPowerManager *manager, gboolean is_low);
|
|
||||||
-static gboolean idle_is_session_inhibited (GsdPowerManager *manager, guint mask, gboolean *is_inhibited);
|
|
||||||
+static gboolean idle_is_session_inhibited (GsdPowerManager *manager, GsmInhibitorFlag mask, gboolean *is_inhibited);
|
|
||||||
static void idle_triggered_idle_cb (GnomeIdleMonitor *monitor, guint watch_id, gpointer user_data);
|
|
||||||
static void idle_became_active_cb (GnomeIdleMonitor *monitor, guint watch_id, gpointer user_data);
|
|
||||||
static void iio_proxy_changed (GsdPowerManager *manager);
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:bb4dc46950e2a90f38f23225848856d2a7b1b718c89d0285ce197b7016bb1dc8
|
|
||||||
size 1465016
|
|
||||||
BIN
gnome-settings-daemon-45.1.tar.xz
(Stored with Git LFS)
Normal file
BIN
gnome-settings-daemon-45.1.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jan 4 17:03:51 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
- Update to version 45.1:
|
||||||
|
+ Power: Compiler warning fixes.
|
||||||
|
+ Smartcard: Error handling fix.
|
||||||
|
+ USB Protection: Comment clean up.
|
||||||
|
+ Updated translations.
|
||||||
|
- Drop upstream fixed patches:
|
||||||
|
+ 41d0dc1db4d75c37ba67fe903105b4e162d42f1a.patch
|
||||||
|
+ 538816ff42f682fc4b541810ca107486abab9976.patch
|
||||||
|
+ a059909d62da0c11774f1089d02937699fabf150.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Nov 28 12:06:23 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
|
Tue Nov 28 12:06:23 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package gnome-settings-daemon
|
# spec file for package gnome-settings-daemon
|
||||||
#
|
#
|
||||||
# Copyright (c) 2023 SUSE LLC
|
# Copyright (c) 2024 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -30,7 +30,7 @@
|
|||||||
%define base_ver 45
|
%define base_ver 45
|
||||||
|
|
||||||
Name: gnome-settings-daemon
|
Name: gnome-settings-daemon
|
||||||
Version: 45.0
|
Version: 45.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Settings daemon for the GNOME desktop
|
Summary: Settings daemon for the GNOME desktop
|
||||||
License: GPL-2.0-or-later AND LGPL-2.1-only
|
License: GPL-2.0-or-later AND LGPL-2.1-only
|
||||||
@ -44,12 +44,6 @@ Patch0: gnome-settings-daemon-initial-keyboard.patch
|
|||||||
Patch1: gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch
|
Patch1: 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
|
# PATCH-FIX-UPSTREAM gnome-settings-daemon-bgo793253.patch bgo#793253 dimstar@opensuse.org -- Fix no-return-in-nonvoid-function
|
||||||
Patch2: gnome-settings-daemon-bgo793253.patch
|
Patch2: gnome-settings-daemon-bgo793253.patch
|
||||||
# PATCH-FIX-UPSTREAM 538816ff42f682fc4b541810ca107486abab9976.patch -- smartcard: Steal error when propagating through GTask
|
|
||||||
Patch3: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/538816ff42f682fc4b541810ca107486abab9976.patch
|
|
||||||
# PATCH-FIX-UPSTREAM a059909d62da0c11774f1089d02937699fabf150.patch -- power: Fix enum mismatch warning
|
|
||||||
Patch4: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/a059909d62da0c11774f1089d02937699fabf150.patch
|
|
||||||
# PATCH-FIX-UPSTREAM 41d0dc1db4d75c37ba67fe903105b4e162d42f1a.patch -- power: Fix uninitialised variable warning
|
|
||||||
Patch5: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/41d0dc1db4d75c37ba67fe903105b4e162d42f1a.patch
|
|
||||||
|
|
||||||
## SLE/LEAP-only patches start at 1000
|
## 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
|
# 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
|
||||||
@ -155,9 +149,6 @@ contact the settings daemon via its DBus interface.
|
|||||||
%patch -P 0 -p1
|
%patch -P 0 -p1
|
||||||
%patch -P 1 -p1
|
%patch -P 1 -p1
|
||||||
%patch -P 2 -p1
|
%patch -P 2 -p1
|
||||||
%patch -P 3 -p1
|
|
||||||
%patch -P 4 -p1
|
|
||||||
%patch -P 5 -p1
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Enable the patches for both Leap 15 and SLE 15, please find the clarification at bsc#1158476.
|
# Enable the patches for both Leap 15 and SLE 15, please find the clarification at bsc#1158476.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user