From 60f1deb1168197700c2bcb6774389e35d52a4390 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Tue, 2 Jan 2024 19:46:36 -0800
Subject: [PATCH] fix iOS simulator builds

With this hopefully the GitHub Action will pass again.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 Subsurface-mobile.pro  | 22 +++++++++++-----------
 packaging/ios/build.sh |  6 ++++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Subsurface-mobile.pro b/Subsurface-mobile.pro
index df84553fc..0167be861 100644
--- a/Subsurface-mobile.pro
+++ b/Subsurface-mobile.pro
@@ -418,12 +418,13 @@ ios {
 	Q_ENABLE_BITCODE.name = ENABLE_BITCODE
 	Q_ENABLE_BITCODE.value = NO
 	QMAKE_MAC_XCODE_SETTINGS += Q_ENABLE_BITCODE
+	ARCH_PATH = ../install-root/ios/$${ARCH}
 
-	LIBS += ../install-root/ios/$${QT_ARCH}/lib/libdivecomputer.a \
-		../install-root/ios/$${QT_ARCH}/lib/libgit2.a \
-		../install-root/ios/$${QT_ARCH}/lib/libzip.a \
-		../install-root/ios/$${QT_ARCH}/lib/libxslt.a \
-		../install-root/ios/$${QT_ARCH}/lib/qml/org/kde/kirigami.2/libkirigamiplugin.a \
+	LIBS += $${ARCH_PATH}/lib/libdivecomputer.a \
+		$${ARCH_PATH}/lib/libgit2.a \
+		$${ARCH_PATH}/lib/libzip.a \
+		$${ARCH_PATH}/lib/libxslt.a \
+		$${ARCH_PATH}/lib/qml/org/kde/kirigami.2/libkirigamiplugin.a \
 		../googlemaps-build/libqtgeoservices_googlemaps.a \
 		-liconv \
 		-lsqlite3 \
@@ -431,14 +432,13 @@ ios {
 
 	LIBS += -framework MessageUI
 
-	INCLUDEPATH += ../install-root/ios/$${QT_ARCH}/include/ \
-		../install-root/ios/$${QT_ARCH}/include \
-		../install-root/ios/$${QT_ARCH}/include/libxstl \
-		../install-root/ios/$${QT_ARCH}/include/libexstl \
-		../install-root/ios/$${QT_ARCH}/include/openssl \
+	INCLUDEPATH += $${ARCH_PATH}/include/ \
+		$${ARCH_PATH}/include/libxstl \
+		$${ARCH_PATH}/include/libexstl \
+		$${ARCH_PATH}/include/openssl \
 		. \
 		./core \
 		./mobile-widgets/3rdparty/kirigami/src/libkirigami \
-		../install-root/ios/$${QT_ARCH}/include/libxml2
+		$${ARCH_PATH}/include/libxml2
 
 }
diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh
index b637f3c65..7ded59900 100755
--- a/packaging/ios/build.sh
+++ b/packaging/ios/build.sh
@@ -346,9 +346,11 @@ for BUILD_NOW in $BUILD_LOOP; do
 	rm -f ssrf-version.h
 	ln -s "$SUBSURFACE_SOURCE"/ssrf-version.h .
 	# shellcheck disable=SC2086
-	"$QMAKE" $QMAKEARG "$SUBSURFACE_SOURCE"/Subsurface-mobile.pro \
+	"$QMAKE" $QMAKEARG ARCH=$ARCH "$SUBSURFACE_SOURCE"/Subsurface-mobile.pro \
 		-spec macx-ios-clang CONFIG+=$TARGET CONFIG+=$TARGET2 CONFIG+=$DRCONFIG
 
-	make -j
+	# it appears that a first make fails with a missing generated file, which a second
+	# invocation of make will happily build
+	make || make
 	popd
 done