New upstream release: 40.6

3 files changed, 11 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac76832b1986..4590f99572c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = mutter-oldstable
 	pkgdesc = A window manager for GNOME (oldstable version)
-	pkgver = 3.38.6
+	pkgver = 40.6
 	pkgrel = 1
 	url = https://gitlab.gnome.org/GNOME/mutter
-	install = mutter.install
 	arch = x86_64
 	groups = gnome-oldstable
 	license = GPL
@@ -14,6 +13,7 @@ pkgbase = mutter-oldstable
 	makedepends = egl-wayland
 	makedepends = meson
 	makedepends = xorg-server
+	makedepends = wayland-protocols
 	depends = dconf
 	depends = gobject-introspection-runtime
 	depends = gsettings-desktop-schemas-oldstable
@@ -31,10 +31,10 @@ pkgbase = mutter-oldstable
 	depends = xorg-xwayland
 	depends = graphene
 	depends = libxkbfile
-	provides = libmutter-7.so
+	provides = libmutter-8.so
 	conflicts = mutter
 	replaces = mutter
-	source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=8bf8474372ea66ee7cccf369a95f6be83109681e
+	source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=48f4306b738b079d3758595cdb6ab7f6a1f821c8
 	sha256sums = SKIP
 
 pkgname = mutter-oldstable
diff --git a/PKGBUILD b/PKGBUILD
index dff32bd825c3..7e15beb25306 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter-oldstable
-pkgver=3.38.6
+pkgver=40.6
 pkgrel=1
 pkgdesc="A window manager for GNOME (oldstable version)"
 url="https://gitlab.gnome.org/GNOME/mutter"
@@ -17,12 +17,12 @@ depends=(dconf gobject-introspection-runtime gsettings-desktop-schemas-oldstable
          libcanberra startup-notification zenity libsm gnome-desktop upower
          libxkbcommon-x11 gnome-settings-daemon-oldstable libgudev libinput pipewire
          xorg-xwayland graphene libxkbfile)
-makedepends=(gobject-introspection git egl-wayland meson xorg-server)
+makedepends=(gobject-introspection git egl-wayland meson xorg-server
+             wayland-protocols)
 checkdepends=(xorg-server-xvfb pipewire-media-session)
-provides=(libmutter-7.so)
+provides=(libmutter-8.so)
 groups=(gnome-oldstable)
-install=mutter.install
-_commit=8bf8474372ea66ee7cccf369a95f6be83109681e  # tag/3.38.6
+_commit=48f4306b738b079d3758595cdb6ab7f6a1f821c8  # tag/40.6
 source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -59,16 +59,15 @@ _check() (
 
   trap "kill $_p1 $_p2; wait" EXIT
 
-  meson test -C build --print-errorlogs || true
+  meson test -C build --print-errorlogs
 )
 
 check() {
-# Check might fail without clean build env. Continue building in any case.
   dbus-run-session xvfb-run \
     -s '-screen 0 1920x1080x24 -nolisten local +iglx -noreset' \
     bash -c "$(declare -f _check); _check"
 }
 
 package() {
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
 }
diff --git a/mutter.install b/mutter.install
deleted file mode 100644
index e419c628d76e..000000000000
--- a/mutter.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  setcap cap_sys_nice+ep usr/bin/mutter
-}
-
-post_upgrade() {
-  post_install
-}