From b883db0d4d5389d2fd87159fe7cb8bf354469d9e Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@eigenlab.org>
Date: Thu, 28 Nov 2019 00:32:53 +0100
Subject: [PATCH] Fix TravisCI OSX build

---
 .travis.yml                                | 15 +++++++--------
 build_scripts/OSX/travis_makeOSXPackage.sh |  0
 2 files changed, 7 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 build_scripts/OSX/travis_makeOSXPackage.sh

diff --git a/.travis.yml b/.travis.yml
index cc75af004..f71410a0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,19 +16,18 @@ matrix:
 
 before_install:
   - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update; fi
-  - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get install -y build-essential libssl-dev libsqlcipher-dev libbz2-dev libmicrohttpd-dev libsqlite3-dev libupnp-dev pkg-config qt5-default libxss-dev qtmultimedia5-dev libqt5x11extras5-dev libqt5designer5 libxapian-dev qttools5-dev; fi
+  - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get install -y build-essential libssl-dev libsqlcipher-dev libbz2-dev libsqlite3-dev libupnp-dev pkg-config qt5-default libxss-dev qtmultimedia5-dev libqt5x11extras5-dev libqt5designer5 libxapian-dev qttools5-dev; fi
 
   - if [ $TRAVIS_OS_NAME == osx ]; then brew update ; fi
-  - if [ $TRAVIS_OS_NAME == osx ]; then brew install ccach; export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi
+  - if [ $TRAVIS_OS_NAME == osx ]; then brew install ccache; export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi
   - if [ $TRAVIS_OS_NAME == osx ]; then brew install qt5; fi
   - if [ $TRAVIS_OS_NAME == osx ]; then brew link --force qt5 ; fi
-  - if [ $TRAVIS_OS_NAME == osx ]; then brew install openssl miniupnpc libmicrohttpd sqlcipher xapian cmark; fi
+  - if [ $TRAVIS_OS_NAME == osx ]; then brew install openssl miniupnpc rapidjson sqlcipher xapian cmark; fi
   - if [ $TRAVIS_OS_NAME == osx ]; then brew install p7zip; fi
   - if [ $TRAVIS_OS_NAME == osx ]; then npm install -g appdmg; fi
 
-  - wget https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz
-  - tar -xf v1.1.0.tar.gz
-  - if [ $TRAVIS_OS_NAME == osx ]; then cp -r rapidjson-1.1.0/include/rapidjson/ /usr/local/include/rapidjson ; fi
+  - if [ $TRAVIS_OS_NAME == linux ]; then wget https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz ; fi
+  - if [ $TRAVIS_OS_NAME == linux ]; then tar -xf v1.1.0.tar.gz ; fi
   - if [ $TRAVIS_OS_NAME == linux ]; then sudo cp -r rapidjson-1.1.0/include/rapidjson/ /usr/include/rapidjson ; fi
 
 env:
@@ -49,13 +48,13 @@ addons:
 before_script:
   - env
   - if [ $TRAVIS_OS_NAME == linux ]; then qmake; fi
-  - if [ $TRAVIS_OS_NAME == osx ]; then qmake CONFIG+=rs_macos10.14 INCLUDEPATH+=/usr/local/opt/openssl/include/ INCLUDEPATH+=$(find /usr/local/Cellar/sqlcipher/*/include | headn -n 1) INCLUDEPATH+=$(find /usr/local/Cellar/libmicrohttpd/*/include | head -n 1) QMAKE_LIBDIR+=/usr/local/opt/openssl/lib/ QMAKE_LIBDIR+=$(find /usr/local/Cellar/libmicrohttpd/*/lib | head -n 1) QMAKE_LIBDIR+=$(find /usr/local/Cellar/sqlcipher/*/lib | head -n 1); fi
+  - if [ $TRAVIS_OS_NAME == osx ]; then qmake CONFIG+=rs_macos10.14 INCLUDEPATH+=$(find /usr/local/Cellar/openssl*/*/include/ | head -n 1) INCLUDEPATH+=$(find /usr/local/Cellar/rapidjson/*/include | head -n 1) INCLUDEPATH+=$(find /usr/local/Cellar/sqlcipher/*/include | head -n 1) QMAKE_LIBDIR+=$(find /usr/local/Cellar/openssl*/*/lib/ | head -n 1) QMAKE_LIBDIR+=$(find /usr/local/Cellar/sqlcipher/*/lib | head -n 1); fi
 
 script:
   - if [ $TRAVIS_OS_NAME == osx ] && [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j4; fi
 
 after_success:
-  - if [ $TRAVIS_OS_NAME == osx ]; then chmod +x ./travis_makeOSXPackage.sh && ./travis_makeOSXPackage.sh ; fi
+  - if [ $TRAVIS_OS_NAME == osx ]; then build_scripts/OSX/travis_makeOSXPackage.sh ; fi
   - if [ $TRAVIS_OS_NAME == linux ] && [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j2; fi
 
 
diff --git a/build_scripts/OSX/travis_makeOSXPackage.sh b/build_scripts/OSX/travis_makeOSXPackage.sh
old mode 100644
new mode 100755