gnome-shell: update to 40.2.

This commit is contained in:
Enno Boland 2021-06-13 18:47:53 +02:00 committed by Enno Boland
parent e997ce94de
commit ad032f3a5b
2 changed files with 14 additions and 34 deletions

View File

@ -1,27 +0,0 @@
This reverts commit 019229c40efb67e3d26f14afa71bf926efeff3fb.
ref: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4284
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 49d3dda22..5a3327b1b 100644
--- ./js/ui/windowManager.js
+++ ./js/ui/windowManager.js
@@ -973,7 +973,6 @@ var WindowManager = class {
}
async _startX11Services(task, cancellable) {
- let status = true;
try {
await Shell.util_start_systemd_unit(
'gnome-session-x11-services-ready.target', 'fail', cancellable);
@@ -984,9 +983,8 @@ var WindowManager = class {
// Note that we do log cancellation from here.
if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_SUPPORTED))
log('Error starting X11 services: %s'.format(e.message));
- status = false;
} finally {
- task.return_boolean(status);
+ task.return_boolean(true);
}
}

View File

@ -1,7 +1,7 @@
# Template file for 'gnome-shell' # Template file for 'gnome-shell'
pkgname=gnome-shell pkgname=gnome-shell
version=40.1 version=40.2
revision=2 revision=1
build_style=meson build_style=meson
build_helper=gir build_helper=gir
configure_args="-Dsystemd=false" configure_args="-Dsystemd=false"
@ -13,17 +13,24 @@ makedepends="at-spi2-atk evolution-data-server-devel folks-devel
ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
libnma-devel polkit-devel pulseaudio-devel pipewire-devel libnma-devel polkit-devel pulseaudio-devel pipewire-devel
startup-notification-devel telepathy-logger-devel gnome-autoar-devel" startup-notification-devel telepathy-logger-devel gnome-autoar-devel elogind-devel"
depends="elogind glxinfo gnome-control-center gsettings-desktop-schemas upower" depends="elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
checkdepends="xvfb-run gdm mesa-dri $depends"
short_desc="GNOME core user interface" short_desc="GNOME core user interface"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell" homepage="https://wiki.gnome.org/Projects/GnomeShell"
changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS" changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=f63e2bed99bd8958cf313d85f44a018d59f852a05ba9f29aa7cb744bec6fa6b7 checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
_xdg_runtime_dir="/tmp/gnome-shell-xdg"
# needs X pre_check() {
do_check() { mkdir "$_xdg_runtime_dir"
: export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
make_cmd="xvfb-run ninja"
}
post_check() {
rm -r "$_xdg_runtime_dir"
} }