Update mr1441 and mr3729
Signed-off-by: Mingi Sung <sungmg@saltyming.net>
This commit is contained in:
parent
c35008e2a1
commit
9d860be09e
GPG key ID:
41BAFD6FFD8036C5
4 changed files with 2376 additions and 1185 deletions
10
.SRCINFO
10
.SRCINFO
|
|
@ -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+r7+g35836f0f1
|
||||
pkgrel = 1
|
||||
pkgrel = 2
|
||||
epoch = 1
|
||||
url = https://gitlab.gnome.org/GNOME/mutter
|
||||
arch = x86_64
|
||||
|
|
@ -78,13 +78,13 @@ pkgbase = mutter-performance
|
|||
source = mr3373.patch
|
||||
source = mr3729.patch
|
||||
sha256sums = e5f178cc9692498c6cc3d6466102c8906f77dd112c12efb4762a903a28a574f5
|
||||
sha256sums = 24385020adda767feb95c7dd25427dce229c3d9e47cb7d87760eeb0b1f4183c2
|
||||
sha256sums = 7d5c90e3f18b2c0645e6224759e571acef723d53495cff2ceaac3c44168226b3
|
||||
sha256sums = 3e1f07b696ad37b1c639a524c092cd9259444bc6156542901ccaec936bea240f
|
||||
sha256sums = c8d04c276bdec2c96cbd4ea6d23998107e24b9b5cc7bd1f8e707a07b2367adb6
|
||||
sha256sums = c072d1983ddd482db993514e86e15fb44024887c5c4d7c1d6f4cf4b8d01743ce
|
||||
b2sums = 28f0cba4142dee6526ddc1147e26e32d875674a927bfda271b3abbc65ddda4021e6765bf74390e37718056b5b5ab44c5b5566ca20f23dc4e846887ed79961d26
|
||||
b2sums = 6d3f086ea407fe68b9eaa0a1d19fc3d28e75374a65ba023385b8314ec2f6f7110ac89d422f1c1db063d65b163235a66569cb073d8941499903beba7f8f531846
|
||||
b2sums = 135b9a24273328c8010d08c3688b527741b0d678814ed52fb983be649b7d40ce6f2d6151d1087a8fed311f35cb3033d8b9d1c7b04cdd2bbef7dff43ee80ea530
|
||||
b2sums = 71f10db4ebe04a787940c7048131eac67cffd3ec8e415cfc961b8041b881f272650581e9df273e2a8da23a50ec9151c790dc2d5ecc0309ab2847a22f8c922c9c
|
||||
b2sums = 59d067ab7fd50a7bf4eda549f5d89cbc66a463897c1005f7a272dfd14bf7094acd69c4065c1340c089d8214021e2e08c02019f2489144cd3338e3c0ff9c83fb2
|
||||
b2sums = a1b283fc3b45160d740702f8bee3c89d6dcef7ecedece5e01b4f1a414ea85a1251481af7b94e2c77e5a895cd93d3b708df97e80749a69edb3b0108bef8c2bf9f
|
||||
|
||||
pkgname = mutter-performance
|
||||
groups = gnome
|
||||
|
|
|
|||
12
PKGBUILD
12
PKGBUILD
|
|
@ -33,7 +33,7 @@ else
|
|||
fi
|
||||
epoch=1
|
||||
pkgver=46.1+r7+g35836f0f1
|
||||
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)
|
||||
|
|
@ -118,13 +118,13 @@ source=("git+$url.git#commit=$_commit"
|
|||
'mr3373.patch'
|
||||
'mr3729.patch')
|
||||
sha256sums=('e5f178cc9692498c6cc3d6466102c8906f77dd112c12efb4762a903a28a574f5'
|
||||
'24385020adda767feb95c7dd25427dce229c3d9e47cb7d87760eeb0b1f4183c2'
|
||||
'7d5c90e3f18b2c0645e6224759e571acef723d53495cff2ceaac3c44168226b3'
|
||||
'3e1f07b696ad37b1c639a524c092cd9259444bc6156542901ccaec936bea240f'
|
||||
'c8d04c276bdec2c96cbd4ea6d23998107e24b9b5cc7bd1f8e707a07b2367adb6')
|
||||
'c072d1983ddd482db993514e86e15fb44024887c5c4d7c1d6f4cf4b8d01743ce')
|
||||
b2sums=('28f0cba4142dee6526ddc1147e26e32d875674a927bfda271b3abbc65ddda4021e6765bf74390e37718056b5b5ab44c5b5566ca20f23dc4e846887ed79961d26'
|
||||
'6d3f086ea407fe68b9eaa0a1d19fc3d28e75374a65ba023385b8314ec2f6f7110ac89d422f1c1db063d65b163235a66569cb073d8941499903beba7f8f531846'
|
||||
'135b9a24273328c8010d08c3688b527741b0d678814ed52fb983be649b7d40ce6f2d6151d1087a8fed311f35cb3033d8b9d1c7b04cdd2bbef7dff43ee80ea530'
|
||||
'71f10db4ebe04a787940c7048131eac67cffd3ec8e415cfc961b8041b881f272650581e9df273e2a8da23a50ec9151c790dc2d5ecc0309ab2847a22f8c922c9c'
|
||||
'59d067ab7fd50a7bf4eda549f5d89cbc66a463897c1005f7a272dfd14bf7094acd69c4065c1340c089d8214021e2e08c02019f2489144cd3338e3c0ff9c83fb2')
|
||||
'a1b283fc3b45160d740702f8bee3c89d6dcef7ecedece5e01b4f1a414ea85a1251481af7b94e2c77e5a895cd93d3b708df97e80749a69edb3b0108bef8c2bf9f')
|
||||
|
||||
pkgver() {
|
||||
cd $_pkgname
|
||||
|
|
@ -219,7 +219,7 @@ prepare() {
|
|||
# Author: Carlos Garnacho <carlosg@gnome.org>
|
||||
# URL: https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3729
|
||||
# Type: 3
|
||||
# Status: 3
|
||||
# Status: 2
|
||||
# Comment: This closes https://gitlab.gnome.org/GNOME/mutter/-/issues/3393
|
||||
pick_mr '3729' 'mr3729.patch' 'patch'
|
||||
|
||||
|
|
|
|||
3527
mr1441.patch
3527
mr1441.patch
File diff suppressed because it is too large
Load diff
12
mr3729.patch
12
mr3729.patch
|
|
@ -1,4 +1,4 @@
|
|||
From 4f95a0c38c1146364601aaeb4a77797394e03dd3 Mon Sep 17 00:00:00 2001
|
||||
From 8f6ad3f14d0d680c57fd628e90d4bc3b9a2e06be Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Thu, 2 May 2024 13:15:31 +0200
|
||||
Subject: [PATCH 1/3] compositor: Make surface actors unreactive after losing
|
||||
|
|
@ -12,7 +12,7 @@ are eligible for picking, but do not have a surface anymore.
|
|||
1 file changed, 18 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/compositor/meta-surface-actor-wayland.c b/src/compositor/meta-surface-actor-wayland.c
|
||||
index 819672c4abd..454414fde32 100644
|
||||
index 819672c4abd..d20ed5523a8 100644
|
||||
--- a/src/compositor/meta-surface-actor-wayland.c
|
||||
+++ b/src/compositor/meta-surface-actor-wayland.c
|
||||
@@ -260,6 +260,18 @@ out:
|
||||
|
|
@ -25,7 +25,7 @@ index 819672c4abd..454414fde32 100644
|
|||
+{
|
||||
+ MetaSurfaceActorWayland *self = user_data;
|
||||
+
|
||||
+ g_assert (destroyed_object == self->surface);
|
||||
+ g_assert (destroyed_object == (GObject *) self->surface);
|
||||
+
|
||||
+ clutter_actor_set_reactive (CLUTTER_ACTOR (self), FALSE);
|
||||
+ self->surface = NULL;
|
||||
|
|
@ -62,7 +62,7 @@ index 819672c4abd..454414fde32 100644
|
|||
GitLab
|
||||
|
||||
|
||||
From a739236338cdab94588d65c3502912d3f5ba1602 Mon Sep 17 00:00:00 2001
|
||||
From c5e5b75e9edb771a165959743112be0c3e807ac7 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Thu, 2 May 2024 13:21:21 +0200
|
||||
Subject: [PATCH 2/3] wayland: Make subsurface actors unreactive early during
|
||||
|
|
@ -79,7 +79,7 @@ MetaWindow was severed, since it should not be eligible for picking anymore.
|
|||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/wayland/meta-wayland-subsurface.c b/src/wayland/meta-wayland-subsurface.c
|
||||
index fd9df170b6d..9d4533e9314 100644
|
||||
index 4f2ae6df6ec..246a71b21df 100644
|
||||
--- a/src/wayland/meta-wayland-subsurface.c
|
||||
+++ b/src/wayland/meta-wayland-subsurface.c
|
||||
@@ -437,6 +437,7 @@ permanently_unmap_subsurface (MetaWaylandSurface *surface)
|
||||
|
|
@ -103,7 +103,7 @@ index fd9df170b6d..9d4533e9314 100644
|
|||
GitLab
|
||||
|
||||
|
||||
From 78d6683d84450921c89d3b89f8ca07db18159b7e Mon Sep 17 00:00:00 2001
|
||||
From 34e9bc34a7a5c694daead3fc7e31cead9b7ca555 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Thu, 2 May 2024 13:23:54 +0200
|
||||
Subject: [PATCH 3/3] wayland: Double check surface/window before looking for
|
||||
|
|
|
|||
Loading…
Reference in a new issue