mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

AppImage: Fix missing libssl1.1

Browse source 
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>
This commit is contained in:
Paul Buxton 2019-09-22 13:32:55 +01:00 • committed by Dirk Hohndel
parent b2230855e6
commit 4b391c448d
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/docker/trusty-qt512/Dockerfile
View file

@ -59,6 +59,11 @@ RUN mkdir dbus-1.12.16/build && \
make install && \
ldconfig
ADD OpenSSL_1_1_1.tar.gz .
RUN cd /openssl-OpenSSL_1_1_1 && \
./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib && \
make && mkdir -p /ssllibs && cp *.so /ssllibs && cd / && rm -rf openssl-OpenSSL_1_1_1
# try to remove some of the packages we no longer need
RUN apt-get remove -y libqt5core5a libqt5dbus5 libqt5gui5 ruby openssh-client
@ -68,4 +73,4 @@ RUN git clone git://github.com/Subsurface-divelog/subsurface
RUN bash -e -x ./subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit
# remove the source, but keep the install-root
RUN rm -rf subsurface libgit2 googlemaps grantlee
RUN rm -rf subsurface libgit2 googlemaps grantlee

6
scripts/docker/trusty-qt512/getpackages.sh Normal file
View file

@ -0,0 +1,6 @@
#!/bin/bash
wget https://github.com/Kitware/CMake/releases/download/v3.13.2/cmake-3.13.2-Linux-x86_64.sh
wget http://download.qt.io/official_releases/qt/5.12/5.12.4/qt-opensource-linux-x64-5.12.4.run
curl -O https://dbus.freedesktop.org/releases/dbus/dbus-1.12.16.tar.gz
wget https://github.com/openssl/openssl/archive/OpenSSL_1_1_1.tar.gz

2
scripts/linux-trusty-qt512/before_install.sh
View file

@ -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

2
scripts/linux-trusty-qt512/in-container-build.sh
View file

@ -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"