From 6ac40da990d5859036742824e7c411f002330aa1 Mon Sep 17 00:00:00 2001 From: David McKinney Date: Tue, 7 May 2019 09:20:02 -0400 Subject: [PATCH] Disable gsd-sharing plugin --- ....SettingsDaemon.Sharing-from-require.patch | 19 +++++++++++++++++ .../gnome-session/gnome-session_3.31.4.bb | 1 + .../0001-Disable-gsd-sharing-plugin.patch | 21 +++++++++++++++++++ .../gnome-settings-daemon_3.32.0.bb | 4 +++- 4 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Remove-org.gnome.SettingsDaemon.Sharing-from-require.patch create mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-gsd-sharing-plugin.patch diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Remove-org.gnome.SettingsDaemon.Sharing-from-require.patch b/meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Remove-org.gnome.SettingsDaemon.Sharing-from-require.patch new file mode 100644 index 0000000..c1b92eb --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Remove-org.gnome.SettingsDaemon.Sharing-from-require.patch @@ -0,0 +1,19 @@ +From 09fda1a494cb77820269a7419d0185af16612579 Mon Sep 17 00:00:00 2001 +From: David McKinney +Date: Wed, 24 Apr 2019 18:50:35 +0000 +Subject: [PATCH] Remove org.gnome.SettingsDaemon.Sharing from required session + components + +--- + 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 86570c4..62b0615 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.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;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.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;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-gnome/recipes-gnome/gnome-session/gnome-session_3.31.4.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.31.4.bb index d18baa6..fd9d3a8 100644 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.31.4.bb +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.31.4.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase meson +SRC_URI += " file://0001-Remove-org.gnome.SettingsDaemon.Sharing-from-require.patch" SRC_URI[archive.md5sum] = "f2d548a79732f0db9f6148de908c68ce" SRC_URI[archive.sha256sum] = "5279776b9f8b74e348507fedb062ef303172fbb1f3a16979a8cb9321c396878e" 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 new file mode 100644 index 0000000..7309e57 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-gsd-sharing-plugin.patch @@ -0,0 +1,21 @@ +From d7bc4ecd5731378dea34a1ea9c7f8819a9a3cd12 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 3db69da..f35ce03 100644 +--- a/plugins/meson.build ++++ b/plugins/meson.build +@@ -10,7 +10,6 @@ enabled_plugins = [ + ['media-keys', 'MediaKeys'], + ['mouse', 'Mouse'], + ['screensaver-proxy', 'ScreensaverProxy'], +- ['sharing', 'Sharing'], + ['sound', 'Sound'], + ['xsettings', 'XSettings'] + ] diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.32.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.32.0.bb index c212ac9..98b939a 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.32.0.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.32.0.bb @@ -20,6 +20,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gettext meson-exe-wrapper -SRC_URI += " file://0001-don-t-run-power-module-tests.patch" +SRC_URI += " file://0001-Disable-gsd-sharing-plugin.patch \ + file://0001-don-t-run-power-module-tests.patch" + EXTRA_OEMESON += "--buildtype=release -Dcups=false -Dsmartcard=false"