commit: b6628fdbdc50807a2519be06bf0e32ffeb05e9a1 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Mon Sep 10 11:22:57 2018 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Mon Sep 10 14:01:30 2018 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b6628fdb
gnome-base/gnome-shell: make bluetooth support optional again Package-Manager: Portage-2.3.49, Repoman-2.3.10 Manifest-Sign-Key: 0x5A56C8CD0C13248A .../gnome-shell/files/3.26-bluetooth-flag.patch | 72 ++++++++++++++++++++++ ...26.2-r1.ebuild => gnome-shell-3.26.2-r2.ebuild} | 11 ++-- 2 files changed, 79 insertions(+), 4 deletions(-) diff --git a/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch b/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch new file mode 100644 index 00000000..65686954 --- /dev/null +++ b/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch @@ -0,0 +1,72 @@ +From 7ca3e1a9d18e6f6154b4479bcd94d420bc69798c Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <[email protected]> +Date: Mon, 10 Sep 2018 13:17:39 +0200 +Subject: [PATCH] Make bluetooth support optional + +https://bugs.gentoo.org/show_bug.cgi?id=398145 +--- + js/misc/meson.build | 2 +- + meson.build | 15 ++++++++++++++- + meson_options.txt | 7 +++++++ + 3 files changed, 22 insertions(+), 2 deletions(-) + +diff --git a/js/misc/meson.build b/js/misc/meson.build +index 20489496c..3071f9dfb 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 b82c41398..7d342ff61 100644 +--- a/meson.build ++++ b/meson.build +@@ -91,7 +91,20 @@ startup_dep = dependency('libstartup-notification-1.0', version: startup_req) + x11_dep = dependency('x11') + schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req) + +-bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false) ++bt_dep = [] ++enable_bluetooth = get_option('enable-networkmanager') ++if enable_bluetooth != 'no' ++ want_bluetooth = enable_bluetooth == 'yes' ++ bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: want_bluetooth) ++ have_bluetooth = bt_dep.found() ++ ++ if not have_bluetooth ++ bt_dep = [] ++ endif ++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 18899ffdb..9191f8c0e 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -16,6 +16,13 @@ option('enable-man', + description: 'Generate man pages' + ) + ++option('enable-bluetooth', ++ type: 'combo', ++ choices: ['yes', 'no', 'auto'], ++ value: 'auto', ++ description: 'Enable bluetooth support' ++) ++ + option('enable-networkmanager', + type: 'combo', + choices: ['yes', 'no', 'auto'], +-- +2.18.0 + diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.2-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r2.ebuild similarity index 97% rename from gnome-base/gnome-shell/gnome-shell-3.26.2-r1.ebuild rename to gnome-base/gnome-shell/gnome-shell-3.26.2-r2.ebuild index 3346d08b..84ff9806 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r1.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.26.2-r2.ebuild @@ -6,7 +6,7 @@ GNOME2_LA_PUNT="yes" GNOME2_EAUTORECONF="yes" PYTHON_COMPAT=( python3_{4,5,6} ) -inherit gnome-meson multilib pax-utils python-r1 systemd +inherit gnome-meson multilib pax-utils python-r1 systemd virtualx DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"; @@ -21,8 +21,6 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" # libXfixes-5.0 needed for pointer barriers # FIXME: # * gstreamer support is currently automagic -# * gnome-bluetooth is automagic -# * BROWSER_PLUGIN_DIR is not set COMMON_DEPEND=" >=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] @@ -121,6 +119,7 @@ PATCHES=( # Change favorites defaults, bug #479918 "${FILESDIR}"/${PN}-3.22.0-defaults.patch # Fix automagic gnome-bluetooth dep, bug #398145 + "${FILESDIR}"/3.26-bluetooth-flag.patch ) src_configure() { @@ -129,7 +128,11 @@ src_configure() { -Denable-documentation=false \ -Denable-systemd=$(usex !openrc-force yes no) \ -Denable-networkmanager=$(usex networkmanager yes no) \ - $(meson_use nsplugin enable-browser-plugin) + $(meson_use nsplugin enable-browser-plugin) +} + +src_test() { + virtx meson_src_test } src_install() {
