uppkg -> 1:45.4-2

.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = gnome-shell-no-screenshot-notification
 	pkgdesc = Next generation desktop shell - without the screenshot notification
 	pkgver = 45.4
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://wiki.gnome.org/Projects/GnomeShell
 	arch = x86_64
@@ -20,22 +20,45 @@ pkgbase = gnome-shell-no-screenshot-notification
 	makedepends = meson
 	makedepends = sassc
 	depends = accountsservice
+	depends = at-spi2-core
+	depends = bash
+	depends = cairo
+	depends = dconf
+	depends = gcc-libs
 	depends = gcr-4
+	depends = gdk-pixbuf2
 	depends = gjs
+	depends = glib2
+	depends = glibc
 	depends = gnome-autoar
+	depends = gnome-desktop-4
 	depends = gnome-session
 	depends = gnome-settings-daemon
+	depends = graphene
 	depends = gsettings-desktop-schemas
 	depends = gtk4
+	depends = hicolor-icon-theme
+	depends = json-glib
 	depends = libadwaita
 	depends = libcanberra-pulse
 	depends = libgdm
+	depends = libgirepository
+	depends = libglvnd
 	depends = libgweather-4
 	depends = libibus
+	depends = libical
+	depends = libnm
 	depends = libnma-gtk4
+	depends = libpipewire
+	depends = libpulse
 	depends = libsecret
 	depends = libsoup3
+	depends = libx11
+	depends = libxfixes
 	depends = mutter
+	depends = pango
+	depends = polkit
+	depends = systemd-libs
 	depends = unzip
 	depends = upower
 	optdepends = evolution-data-server: Evolution calendar integration
@@ -46,38 +69,64 @@ pkgbase = gnome-shell-no-screenshot-notification
 	optdepends = gst-plugins-good: Screen recording
 	optdepends = power-profiles-daemon: Power profile switching
 	optdepends = python-gobject: gnome-shell-test-tool performance tester
+	optdepends = python-simplejson: gnome-shell-test-tool performance tester
 	optdepends = switcheroo-control: Multi-GPU support
 	provides = gnome-shell
 	conflicts = gnome-shell
 	source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=58522920b5ae96d2b95dad0371ce13eb4bd955ce
 	source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
+	source = 0001-subprojects-gvc-Bump-gvc-submodule-to-newest-commit.patch
 	source = disable-screenshot-notification.patch
 	source = disable-screenshot-sound.patch
 	source = change-screenshot-filenaming.patch
 	b2sums = SKIP
 	b2sums = SKIP
+	b2sums = ee7b40aefdf751feaa661de6d0aed28efcd282250f41b25b6c0413bd75503bb2cd5413fce96d33336206448a777be04b701a4465e38c799e91328fb4197d011b
 	b2sums = a726caac6ec6dea7f7c8d122cedf30ad0a44921321ed763e2b4422e6f455edf2a93f6d9de72ac8c10560f69bb987a37acf6de2580b36464345afc08ab439d86e
 	b2sums = aca63da0703e44401fa987660d9542d92df7e89da66d93dbf0cd75bc25868b75d9502fb73c6981d964ebbb3b6a719c9b1d84629560dafbfedf3781a6fab7769a
 	b2sums = e3d93ff6565a4e2db845fe95bfd965d39a042beb47a89a91aea5f7c21b7c4d52d377470b9803082d33924780cb5a82b06159cd6ace14e1ae4249ba08eda71dac
 
 pkgname = gnome-shell-no-screenshot-notification
 	depends = accountsservice
+	depends = at-spi2-core
+	depends = bash
+	depends = cairo
+	depends = dconf
+	depends = gcc-libs
 	depends = gcr-4
+	depends = gdk-pixbuf2
 	depends = gjs
+	depends = glib2
+	depends = glibc
 	depends = gnome-autoar
+	depends = gnome-desktop-4
 	depends = gnome-session
 	depends = gnome-settings-daemon
+	depends = graphene
 	depends = gsettings-desktop-schemas
 	depends = gtk4
+	depends = hicolor-icon-theme
+	depends = json-glib
 	depends = libadwaita
 	depends = libcanberra-pulse
 	depends = libgdm
+	depends = libgirepository
+	depends = libglvnd
 	depends = libgweather-4
 	depends = libibus
+	depends = libical
+	depends = libnm
 	depends = libnma-gtk4
+	depends = libpipewire
+	depends = libpulse
 	depends = libsecret
 	depends = libsoup3
+	depends = libx11
+	depends = libxfixes
 	depends = mutter
+	depends = pango
+	depends = polkit
+	depends = systemd-libs
 	depends = unzip
 	depends = upower
 	depends = libmutter-13.so

0001-main-Leak-the-GJS-context-and-ShellGlobal.patch

@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
-Date: Wed, 6 Oct 2021 10:00:43 +0200
-Subject: [PATCH] main: Leak the GJS context and ShellGlobal
-
-There are many crash-on-exit happening as a side effect of destroying
-the GJS context. Work around these until we have a better solution by
-leaking them.
----
- src/main.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/main.c b/src/main.c
-index 29275cda0725..2311a74bd110 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -589,9 +589,11 @@ main (int argc, char **argv)
- 
-   shell_profiler_shutdown ();
- 
-+#if 0
-   g_debug ("Doing final cleanup");
-   _shell_global_destroy_gjs_context (shell_global_get ());
-   g_object_unref (shell_global_get ());
-+#endif
- 
-   return ecode;
- }

0001-subprojects-gvc-Bump-gvc-submodule-to-newest-commit.patch

@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
+Date: Tue, 12 Mar 2024 18:24:44 +0100
+Subject: [PATCH] subprojects/gvc: Bump gvc submodule to newest commit
+
+A few fixes have landed in gvc recently that should fix a crash,
+so bump the submodule to include those.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3233>
+---
+ subprojects/gvc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/subprojects/gvc b/subprojects/gvc
+index 000046e88714..91f3f4149066 160000
+--- a/subprojects/gvc
++++ b/subprojects/gvc
+@@ -1 +1 @@
+-Subproject commit 000046e88714de77db320b0711af3baacb2813a2
++Subproject commit 91f3f41490666a526ed78af744507d7ee1134323

PKGBUILD

@@ -1,12 +1,13 @@
 # Maintainer: Noah Vogt <noah@noahvogt.com>
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+# Maintainer: Fabian Bornschein <fabiscafe@archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 _base_name=gnome-shell
 pkgname=gnome-shell-no-screenshot-notification
 pkgver=45.4
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Next generation desktop shell - without the screenshot notification"
 url="https://wiki.gnome.org/Projects/GnomeShell"
@@ -14,22 +15,45 @@ arch=(x86_64)
 license=(GPL-3.0-or-later)
 depends=(
   accountsservice
+  at-spi2-core
+  bash
+  cairo
+  dconf
+  gcc-libs
   gcr-4
+  gdk-pixbuf2
   gjs
+  glib2
+  glibc
   gnome-autoar
+  gnome-desktop-4
   gnome-session
   gnome-settings-daemon
+  graphene
   gsettings-desktop-schemas
   gtk4
+  hicolor-icon-theme
+  json-glib
   libadwaita
   libcanberra-pulse
   libgdm
+  libgirepository
+  libglvnd
   libgweather-4
   libibus
+  libical
+  libnm
   libnma-gtk4
+  libpipewire
+  libpulse
   libsecret
   libsoup3
+  libx11
+  libxfixes
   mutter
+  pango
+  polkit
+  systemd-libs
   unzip
   upower
 )
@@ -58,6 +82,7 @@ optdepends=(
   'gst-plugins-good: Screen recording'
   'power-profiles-daemon: Power profile switching'
   'python-gobject: gnome-shell-test-tool performance tester'
+  'python-simplejson: gnome-shell-test-tool performance tester'
   'switcheroo-control: Multi-GPU support'
 )
 conflicts=(gnome-shell)
@@ -67,24 +92,30 @@ _commit=58522920b5ae96d2b95dad0371ce13eb4bd955ce  # tags/45.4^0
 source=(
   "git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
   "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
+  "0001-subprojects-gvc-Bump-gvc-submodule-to-newest-commit.patch"
   "disable-screenshot-notification.patch"
   "disable-screenshot-sound.patch"
   "change-screenshot-filenaming.patch"
 )
 b2sums=('SKIP'
         'SKIP'
+        'ee7b40aefdf751feaa661de6d0aed28efcd282250f41b25b6c0413bd75503bb2cd5413fce96d33336206448a777be04b701a4465e38c799e91328fb4197d011b'
         'a726caac6ec6dea7f7c8d122cedf30ad0a44921321ed763e2b4422e6f455edf2a93f6d9de72ac8c10560f69bb987a37acf6de2580b36464345afc08ab439d86e'
         'aca63da0703e44401fa987660d9542d92df7e89da66d93dbf0cd75bc25868b75d9502fb73c6981d964ebbb3b6a719c9b1d84629560dafbfedf3781a6fab7769a'
         'e3d93ff6565a4e2db845fe95bfd965d39a042beb47a89a91aea5f7c21b7c4d52d377470b9803082d33924780cb5a82b06159cd6ace14e1ae4249ba08eda71dac')
 
 pkgver() {
   cd $_base_name
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+  git describe --tags | sed -r 's/\.([a-z])/\1/;s/([a-z])\./\1/;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd $_base_name
 
+  # Update libgnome-volume-control
+  # https://gitlab.archlinux.org/archlinux/packaging/packages/gnome-shell/-/issues/3
+  git apply -3 ../0001-subprojects-gvc-Bump-gvc-submodule-to-newest-commit.patch
+
   patch -p1 -i "$srcdir/disable-screenshot-notification.patch"
   patch -p1 -i "$srcdir/disable-screenshot-sound.patch"
   patch -p1 -i "$srcdir/change-screenshot-filenaming.patch"