Fixes for latest macOS

Signed-off-by: Ben Collins <[email protected]>

CMakeLists.txt

@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(VERSION 2.8.0)
+cmake_minimum_required(VERSION 3.10)
+cmake_policy(VERSION 3.10)
 
 project(client)
 
@@ -154,7 +154,7 @@ if(NOT TOKEN_AUTH_ONLY)
 endif()
 
 if(APPLE)
-  find_package(Sparkle)
+  find_package(Sparkle REQUIRED)
 endif(APPLE)
 
 if(UNIX)
@@ -192,7 +192,7 @@ set(TRANSLATIONS ${TRANS_FILES})
 add_subdirectory(csync)
 add_subdirectory(src)
 if(NOT BUILD_LIBRARIES_ONLY)
-add_subdirectory(shell_integration)
+# add_subdirectory(shell_integration)
 add_subdirectory(doc)
 add_subdirectory(admin)
 endif(NOT BUILD_LIBRARIES_ONLY)

OwnCloudCPack.cmake

@@ -22,7 +22,7 @@ if(APPLE)
     set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/ownCloud.icns)
 
     set( CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/admin/osx/DS_Store.in")
-#    set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" )
+#   set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" )
 
     set( CPACK_DMG_FORMAT "UDBZ" )
     set( CPACK_DMG_VOLUME_NAME "${APPLICATION_NAME}")

SwissDisk/mac/build.sh

@@ -1,29 +1,38 @@
 #!/bin/bash -ex
 
+QT_LOC="/opt/homebrew/opt/qt@5"
+QTK_LOC="/opt/homebrew/opt/qtkeychain"
+SPARKLE="/opt/homebrew/Caskroom/sparkle/2.6.4"
+
 SDIR="`pwd`/../.."
 BDIR="`pwd`/build"
+IDIR="$SDIR/SwissDisk/install"
+ADIR="$IDIR/SwissDisk.app/Contents"
 
 rm -rf "$BDIR"
-mkdir -p "$BDIR"
+rm -rf "$IDIR"
 
+mkdir -p "$BDIR"
 cd "$BDIR"
 
-QT_LOC="$HOME/Qt5.6.3/5.6.3/clang_64"
-
 export PATH="$QT_LOC/bin:$PATH"
-export PKG_CONFIG_PATH="/usr/local/opt/[email protected]/lib/pkgconfig"
 
-cmake -DOEM_THEME_DIR="$SDIR/SwissDisk" -DCMAKE_INSTALL_PREFIX=../../install "$SDIR"
+cmake -DOEM_THEME_DIR="$SDIR/SwissDisk" -DCMAKE_INSTALL_PREFIX="$IDIR" \
+	-DCMAKE_MODULE_PATH="$QTK_LOC/lib/cmake" -DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_FRAMEWORK_PATH="$SPARKLE;$QT_LOC/lib" -DQT_IS_STATIC=YES \
+	"$SDIR"
 
-make -j6
+make VERBOSE=1 -j6
 
 make install
 
-rm -rf ../../install/Library/Frameworks
-mkdir -p ../../install/Library/Frameworks
-cp -a $QT_LOC/lib/Qt{Sql,Widgets,Network,Xml,MacExtras,Gui,Core}.framework ../../install/Library/Frameworks/
-rm -rf ../../install/Library/Frameworks/*.framework/Versions/5/Headers
-rm -f ../../install/Library/Frameworks/*.framework/Versions/5/*_debug*
-
-./admin/osx/create_mac.sh ../../install . 
+./admin/osx/create_mac.sh "$IDIR" .
 #'3rd Party Mac Developer Installer: maClara, LLC (53R32TQWB6)'
+
+sign="codesign --sign - --force --preserve-metadata=entitlements,requirements,flags,runtime"
+
+$sign $ADIR/Frameworks/*
+$sign $ADIR/PlugIns/*/*
+$sign $ADIR/MacOS/*
+$sign $ADIR/..
+