1 |
commit: be15a38f86d63f4e03f8a182aa78732563e70b9a |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 6 21:06:57 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 6 21:44:43 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be15a38f |
7 |
|
8 |
gnome-base/gnome-shell: bump to 3.32.2 |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.12 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
gnome-base/gnome-shell/Manifest | 2 + |
14 |
.../files/3.32-optional-bluetooth.patch | 59 +++++++ |
15 |
gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild | 186 +++++++++++++++++++++ |
16 |
3 files changed, 247 insertions(+) |
17 |
|
18 |
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest |
19 |
index 5e960bacb1a..8382daefe5c 100644 |
20 |
--- a/gnome-base/gnome-shell/Manifest |
21 |
+++ b/gnome-base/gnome-shell/Manifest |
22 |
@@ -2,3 +2,5 @@ DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 745b8549f7480b004f4df9b815 |
23 |
DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14 SHA512 0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a |
24 |
DIST gnome-shell-3.30.2-r2-patchset.tar.xz 41852 BLAKE2B f854a42b0ba0be8019487edfc1a0e73d11d406537ffe288d1a5d81e9a512b8fb02e6af466fbe4d0d0e8644aa6f57cad1d381b5e873223749c88d1dccdae72b9e SHA512 c0c935206048c961e70f319b67133dcf0f5253c2283aefd6283db910950f8cd645888f6a6b7bbbfc620a023e0b5ae85394e5f5ce0fb2ff120b18ab7640f9859e |
25 |
DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877 SHA512 5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6 |
26 |
+DIST gnome-shell-3.32.2-patchset.tar.xz 23540 BLAKE2B 363989a630faa7538ccbf9765a1ccc5995fb4584b00a603ef11e48fee970a6d9791ed1fa92e2344e56cd8c282c9a22779cb8e50e7ec6637e0efda1ccc36579a4 SHA512 e854ba9fd864101009528d94cb310be10495db225380c353b76cd61b082a88f1f89035a0708cd386d1738001cf9949b4a8b8b8d7b1d2675068e01fecb35738c7 |
27 |
+DIST gnome-shell-3.32.2.tar.xz 1454372 BLAKE2B 9da7e17d4e47e187fa2285c6cf942cc8dc955e388179d2ad1fe8036c2908e217fc47d8b1515fc3cf6973e2083de8c350b55912782b9adbcf1b6cc37c7a3a9ae2 SHA512 7d8b25aa75149f096033a8b44d7f6f8d17ddadfcd8f5bb1915652423fe9d9db14902e674508f16fe5c6e7cbe956cde8349ec779c24c46f32b0a346755876bc46 |
28 |
|
29 |
diff --git a/gnome-base/gnome-shell/files/3.32-optional-bluetooth.patch b/gnome-base/gnome-shell/files/3.32-optional-bluetooth.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..c7637046c01 |
32 |
--- /dev/null |
33 |
+++ b/gnome-base/gnome-shell/files/3.32-optional-bluetooth.patch |
34 |
@@ -0,0 +1,59 @@ |
35 |
+From 77518c23dd1ce3d000d5667b4d903af095939f7c Mon Sep 17 00:00:00 2001 |
36 |
+From: Mart Raudsepp <leio@g.o> |
37 |
+Date: Thu, 28 Feb 2019 00:50:19 +0200 |
38 |
+Subject: [PATCH] build: Make bluetooth support optional |
39 |
+ |
40 |
+--- |
41 |
+ js/misc/meson.build | 2 +- |
42 |
+ meson.build | 7 ++++++- |
43 |
+ meson_options.txt | 6 ++++++ |
44 |
+ 3 files changed, 13 insertions(+), 2 deletions(-) |
45 |
+ |
46 |
+diff --git a/js/misc/meson.build b/js/misc/meson.build |
47 |
+index 5a4871762..3c5e02368 100644 |
48 |
+--- a/js/misc/meson.build |
49 |
++++ b/js/misc/meson.build |
50 |
+@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name()) |
51 |
+ jsconf.set('PACKAGE_VERSION', meson.project_version()) |
52 |
+ jsconf.set('GETTEXT_PACKAGE', meson.project_name()) |
53 |
+ jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version) |
54 |
+-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found()) |
55 |
++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth) |
56 |
+ jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager) |
57 |
+ jsconf.set('datadir', datadir) |
58 |
+ jsconf.set('libexecdir', libexecdir) |
59 |
+diff --git a/meson.build b/meson.build |
60 |
+index 21a80bcc8..c76afaa9c 100644 |
61 |
+--- a/meson.build |
62 |
++++ b/meson.build |
63 |
+@@ -95,7 +95,12 @@ ibus_dep = dependency('ibus-1.0', version: ibus_req) |
64 |
+ x11_dep = dependency('x11') |
65 |
+ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req) |
66 |
+ |
67 |
+-bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false) |
68 |
++if get_option('bluetooth') |
69 |
++ bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req) |
70 |
++ have_bluetooth = true |
71 |
++else |
72 |
++ have_bluetooth = false |
73 |
++endif |
74 |
+ gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false) |
75 |
+ gst_base_dep = dependency('gstreamer-base-1.0', required: false) |
76 |
+ |
77 |
+diff --git a/meson_options.txt b/meson_options.txt |
78 |
+index 853ca98dc..33f76379b 100644 |
79 |
+--- a/meson_options.txt |
80 |
++++ b/meson_options.txt |
81 |
+@@ -1,3 +1,9 @@ |
82 |
++option('bluetooth', |
83 |
++ type: 'boolean', |
84 |
++ value: true, |
85 |
++ description: 'Enable bluetooth support' |
86 |
++) |
87 |
++ |
88 |
+ option('gtk_doc', |
89 |
+ type: 'boolean', |
90 |
+ value: false, |
91 |
+-- |
92 |
+2.20.1 |
93 |
+ |
94 |
|
95 |
diff --git a/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild |
96 |
new file mode 100644 |
97 |
index 00000000000..52c198b7fd6 |
98 |
--- /dev/null |
99 |
+++ b/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild |
100 |
@@ -0,0 +1,186 @@ |
101 |
+# Copyright 1999-2019 Gentoo Authors |
102 |
+# Distributed under the terms of the GNU General Public License v2 |
103 |
+ |
104 |
+EAPI=7 |
105 |
+PYTHON_COMPAT=( python3_{5,6,7} ) |
106 |
+ |
107 |
+inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg |
108 |
+ |
109 |
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" |
110 |
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell" |
111 |
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz" |
112 |
+ |
113 |
+LICENSE="GPL-2+ LGPL-2+" |
114 |
+SLOT="0" |
115 |
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy" |
116 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
117 |
+ ?? ( elogind systemd )" |
118 |
+ |
119 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
120 |
+ |
121 |
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h> |
122 |
+# FIXME: |
123 |
+# * gstreamer support is currently automagic |
124 |
+DEPEND=" |
125 |
+ >=dev-libs/libcroco-0.6.8:0.6 |
126 |
+ >=gnome-extra/evolution-data-server-3.17.2:= |
127 |
+ >=app-crypt/gcr-3.7.5[introspection] |
128 |
+ >=gnome-base/gnome-desktop-3.7.90:3=[introspection] |
129 |
+ >=dev-libs/glib-2.57.2:2 |
130 |
+ >=dev-libs/gobject-introspection-1.49.1:= |
131 |
+ >=dev-libs/gjs-1.54.0 |
132 |
+ >=x11-libs/gtk+-3.15.0:3[introspection] |
133 |
+ >=x11-wm/mutter-3.32.0:0/4[introspection] |
134 |
+ >=sys-auth/polkit-0.100[introspection] |
135 |
+ >=gnome-base/gsettings-desktop-schemas-3.27.90 |
136 |
+ >=x11-libs/startup-notification-0.11 |
137 |
+ >=app-i18n/ibus-1.5.2 |
138 |
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) |
139 |
+ >=media-libs/gstreamer-0.11.92:1.0 |
140 |
+ media-libs/gst-plugins-base:1.0 |
141 |
+ networkmanager? ( |
142 |
+ >=net-misc/networkmanager-1.10.4:=[introspection] |
143 |
+ >=app-crypt/libsecret-0.18 |
144 |
+ dev-libs/dbus-glib ) |
145 |
+ systemd? ( >=sys-apps/systemd-31 ) |
146 |
+ elogind? ( >=sys-auth/elogind-237 ) |
147 |
+ |
148 |
+ >=app-accessibility/at-spi2-atk-2.5.3 |
149 |
+ x11-libs/gdk-pixbuf:2[introspection] |
150 |
+ dev-libs/libxml2:2 |
151 |
+ x11-libs/libX11 |
152 |
+ |
153 |
+ >=media-sound/pulseaudio-2[glib] |
154 |
+ >=dev-libs/atk-2[introspection] |
155 |
+ dev-libs/libical:= |
156 |
+ >=x11-libs/libXfixes-5.0 |
157 |
+ |
158 |
+ ${PYTHON_DEPS} |
159 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
160 |
+ media-libs/mesa[X(+)] |
161 |
+" |
162 |
+# Runtime-only deps are probably incomplete and approximate. |
163 |
+# Introspection deps generated using: |
164 |
+# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq |
165 |
+# Each block: |
166 |
+# 1. Introspection stuff needed via imports.gi.* |
167 |
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc |
168 |
+# 3. Control shell settings |
169 |
+# 4. logind interface needed for suspending support |
170 |
+# 5. xdg-utils needed for xdg-open, used by extension tool |
171 |
+# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+) |
172 |
+# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review |
173 |
+# 8. IBus is needed for nls integration |
174 |
+# 9. Optional telepathy chat integration |
175 |
+# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too) |
176 |
+# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper |
177 |
+RDEPEND="${DEPEND} |
178 |
+ >=sys-apps/accountsservice-0.6.14[introspection] |
179 |
+ app-accessibility/at-spi2-core:2[introspection] |
180 |
+ app-misc/geoclue[introspection] |
181 |
+ >=dev-libs/libgweather-3.26:2[introspection] |
182 |
+ >=sys-power/upower-0.99:=[introspection] |
183 |
+ x11-libs/pango[introspection] |
184 |
+ gnome-base/librsvg:2[introspection] |
185 |
+ |
186 |
+ >=gnome-base/gnome-session-2.91.91 |
187 |
+ >=gnome-base/gnome-settings-daemon-3.8.3 |
188 |
+ |
189 |
+ x11-misc/xdg-utils |
190 |
+ |
191 |
+ >=x11-themes/adwaita-icon-theme-3.26 |
192 |
+ |
193 |
+ networkmanager? ( |
194 |
+ net-misc/mobile-broadband-provider-info |
195 |
+ sys-libs/timezone-data ) |
196 |
+ ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) |
197 |
+ telepathy? ( |
198 |
+ >=net-im/telepathy-logger-0.2.4[introspection] |
199 |
+ >=net-libs/telepathy-glib-0.19[introspection] ) |
200 |
+ media-fonts/cantarell |
201 |
+" |
202 |
+# avoid circular dependency, see bug #546134 |
203 |
+PDEPEND=" |
204 |
+ >=gnome-base/gdm-3.5[introspection] |
205 |
+ >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] |
206 |
+ browser-extension? ( gnome-extra/chrome-gnome-shell ) |
207 |
+" |
208 |
+BDEPEND=" |
209 |
+ dev-lang/sassc |
210 |
+ dev-libs/libxslt |
211 |
+ >=dev-util/gdbus-codegen-2.45.3 |
212 |
+ dev-util/glib-utils |
213 |
+ gtk-doc? ( >=dev-util/gtk-doc-1.17 |
214 |
+ app-text/docbook-xml-dtd:4.3 ) |
215 |
+ >=sys-devel/gettext-0.19.8 |
216 |
+ virtual/pkgconfig |
217 |
+" |
218 |
+ |
219 |
+PATCHES=( |
220 |
+ # Patches from gnome-3-32 branch on top of 3.32.2 |
221 |
+ "${WORKDIR}"/patches/ |
222 |
+ # Fix automagic gnome-bluetooth dep, bug #398145 |
223 |
+ "${FILESDIR}"/3.32-optional-bluetooth.patch |
224 |
+ # Change favorites defaults, bug #479918 |
225 |
+ "${FILESDIR}"/3.28.3-defaults.patch |
226 |
+) |
227 |
+ |
228 |
+src_prepare() { |
229 |
+ xdg_src_prepare |
230 |
+ # Hack in correct python shebang |
231 |
+ sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die |
232 |
+} |
233 |
+ |
234 |
+src_configure() { |
235 |
+ local emesonargs=( |
236 |
+ $(meson_use bluetooth) |
237 |
+ $(meson_use gtk-doc gtk_doc) |
238 |
+ -Dman=true |
239 |
+ $(meson_use networkmanager) |
240 |
+ $(meson_use systemd) # this controls journald integration only as of 3.26.2 (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session) |
241 |
+ # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary |
242 |
+ ) |
243 |
+ meson_src_configure |
244 |
+} |
245 |
+ |
246 |
+src_install() { |
247 |
+ meson_src_install |
248 |
+ |
249 |
+ # Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant? |
250 |
+ pax-mark m "${ED}/usr/bin/gnome-shell"{,-extension-prefs} |
251 |
+} |
252 |
+ |
253 |
+src_test() { |
254 |
+ virtx meson_src_test |
255 |
+} |
256 |
+ |
257 |
+pkg_postinst() { |
258 |
+ xdg_pkg_postinst |
259 |
+ gnome2_schemas_update |
260 |
+ |
261 |
+ if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
262 |
+ ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
263 |
+ ewarn "To make use of GNOME Shell's built-in screen recording utility," |
264 |
+ ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
265 |
+ ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
266 |
+ ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." |
267 |
+ fi |
268 |
+ |
269 |
+ if ! has_version "media-libs/mesa[llvm]"; then |
270 |
+ elog "llvmpipe is used as fallback when no 3D acceleration" |
271 |
+ elog "is available. You will need to enable llvm USE for" |
272 |
+ elog "media-libs/mesa if you do not have hardware 3D setup." |
273 |
+ fi |
274 |
+ |
275 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=563084 |
276 |
+ # TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)? |
277 |
+ if has_version "x11-drivers/nvidia-drivers[-kms]"; then |
278 |
+ ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," |
279 |
+ ewarn "otherwise Gnome will fail to start" |
280 |
+ fi |
281 |
+} |
282 |
+ |
283 |
+pkg_postrm() { |
284 |
+ xdg_pkg_postrm |
285 |
+ gnome2_schemas_update |
286 |
+} |