commit: dde7e494acd9ae993f0004f5f6d23e6390c9bbb6 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Mon Dec 5 17:33:02 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Mon Dec 5 17:34:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dde7e494
gnome-base/gnome-shell: Restore necessary patch This partially reverts commit 1edcdd52548b5e2b39abbac925d335939fd9168a. Closes: https://bugs.gentoo.org/884475 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> .../files/42.0-optional-bluetooth.patch | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch new file mode 100644 index 000000000000..c7fe07dd69de --- /dev/null +++ b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch @@ -0,0 +1,59 @@ +From d7cfd7bff4f9fa9d8528f72d4275e07551c6b288 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <[email protected]> +Date: Thu, 28 Feb 2019 00:50:19 +0200 +Subject: [PATCH] build: Make bluetooth support optional + +--- + js/misc/meson.build | 2 +- + meson.build | 7 ++++++- + meson_options.txt | 6 ++++++ + 3 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/js/misc/meson.build b/js/misc/meson.build +index 582562711..ec9c62645 100644 +--- a/js/misc/meson.build ++++ b/js/misc/meson.build +@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name()) + jsconf.set('PACKAGE_VERSION', meson.project_version()) + jsconf.set('GETTEXT_PACKAGE', meson.project_name()) + jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version) +-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found()) ++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth) + jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager) + jsconf.set10('HAVE_SOUP2', have_soup2) + jsconf.set('datadir', datadir) +diff --git a/meson.build b/meson.build +index 8d7478f9b..79d340840 100644 +--- a/meson.build ++++ b/meson.build +@@ -93,7 +93,12 @@ x11_dep = dependency('x11') + schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req) + gnome_desktop_dep = dependency('gnome-desktop-3.0', version: gnome_desktop_req) + +-bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req, required: false) ++if get_option('bluetooth') ++ bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req) ++ have_bluetooth = true ++else ++ have_bluetooth = false ++endif + gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false) + gst_base_dep = dependency('gstreamer-base-1.0', required: false) + pipewire_dep = dependency('libpipewire-0.3', required: false) +diff --git a/meson_options.txt b/meson_options.txt +index f0f2ecf6c..85fc58ea4 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,9 @@ ++option('bluetooth', ++ type: 'boolean', ++ value: true, ++ description: 'Enable bluetooth support' ++) ++ + option('extensions_tool', + type: 'boolean', + value: true, +-- +2.34.1 +
