Date: Wednesday, February 1, 2023 @ 17:50:47
Author: heftig
Revision: 467742
archrelease: copy trunk to extra-x86_64
Added:
gnome-shell/repos/extra-x86_64/0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
(from rev 467741,
gnome-shell/trunk/0001-main-Leak-the-GJS-context-and-ShellGlobal.patch)
gnome-shell/repos/extra-x86_64/PKGBUILD
(from rev 467741, gnome-shell/trunk/PKGBUILD)
Deleted:
gnome-shell/repos/extra-x86_64/PKGBUILD
------------------------------------------------------+
0001-main-Leak-the-GJS-context-and-ShellGlobal.patch | 28 ++
PKGBUILD | 180 ++++++++++-------
2 files changed, 136 insertions(+), 72 deletions(-)
Copied:
gnome-shell/repos/extra-x86_64/0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
(from rev 467741,
gnome-shell/trunk/0001-main-Leak-the-GJS-context-and-ShellGlobal.patch)
===================================================================
--- 0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
(rev 0)
+++ 0001-main-Leak-the-GJS-context-and-ShellGlobal.patch 2023-02-01
17:50:47 UTC (rev 467742)
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <[email protected]>
+Date: Wed, 6 Oct 2021 10:00:43 +0200
+Subject: [PATCH] main: Leak the GJS context and ShellGlobal
+
+There are many crash-on-exit happening as a side effect of destroying
+the GJS context. Work around these until we have a better solution by
+leaking them.
+---
+ src/main.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/main.c b/src/main.c
+index 29275cda0725..2311a74bd110 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -589,9 +589,11 @@ main (int argc, char **argv)
+
+ shell_profiler_shutdown ();
+
++#if 0
+ g_debug ("Doing final cleanup");
+ _shell_global_destroy_gjs_context (shell_global_get ());
+ g_object_unref (shell_global_get ());
++#endif
+
+ return ecode;
+ }
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-02-01 17:50:36 UTC (rev 467741)
+++ PKGBUILD 2023-02-01 17:50:47 UTC (rev 467742)
@@ -1,72 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-# Contributor: Ionut Biru <[email protected]>
-# Contributor: Flamelab <[email protected]
-
-pkgname=gnome-shell
-pkgver=43.2
-pkgrel=1
-epoch=1
-pkgdesc="Next generation desktop shell"
-url="https://wiki.gnome.org/Projects/GnomeShell";
-arch=(x86_64)
-license=(GPL)
-depends=(accountsservice gcr-4 gjs upower gnome-session gtk4
- gnome-settings-daemon gsettings-desktop-schemas libcanberra-pulse
- libgdm libsecret mutter libnma unzip libibus gnome-autoar
- gnome-disk-utility libsoup3 libgweather-4)
-makedepends=(gtk-doc gnome-control-center evolution-data-server
- gobject-introspection git meson sassc asciidoc bash-completion)
-checkdepends=(xorg-server-xvfb)
-optdepends=('gnome-control-center: System settings'
- 'evolution-data-server: Evolution calendar integration'
- 'gst-plugins-good: Screen recording'
- 'gst-plugin-pipewire: Screen recording'
- 'gnome-bluetooth-3.0: Bluetooth support'
- 'power-profiles-daemon: Power profile switching')
-groups=(gnome)
-options=(debug)
-_commit=e9b26eac0c0d66b87201874ce2b704268ee99be6 # tags/43.2^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit";
- "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git";)
-sha256sums=('SKIP'
- 'SKIP')
-
-pkgver() {
- cd gnome-shell
- git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd gnome-shell
-
- git submodule init
- git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
- git -c protocol.file.allow=always submodule update
-}
-
-build() {
- CFLAGS="${CFLAGS/-O2/-O3} -fno-semantic-interposition"
- LDFLAGS+=" -Wl,-Bsymbolic-functions"
-
- arch-meson gnome-shell build -D gtk_doc=true
- meson compile -C build
-}
-
-_check() (
- export XDG_RUNTIME_DIR="$PWD/runtime-dir"
- mkdir -p -m 700 "$XDG_RUNTIME_DIR"
-
- meson test -C build --print-errorlogs
-)
-
-check() {
- dbus-run-session xvfb-run -s '-nolisten local +iglx -noreset' \
- bash -c "$(declare -f _check); _check"
-}
-
-package() {
- depends+=(libmutter-11.so)
- meson install -C build --destdir "$pkgdir"
-}
-
-# vim:set sw=2 sts=-1 et:
Copied: gnome-shell/repos/extra-x86_64/PKGBUILD (from rev 467741,
gnome-shell/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-02-01 17:50:47 UTC (rev 467742)
@@ -0,0 +1,108 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Contributor: Ionut Biru <[email protected]>
+# Contributor: Flamelab <[email protected]
+
+pkgname=gnome-shell
+pkgver=43.2
+pkgrel=2
+epoch=1
+pkgdesc="Next generation desktop shell"
+url="https://wiki.gnome.org/Projects/GnomeShell";
+arch=(x86_64)
+license=(GPL)
+depends=(
+ accountsservice
+ gcr-4
+ gjs
+ gnome-autoar
+ gnome-disk-utility
+ gnome-session
+ gnome-settings-daemon
+ gsettings-desktop-schemas
+ gtk4
+ libcanberra-pulse
+ libgdm
+ libgweather-4
+ libibus
+ libnma
+ libsecret
+ libsoup3
+ mutter
+ unzip
+ upower
+)
+makedepends=(
+ asciidoc
+ bash-completion
+ evolution-data-server
+ git
+ gnome-control-center
+ gobject-introspection
+ gtk-doc
+ meson
+ sassc
+)
+checkdepends=(xorg-server-xvfb)
+optdepends=(
+ 'evolution-data-server: Evolution calendar integration'
+ 'gnome-bluetooth-3.0: Bluetooth support'
+ 'gnome-control-center: System settings'
+ 'gst-plugin-pipewire: Screen recording'
+ 'gst-plugins-good: Screen recording'
+ 'power-profiles-daemon: Power profile switching'
+ 'switcheroo-control: Multi-GPU support'
+)
+groups=(gnome)
+_commit=e9b26eac0c0d66b87201874ce2b704268ee99be6 # tags/43.2^0
+source=(
+ "git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit";
+ "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git";
+ 0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
+)
+b2sums=('SKIP'
+ 'SKIP'
+
'5636fd813bc0aeafbdd52eb6335ef79b5801b800e332119b3d127a6cd188aa24051ebc718449f22bea7bedc37347ff98c7d491b35d84f573f0e4cff2046117d4')
+
+pkgver() {
+ cd gnome-shell
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd gnome-shell
+
+ # https://bugs.archlinux.org/task/71250
+ # https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5560#note_1636124
+ git apply -3 ../0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
+
+ git submodule init
+ git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
+ git -c protocol.file.allow=always submodule update
+}
+
+build() {
+ CFLAGS="${CFLAGS/-O2/-O3} -fno-semantic-interposition"
+ LDFLAGS+=" -Wl,-Bsymbolic-functions"
+
+ arch-meson gnome-shell build -D gtk_doc=true
+ meson compile -C build
+}
+
+_check() (
+ export XDG_RUNTIME_DIR="$PWD/runtime-dir"
+ mkdir -p -m 700 "$XDG_RUNTIME_DIR"
+
+ meson test -C build --print-errorlogs
+)
+
+check() {
+ dbus-run-session xvfb-run -s '-nolisten local +iglx -noreset' \
+ bash -c "$(declare -f _check); _check"
+}
+
+package() {
+ depends+=(libmutter-11.so)
+ meson install -C build --destdir "$pkgdir"
+}
+
+# vim:set sw=2 sts=-1 et:
