diff options
| author | Térence Clastres | 2018-12-18 17:41:02 +0100 |
|---|---|---|
| committer | Térence Clastres | 2018-12-18 17:41:02 +0100 |
| commit | 77c07126668ae07aa000d3d04e6314871f1a64b9 (patch) | |
| tree | a2e8e5160112d256f2d2b9b87ad1ca2cacf2aa67 | |
| parent | 6ed6a9406e1b9cfccf72275a4eadd2d49fb1d5f2 (diff) | |
| download | aur-77c07126668ae07aa000d3d04e6314871f1a64b9.tar.gz | |
Revert enabling MR 168 and add workaround for git mergetool error
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
2 files changed, 8 insertions, 4 deletions
@@ -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.30.2+7 - pkgrel = 2 + pkgrel = 3 url = https://gitlab.gnome.org/GNOME/mutter arch = x86_64 groups = gnome @@ -8,7 +8,7 @@ pkgname=mutter-781835-workaround _pkgname=mutter pkgver=3.30.2+7 -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) @@ -39,13 +39,17 @@ prepare() { # Commented multiline comment start, remove the # below to disable the patches # : ' + # workaround to automatically resolve conflicts with git mergetool + git config user.email "you@example.com" + git config user.name "Your Name" + git remote add vanvugt https://gitlab.gnome.org/vanvugt/mutter.git || true git fetch vanvugt # clutter: Deliver events sooner when possible # https://gitlab.gnome.org/GNOME/mutter/merge_requests/168/commits - # may cause stutter when using mouse with high polling rate - git cherry-pick 7782ed6e + # Disabled as may cause stutter when using mouse with high polling rate + # git cherry-pick 7782ed6e # clutter: Fix offscreen-effect painting of clones # https://gitlab.gnome.org/GNOME/mutter/merge_requests/117/commits |