diff options
author | Mart Raudsepp <leio@gentoo.org> | 2020-03-01 15:01:27 +0200 |
---|---|---|
committer | Mart Raudsepp <leio@gentoo.org> | 2020-03-01 18:17:39 +0200 |
commit | 1f08e2de459342e98fadc04fd21dca40ce319d06 (patch) | |
tree | 0bde403f3701bd200db6d73e1fd44322dcd1b6fe /gnome-base/gnome-shell/files | |
parent | dev-libs/gjs: bump to 1.58.5 (diff) | |
download | gentoo-1f08e2de459342e98fadc04fd21dca40ce319d06.tar.gz gentoo-1f08e2de459342e98fadc04fd21dca40ce319d06.tar.bz2 gentoo-1f08e2de459342e98fadc04fd21dca40ce319d06.zip |
gnome-base/gnome-shell: bump to 3.34.4
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'gnome-base/gnome-shell/files')
-rw-r--r-- | gnome-base/gnome-shell/files/3.34-optional-bluetooth.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/gnome-base/gnome-shell/files/3.34-optional-bluetooth.patch b/gnome-base/gnome-shell/files/3.34-optional-bluetooth.patch new file mode 100644 index 000000000000..01e28192d363 --- /dev/null +++ b/gnome-base/gnome-shell/files/3.34-optional-bluetooth.patch @@ -0,0 +1,59 @@ +From 23b1b1184a3a882febb104652f5ac2e6ffd3fed0 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +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 5a4871762..3c5e02368 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.set('datadir', datadir) + jsconf.set('libexecdir', libexecdir) +diff --git a/meson.build b/meson.build +index 97de19758..77646793f 100644 +--- a/meson.build ++++ b/meson.build +@@ -100,7 +100,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-1.0', version: bt_req, required: false) ++if get_option('bluetooth') ++ bt_dep = dependency('gnome-bluetooth-1.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) + +diff --git a/meson_options.txt b/meson_options.txt +index 2c5539012..8e8d9eee6 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.20.1 + |