[arch-commits] Commit in mutter/trunk (PKGBUILD)

[Jan Steffens]

    Date: Thursday, April 7, 2022 @ 08:53:34
  Author: heftig
Revision: 441701

42.0-2

Modified:
  mutter/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-07 08:43:51 UTC (rev 441700)
+++ PKGBUILD	2022-04-07 08:53:34 UTC (rev 441701)
@@ -5,7 +5,7 @@
 pkgbase=mutter
 pkgname=(mutter mutter-docs)
 pkgver=42.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A window manager for GNOME"
 url="https://gitlab.gnome.org/GNOME/mutter"
 arch=(x86_64)
@@ -16,7 +16,7 @@
          xorg-xwayland graphene libxkbfile libsysprof-capture)
 makedepends=(gobject-introspection git egl-wayland meson xorg-server
              wayland-protocols sysprof gi-docgen)
-checkdepends=(xorg-server-xvfb pipewire-media-session python-dbusmock)
+checkdepends=(xorg-server-xvfb wireplumber python-dbusmock)
 options=(debug)
 _commit=9249aba72a5c4454894c08735a4963ca1665e34d  # tags/42.0^0
 source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit")
@@ -29,6 +29,12 @@
 
 prepare() {
   cd mutter
+
+  # Fix Dash-to-dock not autohiding
+  git cherry-pick -n 2aad56b949b8 0280b0aaa563
+
+  # https://bugs.archlinux.org/task/74360
+  git cherry-pick -n f9857cb8bd7af20e819283917ae165fa40c19f07
 }
 
 build() {
@@ -51,7 +57,7 @@
   pipewire &
   _p1=$!
 
-  pipewire-media-session &
+  wireplumber &
   _p2=$!
 
   trap "kill $_p1 $_p2; wait" EXIT