Accepting request 789270 from GNOME:Factory

- Add gnome-session-remove-gsd-XSettings.patch: Remove
  org.gnome.SettingsDaemon.XSettings from file gnome.session
  (bsc#1163262 glgo#GNOME/gnome-session#51) (forwarded request 785449 from xiaoguang_wang)

OBS-URL: https://build.opensuse.org/request/show/789270
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=188
This commit is contained in:
Dominique Leuenberger 2020-03-30 20:51:07 +00:00 committed by Git OBS Bridge
commit 35d3297b95
3 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,24 @@
From 7690131514d22578dc6bfdc3b1af3196ffc4bbac Mon Sep 17 00:00:00 2001
From: Xiaoguang Wang <xwang@suse.com>
Date: Thu, 5 Mar 2020 14:44:38 +0800
Subject: [PATCH] data: Remove org.gnome.SettingsDaemon.XSettings
Now gnome-shell starts up org.gnome.SettingsDaemon.XSettings
https://gitlab.gnome.org/GNOME/gnome-session/issues/51
---
data/gnome.session.desktop.in.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/gnome.session.desktop.in.in b/data/gnome.session.desktop.in.in
index 6c70f540..079e1e82 100644
--- a/data/gnome.session.desktop.in.in
+++ b/data/gnome.session.desktop.in.in
@@ -1,3 +1,3 @@
[GNOME Session]
Name=GNOME
-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
+RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;
--
2.25.0

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Mar 16 03:51:13 UTC 2020 - Xiaoguang Wang <xwang@suse.com>
- Add gnome-session-remove-gsd-XSettings.patch: Remove
org.gnome.SettingsDaemon.XSettings from file gnome.session
(bsc#1163262 glgo#GNOME/gnome-session#51)
-------------------------------------------------------------------
Sat Jan 25 14:11:39 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -1,7 +1,7 @@
#
# spec file for package gnome-session
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -29,6 +29,8 @@ Source2: gnome.desktop
# PATCH-FIX-UPSTREAM gnome-session-better-handle-empty-xdg_session_type.patch bsc#1084756 bgo#794256 yfjiang@suse.com -- solution provided by msrb@suse.com using a more reasonable way to handle gpu acceleration check
Patch0: gnome-session-better-handle-empty-xdg_session_type.patch
# PATCH-FIX-UPSTREAM gnome-session-remove-gsd-XSettings.patch bsc#1163262 glgo#GNOME/gnome-session#51 xwang@suse.com -- remove org.gnome.SettingsDaemon.XSettings from gnome.session
Patch1: gnome-session-remove-gsd-XSettings.patch
# PATCH-FIX-OPENSUSE gnome-session-s390-not-require-g-s-d_wacom.patch bsc#1129412 yfjiang@suse.com -- Remove the runtime requirement of g-s-d Wacom plugin
Patch2: gnome-session-s390-not-require-g-s-d_wacom.patch
@ -105,6 +107,7 @@ functional GNOME desktop.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%ifarch s390 s390x
%patch2 -p1
%endif