1 |
commit: b6628fdbdc50807a2519be06bf0e32ffeb05e9a1 |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 10 11:22:57 2018 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 10 14:01:30 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b6628fdb |
7 |
|
8 |
gnome-base/gnome-shell: make bluetooth support optional again |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
Manifest-Sign-Key: 0x5A56C8CD0C13248A |
12 |
|
13 |
.../gnome-shell/files/3.26-bluetooth-flag.patch | 72 ++++++++++++++++++++++ |
14 |
...26.2-r1.ebuild => gnome-shell-3.26.2-r2.ebuild} | 11 ++-- |
15 |
2 files changed, 79 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch b/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch |
18 |
new file mode 100644 |
19 |
index 00000000..65686954 |
20 |
--- /dev/null |
21 |
+++ b/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch |
22 |
@@ -0,0 +1,72 @@ |
23 |
+From 7ca3e1a9d18e6f6154b4479bcd94d420bc69798c Mon Sep 17 00:00:00 2001 |
24 |
+From: Gilles Dartiguelongue <eva@g.o> |
25 |
+Date: Mon, 10 Sep 2018 13:17:39 +0200 |
26 |
+Subject: [PATCH] Make bluetooth support optional |
27 |
+ |
28 |
+https://bugs.gentoo.org/show_bug.cgi?id=398145 |
29 |
+--- |
30 |
+ js/misc/meson.build | 2 +- |
31 |
+ meson.build | 15 ++++++++++++++- |
32 |
+ meson_options.txt | 7 +++++++ |
33 |
+ 3 files changed, 22 insertions(+), 2 deletions(-) |
34 |
+ |
35 |
+diff --git a/js/misc/meson.build b/js/misc/meson.build |
36 |
+index 20489496c..3071f9dfb 100644 |
37 |
+--- a/js/misc/meson.build |
38 |
++++ b/js/misc/meson.build |
39 |
+@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name()) |
40 |
+ jsconf.set('PACKAGE_VERSION', meson.project_version()) |
41 |
+ jsconf.set('GETTEXT_PACKAGE', meson.project_name()) |
42 |
+ jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version) |
43 |
+-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found()) |
44 |
++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth) |
45 |
+ jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager) |
46 |
+ jsconf.set('datadir', datadir) |
47 |
+ jsconf.set('libexecdir', libexecdir) |
48 |
+diff --git a/meson.build b/meson.build |
49 |
+index b82c41398..7d342ff61 100644 |
50 |
+--- a/meson.build |
51 |
++++ b/meson.build |
52 |
+@@ -91,7 +91,20 @@ startup_dep = dependency('libstartup-notification-1.0', version: startup_req) |
53 |
+ x11_dep = dependency('x11') |
54 |
+ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req) |
55 |
+ |
56 |
+-bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false) |
57 |
++bt_dep = [] |
58 |
++enable_bluetooth = get_option('enable-networkmanager') |
59 |
++if enable_bluetooth != 'no' |
60 |
++ want_bluetooth = enable_bluetooth == 'yes' |
61 |
++ bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: want_bluetooth) |
62 |
++ have_bluetooth = bt_dep.found() |
63 |
++ |
64 |
++ if not have_bluetooth |
65 |
++ bt_dep = [] |
66 |
++ endif |
67 |
++else |
68 |
++ have_bluetooth = false |
69 |
++endif |
70 |
++ |
71 |
+ gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false) |
72 |
+ gst_base_dep = dependency('gstreamer-base-1.0', required: false) |
73 |
+ |
74 |
+diff --git a/meson_options.txt b/meson_options.txt |
75 |
+index 18899ffdb..9191f8c0e 100644 |
76 |
+--- a/meson_options.txt |
77 |
++++ b/meson_options.txt |
78 |
+@@ -16,6 +16,13 @@ option('enable-man', |
79 |
+ description: 'Generate man pages' |
80 |
+ ) |
81 |
+ |
82 |
++option('enable-bluetooth', |
83 |
++ type: 'combo', |
84 |
++ choices: ['yes', 'no', 'auto'], |
85 |
++ value: 'auto', |
86 |
++ description: 'Enable bluetooth support' |
87 |
++) |
88 |
++ |
89 |
+ option('enable-networkmanager', |
90 |
+ type: 'combo', |
91 |
+ choices: ['yes', 'no', 'auto'], |
92 |
+-- |
93 |
+2.18.0 |
94 |
+ |
95 |
|
96 |
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 |
97 |
similarity index 97% |
98 |
rename from gnome-base/gnome-shell/gnome-shell-3.26.2-r1.ebuild |
99 |
rename to gnome-base/gnome-shell/gnome-shell-3.26.2-r2.ebuild |
100 |
index 3346d08b..84ff9806 100644 |
101 |
--- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r1.ebuild |
102 |
+++ b/gnome-base/gnome-shell/gnome-shell-3.26.2-r2.ebuild |
103 |
@@ -6,7 +6,7 @@ GNOME2_LA_PUNT="yes" |
104 |
GNOME2_EAUTORECONF="yes" |
105 |
PYTHON_COMPAT=( python3_{4,5,6} ) |
106 |
|
107 |
-inherit gnome-meson multilib pax-utils python-r1 systemd |
108 |
+inherit gnome-meson multilib pax-utils python-r1 systemd virtualx |
109 |
|
110 |
DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" |
111 |
HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell" |
112 |
@@ -21,8 +21,6 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" |
113 |
# libXfixes-5.0 needed for pointer barriers |
114 |
# FIXME: |
115 |
# * gstreamer support is currently automagic |
116 |
-# * gnome-bluetooth is automagic |
117 |
-# * BROWSER_PLUGIN_DIR is not set |
118 |
COMMON_DEPEND=" |
119 |
>=app-accessibility/at-spi2-atk-2.5.3 |
120 |
>=dev-libs/atk-2[introspection] |
121 |
@@ -121,6 +119,7 @@ PATCHES=( |
122 |
# Change favorites defaults, bug #479918 |
123 |
"${FILESDIR}"/${PN}-3.22.0-defaults.patch |
124 |
# Fix automagic gnome-bluetooth dep, bug #398145 |
125 |
+ "${FILESDIR}"/3.26-bluetooth-flag.patch |
126 |
) |
127 |
|
128 |
src_configure() { |
129 |
@@ -129,7 +128,11 @@ src_configure() { |
130 |
-Denable-documentation=false \ |
131 |
-Denable-systemd=$(usex !openrc-force yes no) \ |
132 |
-Denable-networkmanager=$(usex networkmanager yes no) \ |
133 |
- $(meson_use nsplugin enable-browser-plugin) |
134 |
+ $(meson_use nsplugin enable-browser-plugin) |
135 |
+} |
136 |
+ |
137 |
+src_test() { |
138 |
+ virtx meson_src_test |
139 |
} |
140 |
|
141 |
src_install() { |