diff options
author | Mario Danic <mario@lovelyhq.com> | 2017-10-12 00:20:20 +0300 |
---|---|---|
committer | Mario Danic <mario@lovelyhq.com> | 2017-10-12 00:20:54 +0300 |
commit | 5a160116872d19adb3d99bb6671821266c699e34 (patch) | |
tree | 8b4a6097bab4c5cf08ff32c259e15474bda47207 | |
parent | b2437ff95036cf5d8ab71b8063227a4529481c86 (diff) |
Fix mac build instructions
Signed-off-by: Mario Danic <mario@lovelyhq.com>
-rw-r--r-- | README.md | 13 | ||||
-rw-r--r-- | osx/build.sh | 13 |
2 files changed, 14 insertions, 12 deletions
@@ -150,16 +150,15 @@ sudo make install ### Compile Qt -Because the desktop client comes with some custom patches you have to download the Qt 5.6.2 source and then apply all of them. Make sure to adjust <client> with the login to the cloned client repository. +Download and compile Qt 5.9.2 source. Unfortunately the Qt patches don't apply anymore, +so we just ignore them for the time being. ```bash cd /tmp/ -wget http://download.qt.io/official_releases/qt/5.6/5.6.2/single/qt-everywhere-opensource-src-5.6.2.tar.gz -tar -xf qt-everywhere-opensource-src-5.6.2.tar.gz -cd /tmp/qt-everywhere-opensource-src-5.6.2/qtbase -git apply <client>/admin/qt/patches/qtbase/*.patch -cd .. -./configure -sdk macosx10.9 -openssl -openssl-linked +wget http://download.qt.io/official_releases/qt/5.9/5.9.2/single/qt-everywhere-opensource-src-5.9.2.tar.xz +tar -xjf qt-everywhere-opensource-src-5.9.2.tar.xz +cd /tmp/qt-everywhere-opensource-src-5.9.2 +./configure -sdk macosx10.11 -openssl -openssl-linked -I /usr/local/opt/openssl/include/ -L /usr/local/opt/openssl/lib/ make -j2 sudo make -j1 install ``` diff --git a/osx/build.sh b/osx/build.sh index 4e3c6a1..01819f2 100644 --- a/osx/build.sh +++ b/osx/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -export PATH=/usr/local/Qt-5.6.2/bin/:$PATH +export PATH=/usr/local/Qt-5.9.2/bin/:$PATH export OPENSSL_ROOT_DIR=$(brew --prefix openssl) # Cleanup @@ -7,17 +7,20 @@ cd ~ sudo rm -rf build-mac sudo rm -rf client sudo rm -rf install +sudo rm -rf client_theming -# Clone the desktop client code +# Clone the desktop client code and the theming repository cd ~ +git clone https://github.com/nextcloud/client_theming.git + git clone --recursive https://github.com/owncloud/client.git cd client -git checkout v2.3.2 +git checkout v2.3.3 git submodule update --recursive # Build qtkeychain cd ~/client/src/3rdparty/qtkeychain -cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 -DCMAKE_INSTALL_PREFIX=/Users/builder/install -DCMAKE_PREFIX_PATH=/Users/builder/Qt/5.6/clang_64 . +cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 -DCMAKE_INSTALL_PREFIX=/Users/builder/install -DCMAKE_PREFIX_PATH=/Users/builder/Qt/5.9/clang_64 . sudo make install # Build the client @@ -26,7 +29,7 @@ cp client_theming/osx/dsa_pub.pem client/admin/osx/sparkle/ rm -rf build-mac mkdir build-mac cd build-mac -cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 -DCMAKE_INSTALL_PREFIX=/Users/builder/install -DCMAKE_PREFIX_PATH=/Users/builder/Qt/5.6/clang_64 -D SPARKLE_INCLUDE_DIR=/Users/builder/Library/Frameworks/Sparkle.framework/ -D SPARKLE_LIBRARY=/Users/builder/Library/Frameworks/Sparkle.framework/ -D OEM_THEME_DIR=/Users/builder/client_theming/nextcloudtheme -DWITH_CRASHREPORTER=ON -DNO_SHIBBOLETH=1 -DMIRALL_VERSION_SUFFIX=beta -DMIRALL_VERSION_BUILD=1 ../client +cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 -DCMAKE_INSTALL_PREFIX=/Users/builder/install -DCMAKE_PREFIX_PATH=/Users/builder/Qt/5.9/clang_64 -D SPARKLE_INCLUDE_DIR=/Users/builder/Library/Frameworks/Sparkle.framework/ -D SPARKLE_LIBRARY=/Users/builder/Library/Frameworks/Sparkle.framework/ -D OEM_THEME_DIR=/Users/builder/client_theming/nextcloudtheme -DWITH_CRASHREPORTER=ON -DNO_SHIBBOLETH=1 -DMIRALL_VERSION_BUILD=1 ../client make sudo make install sudo ~/client_theming/client/admin/osx/sign_app.sh ~/install/nextcloud.app 59FA8948AEBAE3F2222AE9BC020D6DA31DF821A7 |