Upgrade Mutter to version 46.1

2 files changed, 9 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 81286d275b3e..244257eeca4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mutter-dynamic-buffering
 	pkgdesc = Window manager and compositor for GNOME (with dynamic triple/double buffering)
-	pkgver = 46.0
+	pkgver = 46.1
 	pkgrel = 1
 	url = https://gitlab.gnome.org/GNOME/mutter
 	arch = x86_64
@@ -70,10 +70,10 @@ pkgbase = mutter-dynamic-buffering
 	depends = systemd-libs
 	depends = wayland
 	depends = xorg-xwayland
-	source = mutter-dynamic-buffering::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=c4753689e3413cd9332d885dd0297b3b7d9ba9ca
+	source = mutter-dynamic-buffering::git+https://gitlab.gnome.org/GNOME/mutter.git#tag=46.1
 	source = mr1441.patch
-	sha256sums = SKIP
-	sha256sums = 0146f9e566786164a0d59d4dbbd87a8a97c29af0dc074b830df44458e7ea5a28
+	b2sums = 4acd4a192455890b12b2fc9b6553ed65bd2176307cd6c6683fc2ab476b7fa88f4b5e507a1209b3e900c68d94768f3cf749b4f5d87d25300b33a112182c8a62a7
+	b2sums = b85b4129a7e3c79a076650b804c01f801bdb89ce896546bdedb97e445b289ec2784f11bfd9a29d78e8830769938d42d108e7bdca9c97ec6fc867c2be53867a24
 
 pkgname = mutter-dynamic-buffering
 	provides = mutter
diff --git a/PKGBUILD b/PKGBUILD
index fed87ca8bb1e..1969403003ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgbase=mutter-dynamic-buffering
 pkgname=(mutter-dynamic-buffering)
-pkgver=46.0
+pkgver=46.1
 pkgrel=1
 pkgdesc="Window manager and compositor for GNOME (with dynamic triple/double buffering)"
 url="https://gitlab.gnome.org/GNOME/mutter"
@@ -87,20 +87,13 @@ _checkdepends=(
   wireplumber
   zenity
 )
-_commit=c4753689e3413cd9332d885dd0297b3b7d9ba9ca  # tags/46.0^0
 source=(
-  "$pkgname::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
+  # Mutter tags use SSH signatures which makepkg doesn't understand
+  "$pkgname::git+$url.git#tag=${pkgver/[a-z]/.&}"
   'mr1441.patch'
 )
-sha256sums=(
-  'SKIP'
-  '0146f9e566786164a0d59d4dbbd87a8a97c29af0dc074b830df44458e7ea5a28'
-)
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed -r 's/\.([a-z])/\1/;s/([a-z])\./\1/;s/[^-]*-g/r&/;s/-/+/g'
-}
+b2sums=('4acd4a192455890b12b2fc9b6553ed65bd2176307cd6c6683fc2ab476b7fa88f4b5e507a1209b3e900c68d94768f3cf749b4f5d87d25300b33a112182c8a62a7'
+        'b85b4129a7e3c79a076650b804c01f801bdb89ce896546bdedb97e445b289ec2784f11bfd9a29d78e8830769938d42d108e7bdca9c97ec6fc867c2be53867a24')
 
 prepare() {
   cd "$srcdir/$pkgname"