Sync to gnome-41
This commit is contained in:
parent
da20ce9511
commit
a80a2b9ff5
2 changed files with 9 additions and 6 deletions
6
.SRCINFO
6
.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 = 41.3+4+g2405c3b3b
|
||||
pkgrel = 2
|
||||
pkgver = 41.4
|
||||
pkgrel = 1
|
||||
url = https://gitlab.gnome.org/GNOME/mutter
|
||||
arch = x86_64
|
||||
groups = gnome
|
||||
|
@ -39,7 +39,7 @@ pkgbase = mutter-performance
|
|||
provides = libmutter-9.so
|
||||
conflicts = mutter
|
||||
replaces = mutter-781835-workaround
|
||||
source = mutter-performance::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=2405c3b3be7e722022554fd032f30dc3918374d5
|
||||
source = mutter-performance::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=83a34957046c5b6bca609fda4b68c8c5d1276d14
|
||||
source = mr1441.patch
|
||||
source = mr1877.patch
|
||||
sha256sums = SKIP
|
||||
|
|
9
PKGBUILD
9
PKGBUILD
|
@ -18,8 +18,8 @@ _merge_requests_to_use=('1441' '1877')
|
|||
### IMPORTANT: Do no edit below this line unless you know what you're doing
|
||||
|
||||
pkgname=mutter-performance
|
||||
pkgver=41.3+4+g2405c3b3b
|
||||
pkgrel=2
|
||||
pkgver=41.4
|
||||
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)
|
||||
|
@ -35,7 +35,7 @@ provides=(mutter mutter-781835-workaround libmutter-9.so)
|
|||
conflicts=(mutter)
|
||||
replaces=(mutter-781835-workaround)
|
||||
groups=(gnome)
|
||||
_commit=2405c3b3be7e722022554fd032f30dc3918374d5 # tags/41.3^4
|
||||
_commit=83a34957046c5b6bca609fda4b68c8c5d1276d14 # tags/41.4^0
|
||||
source=("$pkgname::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
|
||||
'mr1441.patch'
|
||||
'mr1877.patch')
|
||||
|
@ -78,6 +78,9 @@ pick_mr() {
|
|||
prepare() {
|
||||
cd $pkgname
|
||||
|
||||
# Make tests run
|
||||
sed -i '/catchsegv/d' meson.build
|
||||
|
||||
git reset --hard
|
||||
git cherry-pick --abort || true
|
||||
|
||||
|
|
Loading…
Reference in a new issue