From 28e7540096bc49f680d5a11cdce62aa43309133b Mon Sep 17 00:00:00 2001 From: Christian Kieschnick Date: Mon, 1 Oct 2018 10:27:14 -0400 Subject: [PATCH] Update ci files * Removed libquazip-headers from trusty ci images Trusty does not provide libquazip-headers (they are part of libquazip-dev most likely) * Bump rebuild counter --- Dockerfile | 3 +-- INSTALL.md | 1 + ci/trusty/Dockerfile | 5 ++--- snapcraft.yaml | 2 ++ 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 95c3ed99f..e7b346d1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,8 +53,7 @@ RUN set -x \ zlib1g-dev \ libxi-dev \ libxtst-dev \ - libquazip5-headers \ - libquazip5-dev \ + libquazip-dev \ mesa-common-dev \ libyubikey-dev \ libykpers-1-dev diff --git a/INSTALL.md b/INSTALL.md index c13263913..5ef819899 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -27,6 +27,7 @@ The following libraries are required: * libxi, libxtst, qtx11extras (optional for auto-type on X11) * libsodium (>= 1.0.12, optional for KeePassXC-Browser support) * libargon2 +* libquazip5 Prepare the Building Environment ================================ diff --git a/ci/trusty/Dockerfile b/ci/trusty/Dockerfile index 55c604e75..cc50f8141 100644 --- a/ci/trusty/Dockerfile +++ b/ci/trusty/Dockerfile @@ -18,7 +18,7 @@ FROM ubuntu:14.04 -ENV REBUILD_COUNTER=4 +ENV REBUILD_COUNTER=5 ENV QT5_VERSION=qt53 ENV QT5_PPA_VERSION=${QT5_VERSION}2 @@ -52,8 +52,7 @@ RUN set -x \ zlib1g-dev \ libyubikey-dev \ libykpers-1-dev \ - libquazip5-headers \ - libquazip5-dev \ + libquazip-dev \ libxi-dev \ libxtst-dev \ xvfb diff --git a/snapcraft.yaml b/snapcraft.yaml index d9321d748..ad3dd18d6 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -48,6 +48,8 @@ parts: - libykpers-1-dev - libsodium-dev - libargon2-0-dev + - libquazip5-dev + - libquazip5-headers stage-packages: - dbus - qttranslations5-l10n # common translations