update with changes from extra

1 files changed, 20 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index fc71c31a5fbd..46a423099d8a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,34 @@
 # $Id$
 # Maintainer: Lubosz Sarnecki <lubosz.sarnecki@collabora.com>
+# Maintainer: Christoph Haag <christoph.haag@collabora.com>
+# Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 basename=gnome-shell
 pkgname=$basename-xrdesktop-git
-pkgver=3.38.3
+pkgver=3.38.4
 pkgrel=1
 epoch=1
 conflicts=($basename)
-pkgdesc="The next generation GNOME Shell - with patches for xrdesktop."
+pkgdesc="Next generation desktop shell - with patches for xrdesktop."
 url="https://gitlab.freedesktop.org/xrdesktop"
 arch=(x86_64)
 license=(GPL2)
-depends=(accountsservice gjs gnome-bluetooth gnome-session gnome-themes-extra libgdm
-         mutter nm-connection-editor unzip xrdesktop-git libinputsynth-git gnome-autoar evolution-data-server python)
+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 gst-plugin-pipewire
+         xrdesktop-git libinputsynth-git)
 makedepends=(gtk-doc gnome-control-center evolution-data-server gobject-introspection git meson
-             sassc vulkan-headers asciidoc)
-optdepends=('gnome-control-center: System settings')
+             sassc asciidoc bash-completion)
+optdepends=('gnome-control-center: System settings'
+            'evolution-data-server: Evolution calendar integration')
 groups=(gnome)
+install=gnome-shell.install
 provides=(gnome-shell=$pkgver)
-source=($basename::"git+https://gitlab.freedesktop.org/xrdesktop/gnome-shell.git#branch=3.38.3-xrdesktop"
-        "git+https://git.gnome.org/browse/libgnome-volume-control")
-
+source=($basename::"git+https://gitlab.freedesktop.org/xrdesktop/gnome-shell.git#branch=3.38.4-xrdesktop"
+        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
 sha256sums=('SKIP'
             'SKIP')
 
@@ -38,18 +44,16 @@ prepare() {
   sed -i "s/'mozilla'/'epiphany'/g" meson.build
 
   git submodule init
-  git config --local submodule.subprojects/gvc.url "$srcdir/libgnome-volume-control"
+  git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
   git submodule update
 }
   
 build() {
-  arch-meson $basename build -D gtk_doc=true --buildtype=release
-  ninja -C build
+  arch-meson $basename build -D gtk_doc=true --libdir="lib"
+  meson compile -C build
 }
 
 package() {
-  DESTDIR="$pkgdir" ninja -C build install
-
-  # Must exist; FS#37412
-  mkdir "$pkgdir/usr/share/gnome-shell/modes"
+  depends+=(libmutter-7.so)
+  DESTDIR="$pkgdir" meson install -C build
 }