summaryrefslogtreecommitdiffstats
path: root/scripts/linux/before_install.sh
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/linux/before_install.sh')
-rw-r--r--scripts/linux/before_install.sh21
1 files changed, 7 insertions, 14 deletions
diff --git a/scripts/linux/before_install.sh b/scripts/linux/before_install.sh
index 95c8527c8..593e1c128 100644
--- a/scripts/linux/before_install.sh
+++ b/scripts/linux/before_install.sh
@@ -2,22 +2,15 @@
# prep things so we can build for Linux
# we have a custom built Qt some gives us just what we need, including QtWebKit
+#
+# this is built from the latest version as of 2017-11-09 in the 5.9 branch and
+# therefore calls itself Qt-5.9.3
+export QT_ROOT=$PWD/Qt/5.9.3
rm -rf Qt
-mkdir -p Qt/5.9.1
-wget http://subsurface-divelog.org/downloads/Qt-5.9.1.tar.xz
-tar -xJ -C Qt/5.9.1 -f Qt-5.9.1.tar.xz
-cd Qt/5.9.1
-
-# this should all be handled in the packaged tar file, for now we hack it here
-
-ln -s . gcc_64
-cd ..
-ln -s 5.9.1/* .
-cd ..
-
-# terrifying hack to fix the OpenSSL dependency issue
-sed -i -e 's|1.0.1e|1.0.0\x00|g' Qt/lib/libQt5Network.so.5
+mkdir -p $QT_ROOT
+wget http://subsurface-divelog.org/downloads/Qt-5.9.3-trusty.tar.xz
+tar -xJ -C $QT_ROOT -f Qt-5.9.3-trusty.tar.xz
# TestPreferences uses gui calls, so run a xvfb so it has something to talk to
export DISPLAY=:99.0