From 3ea150f68d6843b6a4e2958540699b2108a3eb31 Mon Sep 17 00:00:00 2001 From: Saren Arterius Date: Sat, 5 Jun 2021 12:33:22 +0800 Subject: [PATCH] sync --- .SRCINFO | 2 +- PKGBUILD | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index cf00c56..08586a4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = gnome-shell-performance pkgdesc = Next generation desktop shell pkgver = 40.1 - pkgrel = 1 + pkgrel = 2 epoch = 1 url = https://wiki.gnome.org/Projects/GnomeShell install = gnome-shell-performance.install diff --git a/PKGBUILD b/PKGBUILD index d5d1ced..515b2d0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,7 +15,7 @@ _merge_requests_to_use=() pkgname=gnome-shell-performance _pkgname=gnome-shell pkgver=40.1 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="Next generation desktop shell" url="https://wiki.gnome.org/Projects/GnomeShell" @@ -75,6 +75,10 @@ pick_mr() { prepare() { cd $_pkgname + # https://bugs.archlinux.org/task/70851 + # https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1850 + git cherry-pick -n d9239e2cee27cad582544e769ad794ca571f35fb + ### Adding and fetching remotes providing the selected merge-requests ### Only needed when there is no MR opened