update to 41.5 and add patch for meson 0.60.0+

2 files changed, 14 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6f9aafa05a8..b4999f6e68b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gnome-shell-xrdesktop-git
 	pkgdesc = Next generation desktop shell - with patches for xrdesktop.
-	pkgver = 41.1
+	pkgver = 41.5
 	pkgrel = 1
 	epoch = 1
 	url = https://gitlab.freedesktop.org/xrdesktop
@@ -43,12 +43,14 @@ pkgbase = gnome-shell-xrdesktop-git
 	depends = libinputsynth-git
 	optdepends = gnome-control-center: System settings
 	optdepends = evolution-data-server: Evolution calendar integration
-	provides = gnome-shell=41.1
+	provides = gnome-shell=41.5
 	conflicts = gnome-shell
-	source = git+https://gitlab.freedesktop.org/xrdesktop/gnome-shell.git#branch=41.1-xrdesktop
+	source = git+https://gitlab.freedesktop.org/xrdesktop/gnome-shell.git#branch=41.5-xrdesktop
 	source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
+	source = https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/65450a836ee9e0722a2d4c3327f52345eae293c6.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = 9ccd84e3996568cdfd76d23e00954665898848da84b91f1936d5aee723b18ead
 
 pkgname = gnome-shell-xrdesktop-git
 	depends = accountsservice
diff --git a/PKGBUILD b/PKGBUILD
index 81686e9421cc..0cae8b846d5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 basename=gnome-shell
 pkgname=$basename-xrdesktop-git
-pkgver=41.1
+pkgver=41.5
 pkgrel=1
 epoch=1
 conflicts=($basename)
@@ -27,10 +27,13 @@ optdepends=('gnome-control-center: System settings'
 groups=(gnome)
 provides=(gnome-shell=$pkgver)
 install=gnome-shell.install
-source=("git+https://gitlab.freedesktop.org/xrdesktop/gnome-shell.git#branch=41.1-xrdesktop"
-        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
+source=("git+https://gitlab.freedesktop.org/xrdesktop/gnome-shell.git#branch=41.5-xrdesktop"
+        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
+        # https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078
+        "https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/65450a836ee9e0722a2d4c3327f52345eae293c6.patch")
 sha256sums=('SKIP'
-            'SKIP')
+            'SKIP'
+            '9ccd84e3996568cdfd76d23e00954665898848da84b91f1936d5aee723b18ead')
 
 pkgver() {
   cd $basename
@@ -43,6 +46,8 @@ prepare() {
   git submodule init
   git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
   git submodule update
+
+  git am -3 --no-commit "$srcdir/65450a836ee9e0722a2d4c3327f52345eae293c6.patch"
 }
 
 build() {