From bc63320b981716839bcb4f724e79f778463bfd3f Mon Sep 17 00:00:00 2001
From: Saren Arterius <saren@wtako.net>
Date: Tue, 4 Sep 2018 13:40:43 +0800
Subject: [PATCH] tweener patches cause conflict although can be automerge,
 disabled

---
 .SRCINFO |  2 +-
 PKGBUILD | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 4baef1d..bd3600e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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
diff --git a/PKGBUILD b/PKGBUILD
index 64b9333..8549161 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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