diff options
| author |  Paul Buxton <paubuxton.mail@googlemail.com> | 2019-09-22 13:32:55 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-09-23 13:38:57 -0700 |
| commit | 4b391c448dadb33b01505b7356108a02cf0a80d4 (patch) | |
| tree | 06d9280cb95eb302a10585dbc1fa9c2a0421bc10 /scripts/linux-trusty-qt512 | |
| parent | b2230855e61c99d5d0b8de672a3e366688beaa30 (diff) | |
| download | subsurface-4b391c448dadb33b01505b7356108a02cf0a80d4.tar.gz | |
AppImage: Fix missing libssl1.1
Add ssl to the AppImage build.
Add helper script to fetch required dependancies.
Update docker build container used.
Signed-off-by: Paul Buxton <paubuxton.mail@googlemail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/linux-trusty-qt512')
| -rw-r--r-- | scripts/linux-trusty-qt512/before_install.sh | 2 | ||||
| -rw-r--r-- | scripts/linux-trusty-qt512/in-container-build.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/linux-trusty-qt512/before_install.sh b/scripts/linux-trusty-qt512/before_install.sh index 1d1e057cc..cd119c774 100644 --- a/scripts/linux-trusty-qt512/before_install.sh +++ b/scripts/linux-trusty-qt512/before_install.sh @@ -28,4 +28,4 @@ export QT_ROOT=/usr/local/Qt/5.12.4 cd ${TRAVIS_BUILD_DIR}/.. # start the container and keep it running -docker run -v $PWD/subsurface:/subsurface --name=trusty-qt512 -w / -d dirkhh/trusty-qt512:0.6 /bin/sleep 60m +docker run -v $PWD/subsurface:/subsurface --name=trusty-qt512 -w / -d dirkhh/trusty-qt512:0.7 /bin/sleep 60m diff --git a/scripts/linux-trusty-qt512/in-container-build.sh b/scripts/linux-trusty-qt512/in-container-build.sh index 226170f93..c8c21bc31 100644 --- a/scripts/linux-trusty-qt512/in-container-build.sh +++ b/scripts/linux-trusty-qt512/in-container-build.sh @@ -23,6 +23,8 @@ mv appdir/usr/usr/local/Qt/5.12.4/gcc_64/plugins/* appdir/usr/plugins # the usr mv appdir/usr/lib/grantlee/ appdir/usr/plugins/ rm -rf appdir/usr/home/ appdir/usr/include/ appdir/usr/share/man/ # No need to ship developer and man files as part of the AppImage rm -rf appdir/usr/usr appdir/usr/lib/cmake appdir/usr/lib/pkgconfig +cp /ssllibs/libssl.so appdir/usr/lib/libssl.so.1.1 +cp /ssllibs/libcrypto.so appdir/usr/lib/libcrypto.so.1.1 # get the linuxdeployqt tool and run it to collect the libraries curl -L -O "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" |