1
0
Fork 0

1:46.1-2: [HACK] Add fix-sigsegv-in-meta_window_foreach_transient.patch

Signed-off-by: Mingi Sung <sungmg@saltyming.net>
This commit is contained in:
Mingi Sung 2024-04-29 11:34:33 +09:00
parent 3316c57cb3
commit f412c9961f
Signed by: sungmg
GPG key ID: 41BAFD6FFD8036C5
3 changed files with 32 additions and 6 deletions

View file

@ -1,7 +1,7 @@
pkgbase = mutter-performance
pkgdesc = A window manager for GNOME | Attempts to improve performances with non-upstreamed merge-requests and frequent stable branch resync
pkgver = 46.1
pkgrel = 1
pkgrel = 2
epoch = 1
url = https://gitlab.gnome.org/GNOME/mutter
arch = x86_64
@ -13,6 +13,7 @@ pkgbase = mutter-performance
makedepends = gobject-introspection
makedepends = gtk3
makedepends = meson
makedepends = python-packaging
makedepends = sysprof
makedepends = wayland-protocols
makedepends = xorg-server
@ -75,12 +76,15 @@ pkgbase = mutter-performance
source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=b57c80602d3780bb9b13fddcf2caca394910e6b4
source = mr1441.patch
source = mr3373.patch
source = fix-sigsegv-in-meta_window_foreach_transient.patch
sha256sums = 56dc25f7743ca3d72e5471ceadeb774e19e34feeb7ba106a6a78c8bb2cc20b56
sha256sums = 1a0e4ca2ebf32c9b75085114cb1c6856e6f35ea3a157a7e2c5be765466716a34
sha256sums = 3e1f07b696ad37b1c639a524c092cd9259444bc6156542901ccaec936bea240f
sha256sums = 488326a7b1eca1e3a91cbfcec0101b217b66b440c3b14e4333406373a84b3682
b2sums = 4acd4a192455890b12b2fc9b6553ed65bd2176307cd6c6683fc2ab476b7fa88f4b5e507a1209b3e900c68d94768f3cf749b4f5d87d25300b33a112182c8a62a7
b2sums = a40fdd0d5c01c0bd5cea98e8aeae6d313834a863b2c4789aea107c8318ab63783a5e4cb92759f3c2b74e8fcac5775b7fa14bf7d11692524f8d0a46f67ac532d6
b2sums = 71f10db4ebe04a787940c7048131eac67cffd3ec8e415cfc961b8041b881f272650581e9df273e2a8da23a50ec9151c790dc2d5ecc0309ab2847a22f8c922c9c
b2sums = 03c9531036437dcb145f5676055bc29a2f855d2c53513be3063b87797a994fcaa86f59fc6d22cd490f2dec92bd1afc6e8556a881045a89ab69127be43f32ba27
pkgname = mutter-performance
groups = gnome

View file

@ -33,7 +33,7 @@ else
fi
epoch=1
pkgver=46.1
pkgrel=1
pkgrel=2
pkgdesc="A window manager for GNOME | Attempts to improve performances with non-upstreamed merge-requests and frequent stable branch resync"
url="https://gitlab.gnome.org/GNOME/mutter"
arch=(x86_64 aarch64)
@ -103,6 +103,7 @@ makedepends=(
gobject-introspection
gtk3
meson
python-packaging
sysprof
wayland-protocols
xorg-server
@ -112,15 +113,18 @@ if [ -n "$_enable_check" ]; then
checkdepends=(gnome-session xorg-server-xvfb pipewire-session-manager python-dbusmock zenity)
fi
_commit=b57c80602d3780bb9b13fddcf2caca394910e6b4 # tags/46.1^0
source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
source=("git+$url.git#commit=$_commit"
'mr1441.patch'
'mr3373.patch')
'mr3373.patch'
'fix-sigsegv-in-meta_window_foreach_transient.patch')
sha256sums=('56dc25f7743ca3d72e5471ceadeb774e19e34feeb7ba106a6a78c8bb2cc20b56'
'1a0e4ca2ebf32c9b75085114cb1c6856e6f35ea3a157a7e2c5be765466716a34'
'3e1f07b696ad37b1c639a524c092cd9259444bc6156542901ccaec936bea240f')
'3e1f07b696ad37b1c639a524c092cd9259444bc6156542901ccaec936bea240f'
'488326a7b1eca1e3a91cbfcec0101b217b66b440c3b14e4333406373a84b3682')
b2sums=('4acd4a192455890b12b2fc9b6553ed65bd2176307cd6c6683fc2ab476b7fa88f4b5e507a1209b3e900c68d94768f3cf749b4f5d87d25300b33a112182c8a62a7'
'a40fdd0d5c01c0bd5cea98e8aeae6d313834a863b2c4789aea107c8318ab63783a5e4cb92759f3c2b74e8fcac5775b7fa14bf7d11692524f8d0a46f67ac532d6'
'71f10db4ebe04a787940c7048131eac67cffd3ec8e415cfc961b8041b881f272650581e9df273e2a8da23a50ec9151c790dc2d5ecc0309ab2847a22f8c922c9c')
'71f10db4ebe04a787940c7048131eac67cffd3ec8e415cfc961b8041b881f272650581e9df273e2a8da23a50ec9151c790dc2d5ecc0309ab2847a22f8c922c9c'
'03c9531036437dcb145f5676055bc29a2f855d2c53513be3063b87797a994fcaa86f59fc6d22cd490f2dec92bd1afc6e8556a881045a89ab69127be43f32ba27')
pkgver() {
cd $_pkgname
@ -169,6 +173,10 @@ prepare() {
#git fetch verdre
#git fetch 3v1no
# Shell crashes with SIGSEGV in "meta_window_foreach_transient ()"
## https://gitlab.gnome.org/GNOME/mutter/-/issues/3427
patch -Np1 -i ../"fix-sigsegv-in-meta_window_foreach_transient.patch"
### Merge Requests
# Merge Request Prototype

View file

@ -0,0 +1,14 @@
diff --git a/src/core/window.c b/src/core/window.c
index 47c29d94a8..5ac054e88f 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -5993,6 +5993,9 @@ meta_window_foreach_transient (MetaWindow *window,
GSList *windows;
GSList *tmp;
+ if (!window)
+ return;
+
windows = meta_display_list_windows (window->display, META_LIST_DEFAULT);
tmp = windows;