Update to 42.0-1

3 files changed, 43 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7dbcc2d01e7c..96d005b877ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = mutter-rounded
 	pkgdesc = A window manager for GNOME, with rounded corners patch (integrate mr1441)
 	pkgver = 42.0
-	pkgrel = 0.1
+	pkgrel = 1
 	url = https://gitlab.gnome.org/GNOME/mutter
-	install = mutter.install
 	arch = x86_64
 	license = GPL
 	checkdepends = xorg-server-xvfb
@@ -16,6 +15,7 @@ pkgbase = mutter-rounded
 	makedepends = xorg-server
 	makedepends = wayland-protocols
 	makedepends = sysprof
+	makedepends = gi-docgen
 	depends = dconf
 	depends = gobject-introspection-runtime
 	depends = gsettings-desktop-schemas
@@ -24,7 +24,6 @@ pkgbase = mutter-rounded
 	depends = zenity
 	depends = libsm
 	depends = gnome-desktop
-	depends = upower
 	depends = libxkbcommon-x11
 	depends = gnome-settings-daemon
 	depends = libgudev
@@ -34,9 +33,6 @@ pkgbase = mutter-rounded
 	depends = graphene
 	depends = libxkbfile
 	depends = libsysprof-capture
-	provides = libmutter-10.so
-	provides = mutter
-	conflicts = mutter
 	options = debug
 	source = mutter-rounded::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=9249aba72a5c4454894c08735a4963ca1665e34d
 	source = mutter_settings::git+https://github.com/yilozt/mutter-rounded-setting
@@ -60,3 +56,11 @@ pkgbase = mutter-rounded
 	sha256sums = cf99896763558258f489ff0e9a1e8001f716d63b06366f740e044cc72a71d3e7
 
 pkgname = mutter-rounded
+	install = mutter-rounded.install
+	provides = libmutter-10.so
+	provides = mutter
+	conflicts = mutter
+
+pkgname = mutter-docs
+	pkgdesc = A window manager for GNOME, with rounded corners patch (integrate mr1441) (documentation)
+	depends = 
diff --git a/PKGBUILD b/PKGBUILD
index 55ca8925704c..e42c808e8ccc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,23 +7,21 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
-pkgname=mutter-rounded
+pkgbase=mutter-rounded
+pkgname=(mutter-rounded mutter-docs)
 pkgver=42.0
-pkgrel=0.1
+pkgrel=1
 pkgdesc="A window manager for GNOME, with rounded corners patch (integrate mr1441)"
 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 python-dbusmock wireplumber)
-provides=(libmutter-10.so mutter)
-conflicts=(mutter)
-install=mutter.install
 
 options=(debug)
 _commit=9249aba72a5c4454894c08735a4963ca1665e34d  # tag/42.0^0
@@ -70,13 +68,11 @@ prepare() {
   mv mutter_settings/dist/mutter_settings.js mutter_settings/dist/mutter_settings
 
   cd $pkgname
+  find -name "*.orig" -exec rm {} \;
   cp $srcdir/*.[ch] $srcdir/$pkgname/src
   patch -p1 < $srcdir/rounded_corners.patch
   patch -p1 < $srcdir/shell_blur_effect.patch
   # patch -p1 < $srcdir/mr1441.patch
-
-  # Make tests run
-  sed -i '/catchsegv/d' meson.build
 }
 
 build() {
@@ -86,6 +82,7 @@ build() {
   arch-meson $pkgname build \
     -D egl_device=true \
     -D wayland_eglstream=true \
+    -D docs=true \
     -D installed_tests=false
   meson compile -C build
 }
@@ -103,7 +100,7 @@ _check() (
 
   trap "kill $_p1 $_p2; wait" EXIT
 
-  meson test -C build --print-errorlogs
+  meson test -C build --print-errorlogs -t 3
 )
 
 check() {
@@ -111,8 +108,23 @@ check() {
     bash -c "$(declare -f _check); _check"
 }
 
-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-rounded() {
+  provides=(libmutter-10.so mutter)
+  conflicts=(mutter)
+  install=mutter-rounded.install
+
   meson install -C build --destdir "$pkgdir"
+
   install mutter_settings/dist/mutter_settings $pkgdir/usr/bin/
 
   _uuid=pickawindow@lluo.gitlab.com
@@ -124,4 +136,13 @@ package() {
   install -d "$pkgdir/usr/share/glib-2.0/schemas/"
   ln -s "/usr/share/gnome-shell/extensions/$_uuid/schemas/$_schemas" \
     "$pkgdir/usr/share/glib-2.0/schemas/"
+
+  _pick docs "$pkgdir"/usr/share/mutter-*/doc
 }
+
+package_mutter-docs() {
+  pkgdesc+=" (documentation)"
+  depends=()
+
+  mv docs/* "$pkgdir"
+}
\ No newline at end of file
diff --git a/mutter.install b/mutter-rounded.install
index 4e2f5c19a4dc..4e2f5c19a4dc 100644
--- a/mutter.install
+++ b/mutter-rounded.install