From 5e1146351cd996c4a4dfec290cddad6dc273b7d2 Mon Sep 17 00:00:00 2001
From: heftig <heftig@eb2447ed-0c53-47e4-bac8-5bc4a241df78>
Date: Sat, 6 May 2023 16:43:51 +0000
Subject: [PATCH] db-move: moved gnome-shell from [testing] to [extra] (x86_64)

git-svn-id: file:///srv/repos/svn-packages/svn@476837 eb2447ed-0c53-47e4-bac8-5bc4a241df78
---
 gnome-shell/repos/extra-x86_64/PKGBUILD            |  31 ++----
 ...main-Leak-the-GJS-context-and-ShellGlobal.patch |  28 ------
 gnome-shell/repos/testing-x86_64/PKGBUILD          | 111 ---------------------
 3 files changed, 9 insertions(+), 161 deletions(-)
 delete mode 100644 gnome-shell/repos/testing-x86_64/0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
 delete mode 100644 gnome-shell/repos/testing-x86_64/PKGBUILD

diff --git a/gnome-shell/repos/extra-x86_64/PKGBUILD b/gnome-shell/repos/extra-x86_64/PKGBUILD
index 95a22b0dcc4..9fa718adddc 100644
--- a/gnome-shell/repos/extra-x86_64/PKGBUILD
+++ b/gnome-shell/repos/extra-x86_64/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=43.5
-pkgrel=1
+pkgver=44.1
+pkgrel=3
 epoch=1
 pkgdesc="Next generation desktop shell"
 url="https://wiki.gnome.org/Projects/GnomeShell"
@@ -24,7 +24,7 @@ depends=(
   libgdm
   libgweather-4
   libibus
-  libnma
+  libnma-gtk4
   libsecret
   libsoup3
   mutter
@@ -44,6 +44,7 @@ makedepends=(
 )
 checkdepends=(
   appstream-glib
+  python-dbusmock
   xorg-server-xvfb
 )
 optdepends=(
@@ -57,15 +58,13 @@ optdepends=(
   'switcheroo-control: Multi-GPU support'
 )
 groups=(gnome)
-_commit=4b23dfb53519710fac643d214e661b1488505fda  # tags/43.5^0
+_commit=b0ca64e7775225b7c5d049571a44ef40bf516406  # tags/44.1^0
 source=(
   "git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
   "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
-  0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
 )
 b2sums=('SKIP'
-        'SKIP'
-        '5636fd813bc0aeafbdd52eb6335ef79b5801b800e332119b3d127a6cd188aa24051ebc718449f22bea7bedc37347ff98c7d491b35d84f573f0e4cff2046117d4')
+        'SKIP')
 
 pkgver() {
   cd $pkgname
@@ -75,18 +74,6 @@ pkgver() {
 prepare() {
   cd $pkgname
 
-  # https://bugs.archlinux.org/task/77572
-  # https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2611
-  git cherry-pick -n a9e6e44ef898671229388938cc3ed511fa394dfc
-
-  # https://bugs.archlinux.org/task/74434
-  # https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2621
-  git cherry-pick -n 266a19f05cad26d97c659493cd34ba196ef6eeb2
-
-  # https://bugs.archlinux.org/task/71250
-  # https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5560#note_1636124
-  git apply -3 ../0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
-
   git submodule init
   git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
   git -c protocol.file.allow=always submodule update
@@ -105,10 +92,10 @@ build() {
 }
 
 _check() (
-  export XDG_RUNTIME_DIR="$PWD/runtime-dir"
+  export XDG_RUNTIME_DIR="$PWD/rdir"
   mkdir -p -m 700 "$XDG_RUNTIME_DIR"
 
-  meson test -C build --print-errorlogs
+  meson test -C build --print-errorlogs -t 3
 )
 
 check() {
@@ -117,7 +104,7 @@ check() {
 }
 
 package() {
-  depends+=(libmutter-11.so)
+  depends+=(libmutter-12.so)
   meson install -C build --destdir "$pkgdir"
 }
 
diff --git a/gnome-shell/repos/testing-x86_64/0001-main-Leak-the-GJS-context-and-ShellGlobal.patch b/gnome-shell/repos/testing-x86_64/0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
deleted file mode 100644
index 1e4188749f0..00000000000
--- a/gnome-shell/repos/testing-x86_64/0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
+++ /dev/null
@@ -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;
- }
diff --git a/gnome-shell/repos/testing-x86_64/PKGBUILD b/gnome-shell/repos/testing-x86_64/PKGBUILD
deleted file mode 100644
index 9fa718adddc..00000000000
--- a/gnome-shell/repos/testing-x86_64/PKGBUILD
+++ /dev/null
@@ -1,111 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Flamelab <panosfilip@gmail.com
-
-pkgname=gnome-shell
-pkgver=44.1
-pkgrel=3
-epoch=1
-pkgdesc="Next generation desktop shell"
-url="https://wiki.gnome.org/Projects/GnomeShell"
-arch=(x86_64)
-license=(GPL)
-depends=(
-  accountsservice
-  gcr-4
-  gjs
-  gnome-autoar
-  gnome-session
-  gnome-settings-daemon
-  gsettings-desktop-schemas
-  gtk4
-  libadwaita
-  libcanberra-pulse
-  libgdm
-  libgweather-4
-  libibus
-  libnma-gtk4
-  libsecret
-  libsoup3
-  mutter
-  unzip
-  upower
-)
-makedepends=(
-  asciidoc
-  bash-completion
-  evolution-data-server
-  git
-  gnome-control-center
-  gobject-introspection
-  gtk-doc
-  meson
-  sassc
-)
-checkdepends=(
-  appstream-glib
-  python-dbusmock
-  xorg-server-xvfb
-)
-optdepends=(
-  'evolution-data-server: Evolution calendar integration'
-  'gnome-bluetooth-3.0: Bluetooth support'
-  'gnome-control-center: System settings'
-  'gnome-disk-utility: Mount with keyfiles'
-  'gst-plugin-pipewire: Screen recording'
-  'gst-plugins-good: Screen recording'
-  'power-profiles-daemon: Power profile switching'
-  'switcheroo-control: Multi-GPU support'
-)
-groups=(gnome)
-_commit=b0ca64e7775225b7c5d049571a44ef40bf516406  # tags/44.1^0
-source=(
-  "git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
-  "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
-)
-b2sums=('SKIP'
-        'SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  git submodule init
-  git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
-  git -c protocol.file.allow=always submodule update
-}
-
-build() {
-  local meson_options=(
-    -D gtk_doc=true
-  )
-
-  CFLAGS="${CFLAGS/-O2/-O3} -fno-semantic-interposition"
-  LDFLAGS+=" -Wl,-Bsymbolic-functions"
-
-  arch-meson $pkgname build "${meson_options[@]}"
-  meson compile -C build
-}
-
-_check() (
-  export XDG_RUNTIME_DIR="$PWD/rdir"
-  mkdir -p -m 700 "$XDG_RUNTIME_DIR"
-
-  meson test -C build --print-errorlogs -t 3
-)
-
-check() {
-  dbus-run-session xvfb-run -s '-nolisten local +iglx -noreset' \
-    bash -c "$(declare -f _check); _check"
-}
-
-package() {
-  depends+=(libmutter-12.so)
-  meson install -C build --destdir "$pkgdir"
-}
-
-# vim:set sw=2 sts=-1 et:
-- 
2.11.4.GIT