From 098c639ed744cf0bba1bb3cc87a72e4f61880537 Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Tue, 3 Nov 2020 15:05:01 -0500 Subject: [PATCH] Use the disabled-plugins feature of GSD to remove plugins This will create "dummy" .desktop launchers for the removed plugins so that we don't need to change any session files in gnome-session or gdm. --- .../files/citadel-installer.session | 3 ++- .../session.conf | 16 +++++++++++++ ...and-usb-protection-add-systemd-to-de.patch | 15 ------------ .../0001-Disable-gsd-sharing-plugin.patch | 21 ----------------- ...001-disable-power-tests-and-sharing.patch} | 23 ++++++++++--------- .../gnome-settings-daemon_3.38.0.bb | 15 ++++++++---- 6 files changed, 41 insertions(+), 52 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-gsd-sharing-plugin.patch rename meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/{0001-Disable-power-tests-and-USB-protection.patch => 0001-disable-power-tests-and-sharing.patch} (75%) diff --git a/meta-citadel/recipes-citadel/citadel-config/files/citadel-installer.session b/meta-citadel/recipes-citadel/citadel-config/files/citadel-installer.session index 25b5f14..a92c900 100644 --- a/meta-citadel/recipes-citadel/citadel-config/files/citadel-installer.session +++ b/meta-citadel/recipes-citadel/citadel-config/files/citadel-installer.session @@ -1,6 +1,7 @@ # /usr/share/gnome-session/sessions/citadel-installer.session [GNOME Session] Name=Citadel Installer -RequiredComponents=citadel-installer-ui;org.gnome.SettingsDaemon.XSettings; +RequiredComponents=citadel-installer-ui;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.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings; + diff --git a/meta-citadel/recipes-citadel/citadel-config/files/systemd/user/gnome-session@citadel-installer.target.d/session.conf b/meta-citadel/recipes-citadel/citadel-config/files/systemd/user/gnome-session@citadel-installer.target.d/session.conf index d5882fe..ff10aad 100644 --- a/meta-citadel/recipes-citadel/citadel-config/files/systemd/user/gnome-session@citadel-installer.target.d/session.conf +++ b/meta-citadel/recipes-citadel/citadel-config/files/systemd/user/gnome-session@citadel-installer.target.d/session.conf @@ -1,4 +1,20 @@ [Unit] + +# Must be in sync with citadel-installer.session + +Wants=org.gnome.SettingsDaemon.A11ySettings.target +Wants=org.gnome.SettingsDaemon.Color.target +Wants=org.gnome.SettingsDaemon.Datetime.target +Wants=org.gnome.SettingsDaemon.Housekeeping.target +Wants=org.gnome.SettingsDaemon.Keyboard.target +Wants=org.gnome.SettingsDaemon.MediaKeys.target +Wants=org.gnome.SettingsDaemon.Power.target +Wants=org.gnome.SettingsDaemon.PrintNotifications.target +Wants=org.gnome.SettingsDaemon.Rfkill.target +Wants=org.gnome.SettingsDaemon.ScreensaverProxy.target +Wants=org.gnome.SettingsDaemon.Smartcard.target +Wants=org.gnome.SettingsDaemon.Sound.target +Wants=org.gnome.SettingsDaemon.Wacom.target Wants=org.gnome.SettingsDaemon.XSettings.target Requires=org.gnome.Shell.target diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Disable-sharing-and-usb-protection-add-systemd-to-de.patch b/meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Disable-sharing-and-usb-protection-add-systemd-to-de.patch index 3854313..56b59a6 100644 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Disable-sharing-and-usb-protection-add-systemd-to-de.patch +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Disable-sharing-and-usb-protection-add-systemd-to-de.patch @@ -51,18 +51,3 @@ index 7eec1de..d83655e 100644 TryExec=@bindir@/gnome-session Type=Application DesktopNames=GNOME -diff --git a/data/meson.build b/data/meson.build -index e02b80d..08afab6 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -21,10 +21,8 @@ required_components = { - '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.UsbProtection', - 'org.gnome.SettingsDaemon.Wacom', - 'org.gnome.SettingsDaemon.XSettings', - ], diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-gsd-sharing-plugin.patch b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-gsd-sharing-plugin.patch deleted file mode 100644 index 7585f54..0000000 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-gsd-sharing-plugin.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 5b9ba7cbf744ed5e87041c894d3b3f967215b7be Mon Sep 17 00:00:00 2001 -From: David McKinney -Date: Mon, 22 Apr 2019 15:14:19 +0000 -Subject: [PATCH] Disable gsd-sharing plugin - ---- - plugins/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/plugins/meson.build b/plugins/meson.build -index c8c10db4..b75a4681 100644 ---- a/plugins/meson.build -+++ b/plugins/meson.build -@@ -7,7 +7,6 @@ all_plugins = [ - ['keyboard', 'Keyboard', 'GNOME keyboard configuration'], - ['media-keys', 'MediaKeys', 'GNOME keyboard shortcuts'], - ['screensaver-proxy', 'ScreensaverProxy', 'GNOME FreeDesktop screensaver'], -- ['sharing', 'Sharing', 'GNOME file sharing'], - ['sound', 'Sound', 'GNOME sound sample caching'], - ['usb-protection', 'UsbProtection', 'GNOME USB protection'], - ['xsettings', 'XSettings', 'GNOME XSettings'], diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-power-tests-and-USB-protection.patch b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-disable-power-tests-and-sharing.patch similarity index 75% rename from meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-power-tests-and-USB-protection.patch rename to meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-disable-power-tests-and-sharing.patch index bc99797..41df55a 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-power-tests-and-USB-protection.patch +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-disable-power-tests-and-sharing.patch @@ -1,16 +1,17 @@ diff --git a/plugins/meson.build b/plugins/meson.build -index c8c10db4..4d7d6ebe 100644 +index c8c10db..30c38ab 100644 --- a/plugins/meson.build +++ b/plugins/meson.build -@@ -8,7 +8,6 @@ all_plugins = [ - ['media-keys', 'MediaKeys', 'GNOME keyboard shortcuts'], - ['screensaver-proxy', 'ScreensaverProxy', 'GNOME FreeDesktop screensaver'], - ['sound', 'Sound', 'GNOME sound sample caching'], -- ['usb-protection', 'UsbProtection', 'GNOME USB protection'], - ['xsettings', 'XSettings', 'GNOME XSettings'], - ['smartcard', 'Smartcard', 'GNOME smartcard'], - ['wacom', 'Wacom', 'GNOME Wacom tablet support'], -@@ -32,7 +31,7 @@ if not enable_wacom +@@ -20,6 +20,8 @@ all_plugins = [ + + disabled_plugins = [] + ++disabled_plugins += ['sharing'] ++ + if not enable_smartcard + disabled_plugins += ['smartcard'] + endif +@@ -33,7 +35,7 @@ if not enable_wacom endif if not enable_cups @@ -20,7 +21,7 @@ index c8c10db4..4d7d6ebe 100644 if not enable_rfkill diff --git a/plugins/power/meson.build b/plugins/power/meson.build -index 69e619f2..cd1c88b6 100644 +index 69e619f..cd1c88b 100644 --- a/plugins/power/meson.build +++ b/plugins/power/meson.build @@ -102,49 +102,4 @@ if host_is_linux diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.38.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.38.0.bb index 4d6aac2..324afc2 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.38.0.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.38.0.bb @@ -23,9 +23,8 @@ inherit gnomebase gobject-introspection gettext meson-exe-wrapper WARN_QA_remove = "unknown-configure-option" -SRC_URI += "file://0001-Disable-gsd-sharing-plugin.patch \ - file://0001-Disable-power-tests-and-USB-protection.patch \ - " +SRC_URI += "file://0001-disable-power-tests-and-sharing.patch" + # allow cross build mixed with build of native tools do_write_config_append() { cat >${WORKDIR}/meson.native <