From 85cf792a379404cec5b3053c3bb8cf7723f92bc8f12343d7143ad0cee2322397 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 28 Mar 2020 12:10:30 +0000 Subject: [PATCH] Accepting request 785455 from home:xiaoguang_wang:branches:GNOME:Factory - Add gnome-shell-extensions-remove-gsd-XSettings.patch: Remove org.gnome.SettingsDaemon.XSettings from file gnome-classic.session (bsc#1163262 glgo#GNOME/gnome-session#51) OBS-URL: https://build.opensuse.org/request/show/785455 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell-extensions?expand=0&rev=212 --- gnome-shell-extensions-remove-gsd-XSettings.patch | 9 +++++++++ gnome-shell-extensions.changes | 7 +++++++ gnome-shell-extensions.spec | 3 +++ 3 files changed, 19 insertions(+) create mode 100644 gnome-shell-extensions-remove-gsd-XSettings.patch diff --git a/gnome-shell-extensions-remove-gsd-XSettings.patch b/gnome-shell-extensions-remove-gsd-XSettings.patch new file mode 100644 index 0000000..07d5267 --- /dev/null +++ b/gnome-shell-extensions-remove-gsd-XSettings.patch @@ -0,0 +1,9 @@ +diff --git a/data/gnome-classic.session.desktop.in b/data/gnome-classic.session.desktop.in +index c29447d..2017e6d 100644 +--- a/data/gnome-classic.session.desktop.in ++++ b/data/gnome-classic.session.desktop.in +@@ -1,3 +1,3 @@ + [GNOME Session] + Name=GNOME Classic +-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; diff --git a/gnome-shell-extensions.changes b/gnome-shell-extensions.changes index 121613f..8da11ba 100644 --- a/gnome-shell-extensions.changes +++ b/gnome-shell-extensions.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 16 06:44:29 UTC 2020 - Xiaoguang Wang + +- Add gnome-shell-extensions-remove-gsd-XSettings.patch: Remove + org.gnome.SettingsDaemon.XSettings from file gnome-classic.session + (bsc#1163262 glgo#GNOME/gnome-session#51) + ------------------------------------------------------------------- Sun Mar 1 20:21:31 UTC 2020 - mgorse@suse.com diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index d536258..e328e5c 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -36,6 +36,8 @@ Source7: 00_org.gnome.shell.extensions.sle-classic.gschema.override Patch1: gnome-shell-add-app-to-desktop.patch # PATCH-FIX-OPENSUSE gnome-classic-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-classic-s390-not-require-g-s-d_wacom.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-classic.session +Patch3: gnome-shell-extensions-remove-gsd-XSettings.patch ## NOTE keep SLE Classic patch at the bottom # PATCH-FIX-SLE gse-sle-classic-ext.patch Fate#318572 cxiong@suse.com -- add sle classic support @@ -117,6 +119,7 @@ to pick system installed themes or even themes installed in the user's home. %ifarch s390 s390x %patch2 -p1 %endif +%patch3 -p1 translation-update-upstream po %{name} gnome-patch-translation-prepare po %{name}