1 |
commit: 1f08e2de459342e98fadc04fd21dca40ce319d06 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 1 13:01:27 2020 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 1 16:17:39 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f08e2de |
7 |
|
8 |
gnome-base/gnome-shell: bump to 3.34.4 |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
gnome-base/gnome-shell/Manifest | 2 + |
14 |
.../files/3.34-optional-bluetooth.patch | 59 +++++++ |
15 |
gnome-base/gnome-shell/gnome-shell-3.34.4.ebuild | 194 +++++++++++++++++++++ |
16 |
3 files changed, 255 insertions(+) |
17 |
|
18 |
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest |
19 |
index e16d526404a..6200e4fd2fb 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.32.2-patchset.tar.xz 23540 BLAKE2B 363989a630faa7538ccbf9765a1ccc5995fb4584b00a603ef11e48fee970a6d9791ed1fa92e2344e56cd8c282c9a22779cb8e50e7ec6637e0efda1ccc36579a4 SHA512 e854ba9fd864101009528d94cb310be10495db225380c353b76cd61b082a88f1f89035a0708cd386d1738001cf9949b4a8b8b8d7b1d2675068e01fecb35738c7 |
25 |
DIST gnome-shell-3.32.2.tar.xz 1454372 BLAKE2B 9da7e17d4e47e187fa2285c6cf942cc8dc955e388179d2ad1fe8036c2908e217fc47d8b1515fc3cf6973e2083de8c350b55912782b9adbcf1b6cc37c7a3a9ae2 SHA512 7d8b25aa75149f096033a8b44d7f6f8d17ddadfcd8f5bb1915652423fe9d9db14902e674508f16fe5c6e7cbe956cde8349ec779c24c46f32b0a346755876bc46 |
26 |
+DIST gnome-shell-3.34.4-patchset.tar.xz 3284 BLAKE2B c161f4422c8964b61ec0d5bc3267c1c9c69e632767ab5f0fde232c6055e34d1f1c8e4d1f92e3a636f67d08452061512ebc9cfec003a9e4e250f7f213203df0a1 SHA512 d8147d59a379eea5d90c441dd4ed8599243477e6325a579c5c10e825d68c21bf92b95c6f1b414d66bea8c2a7c3b181cf848fb6a79f9f06c713471c75543bae55 |
27 |
+DIST gnome-shell-3.34.4.tar.xz 1545568 BLAKE2B a197235ece72e047d2c22b38aa20a4935c78d88b88fc66f881e788ee3659d89318632d2bbb2fc61448d13633d2a3c0b63e9ce5d1f8060aa5f4d63c2a986fce79 SHA512 17832780bcd91f9aedfd642881f4b17f52fe6844e7cc144a6ecac4e3e13ff889779ef24cf52e7f58e61bffc3fa3a3ef75d23c92ed3833ad42d00c49382284b89 |
28 |
|
29 |
diff --git a/gnome-base/gnome-shell/files/3.34-optional-bluetooth.patch b/gnome-base/gnome-shell/files/3.34-optional-bluetooth.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..01e28192d36 |
32 |
--- /dev/null |
33 |
+++ b/gnome-base/gnome-shell/files/3.34-optional-bluetooth.patch |
34 |
@@ -0,0 +1,59 @@ |
35 |
+From 23b1b1184a3a882febb104652f5ac2e6ffd3fed0 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 97de19758..77646793f 100644 |
61 |
+--- a/meson.build |
62 |
++++ b/meson.build |
63 |
+@@ -100,7 +100,12 @@ x11_dep = dependency('x11') |
64 |
+ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req) |
65 |
+ gnome_desktop_dep = dependency('gnome-desktop-3.0', version: gnome_desktop_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 2c5539012..8e8d9eee6 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('extensions_tool', |
89 |
+ type: 'boolean', |
90 |
+ value: true, |
91 |
+-- |
92 |
+2.20.1 |
93 |
+ |
94 |
|
95 |
diff --git a/gnome-base/gnome-shell/gnome-shell-3.34.4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.34.4.ebuild |
96 |
new file mode 100644 |
97 |
index 00000000000..556c9a167ed |
98 |
--- /dev/null |
99 |
+++ b/gnome-base/gnome-shell/gnome-shell-3.34.4.ebuild |
100 |
@@ -0,0 +1,194 @@ |
101 |
+# Copyright 1999-2020 Gentoo Authors |
102 |
+# Distributed under the terms of the GNU General Public License v2 |
103 |
+ |
104 |
+EAPI=7 |
105 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
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/${P}-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.33.1:= |
127 |
+ >=app-crypt/gcr-3.7.5[introspection] |
128 |
+ >=dev-libs/glib-2.57.2:2 |
129 |
+ >=dev-libs/gobject-introspection-1.49.1:= |
130 |
+ >=dev-libs/gjs-1.57.3 |
131 |
+ >=x11-libs/gtk+-3.15.0:3[introspection] |
132 |
+ >=x11-wm/mutter-3.34.0:0/5[introspection] |
133 |
+ >=sys-auth/polkit-0.100[introspection] |
134 |
+ >=gnome-base/gsettings-desktop-schemas-3.33.1 |
135 |
+ >=x11-libs/startup-notification-0.11 |
136 |
+ >=app-i18n/ibus-1.5.2 |
137 |
+ >=gnome-base/gnome-desktop-3.32:3=[introspection] |
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 |
+ >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) |
147 |
+ elogind? ( >=sys-auth/elogind-237 ) |
148 |
+ app-arch/gnome-autoar |
149 |
+ dev-libs/json-glib |
150 |
+ |
151 |
+ >=app-accessibility/at-spi2-atk-2.5.3 |
152 |
+ x11-libs/gdk-pixbuf:2[introspection] |
153 |
+ dev-libs/libxml2:2 |
154 |
+ x11-libs/libX11 |
155 |
+ |
156 |
+ >=media-sound/pulseaudio-2[glib] |
157 |
+ >=dev-libs/atk-2[introspection] |
158 |
+ dev-libs/libical:= |
159 |
+ >=x11-libs/libXfixes-5.0 |
160 |
+ |
161 |
+ ${PYTHON_DEPS} |
162 |
+ $(python_gen_cond_dep ' |
163 |
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] |
164 |
+ ') |
165 |
+ media-libs/mesa[X(+)] |
166 |
+" |
167 |
+# Runtime-only deps are probably incomplete and approximate. |
168 |
+# Introspection deps generated using: |
169 |
+# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq |
170 |
+# Each block: |
171 |
+# 1. Introspection stuff needed via imports.gi.* |
172 |
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc |
173 |
+# 3. Control shell settings |
174 |
+# 4. logind interface needed for suspending support |
175 |
+# 5. xdg-utils needed for xdg-open, used by extension tool |
176 |
+# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+) |
177 |
+# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review |
178 |
+# 8. IBus is needed for nls integration |
179 |
+# 9. Optional telepathy chat integration |
180 |
+# 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) |
181 |
+# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper |
182 |
+RDEPEND="${DEPEND} |
183 |
+ >=sys-apps/accountsservice-0.6.14[introspection] |
184 |
+ app-accessibility/at-spi2-core:2[introspection] |
185 |
+ app-misc/geoclue[introspection] |
186 |
+ >=dev-libs/libgweather-3.26:2[introspection] |
187 |
+ >=sys-power/upower-0.99:=[introspection] |
188 |
+ x11-libs/pango[introspection] |
189 |
+ gnome-base/librsvg:2[introspection] |
190 |
+ |
191 |
+ >=gnome-base/gnome-session-2.91.91 |
192 |
+ >=gnome-base/gnome-settings-daemon-3.8.3 |
193 |
+ |
194 |
+ x11-misc/xdg-utils |
195 |
+ |
196 |
+ >=x11-themes/adwaita-icon-theme-3.26 |
197 |
+ |
198 |
+ networkmanager? ( |
199 |
+ net-misc/mobile-broadband-provider-info |
200 |
+ sys-libs/timezone-data ) |
201 |
+ ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) |
202 |
+ telepathy? ( |
203 |
+ >=net-im/telepathy-logger-0.2.4[introspection] |
204 |
+ >=net-libs/telepathy-glib-0.19[introspection] ) |
205 |
+ media-fonts/cantarell |
206 |
+" |
207 |
+# avoid circular dependency, see bug #546134 |
208 |
+PDEPEND=" |
209 |
+ >=gnome-base/gdm-3.5[introspection] |
210 |
+ >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] |
211 |
+ browser-extension? ( gnome-extra/chrome-gnome-shell ) |
212 |
+" |
213 |
+BDEPEND=" |
214 |
+ dev-lang/sassc |
215 |
+ dev-libs/libxslt |
216 |
+ app-text/asciidoc |
217 |
+ >=dev-util/gdbus-codegen-2.45.3 |
218 |
+ dev-util/glib-utils |
219 |
+ gtk-doc? ( >=dev-util/gtk-doc-1.17 |
220 |
+ app-text/docbook-xml-dtd:4.3 ) |
221 |
+ >=sys-devel/gettext-0.19.8 |
222 |
+ virtual/pkgconfig |
223 |
+" |
224 |
+ |
225 |
+PATCHES=( |
226 |
+ # Patches from gnome-3-34 branch on top of 3.34.4 |
227 |
+ "${WORKDIR}"/patches/ |
228 |
+ # Fix automagic gnome-bluetooth dep, bug #398145 |
229 |
+ "${FILESDIR}"/3.34-optional-bluetooth.patch |
230 |
+ # Change favorites defaults, bug #479918 |
231 |
+ "${FILESDIR}"/3.28.3-defaults.patch |
232 |
+) |
233 |
+ |
234 |
+src_prepare() { |
235 |
+ xdg_src_prepare |
236 |
+ # Hack in correct python shebang |
237 |
+ sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die |
238 |
+} |
239 |
+ |
240 |
+src_configure() { |
241 |
+ local emesonargs=( |
242 |
+ $(meson_use bluetooth) |
243 |
+ -Dextensions_tool=true |
244 |
+ $(meson_use gtk-doc gtk_doc) |
245 |
+ -Dman=true |
246 |
+ $(meson_use networkmanager) |
247 |
+ $(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4 |
248 |
+ # (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session) |
249 |
+ # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary |
250 |
+ ) |
251 |
+ meson_src_configure |
252 |
+} |
253 |
+ |
254 |
+src_install() { |
255 |
+ meson_src_install |
256 |
+ |
257 |
+ # Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant? |
258 |
+ pax-mark m "${ED}/usr/bin/gnome-shell"{,-extension-prefs} |
259 |
+} |
260 |
+ |
261 |
+src_test() { |
262 |
+ virtx meson_src_test |
263 |
+} |
264 |
+ |
265 |
+pkg_postinst() { |
266 |
+ xdg_pkg_postinst |
267 |
+ gnome2_schemas_update |
268 |
+ |
269 |
+ if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
270 |
+ ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
271 |
+ ewarn "To make use of GNOME Shell's built-in screen recording utility," |
272 |
+ ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
273 |
+ ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
274 |
+ ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." |
275 |
+ fi |
276 |
+ |
277 |
+ if ! has_version "media-libs/mesa[llvm]"; then |
278 |
+ elog "llvmpipe is used as fallback when no 3D acceleration" |
279 |
+ elog "is available. You will need to enable llvm USE for" |
280 |
+ elog "media-libs/mesa if you do not have hardware 3D setup." |
281 |
+ fi |
282 |
+ |
283 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=563084 |
284 |
+ # TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)? |
285 |
+ if has_version "x11-drivers/nvidia-drivers[-kms]"; then |
286 |
+ ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," |
287 |
+ ewarn "otherwise Gnome will fail to start" |
288 |
+ fi |
289 |
+} |
290 |
+ |
291 |
+pkg_postrm() { |
292 |
+ xdg_pkg_postrm |
293 |
+ gnome2_schemas_update |
294 |
+} |