[PR PATCH] gnome shell 40.2

[Gottox <Gottox@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 381 bytes --]

There is a new pull request by Gottox against master on the void-packages repository

https://github.com/Gottox/void-packages gnome-shell-40.2
https://github.com/void-linux/void-packages/pull/31454

gnome shell 40.2
- gnome-shell: update to 40.2.
- gnome-shell-extensions: update to 40.2.


A patch file from https://github.com/void-linux/void-packages/pull/31454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-shell-40.2-31454.patch --]
[-- Type: text/x-diff, Size: 4523 bytes --]

From 79523f759f6c1b1fa42c069db2de7b32b1edba2a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 13 Jun 2021 18:47:53 +0200
Subject: [PATCH 1/2] gnome-shell: update to 40.2.

---
 .../gnome-shell/patches/fix-xwayland.patch    | 27 -------------------
 srcpkgs/gnome-shell/template                  | 21 ++++++++++-----
 2 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/gnome-shell/patches/fix-xwayland.patch

diff --git a/srcpkgs/gnome-shell/patches/fix-xwayland.patch b/srcpkgs/gnome-shell/patches/fix-xwayland.patch
deleted file mode 100644
index d5788be1d0e8..000000000000
--- a/srcpkgs/gnome-shell/patches/fix-xwayland.patch
+++ /dev/null
@@ -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);
-         }
-     }
- 
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5ecc9e80610e..0fb12cfa4698 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.1
-revision=2
+version=40.2
+revision=1
 build_style=meson
 build_helper=gir
 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
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-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"
+checkdepends="xvfb-run gdm mesa-dri $depends"
 short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f63e2bed99bd8958cf313d85f44a018d59f852a05ba9f29aa7cb744bec6fa6b7
+checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
+_xdg_runtime_dir="/tmp/gnome-shell-xdg"
 
-# needs X
-do_check() {
-	:
+pre_check() {
+	mkdir "$_xdg_runtime_dir"
+	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
+	make_cmd="xvfb-run ninja"
+}
+
+post_check() {
+	rm -r "$_xdg_runtime_dir"
 }

From acb03c3403997f1f8e00d79d17c54906883da712 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 13 Jun 2021 18:49:51 +0200
Subject: [PATCH 2/2] gnome-shell-extensions: update to 40.2.

---
 srcpkgs/gnome-shell-extensions/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 1bea6e92c949..101c2b9a9149 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.1
+version=40.2
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4fbfce0ad4357bee73ae7dc18eaa1ef4caa7385e4f94f6afb8dfc7251fd1a8bf
+checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8