1
0
Fork 0

tweener patches cause conflict although can be automerge, disabled

This commit is contained in:
Saren Arterius 2018-09-04 13:40:43 +08:00
parent cab3394bde
commit bc63320b98
2 changed files with 9 additions and 9 deletions

View file

@ -1,7 +1,7 @@
pkgbase = gnome-shell-performance
pkgdesc = The next generation GNOME Shell | Attempt to improve the performance by non-upstreamed patches
pkgver = 3.28.3+7+g721ce5403
pkgrel = 1
pkgrel = 2
url = https://wiki.gnome.org/Projects/GnomeShell
arch = x86_64
groups = gnome

View file

@ -5,7 +5,7 @@
pkgname=gnome-shell-performance
_pkgname=gnome-shell
pkgver=3.28.3+7+g721ce5403
pkgrel=1
pkgrel=2
pkgdesc="The next generation GNOME Shell | Attempt to improve the performance by non-upstreamed patches"
url="https://wiki.gnome.org/Projects/GnomeShell"
arch=(x86_64)
@ -39,13 +39,13 @@ prepare() {
# Javascript invalid access fixes
# https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/4/commits
git remote add vanvugt https://gitlab.gnome.org/vanvugt/gnome-shell.git || true
git fetch vanvugt
git cherry-pick 78da92c1 || bash
git cherry-pick df5ca834 || bash
git cherry-pick a667357e || bash
git cherry-pick 163e9b43 || bash
git cherry-pick 1f820518 || bash
# git remote add vanvugt https://gitlab.gnome.org/vanvugt/gnome-shell.git || true
# git fetch vanvugt
# git cherry-pick 78da92c1 || bash
# git cherry-pick df5ca834 || bash
# git cherry-pick a667357e || bash
# git cherry-pick 163e9b43 || bash
# git cherry-pick 1f820518 || bash
# Try to fix docs build