Update to GNOME Shell 40.1. Update to new Arch PKGBUILD.

2 files changed, 20 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b238d3e424c3..858f2afa2ad3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = gnome-shell-xrdesktop-git
 	pkgdesc = Next generation desktop shell - with patches for xrdesktop.
-	pkgver = 3.38.4
+	pkgver = 40.1
 	pkgrel = 1
 	epoch = 1
 	url = https://gitlab.freedesktop.org/xrdesktop
 	install = gnome-shell.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-xrdesktop-git
 	depends = gnome-bluetooth
 	depends = upower
 	depends = gnome-session
+	depends = gtk4
 	depends = gnome-settings-daemon
 	depends = gnome-themes-extra
 	depends = gsettings-desktop-schemas
@@ -41,9 +43,9 @@ pkgbase = gnome-shell-xrdesktop-git
 	depends = libinputsynth-git
 	optdepends = gnome-control-center: System settings
 	optdepends = evolution-data-server: Evolution calendar integration
-	provides = gnome-shell=3.38.4
+	provides = gnome-shell=40.1
 	conflicts = gnome-shell
-	source = gnome-shell::git+https://gitlab.freedesktop.org/xrdesktop/gnome-shell.git#branch=3.38.4-xrdesktop
+	source = git+https://gitlab.freedesktop.org/xrdesktop/gnome-shell.git#branch=40.1-xrdesktop
 	source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -55,6 +57,7 @@ pkgname = gnome-shell-xrdesktop-git
 	depends = gnome-bluetooth
 	depends = upower
 	depends = gnome-session
+	depends = gtk4
 	depends = gnome-settings-daemon
 	depends = gnome-themes-extra
 	depends = gsettings-desktop-schemas
@@ -71,5 +74,4 @@ pkgname = gnome-shell-xrdesktop-git
 	depends = gst-plugin-pipewire
 	depends = xrdesktop-git
 	depends = libinputsynth-git
-	depends = libmutter-7.so
-
+	depends = libmutter-8.so
diff --git a/PKGBUILD b/PKGBUILD
index 46a423099d8a..44f5990dc625 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: Lubosz Sarnecki <lubosz.sarnecki@collabora.com>
 # Maintainer: Christoph Haag <christoph.haag@collabora.com>
 # Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
@@ -7,27 +6,28 @@
 
 basename=gnome-shell
 pkgname=$basename-xrdesktop-git
-pkgver=3.38.4
+pkgver=40.1
 pkgrel=1
 epoch=1
 conflicts=($basename)
 pkgdesc="Next generation desktop shell - with patches for xrdesktop."
 url="https://gitlab.freedesktop.org/xrdesktop"
 arch=(x86_64)
-license=(GPL2)
-depends=(accountsservice gcr gjs gnome-bluetooth upower gnome-session
+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
          xrdesktop-git libinputsynth-git)
-makedepends=(gtk-doc gnome-control-center evolution-data-server gobject-introspection git meson
-             sassc asciidoc bash-completion)
+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)
-install=gnome-shell.install
 provides=(gnome-shell=$pkgver)
-source=($basename::"git+https://gitlab.freedesktop.org/xrdesktop/gnome-shell.git#branch=3.38.4-xrdesktop"
+install=gnome-shell.install
+source=("git+https://gitlab.freedesktop.org/xrdesktop/gnome-shell.git#branch=40.1-xrdesktop"
         "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
 sha256sums=('SKIP'
             'SKIP')
@@ -40,20 +40,17 @@ pkgver() {
 prepare() {
   cd $basename
 
-  # Move the plugin to our custom epiphany-only dir
-  sed -i "s/'mozilla'/'epiphany'/g" meson.build
-
   git submodule init
   git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
   git submodule update
 }
-  
+
 build() {
-  arch-meson $basename build -D gtk_doc=true --libdir="lib"
+  arch-meson $basename build -D gtk_doc=true --buildtype=release
   meson compile -C build
 }
 
 package() {
-  depends+=(libmutter-7.so)
-  DESTDIR="$pkgdir" meson install -C build
+  depends+=(libmutter-8.so)
+  meson install -C build --destdir "$pkgdir"
 }