pool/gnome-settings-daemon
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1102332 from home:yfjiang:branches:GNOME:Factory

Browse Source 
- Do not use %autopatch to build on SLE where rpm version is not
  ready for the macro.
- Drop patch gnome-settings-daemon-bnc873545-hide-warnings.patch:
  the relevant color management has been moved to mutter.

OBS-URL: https://build.opensuse.org/request/show/1102332
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=401
This commit is contained in:
Dominique Leuenberger 2023-08-08 14:46:27 +00:00 committed by Git OBS Bridge
parent c7ed8b3103
commit fdfd7dde45
3 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gnome-settings-daemon-bnc873545-hide-warnings.patch
View File

@ -1,32 +0,0 @@
From fd0df3003ba7c0ae4d04a8314358db7f82dd2ab1 Mon Sep 17 00:00:00 2001
From: Felix Zhang <fezhang@suse.com>
Date: Tue, 6 May 2014 16:13:04 +0800
Subject: [PATCH] hide warnings
---
diff -urp gnome-settings-daemon-3.33.90.orig/plugins/color/gsd-color-profiles.c gnome-settings-daemon-3.33.90/plugins/color/gsd-color-profiles.c
--- gnome-settings-daemon-3.33.90.orig/plugins/color/gsd-color-profiles.c 2019-08-05 18:40:19.000000000 -0500
+++ gnome-settings-daemon-3.33.90/plugins/color/gsd-color-profiles.c 2019-08-31 19:41:32.942733480 -0500
@@ -71,7 +71,9 @@ gcm_session_client_connect_cb (GObject *
profiles = GSD_COLOR_PROFILES (user_data);
ret = cd_client_get_has_server (profiles->client);
if (!ret) {
+ /* hide this warning for SLES
g_warning ("There is no colord server available");
+ */
return;
}
diff -urp gnome-settings-daemon-3.33.90.orig/plugins/color/gsd-color-state.c gnome-settings-daemon-3.33.90/plugins/color/gsd-color-state.c
--- gnome-settings-daemon-3.33.90.orig/plugins/color/gsd-color-state.c 2019-08-05 18:40:19.000000000 -0500
+++ gnome-settings-daemon-3.33.90/plugins/color/gsd-color-state.c 2019-08-31 19:42:00.470879362 -0500
@@ -1359,7 +1359,9 @@ gcm_session_client_connect_cb (GObject *
/* is there an available colord instance? */
ret = cd_client_get_has_server (state->client);
if (!ret) {
+ /* hide this warning for SLES
g_warning ("There is no colord server available");
+ */
return;
}

8
gnome-settings-daemon.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Aug 4 09:04:02 UTC 2023 - Yifan Jiang <yfjiang@suse.com>
- Do not use %autopatch to build on SLE where rpm version is not
ready for the macro.
- Drop patch gnome-settings-daemon-bnc873545-hide-warnings.patch:
the relevant color management has been moved to mutter.
-------------------------------------------------------------------
Tue Apr 18 14:40:35 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>

14
gnome-settings-daemon.spec
View File

@ -48,10 +48,8 @@ Patch3: gnome-settings-daemon-bgo793253.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
Patch1000: gnome-settings-daemon-notify-idle-resumed.patch
# PATCH-FIX-OPENSUSE gnome-settings-daemon-bnc873545-hide-warnings.patch bnc#873545 fezhang@suse.com -- hide the warnings when g-s-d cannot find colord running, which is expected on SLES
Patch1001: gnome-settings-daemon-bnc873545-hide-warnings.patch
# PATCH-FIX-OPENSUSE gnome-settings-daemon-more-power-button-actions.patch bsc#996342 fezhang@suse.com -- Bring back the "shutdown" and "interactive" power button actions.
Patch1002: gnome-settings-daemon-more-power-button-actions.patch
Patch1001: gnome-settings-daemon-more-power-button-actions.patch
BuildRequires: cups-devel
BuildRequires: fdupes
@ -142,11 +140,19 @@ contact the settings daemon via its DBus interface.
%prep
%autosetup -N
%if ! 0%{?sle_version}
%autopatch -p1 -M 999
%else
%patch1 -p1
%patch2 -p1
%patch3 -p1
%endif
# Enable the patches for both Leap 15 and SLE 15, please find the clarification at bsc#1158476.
%if 0%{?sle_version} >= 150000
%autopatch -p1 -m 1000
%patch1000 -p1
%patch1001 -p1
%endif
%build