Sync with [extra]

2 files changed, 28 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ca1f5c5fd31..aaa152fbfedc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,7 +7,8 @@ pkgbase = gnome-shell-performance
 	install = gnome-shell-performance.install
 	arch = x86_64
 	groups = gnome
-	license = GPL2
+	license = GPL
+	checkdepends = xorg-server-xvfb
 	makedepends = gtk-doc
 	makedepends = gnome-control-center
 	makedepends = evolution-data-server
@@ -23,6 +24,7 @@ pkgbase = gnome-shell-performance
 	depends = gnome-bluetooth
 	depends = upower
 	depends = gnome-session
+	depends = gtk4
 	depends = gnome-settings-daemon
 	depends = gnome-themes-extra
 	depends = gsettings-desktop-schemas
@@ -36,13 +38,14 @@ pkgbase = gnome-shell-performance
 	depends = libibus
 	depends = gnome-autoar
 	depends = gnome-disk-utility
+	depends = gst-plugin-pipewire
 	optdepends = gnome-control-center: System settings
 	optdepends = evolution-data-server: Evolution calendar integration
 	provides = gnome-shell
 	provides = gnome-shell=3.38.3
 	provides = gnome-shell=1:3.38.3
 	conflicts = gnome-shell
-	source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=0eb273d3a675d40bc1822817f24aa139bfe5e4a9
+	source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=d9e953e93ca3df38600f0286bf58a8d0e6812e7d
 	source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -54,6 +57,7 @@ pkgname = gnome-shell-performance
 	depends = gnome-bluetooth
 	depends = upower
 	depends = gnome-session
+	depends = gtk4
 	depends = gnome-settings-daemon
 	depends = gnome-themes-extra
 	depends = gsettings-desktop-schemas
@@ -67,5 +71,6 @@ pkgname = gnome-shell-performance
 	depends = libibus
 	depends = gnome-autoar
 	depends = gnome-disk-utility
-	depends = libmutter-7.so
+	depends = gst-plugin-pipewire
+	depends = libmutter-8.so
 
diff --git a/PKGBUILD b/PKGBUILD
index 4de1da4f711b..6dc9ecf364b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,19 +20,21 @@ epoch=1
 pkgdesc="Next generation desktop shell"
 url="https://wiki.gnome.org/Projects/GnomeShell"
 arch=(x86_64)
-license=(GPL2)
-depends=(accountsservice gcr gjs gnome-bluetooth upower gnome-session gnome-settings-daemon
-         gnome-themes-extra gsettings-desktop-schemas libcanberra-pulse libgdm libsecret
-         mutter nm-connection-editor unzip gstreamer libibus gnome-autoar gnome-disk-utility)
-makedepends=(gtk-doc gnome-control-center evolution-data-server gobject-introspection git meson
-             sassc asciidoc bash-completion)
+license=(GPL)
+depends=(accountsservice gcr gjs gnome-bluetooth upower gnome-session gtk4
+         gnome-settings-daemon gnome-themes-extra gsettings-desktop-schemas
+         libcanberra-pulse libgdm libsecret mutter nm-connection-editor unzip
+         gstreamer libibus gnome-autoar gnome-disk-utility gst-plugin-pipewire)
+makedepends=(gtk-doc gnome-control-center evolution-data-server
+             gobject-introspection git meson sassc asciidoc bash-completion)
+checkdepends=(xorg-server-xvfb)
 optdepends=('gnome-control-center: System settings'
             'evolution-data-server: Evolution calendar integration')
 groups=(gnome)
 provides=(gnome-shell gnome-shell=$pkgver gnome-shell=$epoch:$pkgver)
 conflicts=(gnome-shell)
 install=$pkgname.install
- _commit=0eb273d3a675d40bc1822817f24aa139bfe5e4a9  # tags/3.38.3^0
+ _commit=d9e953e93ca3df38600f0286bf58a8d0e6812e7d  # master
 source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
         "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
 sha256sums=('SKIP'
@@ -116,7 +118,7 @@ prepare() {
   # Type: 2
   # Status: 1
   # Comment: Crash fix for st_theme_get_custom_stylesheets
-  pick_mr '536' '536.diff' 'patch' 
+  pick_mr '536'
 
   # Title: Some fixes for setting key focus of the closeDialog
   # URL: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/786
@@ -149,7 +151,16 @@ build() {
   meson compile -C build
 }
 
+check() (
+  mkdir -p -m 700 "${XDG_RUNTIME_DIR:=$PWD/runtime-dir}"
+  export XDG_RUNTIME_DIR
+
+  dbus-run-session xvfb-run \
+    -s '-screen 0 1920x1080x24 -nolisten local +iglx -noreset' \
+  meson test -C build --print-errorlogs
+)
+
 package() {
-  depends+=(libmutter-7.so)
+  depends+=(libmutter-8.so)
   DESTDIR="$pkgdir" meson install -C build
 }