Date: Saturday, April 2, 2022 @ 14:33:08 Author: heftig Revision: 441266
42.0-1 Modified: mutter/trunk/PKGBUILD ----------+ PKGBUILD | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-04-02 14:24:44 UTC (rev 441265) +++ PKGBUILD 2022-04-02 14:33:08 UTC (rev 441266) @@ -2,8 +2,9 @@ # Contributor: Ionut Biru <ib...@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> -pkgname=mutter -pkgver=41.5 +pkgbase=mutter +pkgname=(mutter mutter-docs) +pkgver=42.0 pkgrel=1 pkgdesc="A window manager for GNOME" url="https://gitlab.gnome.org/GNOME/mutter"; @@ -10,16 +11,14 @@ 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=(libmutter-9.so) -groups=(gnome) options=(debug) -_commit=17926e941d67867911c462737f4d013adb55e4d6 # tags/41.5^0 +_commit=9249aba72a5c4454894c08735a4963ca1665e34d # tags/42.0^0 source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit";) sha256sums=('SKIP') @@ -30,9 +29,6 @@ prepare() { cd mutter - - # Make tests run - sed -i '/catchsegv/d' meson.build } build() { @@ -42,6 +38,7 @@ arch-meson mutter build \ -D egl_device=true \ -D wayland_eglstream=true \ + -D docs=true \ -D installed_tests=false meson compile -C build } @@ -59,7 +56,7 @@ trap "kill $_p1 $_p2; wait" EXIT - meson test -C build --print-errorlogs + meson test -C build --print-errorlogs -t 3 ) check() { @@ -67,8 +64,30 @@ 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() { + provides=(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" +} + # vim:set sw=2 et:
