Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/
Date: Mon, 28 Mar 2022 15:17:31
Message-Id: 1648480627.998b2b1d772d35e29e0e9df326df12943af8d94e.mattst88@gentoo
1 commit: 998b2b1d772d35e29e0e9df326df12943af8d94e
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 28 15:14:24 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 28 15:17:07 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998b2b1d
7
8 gnome-base/gnome-shell: Version bump to 41.5
9
10 Closes: https://bugs.gentoo.org/836311
11 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
12
13 gnome-base/gnome-shell/Manifest | 1 +
14 ....5-environment-Require-GnomeBluetooth-1.0.patch | 35 ++++
15 ...1.5-environment-Require-gnome-desktop-3.0.patch | 30 +++
16 .../41.5-environment-Require-libgweather-3.0.patch | 29 +++
17 gnome-base/gnome-shell/gnome-shell-41.5.ebuild | 208 +++++++++++++++++++++
18 5 files changed, 303 insertions(+)
19
20 diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
21 index 9cedbba95216..be1d64fd56a4 100644
22 --- a/gnome-base/gnome-shell/Manifest
23 +++ b/gnome-base/gnome-shell/Manifest
24 @@ -1,2 +1,3 @@
25 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48 SHA512 6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
26 +DIST gnome-shell-41.5.tar.xz 1899888 BLAKE2B 73491f382413c313956fc6ab878a54d8a881190ee93cac5d334d169636d8dd21557c78719142f717c94463e02c7ca4eaf12a6e4ca6167e48a002ece9379b6d03 SHA512 b638103528413dcfa12d65d0c7add45716d21334294babbadd0a05e3410ca068ae336b28c30eb8811222b9f90e5efdf0d1a6e0a2e3f104b49061bb28333f066e
27 DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d SHA512 39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935
28
29 diff --git a/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
30 new file mode 100644
31 index 000000000000..8729a6c3e671
32 --- /dev/null
33 +++ b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
34 @@ -0,0 +1,35 @@
35 +From 9ce6756235ba272b8602d50d1f005dc2ef265889 Mon Sep 17 00:00:00 2001
36 +From: Georges Basile Stavracas Neto <georges.stavracas@×××××.com>
37 +Date: Sun, 31 Oct 2021 17:24:58 -0300
38 +Subject: [PATCH 1/2] environment: Require GnomeBluetooth 1.0
39 +
40 +libgnome-bluetooth will start to offer a 2.0 library version
41 +depending on GTK4. Given that GNOME Shell already depends on
42 +GTK3, it cannot use this next version of gnome-bluetooth. And
43 +since GJS will automatically try and use the latest version
44 +available of any library, Shell must specify it wants 1.0
45 +explicitly.
46 +
47 +Add a required GnomeBluetooth version number when importing it
48 +for the status indicator.
49 +
50 +Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2015>
51 +---
52 + js/ui/environment.js | 1 +
53 + 1 file changed, 1 insertion(+)
54 +
55 +diff --git a/js/ui/environment.js b/js/ui/environment.js
56 +index ef53e6022..e906fa6c6 100644
57 +--- a/js/ui/environment.js
58 ++++ b/js/ui/environment.js
59 +@@ -6,6 +6,7 @@ const Config = imports.misc.config;
60 + imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
61 + imports.gi.versions.Gio = '2.0';
62 + imports.gi.versions.GdkPixbuf = '2.0';
63 ++imports.gi.versions.GnomeBluetooth = '1.0';
64 + imports.gi.versions.Gtk = '3.0';
65 + imports.gi.versions.Soup = '3.0';
66 + imports.gi.versions.TelepathyGLib = '0.12';
67 +--
68 +2.34.1
69 +
70
71 diff --git a/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
72 new file mode 100644
73 index 000000000000..3dbb50bb989b
74 --- /dev/null
75 +++ b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
76 @@ -0,0 +1,30 @@
77 +From 795312b8d5634d3005679b3c1313114e41e538fd Mon Sep 17 00:00:00 2001
78 +From: Georges Basile Stavracas Neto <georges.stavracas@×××××.com>
79 +Date: Thu, 11 Nov 2021 16:20:39 -0300
80 +Subject: [PATCH 2/2] environment: Require gnome-desktop 3.0
81 +
82 +Pretty much the exact same case of 9ce6756235.
83 +
84 +libgnome-desktop saw a major version bump, and we have to
85 +stick with 3.0 for a while.
86 +
87 +Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2030>
88 +---
89 + js/ui/environment.js | 1 +
90 + 1 file changed, 1 insertion(+)
91 +
92 +diff --git a/js/ui/environment.js b/js/ui/environment.js
93 +index e906fa6c6..cb254e319 100644
94 +--- a/js/ui/environment.js
95 ++++ b/js/ui/environment.js
96 +@@ -7,6 +7,7 @@ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
97 + imports.gi.versions.Gio = '2.0';
98 + imports.gi.versions.GdkPixbuf = '2.0';
99 + imports.gi.versions.GnomeBluetooth = '1.0';
100 ++imports.gi.versions.GnomeDesktop = '3.0';
101 + imports.gi.versions.Gtk = '3.0';
102 + imports.gi.versions.Soup = '3.0';
103 + imports.gi.versions.TelepathyGLib = '0.12';
104 +--
105 +2.34.1
106 +
107
108 diff --git a/gnome-base/gnome-shell/files/41.5-environment-Require-libgweather-3.0.patch b/gnome-base/gnome-shell/files/41.5-environment-Require-libgweather-3.0.patch
109 new file mode 100644
110 index 000000000000..dedd485a2627
111 --- /dev/null
112 +++ b/gnome-base/gnome-shell/files/41.5-environment-Require-libgweather-3.0.patch
113 @@ -0,0 +1,29 @@
114 +From f07a40d5eeb1daf6e2d118c548c8314c721d558c Mon Sep 17 00:00:00 2001
115 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@×××××.org>
116 +Date: Wed, 5 Jan 2022 02:42:49 +0100
117 +Subject: [PATCH] environment: Require libgweather 3.0
118 +
119 +GWeather did a major version bump on its main branch, so it is
120 +now possible that multiple versions are installed in parallel,
121 +and we should explicitly pick the one we are using.
122 +
123 +Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2083>
124 +---
125 + js/ui/environment.js | 1 +
126 + 1 file changed, 1 insertion(+)
127 +
128 +diff --git a/js/ui/environment.js b/js/ui/environment.js
129 +index cb254e319..ad2b8e4f2 100644
130 +--- a/js/ui/environment.js
131 ++++ b/js/ui/environment.js
132 +@@ -9,6 +9,7 @@ imports.gi.versions.GdkPixbuf = '2.0';
133 + imports.gi.versions.GnomeBluetooth = '1.0';
134 + imports.gi.versions.GnomeDesktop = '3.0';
135 + imports.gi.versions.Gtk = '3.0';
136 ++imports.gi.versions.GWeather = '3.0';
137 + imports.gi.versions.Soup = '3.0';
138 + imports.gi.versions.TelepathyGLib = '0.12';
139 + imports.gi.versions.TelepathyLogger = '0.2';
140 +--
141 +2.34.1
142 +
143
144 diff --git a/gnome-base/gnome-shell/gnome-shell-41.5.ebuild b/gnome-base/gnome-shell/gnome-shell-41.5.ebuild
145 new file mode 100644
146 index 000000000000..06c3d23b7f72
147 --- /dev/null
148 +++ b/gnome-base/gnome-shell/gnome-shell-41.5.ebuild
149 @@ -0,0 +1,208 @@
150 +# Copyright 1999-2022 Gentoo Authors
151 +# Distributed under the terms of the GNU General Public License v2
152 +
153 +EAPI=7
154 +PYTHON_COMPAT=( python3_{8..10} )
155 +
156 +inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
157 +
158 +DESCRIPTION="Provides core UI functions for the GNOME desktop"
159 +HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
160 +
161 +LICENSE="GPL-2+ LGPL-2+"
162 +SLOT="0"
163 +IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy test"
164 +REQUIRED_USE="${PYTHON_REQUIRED_USE}
165 + ?? ( elogind systemd )"
166 +RESTRICT="!test? ( test )"
167 +
168 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
169 +
170 +# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
171 +# FIXME:
172 +# * gstreamer/pipewire support is currently automagic
173 +DEPEND="
174 + >=gnome-extra/evolution-data-server-3.33.1:=
175 + >=app-crypt/gcr-3.7.5[introspection]
176 + >=dev-libs/glib-2.68:2
177 + >=dev-libs/gobject-introspection-1.49.1:=
178 + >=dev-libs/gjs-1.69.2
179 + >=x11-libs/gtk+-3.15.0:3[introspection]
180 + >=x11-wm/mutter-41.0:0/9[introspection,test?]
181 + >=sys-auth/polkit-0.100[introspection]
182 + >=gnome-base/gsettings-desktop-schemas-41_alpha[introspection]
183 + >=x11-libs/startup-notification-0.11
184 + >=app-i18n/ibus-1.5.19
185 + >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
186 + bluetooth? ( >=net-wireless/gnome-bluetooth-3.9:2=[introspection] )
187 + >=media-libs/gstreamer-0.11.92:1.0
188 + media-libs/gst-plugins-base:1.0
189 + >=media-video/pipewire-0.3.0:=
190 + networkmanager? (
191 + >=net-misc/networkmanager-1.10.4:=[introspection]
192 + net-libs/libnma[introspection]
193 + >=app-crypt/libsecret-0.18
194 + dev-libs/dbus-glib )
195 + systemd? ( >=sys-apps/systemd-242
196 + >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
197 + elogind? ( >=sys-auth/elogind-237 )
198 +
199 + app-arch/gnome-autoar
200 + dev-libs/json-glib
201 +
202 + >=app-accessibility/at-spi2-atk-2.5.3
203 + x11-libs/gdk-pixbuf:2[introspection]
204 + dev-libs/libxml2:2
205 + x11-libs/libX11
206 +
207 + >=media-sound/pulseaudio-2[glib]
208 + >=dev-libs/atk-2[introspection]
209 + dev-libs/libical:=
210 + >=x11-libs/libXfixes-5.0
211 +
212 + gui-libs/gtk:4[introspection]
213 +
214 + ${PYTHON_DEPS}
215 + $(python_gen_cond_dep '
216 + dev-python/pygobject:3[${PYTHON_USEDEP}]
217 + ')
218 + media-libs/mesa[X(+)]
219 +"
220 +# Runtime-only deps are probably incomplete and approximate.
221 +# Introspection deps generated from inspection of the output of:
222 +# for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
223 +# or
224 +# rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
225 +# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
226 +# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
227 +# Each block:
228 +# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
229 +# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
230 +# 3. Control shell settings
231 +# 4. xdg-utils needed for xdg-open, used by extension tool
232 +# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
233 +# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review
234 +# 7. IBus is needed for nls integration
235 +# 8. Optional telepathy chat integration
236 +# 9. 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)
237 +# 10. xdg-desktop-portal-gtk for various integration, e.g. #764632
238 +# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
239 +RDEPEND="${DEPEND}
240 + >=sys-apps/accountsservice-0.6.14[introspection]
241 + app-accessibility/at-spi2-core:2[introspection]
242 + app-misc/geoclue[introspection]
243 + media-libs/graphene[introspection]
244 + >=dev-libs/libgweather-3.26:2[introspection]
245 + x11-libs/pango[introspection]
246 + net-libs/libsoup:2.4[introspection]
247 + >=sys-power/upower-0.99:=[introspection]
248 + gnome-base/librsvg:2[introspection]
249 +
250 + >=gnome-base/gnome-session-2.91.91
251 + >=gnome-base/gnome-settings-daemon-3.8.3
252 +
253 + x11-misc/xdg-utils
254 +
255 + >=x11-themes/adwaita-icon-theme-3.26
256 +
257 + networkmanager? (
258 + net-misc/mobile-broadband-provider-info
259 + sys-libs/timezone-data )
260 + ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
261 + telepathy? (
262 + >=net-im/telepathy-logger-0.2.4[introspection]
263 + >=net-libs/telepathy-glib-0.19[introspection] )
264 + media-fonts/cantarell
265 +
266 + sys-apps/xdg-desktop-portal-gtk
267 +"
268 +# avoid circular dependency, see bug #546134
269 +PDEPEND="
270 + >=gnome-base/gdm-3.5[introspection(+)]
271 + >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
272 + browser-extension? ( gnome-extra/chrome-gnome-shell )
273 +"
274 +BDEPEND="
275 + dev-libs/libxslt
276 + >=dev-util/gdbus-codegen-2.45.3
277 + dev-util/glib-utils
278 + gtk-doc? ( >=dev-util/gtk-doc-1.17
279 + app-text/docbook-xml-dtd:4.5 )
280 + >=sys-devel/gettext-0.19.8
281 + virtual/pkgconfig
282 +"
283 +# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
284 +# dev-lang/sassc
285 +# app-text/asciidoc
286 +
287 +PATCHES=(
288 + # Fix automagic gnome-bluetooth dep, bug #398145
289 + "${FILESDIR}"/40.0-optional-bluetooth.patch
290 + # Change favorites defaults, bug #479918
291 + "${FILESDIR}"/40.0-defaults.patch
292 + "${FILESDIR}"/41.3-fix-build-with-meson-0.61.1.patch
293 +
294 + # From upstream
295 + "${FILESDIR}"/${PV}-environment-Require-GnomeBluetooth-1.0.patch
296 + "${FILESDIR}"/${PV}-environment-Require-gnome-desktop-3.0.patch
297 + "${FILESDIR}"/${PV}-environment-Require-libgweather-3.0.patch
298 +)
299 +
300 +src_prepare() {
301 + xdg_src_prepare
302 + # Hack in correct python shebang
303 + sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
304 +}
305 +
306 +src_configure() {
307 + local emesonargs=(
308 + $(meson_use bluetooth)
309 + -Dextensions_tool=true
310 + -Dextensions_app=true
311 + $(meson_use gtk-doc gtk_doc)
312 + -Dman=true
313 + $(meson_use test tests)
314 + $(meson_use networkmanager)
315 + $(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
316 + # (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
317 + # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
318 + -Dsoup2=true # libslot SLOT needs to match with what libgweather is using
319 + )
320 + meson_src_configure
321 +}
322 +
323 +src_test() {
324 + gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
325 + virtx meson_src_test
326 +}
327 +
328 +pkg_postinst() {
329 + xdg_pkg_postinst
330 + gnome2_schemas_update
331 +
332 + if ! has_version 'media-libs/gst-plugins-good:1.0' || \
333 + ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
334 + ewarn "To make use of GNOME Shell's built-in screen recording utility,"
335 + ewarn "you need to either install media-libs/gst-plugins-good:1.0"
336 + ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
337 + ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
338 + fi
339 +
340 + if ! has_version "media-libs/mesa[llvm]"; then
341 + elog "llvmpipe is used as fallback when no 3D acceleration"
342 + elog "is available. You will need to enable llvm USE for"
343 + elog "media-libs/mesa if you do not have hardware 3D setup."
344 + fi
345 +
346 + # https://bugs.gentoo.org/show_bug.cgi?id=563084
347 + # TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
348 + if has_version "x11-drivers/nvidia-drivers[-kms]"; then
349 + ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
350 + ewarn "otherwise Gnome will fail to start"
351 + fi
352 +}
353 +
354 +pkg_postrm() {
355 + xdg_pkg_postrm
356 + gnome2_schemas_update
357 +}