Sync to gnome-3-34, Add !983
This commit is contained in:
parent
d042f809aa
commit
f2e2714380
2 changed files with 14 additions and 8 deletions
5
.SRCINFO
5
.SRCINFO
|
@ -1,6 +1,6 @@
|
||||||
pkgbase = mutter-performance
|
pkgbase = mutter-performance
|
||||||
pkgdesc = A window manager for GNOME | Attempts to improve performances with non-upstreamed merge-requests and frequent stable branch resync
|
pkgdesc = A window manager for GNOME | Attempts to improve performances with non-upstreamed merge-requests and frequent stable branch resync
|
||||||
pkgver = 3.34.1+66+gc0e76186d
|
pkgver = 3.34.2+2+g572431089
|
||||||
pkgrel = 1
|
pkgrel = 1
|
||||||
url = https://gitlab.gnome.org/GNOME/mutter
|
url = https://gitlab.gnome.org/GNOME/mutter
|
||||||
install = mutter.install
|
install = mutter.install
|
||||||
|
@ -33,7 +33,7 @@ pkgbase = mutter-performance
|
||||||
provides = mutter-781835-workaround
|
provides = mutter-781835-workaround
|
||||||
conflicts = mutter
|
conflicts = mutter
|
||||||
replaces = mutter-781835-workaround
|
replaces = mutter-781835-workaround
|
||||||
source = mutter-performance::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=c0e76186da5b7baf7c8804c0ffa80232a5a6bf98
|
source = mutter-performance::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=5724310899e922784f56a85f36b5195fe73f1e0e
|
||||||
source = 0001-EGL-Include-EGL-eglmesaext.h.patch
|
source = 0001-EGL-Include-EGL-eglmesaext.h.patch
|
||||||
source = 0002-surface-actor-wayland-Do-not-send-frame-callbacks-if.patch
|
source = 0002-surface-actor-wayland-Do-not-send-frame-callbacks-if.patch
|
||||||
source = 0003-xwayland-Do-not-queue-frame-callbacks-unconditionall.patch
|
source = 0003-xwayland-Do-not-queue-frame-callbacks-unconditionall.patch
|
||||||
|
@ -43,4 +43,3 @@ pkgbase = mutter-performance
|
||||||
sha256sums = 0ad4084834b6314873d2dc0a9c8bb3b30f0a6106fa44aac98a54129ec0fc0b2c
|
sha256sums = 0ad4084834b6314873d2dc0a9c8bb3b30f0a6106fa44aac98a54129ec0fc0b2c
|
||||||
|
|
||||||
pkgname = mutter-performance
|
pkgname = mutter-performance
|
||||||
|
|
||||||
|
|
17
PKGBUILD
17
PKGBUILD
|
@ -8,14 +8,14 @@
|
||||||
|
|
||||||
### MERGE REQUESTS SELECTION
|
### MERGE REQUESTS SELECTION
|
||||||
|
|
||||||
# available MR: ('!429' '!493' '!575' '!579' !719 '!724' '!762')
|
# available MR: ('!429' '!493' '!575' '!579' !719 '!724' '!762' '!983')
|
||||||
# _merge_requests_to_use=('!493' '!575' '!579' !719 '!724' '!762')
|
# _merge_requests_to_use=('!493' '!575' '!579' !719 '!724' '!762' '!983')
|
||||||
_merge_requests_to_use=('!575' '!724')
|
_merge_requests_to_use=('!575' '!724' '!983')
|
||||||
|
|
||||||
### IMPORTANT: Do no edit below this line unless you know what you're doing
|
### IMPORTANT: Do no edit below this line unless you know what you're doing
|
||||||
|
|
||||||
pkgname=mutter-performance
|
pkgname=mutter-performance
|
||||||
pkgver=3.34.1+66+gc0e76186d
|
pkgver=3.34.2+2+g572431089
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="A window manager for GNOME | Attempts to improve performances with non-upstreamed merge-requests and frequent stable branch resync"
|
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"
|
url="https://gitlab.gnome.org/GNOME/mutter"
|
||||||
|
@ -31,7 +31,7 @@ conflicts=(mutter)
|
||||||
replaces=(mutter-781835-workaround)
|
replaces=(mutter-781835-workaround)
|
||||||
groups=(gnome)
|
groups=(gnome)
|
||||||
install=mutter.install
|
install=mutter.install
|
||||||
_commit=c0e76186da5b7baf7c8804c0ffa80232a5a6bf98 # gnome-3-34
|
_commit=5724310899e922784f56a85f36b5195fe73f1e0e # gnome-3-34
|
||||||
source=("$pkgname::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
|
source=("$pkgname::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
|
||||||
0001-EGL-Include-EGL-eglmesaext.h.patch
|
0001-EGL-Include-EGL-eglmesaext.h.patch
|
||||||
0002-surface-actor-wayland-Do-not-send-frame-callbacks-if.patch
|
0002-surface-actor-wayland-Do-not-send-frame-callbacks-if.patch
|
||||||
|
@ -162,6 +162,13 @@ prepare() {
|
||||||
pick_mr '!719' 97140ab6346bd29208e99c9c9aab892c2eec0e52 'revert'
|
pick_mr '!719' 97140ab6346bd29208e99c9c9aab892c2eec0e52 'revert'
|
||||||
pick_mr '!762' e9ba9dc2 'merge'
|
pick_mr '!762' e9ba9dc2 'merge'
|
||||||
|
|
||||||
|
# Title: clutter/text: Check if attributes are equal before applying
|
||||||
|
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/983
|
||||||
|
# Type: 1
|
||||||
|
# Status: 2
|
||||||
|
# Comment:
|
||||||
|
pick_mr '!983' 59f4e36f 'merge'
|
||||||
|
|
||||||
# fix build with libglvnd's EGL headers
|
# fix build with libglvnd's EGL headers
|
||||||
git apply -3 ../0001-EGL-Include-EGL-eglmesaext.h.patch
|
git apply -3 ../0001-EGL-Include-EGL-eglmesaext.h.patch
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue