Upgrade Mutter to version 42.0

2 files changed, 39 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d79295eb20c..63914ebc5be1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = mutter-dynamic-buffering
 	pkgdesc = A window manager for GNOME (with dynamic triple/double buffering)
-	pkgver = 41.5
+	pkgver = 42.0
 	pkgrel = 1
 	url = https://gitlab.gnome.org/GNOME/mutter
 	arch = x86_64
-	groups = gnome
 	license = GPL
 	makedepends = gobject-introspection
 	makedepends = git
@@ -13,6 +12,7 @@ pkgbase = mutter-dynamic-buffering
 	makedepends = xorg-server
 	makedepends = wayland-protocols
 	makedepends = sysprof
+	makedepends = gi-docgen
 	depends = dconf
 	depends = gobject-introspection-runtime
 	depends = gsettings-desktop-schemas
@@ -21,7 +21,6 @@ pkgbase = mutter-dynamic-buffering
 	depends = zenity
 	depends = libsm
 	depends = gnome-desktop
-	depends = upower
 	depends = libxkbcommon-x11
 	depends = gnome-settings-daemon
 	depends = libgudev
@@ -31,10 +30,7 @@ pkgbase = mutter-dynamic-buffering
 	depends = graphene
 	depends = libxkbfile
 	depends = libsysprof-capture
-	provides = mutter
-	provides = libmutter-9.so
-	conflicts = mutter
-	source = mutter-dynamic-buffering::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=17926e941d67867911c462737f4d013adb55e4d6
+	source = mutter-dynamic-buffering::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=9249aba72a5c4454894c08735a4963ca1665e34d
 	source = backports.patch
 	source = mr1441.patch
 	sha256sums = SKIP
@@ -42,3 +38,7 @@ pkgbase = mutter-dynamic-buffering
 	sha256sums = cf99896763558258f489ff0e9a1e8001f716d63b06366f740e044cc72a71d3e7
 
 pkgname = mutter-dynamic-buffering
+	groups = gnome
+	provides = mutter
+	provides = libmutter-10.so
+	conflicts = mutter
diff --git a/PKGBUILD b/PKGBUILD
index ea482f90aa02..c0039104b741 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,25 +3,23 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
-pkgname=mutter-dynamic-buffering
-pkgver=41.5
+pkgbase=mutter-dynamic-buffering
+pkgname=(mutter-dynamic-buffering)
+pkgver=42.0
 pkgrel=1
 pkgdesc="A window manager for GNOME (with dynamic triple/double buffering)"
 url="https://gitlab.gnome.org/GNOME/mutter"
 arch=(x86_64)
 license=(GPL)
 depends=(dconf gobject-introspection-runtime gsettings-desktop-schemas
-         libcanberra startup-notification zenity libsm gnome-desktop upower
+         libcanberra startup-notification zenity libsm gnome-desktop
          libxkbcommon-x11 gnome-settings-daemon libgudev libinput pipewire
          xorg-xwayland graphene libxkbfile libsysprof-capture)
 makedepends=(gobject-introspection git egl-wayland meson xorg-server
-             wayland-protocols sysprof)
+             wayland-protocols sysprof gi-docgen)
 #checkdepends=(xorg-server-xvfb pipewire-media-session python-dbusmock)
-provides=(mutter libmutter-9.so)
-conflicts=(mutter)
-groups=(gnome)
 #options=(debug)
-_commit=17926e941d67867911c462737f4d013adb55e4d6  # tags/41.5^0
+_commit=9249aba72a5c4454894c08735a4963ca1665e34d  # tags/42.0^0
 source=("$pkgname::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
         'backports.patch'
         'mr1441.patch')
@@ -39,9 +37,6 @@ prepare() {
   cd "$srcdir/$pkgname"
   patch -p1 < "$srcdir/mr1441.patch"
   patch -p1 < "$srcdir/backports.patch"
-
-  # Make tests run
-  sed -i '/catchsegv/d' meson.build
 }
 
 build() {
@@ -50,6 +45,7 @@ build() {
   arch-meson $pkgname build \
     -D egl_device=true \
     -D wayland_eglstream=true \
+    -D docs=true \
     -D installed_tests=false \
     -D tests=false
   meson compile -C build
@@ -68,7 +64,7 @@ _check_internal() (
 
   trap "kill $_p1 $_p2; wait" EXIT
 
-  meson test -C build --print-errorlogs
+  meson test -C build --print-errorlogs -t 3
 )
 
 _check_disabled() {
@@ -76,6 +72,29 @@ _check_disabled() {
     bash -c "$(declare -f _check_internal); _check_internal"
 }
 
-package() {
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
+package_mutter-dynamic-buffering() {
+  conflicts=(mutter)
+  provides=(mutter libmutter-10.so)
+  groups=(gnome)
+
   meson install -C build --destdir "$pkgdir"
+
+  _pick docs "$pkgdir"/usr/share/mutter-*/doc
+}
+
+package_mutter-docs() {
+  pkgdesc+=" (documentation)"
+  depends=()
+
+  mv docs/* "$pkgdir"
 }