Sync to gnome-46 & Correctly set bounding region for undecorated windows in mr3567
Signed-off-by: Mingi Sung <sungmg@saltyming.net>
This commit is contained in:
parent
47e54c14a8
commit
a79b4fc00d
GPG key ID:
41BAFD6FFD8036C5
3 changed files with 56 additions and 22 deletions
14
.SRCINFO
14
.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.3
|
||||
pkgrel = 3
|
||||
pkgver = 46.3.1
|
||||
pkgrel = 1
|
||||
epoch = 1
|
||||
url = https://gitlab.gnome.org/GNOME/mutter
|
||||
arch = x86_64
|
||||
|
|
@ -73,20 +73,20 @@ pkgbase = mutter-performance
|
|||
depends = systemd-libs
|
||||
depends = wayland
|
||||
depends = xorg-xwayland
|
||||
source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=3998f8a422e89c6a64a79e2ce23f9389c0feb7f9
|
||||
source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=c1ffc17331f7e04b185b538fa02cf76b0534c4c8
|
||||
source = mr1441.patch
|
||||
source = mr3373.patch
|
||||
source = mr3567.patch
|
||||
source = mr3751.patch
|
||||
sha256sums = c6497a3045eed064eac55f0780b6a91f919b92450d083d81eaee3c65b13cdb9f
|
||||
sha256sums = 988fcdb4434f6da0ad7847941da7359473a25850f2c19b1a91cafb608293fed3
|
||||
sha256sums = 649dac49f7655f4bd21deb244bb47f2b5a211caa29364d1155454eb155076dbb
|
||||
sha256sums = 3e1f07b696ad37b1c639a524c092cd9259444bc6156542901ccaec936bea240f
|
||||
sha256sums = dbaebf54c0c4cce77d9394334ee55fdeeae8c027f5782a34a94778943baef321
|
||||
sha256sums = 47885ffe6c0aa06fa798cc0b9b48b4f6acf21b6f250b7003819db3854d52635a
|
||||
sha256sums = 9d925b810629074285388b5a1a9a88514a6cb45463a98ada6f66c2cba2ad9d2f
|
||||
b2sums = b228db453c22a94783ceed71eb9489117e0576293f6daa37b7f20b6992b80ee4e67ebeee3b1cf474d306d2341e8d0e26b16820cec9d6c53132ddc7ffd4157634
|
||||
b2sums = 7d9041df986220470c287fe65194ec6e4da8f15540140fb7e0c3fddc95ce6e9ec9fd4f691ed349a31af28e903c769c97d9817ac65c3cc424b002e095cf559606
|
||||
b2sums = 8f5f7c4caae32f46d35f2cd73a0d00ddfde38c0b53e13d60c8a977362b8bfd6fc41f3af1a88353b6f2778d7d6d01881f14198b40532bcda53caf43aba7287804
|
||||
b2sums = 71f10db4ebe04a787940c7048131eac67cffd3ec8e415cfc961b8041b881f272650581e9df273e2a8da23a50ec9151c790dc2d5ecc0309ab2847a22f8c922c9c
|
||||
b2sums = 139cf3ae7dc9e0d9cd187950a6f5d246b0a16d2a7bf0c1179579e178826fa8e6f8a5d515145724ca7635af05d30d3e4098c34f83f0009bcc92fc04393062ab2c
|
||||
b2sums = 8e57fa09e4742cf350436c5d54f3114495543151df71fbb684199d85ca9b138bcedd1dfb5df5724d0efc74aa786f6b1ebf54f3c260a48a4937a700dcb1d5b178
|
||||
b2sums = f720718049c1f9d0f338c203a5ae4520b5e7079b57e692ec95d8183705d7b7627ccd7d3d350d0010d0b225226641afccd699b65a81bd044fd32c441d413a0779
|
||||
|
||||
pkgname = mutter-performance
|
||||
|
|
|
|||
14
PKGBUILD
14
PKGBUILD
|
|
@ -32,8 +32,8 @@ else
|
|||
pkgname=(mutter-performance mutter-performance-docs)
|
||||
fi
|
||||
epoch=1
|
||||
pkgver=46.3
|
||||
pkgrel=3
|
||||
pkgver=46.3.1
|
||||
pkgrel=1
|
||||
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)
|
||||
|
|
@ -112,21 +112,21 @@ makedepends=(
|
|||
if [ -n "$_enable_check" ]; then
|
||||
checkdepends=(gnome-session xorg-server-xvfb pipewire-session-manager python-dbusmock zenity)
|
||||
fi
|
||||
_commit=3998f8a422e89c6a64a79e2ce23f9389c0feb7f9 # tags/46.3^0
|
||||
_commit=c1ffc17331f7e04b185b538fa02cf76b0534c4c8 # tags/46.3.1^0
|
||||
source=("git+$url.git#commit=$_commit"
|
||||
'mr1441.patch'
|
||||
'mr3373.patch'
|
||||
'mr3567.patch'
|
||||
'mr3751.patch')
|
||||
sha256sums=('c6497a3045eed064eac55f0780b6a91f919b92450d083d81eaee3c65b13cdb9f'
|
||||
sha256sums=('988fcdb4434f6da0ad7847941da7359473a25850f2c19b1a91cafb608293fed3'
|
||||
'649dac49f7655f4bd21deb244bb47f2b5a211caa29364d1155454eb155076dbb'
|
||||
'3e1f07b696ad37b1c639a524c092cd9259444bc6156542901ccaec936bea240f'
|
||||
'dbaebf54c0c4cce77d9394334ee55fdeeae8c027f5782a34a94778943baef321'
|
||||
'47885ffe6c0aa06fa798cc0b9b48b4f6acf21b6f250b7003819db3854d52635a'
|
||||
'9d925b810629074285388b5a1a9a88514a6cb45463a98ada6f66c2cba2ad9d2f')
|
||||
b2sums=('b228db453c22a94783ceed71eb9489117e0576293f6daa37b7f20b6992b80ee4e67ebeee3b1cf474d306d2341e8d0e26b16820cec9d6c53132ddc7ffd4157634'
|
||||
b2sums=('7d9041df986220470c287fe65194ec6e4da8f15540140fb7e0c3fddc95ce6e9ec9fd4f691ed349a31af28e903c769c97d9817ac65c3cc424b002e095cf559606'
|
||||
'8f5f7c4caae32f46d35f2cd73a0d00ddfde38c0b53e13d60c8a977362b8bfd6fc41f3af1a88353b6f2778d7d6d01881f14198b40532bcda53caf43aba7287804'
|
||||
'71f10db4ebe04a787940c7048131eac67cffd3ec8e415cfc961b8041b881f272650581e9df273e2a8da23a50ec9151c790dc2d5ecc0309ab2847a22f8c922c9c'
|
||||
'139cf3ae7dc9e0d9cd187950a6f5d246b0a16d2a7bf0c1179579e178826fa8e6f8a5d515145724ca7635af05d30d3e4098c34f83f0009bcc92fc04393062ab2c'
|
||||
'8e57fa09e4742cf350436c5d54f3114495543151df71fbb684199d85ca9b138bcedd1dfb5df5724d0efc74aa786f6b1ebf54f3c260a48a4937a700dcb1d5b178'
|
||||
'f720718049c1f9d0f338c203a5ae4520b5e7079b57e692ec95d8183705d7b7627ccd7d3d350d0010d0b225226641afccd699b65a81bd044fd32c441d413a0779')
|
||||
|
||||
for mr in "${_merge_requests_to_use[@]}"; do
|
||||
|
|
|
|||
50
mr3567.patch
50
mr3567.patch
|
|
@ -1,7 +1,7 @@
|
|||
From faa34e33b16e41df7ac677dd09eb82f20f064afb Mon Sep 17 00:00:00 2001
|
||||
From e59a419987c8ff7207f0cadd4f59aae9cb0e8f71 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
||||
Date: Tue, 12 Dec 2023 22:41:20 +0100
|
||||
Subject: [PATCH 1/4] x11-display: Expose UI scaling factor via D-Bus
|
||||
Subject: [PATCH 1/5] x11-display: Expose UI scaling factor via D-Bus
|
||||
|
||||
This replaces the `legacy-ui-scaling-factor` entry in
|
||||
`org.gnome.Mutter.DisplayConfig`, with the motivation being to no longer
|
||||
|
|
@ -214,10 +214,10 @@ index 3cbf82844..fe152d20b 100644
|
|||
2.45.2
|
||||
|
||||
|
||||
From 263ad502aadbc3c6029214174bb2075ccac40ac2 Mon Sep 17 00:00:00 2001
|
||||
From 42ece5f5f528fb44f63772826fe928f88327a7dc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
|
||||
Date: Tue, 20 Feb 2024 23:51:48 +0100
|
||||
Subject: [PATCH 2/4] Add an experimental feature for letting Xwayland clients
|
||||
Subject: [PATCH 2/5] Add an experimental feature for letting Xwayland clients
|
||||
scale natively
|
||||
|
||||
With the next commits we'll introduce a new mode for scaling of Xwayland apps,
|
||||
|
|
@ -285,10 +285,10 @@ index 3703b23b0..1ae59d636 100644
|
|||
2.45.2
|
||||
|
||||
|
||||
From de7052a9e376d1703cd77b6a0115e035a6f23bbe Mon Sep 17 00:00:00 2001
|
||||
From e518927c779f8498f50fe2087efcd3ee88d75c12 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
||||
Date: Tue, 12 Dec 2023 22:42:46 +0100
|
||||
Subject: [PATCH 3/4] context: Put Wayland compositor getter in the context
|
||||
Subject: [PATCH 3/5] context: Put Wayland compositor getter in the context
|
||||
header
|
||||
|
||||
Signed-off-by: Mingi Sung <sungmg@saltyming.net>
|
||||
|
|
@ -341,10 +341,10 @@ index cbe2a9a3d..8fba4a839 100644
|
|||
2.45.2
|
||||
|
||||
|
||||
From e553d954182dd713d485296edbd822a1668d61c4 Mon Sep 17 00:00:00 2001
|
||||
From 8f5fe12656db5a0488cbeb73298520b7d859b7fc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
||||
Date: Tue, 12 Dec 2023 22:52:44 +0100
|
||||
Subject: [PATCH 4/4] Add experimental mode to use native scaling of Xwayland
|
||||
Subject: [PATCH 4/5] Add experimental mode to use native scaling of Xwayland
|
||||
clients
|
||||
|
||||
Allow scale-aware Xwayland clients to scale by an integer scale
|
||||
|
|
@ -2093,3 +2093,37 @@ index 205eaaa63..fa3fbea6a 100644
|
|||
--
|
||||
2.45.2
|
||||
|
||||
|
||||
From 26bac17fc06d840006c86935b6e9486ccf033082 Mon Sep 17 00:00:00 2001
|
||||
From: HydroH <ixlesis@gmail.com>
|
||||
Date: Tue, 21 May 2024 19:15:36 +0800
|
||||
Subject: [PATCH 5/5] Correctly set bounding region for undecorated windows
|
||||
|
||||
Signed-off-by: Mingi Sung <sungmg@saltyming.net>
|
||||
---
|
||||
src/x11/window-x11.c | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
|
||||
index ccbd75d1a..5f37c634a 100644
|
||||
--- a/src/x11/window-x11.c
|
||||
+++ b/src/x11/window-x11.c
|
||||
@@ -2573,8 +2573,13 @@ meta_window_x11_update_input_region (MetaWindow *window)
|
||||
else
|
||||
{
|
||||
xwindow = priv->xwindow;
|
||||
- bounding_rect.width = priv->client_rect.width;
|
||||
- bounding_rect.height = priv->client_rect.height;
|
||||
+ meta_window_x11_stage_to_protocol(window_x11,
|
||||
+ 0, 0,
|
||||
+ priv->client_rect.width,
|
||||
+ priv->client_rect.height,
|
||||
+ NULL, NULL,
|
||||
+ &bounding_rect.width,
|
||||
+ &bounding_rect.height);
|
||||
}
|
||||
|
||||
if (META_X11_DISPLAY_HAS_SHAPE (x11_display))
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue