aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-11-06 09:42:04 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-11-06 09:42:07 -0800
commitf24b6d461d5bb0095d031fb92238b99593e9501b (patch)
tree44ff8b147165680da763f448dd42ddae34263f54
parent588425e3eb5bb3834461bd34306bed024cbb6e88 (diff)
downloadsubsurface-f24b6d461d5bb0095d031fb92238b99593e9501b.tar.gz
Travis AppImage: work around OpenSSL issue
The Qt binaries that we use for the continues build of the AppImage reference libcrypto.so.1.0.1e, but we bundle libcrypto.so.1.0.0. On distros that have libcrypto.so.1.0.1e that gets loaded in addition to the one that we bundle which causes a conflict. More details are explained in the issue below. Fixes #779 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--.travis.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 135ba3239..d26105eed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,7 @@ before_install:
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 ; ln -s . gcc_64 ; cd .. ; ln -s 5.9.1/* . ; cd .. ;
+ sed -i -e 's|1.0.1e|1.0.0\x00|g' Qt/lib/libQt5Network.so.5
fi
# TestPreferences uses gui calls, so run a xvfb so it has something to talk to
- "export DISPLAY=:99.0"