From e5ba7447cf0a91421f8d103da4c741fe45e058dd Mon Sep 17 00:00:00 2001
From: Lorenz Wildberg <lorenz@wild-fisch.de>
Date: Fri, 3 Feb 2023 12:33:13 +0100
Subject: [PATCH] gnome-shell-mobile: update to 43.1_git20210203 (MR 3840)

---
 temp/gnome-shell-mobile/APKBUILD  | 15 +++++++++------
 temp/gnome-shell-mobile/gsh.patch | 27 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 temp/gnome-shell-mobile/gsh.patch

diff --git a/temp/gnome-shell-mobile/APKBUILD b/temp/gnome-shell-mobile/APKBUILD
index b4de9a04b..e9119b811 100644
--- a/temp/gnome-shell-mobile/APKBUILD
+++ b/temp/gnome-shell-mobile/APKBUILD
@@ -1,8 +1,8 @@
 # Forked from Alpine to add phone adaptivity patches
 
 pkgname=gnome-shell-mobile
-pkgver=43.0
-pkgrel=6
+pkgver=43.1_git20210203
+pkgrel=0
 pkgdesc="GNOME shell"
 url="https://wiki.gnome.org/Projects/GnomeShell"
 arch="all !armhf !s390x !riscv64" # gjs / riscv64: mutter-mobile
@@ -36,7 +36,7 @@ makedepends="
 	git
 	gcr4-dev
 	gjs-dev>=1.64.0
-	mutter-mobile-dev>=43.0
+	mutter-mobile-dev>=43.1_git20210203
 	pulseaudio-dev
 	evolution-data-server-dev evolution-dev
 	python3
@@ -63,11 +63,12 @@ checkdepends="
 	# gdm is also needed but introduces circular dep
 provides="gnome-shell=$pkgver-r$pkgrel"
 subpackages="$pkgname-dbg $pkgname-doc $pkgname-lang $pkgname-schemas::noarch"
-_commit="4ef0db259a1815d00656c3adab89df14f272067e"
+_commit="0c42fe4cc05c54a737400973cc5dc8ff9ba51bca"
 _gvc_commit="8e7a5a4c3e51007ce6579292642517e3d3eb9c50"
 source="gnome-shell-$_commit.tar.gz::https://gitlab.gnome.org/verdre/gnome-shell/-/archive/$_commit/gnome-shell-$_commit.tar.gz
 	libgnome-volume-control-$_gvc_commit.tar.gz::https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_gvc_commit/gnome-shell-$_gvc_commit.tar.gz
-	disable-telepathy-integration.patch"
+	disable-telepathy-integration.patch
+	gsh.patch"
 builddir="$srcdir/gnome-shell-$_commit"
 options="!check" # Tests have circular dependency 'gnome-shell <-> gdm'
 
@@ -76,6 +77,7 @@ options="!check" # Tests have circular dependency 'gnome-shell <-> gdm'
 #     - CVE-2019-3820
 
 prepare() {
+	default_prepare
 	rm -rf "$builddir/subprojects/gvc"
 	mv "$srcdir/libgnome-volume-control-$_gvc_commit" $builddir/subprojects/gvc
 }
@@ -114,7 +116,8 @@ package() {
 }
 
 sha512sums="
-78fe5c5794f8d1d7c327ef3b51d6526eba68c874475c593a7c6ebe3a344a30ca2595f36c3235ca9593fcf4584bc203e81c1fed65579910a50dcecd826a471401  gnome-shell-4ef0db259a1815d00656c3adab89df14f272067e.tar.gz
+973840d6679c8a0194bb49c0a5ac26826085a3f2faa061badbb21a5f6b0fe7f5a61008f335bdad25654c5cfad6d704ec3e4d882850561919734d44a024fde94f  gnome-shell-0c42fe4cc05c54a737400973cc5dc8ff9ba51bca.tar.gz
 ebc6985afbda5ddebcda44d8b6732a9abc2d7249aff3adf7a76a90aa681590f830dcf2e5f3534a624adc32d1f0445e261ee149d65c221f733e0c33e0690a004d  libgnome-volume-control-8e7a5a4c3e51007ce6579292642517e3d3eb9c50.tar.gz
 2ca70115fab957fdf276b7f0772786e1afd56b0b22bcfd92f5b5f1d29676dc97c19cfb079434d0dbf7b459f1d133dbd8d1faa0d88f7b94846040a23856f951f8  disable-telepathy-integration.patch
+dba79b94ab4bcf0db51aa4a19c5fb52f9dae05909fe13531fe9dc06d9db334ac3328bd4040484eac8ef851057ee471a28d86800aa2ae82eec7274f5f79b9146a  gsh.patch
 "
diff --git a/temp/gnome-shell-mobile/gsh.patch b/temp/gnome-shell-mobile/gsh.patch
new file mode 100644
index 000000000..63b6bf045
--- /dev/null
+++ b/temp/gnome-shell-mobile/gsh.patch
@@ -0,0 +1,27 @@
+Patch-Source: https://github.com/chimera-linux/cports/blob/793dbd2807070fd0fd4f7ba37fd73d4c5ff47584/main/gnome-shell/patches/no-exe-introspection.patch
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Sun Mar 19 19:11:00 2023 +0100
+
+    Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+    Even if we manually define _DYNAMIC, it does not work (segfaults
+    somewhere in musl, coming from g_strsplit) and is pretty useless
+    for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+ 
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
+