summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSung Mingi2021-12-18 12:21:29 +0900
committerSung Mingi2021-12-18 12:22:14 +0900
commit0d7bd2ea804c9f9607010370861562da5939006f (patch)
tree641f99fe2ff45118d43b022e9d43ff61e14cd17d
parentd7942d354dbb5838bd2f4073fd83f81a5c5b9c64 (diff)
downloadaur-0d7bd2ea804c9f9607010370861562da5939006f.tar.gz
Remove !2048
Signed-off-by: Sung Mingi <FiestaLake@protonmail.com>
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD16
2 files changed, 4 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8aa085a6820c..a33b5e0bdc3f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gnome-shell-performance
pkgdesc = Next generation desktop shell
pkgver = 42.1
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = https://wiki.gnome.org/Projects/GnomeShell
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 319aff1b2b35..6a57decc547a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,8 @@
### MERGE REQUESTS SELECTION
-# available MR: ('536' '786' '923' '1862' '2048')
-_merge_requests_to_use=('1862' '2048')
+# available MR: ('536' '786' '923' '1862')
+_merge_requests_to_use=('1862')
### IMPORTANT: Do no edit below this line unless you know what you're doing
@@ -20,7 +20,7 @@ _merge_requests_to_use=('1862' '2048')
pkgname=gnome-shell-performance
_pkgname=gnome-shell
pkgver=42.1
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc="Next generation desktop shell"
url="https://wiki.gnome.org/Projects/GnomeShell"
@@ -145,16 +145,6 @@ prepare() {
# Comment: Part 1 was in !1904 (merged)
pick_mr '1862'
- # Title: util: Wait for initial name owners in DBusSenderCheck before checking
- # URL: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2048
- # Type: 3
- # Status: 1
- # Comment: Otherwise an allowed caller might get rejected if the call is right
- # after a gnome-shell restart and the watcher has not finished running its
- # callbacks yet.
- # Fixes: #4813
- pick_mr '2048'
-
git submodule init
git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
git submodule update