diff --git a/.SRCINFO b/.SRCINFO index 6770182..bcdc840 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = gnome-shell-performance pkgdesc = Next generation desktop shell pkgver = 41.1 - pkgrel = 2 + pkgrel = 3 epoch = 1 url = https://wiki.gnome.org/Projects/GnomeShell arch = x86_64 diff --git a/PKGBUILD b/PKGBUILD index c8a193d..c927249 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,8 +11,8 @@ ### MERGE REQUESTS SELECTION -# available MR: ('536' '786' '923' '1862') -_merge_requests_to_use=('1862') +# available MR: ('536' '786' '923' '1862' '2048') +_merge_requests_to_use=('1862' '2048') ### IMPORTANT: Do no edit below this line unless you know what you're doing @@ -20,7 +20,7 @@ _merge_requests_to_use=('1862') pkgname=gnome-shell-performance _pkgname=gnome-shell pkgver=41.1 -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc="Next generation desktop shell" url="https://wiki.gnome.org/Projects/GnomeShell" @@ -146,6 +146,16 @@ 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