summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTérence Clastres2019-05-03 20:33:47 +0200
committerTérence Clastres2019-05-03 20:50:47 +0200
commit72903c05b34020205a0ba1d86a78c99436f590e2 (patch)
tree3834d82dbc806e62e15d8e68c5115c399db1fce3
parent8592550bd8fc54e72ccce780d64477430469cf7e (diff)
downloadaur-72903c05b34020205a0ba1d86a78c99436f590e2.tar.gz
Fix a commit name
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD5
2 files changed, 3 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f8e6d1bb495c..51f3d3de5a7c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mutter-781835-workaround
pkgdesc = A window manager for GNOME. This package reverts a commit which may causes performance problems for nvidia driver users. Some performance patches also included.
pkgver = 3.32.1+5+g668c44e66
- pkgrel = 2
+ pkgrel = 3
url = https://gitlab.gnome.org/GNOME/mutter
arch = x86_64
groups = gnome
diff --git a/PKGBUILD b/PKGBUILD
index 1a050ea1ae2a..7a450eb7b6b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ _revert=
pkgname=mutter-781835-workaround
pkgver=3.32.1+5+g668c44e66
-pkgrel=2
+pkgrel=3
pkgdesc="A window manager for GNOME. This package reverts a commit which may causes performance problems for nvidia driver users. Some performance patches also included."
url="https://gitlab.gnome.org/GNOME/mutter"
arch=(x86_64)
@@ -66,8 +66,7 @@ prepare() {
# clutter-stage-cogl: Reduce output latency and reduce missed frames too [performance]
# https://gitlab.gnome.org/GNOME/mutter/merge_requests/281
# first commit replaced by !363
- # Conflict!
- hash=$(git log --oneline --all | grep 'clutter-stage-cogl: Reschedule update on present' | head -n 1 | awk '{print $1}') # Sorry guys
+ hash=$(git log --oneline --all | grep 'clutter/stage-cogl: Reschedule update on present' | head -n 1 | awk '{print $1}') # Sorry guys
echo "Found $hash for MR281"
git cherry-pick -n $hash -Xtheirs