diff options
| author | Ingo Klöcker <[email protected]> | 2021-09-15 10:01:57 +0000 |
|---|---|---|
| committer | Ingo Klöcker <[email protected]> | 2021-09-15 10:03:23 +0000 |
| commit | e43ff7868ff25c5f01e436931417a2ccd51e7837 (patch) | |
| tree | 73f7e8f464b8ad707437d671dce2e2a968e8031a /appimage/docker | |
| parent | appimage: Add experimental scripts for building an AppImage of gpg (diff) | |
| download | gnupg-ikloecker/t5598-appimage.tar.gz gnupg-ikloecker/t5598-appimage.zip | |
appimage: Add a few hacks that are currently needed to build an AppImageikloecker/t5598-appimage
* Apply a patch to latest pinentry to make it build with Qt 5.9
* Copy appimage.desktop and speedo.mk with appimage support which are
not yet available in gnupg (outside of the work branch)
GnuPG-bug-id: 5598
Diffstat (limited to 'appimage/docker')
| -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 |