mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 21:17:37 -08:00
gnome-base/gnome-shell: Add 48.6, backport fix for crash with -X on rdepend
gnome-session crashes gnome-shell when either it or mutter (or both) are built with USE="-X" gnome-session uses Mutter's XSMP integration to know when gnome-shell is done starting up. No more XSMP = no more notification = gnome-session decides that gnome-shell is dead even though it's not = fail whale Closes: https://bugs.gentoo.org/959295 Signed-off-by: zyxhere💭 <zyx@envs.net> Part-of: https://github.com/gentoo/gentoo/pull/44493 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
zyxhere💭
Sam James
parent
91c1882ecd
commit
c1afb398e5
@ -3,3 +3,4 @@ DIST gnome-shell-47.8.tar.xz 2142660 BLAKE2B 7166e34e32d4e78e3c701a7dda7128a6be0
|
|||||||
DIST gnome-shell-47.9.tar.xz 2143100 BLAKE2B cd570a539906913360c1724e726f19794aae9e10072ca74a579d90b5ddd9d799a9a7fcc5cad264414f57b0912eb91087a0e59324bf4dee4d876b3fedf371ddf4 SHA512 b97aa93a332b37f2f5c5a9a2aa2f66cb25a63d518bf023932f12d581f84e7259fa22577ab7da0e8d7517bbd0b6bb40a85a21c8d83b6a22d435c0d32894b77c2f
|
DIST gnome-shell-47.9.tar.xz 2143100 BLAKE2B cd570a539906913360c1724e726f19794aae9e10072ca74a579d90b5ddd9d799a9a7fcc5cad264414f57b0912eb91087a0e59324bf4dee4d876b3fedf371ddf4 SHA512 b97aa93a332b37f2f5c5a9a2aa2f66cb25a63d518bf023932f12d581f84e7259fa22577ab7da0e8d7517bbd0b6bb40a85a21c8d83b6a22d435c0d32894b77c2f
|
||||||
DIST gnome-shell-48.4.tar.xz 2234384 BLAKE2B 14649d43172e9437bad2361c8e724753cdaff72ee10b28f80ba4137e6b0d36fccd1c2ccdba40ce465b1253a44e35b527f2b058083ddb655ce1d60511d61c386e SHA512 ebdf620795b97fe4a5220fd42dc1cf33934757da8a5948b2428599efb40b3103f8667fe9a6f964f7b896921b585b0edaa6b380ddca08b258fd05bc1f7e65d8e0
|
DIST gnome-shell-48.4.tar.xz 2234384 BLAKE2B 14649d43172e9437bad2361c8e724753cdaff72ee10b28f80ba4137e6b0d36fccd1c2ccdba40ce465b1253a44e35b527f2b058083ddb655ce1d60511d61c386e SHA512 ebdf620795b97fe4a5220fd42dc1cf33934757da8a5948b2428599efb40b3103f8667fe9a6f964f7b896921b585b0edaa6b380ddca08b258fd05bc1f7e65d8e0
|
||||||
DIST gnome-shell-48.5.tar.xz 2237380 BLAKE2B cd531e41fdafface229870c685593506f8d6db1d89b0ee05327c38b0f0e7aadfc834daf7d1d5d544b456842f918b9b04841b5356b6ca017231f0e6a31780b2ff SHA512 c5ed53fd956f905f2129d26cd62055c86e3555dd0417caae8dd6e8d395be59a35193a388d33f23012588585a48110a083c8f036992f1bd21f461f0401f4b39c5
|
DIST gnome-shell-48.5.tar.xz 2237380 BLAKE2B cd531e41fdafface229870c685593506f8d6db1d89b0ee05327c38b0f0e7aadfc834daf7d1d5d544b456842f918b9b04841b5356b6ca017231f0e6a31780b2ff SHA512 c5ed53fd956f905f2129d26cd62055c86e3555dd0417caae8dd6e8d395be59a35193a388d33f23012588585a48110a083c8f036992f1bd21f461f0401f4b39c5
|
||||||
|
DIST gnome-shell-48.6.tar.xz 2243856 BLAKE2B fd5fe0981da072e28aa4ad432276b7e8376ff96307e8cccd6ff4b32924d7d897828eb8d7c1a84252600f06c760eed463c112273db774988119adc5b69c8f9e23 SHA512 16dfaf1fd0c46dcf80fd5f0c2be5985112f7d0001cdc1307f84d3909f487012ddc6dc060693f123b231561edb569949e739631216f556ad084986bf9d9c34da6
|
||||||
|
|||||||
@ -0,0 +1,63 @@
|
|||||||
|
From 1747a59aa5d44f4d7b74e1f1fee1d48174a1ce5a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adrian Vovk <adrianvovk@gmail.com>
|
||||||
|
Date: Tue, 27 May 2025 17:03:34 -0400
|
||||||
|
Subject: [PATCH] main: Notify gnome-session when we're ready
|
||||||
|
|
||||||
|
Basically, we recently[1] removed XSMP from gnome-session because it's
|
||||||
|
been disabled for a while. Mutter also[2] removed its XSMP integration
|
||||||
|
shortly after.
|
||||||
|
|
||||||
|
However, it turns out that gnome-session's builtin service manager was
|
||||||
|
relying on Mutter's XSMP integration to know when gnome-shell is done
|
||||||
|
starting up. No more XSMP = no more notification = gnome-session decides
|
||||||
|
that gnome-shell is dead even though it's not = fail whale
|
||||||
|
|
||||||
|
This is a temporary measure. GDM will soon switch[3] to an architecture
|
||||||
|
that will allow us to completely drop gnome-session's builtin service
|
||||||
|
manager, and this workaround will go away
|
||||||
|
|
||||||
|
[1]: https://gitlab.gnome.org/GNOME/gnome-session/-/merge_requests/139
|
||||||
|
[2]: https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4438
|
||||||
|
[3]: https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/289
|
||||||
|
|
||||||
|
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3730>
|
||||||
|
---
|
||||||
|
js/ui/main.js | 15 +++++++++++++++
|
||||||
|
1 file changed, 15 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/js/ui/main.js b/js/ui/main.js
|
||||||
|
index 76b917f48c..1fc75e130f 100644
|
||||||
|
--- a/js/ui/main.js
|
||||||
|
+++ b/js/ui/main.js
|
||||||
|
@@ -319,6 +319,7 @@ async function _initializeUI() {
|
||||||
|
GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
|
||||||
|
Shell.util_sd_notify();
|
||||||
|
global.context.notify_ready();
|
||||||
|
+ _notifyGnomeSessionReady();
|
||||||
|
return GLib.SOURCE_REMOVE;
|
||||||
|
});
|
||||||
|
|
||||||
|
@@ -383,6 +384,20 @@ async function _initializeUI() {
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
+async function _notifyGnomeSessionReady() {
|
||||||
|
+ try {
|
||||||
|
+ let params = GLib.Variant.new('(ss)', ['org.gnome.Shell.desktop', '']);
|
||||||
|
+ await Gio.DBus.session.call(
|
||||||
|
+ 'org.gnome.SessionManager',
|
||||||
|
+ '/org/gnome/SessionManager',
|
||||||
|
+ 'org.gnome.SessionManager',
|
||||||
|
+ 'RegisterClient', params, null,
|
||||||
|
+ Gio.DBusCallFlags.NONE, -1, null);
|
||||||
|
+ } catch (e) {
|
||||||
|
+ log(`Error notifying gnome-session that we're ready: ${e.message}`);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
function _handleShowWelcomeScreen() {
|
||||||
|
const lastShownVersion = global.settings.get_string(WELCOME_DIALOG_LAST_SHOWN_VERSION);
|
||||||
|
if (Util.GNOMEversionCompare(WELCOME_DIALOG_LAST_TOUR_CHANGE, lastShownVersion) > 0) {
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
||||||
195
gnome-base/gnome-shell/gnome-shell-48.6.ebuild
Normal file
195
gnome-base/gnome-shell/gnome-shell-48.6.ebuild
Normal file
@ -0,0 +1,195 @@
|
|||||||
|
# Copyright 1999-2025 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=8
|
||||||
|
PYTHON_COMPAT=( python3_{11..14} )
|
||||||
|
|
||||||
|
inherit flag-o-matic gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg
|
||||||
|
|
||||||
|
DESCRIPTION="Provides core UI functions for the GNOME desktop"
|
||||||
|
HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-shell"
|
||||||
|
|
||||||
|
LICENSE="GPL-2+ LGPL-2+"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
|
||||||
|
|
||||||
|
IUSE="X elogind gtk-doc +ibus +networkmanager pipewire systemd test wayland"
|
||||||
|
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
||||||
|
?? ( elogind systemd )"
|
||||||
|
RESTRICT="!test? ( test )"
|
||||||
|
|
||||||
|
# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
|
||||||
|
DEPEND="
|
||||||
|
>=gnome-extra/evolution-data-server-3.46.0:=
|
||||||
|
>=app-crypt/gcr-3.90.0:4=[introspection]
|
||||||
|
>=dev-libs/glib-2.68:2
|
||||||
|
>=dev-libs/gobject-introspection-1.82.0-r2:=
|
||||||
|
>=dev-libs/gjs-1.73.1[cairo(+)]
|
||||||
|
>=gui-libs/gtk-4:4[X?,introspection,wayland?]
|
||||||
|
>=x11-wm/mutter-48.0:0/16[introspection,test?]
|
||||||
|
>=sys-auth/polkit-0.120_p20220509[introspection]
|
||||||
|
>=gnome-base/gsettings-desktop-schemas-48_beta[introspection]
|
||||||
|
>=app-i18n/ibus-1.5.19
|
||||||
|
dev-python/docutils
|
||||||
|
>=gnome-base/gnome-desktop-40.0:4=
|
||||||
|
networkmanager? (
|
||||||
|
>=net-misc/networkmanager-1.10.4[introspection]
|
||||||
|
net-libs/libnma[introspection]
|
||||||
|
>=app-crypt/libsecret-0.18
|
||||||
|
)
|
||||||
|
pipewire? ( >=media-video/pipewire-0.3.49:= )
|
||||||
|
systemd? (
|
||||||
|
>=sys-apps/systemd-246:=
|
||||||
|
>=gnome-base/gnome-desktop-3.34.2:3=[systemd]
|
||||||
|
)
|
||||||
|
elogind? ( >=sys-auth/elogind-237 )
|
||||||
|
|
||||||
|
app-arch/gnome-autoar
|
||||||
|
dev-libs/json-glib
|
||||||
|
|
||||||
|
>=app-accessibility/at-spi2-core-2.46:2[introspection]
|
||||||
|
x11-libs/gdk-pixbuf:2[introspection]
|
||||||
|
dev-libs/libxml2:2=
|
||||||
|
x11-libs/libX11
|
||||||
|
|
||||||
|
>=media-libs/libpulse-2[glib]
|
||||||
|
dev-libs/libical:=
|
||||||
|
x11-libs/libXext
|
||||||
|
>=x11-libs/libXfixes-5.0
|
||||||
|
|
||||||
|
gui-libs/gtk:4[introspection]
|
||||||
|
|
||||||
|
${PYTHON_DEPS}
|
||||||
|
$(python_gen_cond_dep '
|
||||||
|
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
||||||
|
')
|
||||||
|
media-libs/libglvnd[X]
|
||||||
|
"
|
||||||
|
# Runtime-only deps are probably incomplete and approximate.
|
||||||
|
# Introspection deps generated from inspection of the output of:
|
||||||
|
# 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
|
||||||
|
# or
|
||||||
|
# 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'
|
||||||
|
# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
|
||||||
|
# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
|
||||||
|
# Each block:
|
||||||
|
# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
|
||||||
|
# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
|
||||||
|
# 3. Control shell settings
|
||||||
|
# 4. xdg-utils needed for xdg-open, used by extension tool
|
||||||
|
# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
|
||||||
|
# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review
|
||||||
|
# 7. IBus is needed for nls integration
|
||||||
|
# 8. Adwaita 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)
|
||||||
|
# 9. xdg-desktop-portal-gtk for various integration, e.g. #764632
|
||||||
|
# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
|
||||||
|
RDEPEND="${DEPEND}
|
||||||
|
>=sys-apps/accountsservice-0.6.14[introspection]
|
||||||
|
app-accessibility/at-spi2-core:2[introspection]
|
||||||
|
app-misc/geoclue:2.0[introspection]
|
||||||
|
media-libs/graphene[introspection]
|
||||||
|
>=x11-libs/pango-1.46.0[introspection]
|
||||||
|
net-libs/libsoup:3.0[introspection]
|
||||||
|
>=sys-power/upower-0.99:=[introspection]
|
||||||
|
gnome-base/librsvg:2[introspection]
|
||||||
|
gui-libs/libadwaita:1[introspection]
|
||||||
|
|
||||||
|
>=gnome-base/gnome-session-48.0-r2
|
||||||
|
>=gnome-base/gnome-settings-daemon-3.8.3
|
||||||
|
|
||||||
|
x11-misc/xdg-utils
|
||||||
|
|
||||||
|
>=x11-themes/adwaita-icon-theme-3.26
|
||||||
|
|
||||||
|
networkmanager? (
|
||||||
|
net-misc/mobile-broadband-provider-info
|
||||||
|
sys-libs/timezone-data
|
||||||
|
)
|
||||||
|
ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] )
|
||||||
|
media-fonts/adwaita-fonts
|
||||||
|
|
||||||
|
sys-apps/xdg-desktop-portal-gnome
|
||||||
|
"
|
||||||
|
# avoid circular dependency, see bug #546134
|
||||||
|
PDEPEND="
|
||||||
|
>=gnome-base/gdm-3.5[introspection(+)]
|
||||||
|
>=gnome-base/gnome-control-center-3.26[networkmanager(+)?]
|
||||||
|
"
|
||||||
|
BDEPEND="
|
||||||
|
>=dev-build/meson-1.3.0
|
||||||
|
dev-libs/libxslt
|
||||||
|
>=dev-util/gdbus-codegen-2.45.3
|
||||||
|
dev-util/glib-utils
|
||||||
|
gtk-doc? ( >=dev-util/gtk-doc-1.17
|
||||||
|
>=dev-util/gi-docgen-2021.1
|
||||||
|
app-text/docbook-xml-dtd:4.5 )
|
||||||
|
>=sys-devel/gettext-0.19.8
|
||||||
|
virtual/pkgconfig
|
||||||
|
test? (
|
||||||
|
sys-apps/dbus
|
||||||
|
x11-wm/mutter[test]
|
||||||
|
)
|
||||||
|
"
|
||||||
|
# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
|
||||||
|
# dev-lang/sassc
|
||||||
|
# app-text/asciidoc
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
# https://bugs.gentoo.org/959295 gnome-session thinks gnome-shell died when built with USE="-X"
|
||||||
|
"${FILESDIR}"/notify-gnome-session-when-ready.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
default
|
||||||
|
xdg_environment_reset
|
||||||
|
# Hack in correct python shebang
|
||||||
|
sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
use X || append-cppflags -DGENTOO_GTK_HIDE_X11
|
||||||
|
use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
|
||||||
|
|
||||||
|
local emesonargs=(
|
||||||
|
$(meson_use pipewire camera_monitor)
|
||||||
|
-Dextensions_tool=true
|
||||||
|
-Dextensions_app=true
|
||||||
|
$(meson_use gtk-doc gtk_doc)
|
||||||
|
-Dman=true
|
||||||
|
$(meson_use test tests)
|
||||||
|
$(meson_use networkmanager)
|
||||||
|
$(meson_use networkmanager portal_helper)
|
||||||
|
$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
|
||||||
|
# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
|
||||||
|
# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
|
||||||
|
)
|
||||||
|
meson_src_configure
|
||||||
|
}
|
||||||
|
|
||||||
|
src_test() {
|
||||||
|
# Reset variables to avoid issues from /etc/profile.d/flatpak.sh file modifying XDG_DATA_DIRS
|
||||||
|
gnome2_environment_reset
|
||||||
|
export XDG_DATA_DIRS="${EPREFIX}"/usr/share
|
||||||
|
virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
xdg_pkg_postinst
|
||||||
|
gnome2_schemas_update
|
||||||
|
|
||||||
|
if ! has_version "media-libs/mesa[llvm]"; then
|
||||||
|
elog "llvmpipe is used as fallback when no 3D acceleration"
|
||||||
|
elog "is available. You will need to enable llvm USE for"
|
||||||
|
elog "media-libs/mesa if you do not have hardware 3D setup."
|
||||||
|
fi
|
||||||
|
|
||||||
|
optfeature "Bluetooth integration" gnome-base/gnome-control-center[bluetooth] net-wireless/gnome-bluetooth:3[introspection]
|
||||||
|
optfeature "Browser extension integration" gnome-extra/gnome-browser-connector
|
||||||
|
optfeature "Screencast/capture support" media-video/pipewire media-libs/gstreamer[introspection] media-libs/gst-plugins-base[introspection] media-libs/gst-plugins-good media-plugins/gst-plugins-vpx
|
||||||
|
optfeature "Weather support" dev-libs/libgweather:4[introspection]
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postrm() {
|
||||||
|
xdg_pkg_postrm
|
||||||
|
gnome2_schemas_update
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user