From 6ca60c074ca62566f9be29120af81a857d13f98c Mon Sep 17 00:00:00 2001
From: Markus Stoll <markus.stoll@junidas.de>
Date: Sun, 14 Feb 2021 10:08:28 +0100
Subject: [PATCH] Fix to make SparkleShare compile under current OSX and
 current VisualStudio Configuration ReleaseMac now works fine again for
 creating Standalone Release

---
 SparkleShare/Mac/config             |  2 --
 SparkleShare/Mac/packReleaseDist.sh | 11 ++++++++---
 SparkleShare/Mac/postBuild.sh       |  1 -
 3 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 SparkleShare/Mac/config

diff --git a/SparkleShare/Mac/config b/SparkleShare/Mac/config
deleted file mode 100644
index 83138436..00000000
--- a/SparkleShare/Mac/config
+++ /dev/null
@@ -1,2 +0,0 @@
-<configuration>
-</configuration>
diff --git a/SparkleShare/Mac/packReleaseDist.sh b/SparkleShare/Mac/packReleaseDist.sh
index 6305f7bb..352c6025 100755
--- a/SparkleShare/Mac/packReleaseDist.sh
+++ b/SparkleShare/Mac/packReleaseDist.sh
@@ -8,12 +8,17 @@ echo packing ${bundle} for release without Mono framework dependency
 
 export MONO_PATH=`readlink /Library/Frameworks/Mono.framework/Versions/Current`
 export PKG_CONFIG_PATH=/usr/lib/pkgconfig:${MONO_PATH}/lib/pkgconfig
-export AS="as -arch i386"
-export CC="cc -arch i386 -lobjc -liconv -framework Foundation"
 export PATH=/usr/local/bin:/opt/local/bin:/Library/Frameworks/Mono.framework/Versions/Current/bin:/usr/bin:/bin
 
 cd ${bundle}/Contents/MonoBundle/
 
 # merge all Assemblies into one Mac binary
-mkbundle --static --deps --config ./config  -o ../MacOS/SparkleShare SparkleShare.exe Sparkles.dll Xamarin.Mac.dll Sparkles.Git.dll
+mkbundle \
+	 --simple \
+	 -v \
+	--config ./config \
+	 --library libxammac.dylib \
+	 --library libmono-native-compat.0.dylib \
+	 -o ../MacOS/SparkleShare \
+	 SparkleShare.exe Sparkles.dll Sparkles.Git.dll
 rm *.dll *.exe
diff --git a/SparkleShare/Mac/postBuild.sh b/SparkleShare/Mac/postBuild.sh
index 6fe1222d..3a2c5b04 100755
--- a/SparkleShare/Mac/postBuild.sh
+++ b/SparkleShare/Mac/postBuild.sh
@@ -11,4 +11,3 @@ export PATH=/usr/local/bin:/opt/local/bin:/Library/Frameworks/Mono.framework/Ver
 ${projectFolder}/checkGit.sh
 tar -x -f ${projectFolder}/git.tar.gz --directory ${bundle}/Contents/Resources
 cp -R SparkleShareInviteOpener.app ${bundle}/Contents/Resources
-cp config ${bundle}/Contents/MonoBundle