diff options
Diffstat (limited to '')
| -rw-r--r-- | appimage/docker/Dockerfile | 4 | ||||
| -rw-r--r-- | appimage/docker/build-appimage.sh | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/appimage/docker/Dockerfile b/appimage/docker/Dockerfile index 34957ad97..46e1ccdde 100644 --- a/appimage/docker/Dockerfile +++ b/appimage/docker/Dockerfile @@ -52,6 +52,10 @@ RUN yum -y install \ sqlite-devel \ wget +# Install patch; this is needed for a temporary HACK +RUN yum -y install \ + patch + COPY build-appimage.sh / RUN chmod +x build-appimage.sh diff --git a/appimage/docker/build-appimage.sh b/appimage/docker/build-appimage.sh index 0d3bde801..ef8fc9ff5 100644 --- a/appimage/docker/build-appimage.sh +++ b/appimage/docker/build-appimage.sh @@ -27,6 +27,13 @@ mkdir -p /build/AppDir cd /src source /opt/rh/devtoolset-7/enable +# HACK disable "exit on error" for first make run because the released pinentry +# doesn't build with Qt 5.9 on CentOS 7 +set +e +make -f build-aux/speedo.mk INSTALL_PREFIX=/build/AppDir/usr CUSTOM_SWDB=1 appimage +set -e +# HACK patch pinentry and run make a second time +(cd PLAY/src/pinentry; patch -p1 <../../../0001-qt-Support-building-with-Qt-5.9.patch) make -f build-aux/speedo.mk INSTALL_PREFIX=/build/AppDir/usr CUSTOM_SWDB=1 appimage mkdir -p /build/download |