From f5a4ad1db07b6ff479381841d600815e1cfff70c Mon Sep 17 00:00:00 2001
From: Eberhard Graether <egraether@gmail.com>
Date: Tue, 1 May 2018 14:42:58 +0200
Subject: [PATCH] build: Fixed macOS gatekeeper refusing to open app bundle
 (issue #568)

---
 .../user/projects/javaparser/javaparser.srctrlprj  |  2 +-
 .../user/projects/tictactoe/tictactoe.srctrlprj    |  2 +-
 bin/app/user/projects/tutorial/tutorial.srctrlprj  |  2 +-
 setup/MacOSX/bundle_install.sh.in                  | 14 +++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/app/user/projects/javaparser/javaparser.srctrlprj b/bin/app/user/projects/javaparser/javaparser.srctrlprj
index 855978b7..4544ffa5 100644
--- a/bin/app/user/projects/javaparser/javaparser.srctrlprj
+++ b/bin/app/user/projects/javaparser/javaparser.srctrlprj
@@ -31,5 +31,5 @@
             <use_jre_system_library>1</use_jre_system_library>
         </source_group_7a9e75fc-2cad-42d5-8c5b-c86d02f7b4e4>
     </source_groups>
-    <version>5</version>
+    <version>6</version>
 </config>
diff --git a/bin/app/user/projects/tictactoe/tictactoe.srctrlprj b/bin/app/user/projects/tictactoe/tictactoe.srctrlprj
index 6f9f163f..b0b097a7 100644
--- a/bin/app/user/projects/tictactoe/tictactoe.srctrlprj
+++ b/bin/app/user/projects/tictactoe/tictactoe.srctrlprj
@@ -26,5 +26,5 @@
             <type>C++ Source Group</type>
         </source_group_afdfade2-4b42-49a6-961a-d4a563f2cf84>
     </source_groups>
-    <version>5</version>
+    <version>6</version>
 </config>
diff --git a/bin/app/user/projects/tutorial/tutorial.srctrlprj b/bin/app/user/projects/tutorial/tutorial.srctrlprj
index f3f405f7..1dd95ab2 100644
--- a/bin/app/user/projects/tutorial/tutorial.srctrlprj
+++ b/bin/app/user/projects/tutorial/tutorial.srctrlprj
@@ -38,5 +38,5 @@
             <type>C++ Source Group</type>
         </source_group_75041cb3-37c8-45c6-bb8a-1b8b79040f59>
     </source_groups>
-    <version>5</version>
+    <version>6</version>
 </config>
diff --git a/setup/MacOSX/bundle_install.sh.in b/setup/MacOSX/bundle_install.sh.in
index 98c596e3..ec51176a 100755
--- a/setup/MacOSX/bundle_install.sh.in
+++ b/setup/MacOSX/bundle_install.sh.in
@@ -95,7 +95,7 @@ install_name_tool -add_rpath "@loader_path/../Frameworks" $APP_PATH
 install_name_tool -delete_rpath "/Users/ebsi/Documents/clang-llvm/build_release/./lib" $INDEXER_PATH
 install_name_tool -delete_rpath "/Users/ebsi/Documents/clang-llvm/build_release/lib" $INDEXER_PATH
 install_name_tool -delete_rpath "/Users/ebsi/Documents/boost_1_64_0/stage/lib" $INDEXER_PATH
-install_name_tool -delete_rpath "/Users/ebsi/Documents/Qt/5.9.1/clang_64/lib" $INDEXER_PATH
+install_name_tool -delete_rpath "$QT_DIR/lib" $INDEXER_PATH
 install_name_tool -add_rpath "@loader_path/../Frameworks" $INDEXER_PATH
 
 echo -e $INFO "App dependencies"
@@ -159,8 +159,8 @@ echo -e $INFO "Codesign frameworks."
 for FRAMEWORK_BIN_PATH in $FRAMEWORK_DIR/*.framework
 do
 	echo "framework" $FRAMEWORK_BIN_PATH
-	codesign --sign "Developer ID Application: Coati Software OG" $FRAMEWORK_BIN_PATH
-	codesign -v --verbose=4 $FRAMEWORK_BIN_PATH
+	codesign --force --sign "Developer ID Application: Coati Software KG" $FRAMEWORK_BIN_PATH
+	codesign -v --verbose=5 $FRAMEWORK_BIN_PATH
 	# spctl -a --verbose $FRAMEWORK_BIN_PATH
 done
 
@@ -168,14 +168,14 @@ echo -e $INFO "Codesign plugins."
 for PLUGIN_PATH in $(find $PLUGIN_DIR -name '*.dylib')
 do
 	echo "plugin" $PLUGIN_PATH
-	codesign --sign "Developer ID Application: Coati Software OG" $PLUGIN_PATH
-	codesign -v --verbose=4 $PLUGIN_PATH
+	codesign --force --sign "Developer ID Application: Coati Software KG" $PLUGIN_PATH
+	codesign -v --verbose=5 $PLUGIN_PATH
 	# spctl -a --verbose $FRAMEWORK_BIN_PATH
 done
 
 echo -e $INFO "Codesign app."
-codesign --sign "Developer ID Application: Coati Software OG" $BUNDLE_PATH
-codesign -v  --deep --verbose=4 $BUNDLE_PATH
+codesign --force --sign "Developer ID Application: Coati Software KG" $BUNDLE_PATH
+codesign -v  --deep --verbose=5 $BUNDLE_PATH
 # spctl -a --verbose $BUNDLE_PATH