From cc3cc3556569f039436edfc2b51dc46924aaa070 Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@jbev.net>
Date: Tue, 27 Feb 2018 01:23:31 +0100
Subject: [PATCH] Update library paths in AppImage recipe and Dockerfiles

---
 AppImage-Recipe.sh   | 10 +++++-----
 Dockerfile           | 19 ++++++++++---------
 ci/trusty/Dockerfile | 17 +++++++++--------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/AppImage-Recipe.sh b/AppImage-Recipe.sh
index 96e7b4099..da3830144 100755
--- a/AppImage-Recipe.sh
+++ b/AppImage-Recipe.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # 
 # KeePassXC AppImage Recipe
-# Copyright (C) 2017 KeePassXC team <https://keepassxc.org/>
+# Copyright (C) 2017-2018 KeePassXC team <https://keepassxc.org/>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -68,17 +68,17 @@ get_apprun
 copy_deps
 
 # protect our libgpg-error from being deleted
-mv ./opt/gpg-error-127/lib/x86_64-linux-gnu/libgpg-error.so.0 ./protected.so
+mv ./opt/keepassxc-libs/lib/x86_64-linux-gnu/libgpg-error.so.0 ./protected.so
 delete_blacklisted
-mv ./protected.so ./opt/gpg-error-127/lib/x86_64-linux-gnu/libgpg-error.so.0
+mv ./protected.so ./opt/keepassxc-libs/lib/x86_64-linux-gnu/libgpg-error.so.0
 
 get_desktop
 get_icon
 cat << EOF > ./usr/bin/keepassxc_env
 #!/usr/bin/env bash
-export LD_LIBRARY_PATH="../opt/libgcrypt20-18/lib/x86_64-linux-gnu:\${LD_LIBRARY_PATH}"
-export LD_LIBRARY_PATH="../opt/gpg-error-127/lib/x86_64-linux-gnu:\${LD_LIBRARY_PATH}"
 export LD_LIBRARY_PATH="..$(dirname ${QT_PLUGIN_PATH})/lib:\${LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH="../opt/keepassxc-libs/lib/x86_64-linux-gnu:\${LD_LIBRARY_PATH}"
+
 export QT_PLUGIN_PATH="..${QT_PLUGIN_PATH}:\${KPXC_QT_PLUGIN_PATH}"
 
 # unset XDG_DATA_DIRS to make tray icon work in Ubuntu Unity
diff --git a/Dockerfile b/Dockerfile
index 31d8cf6ca..f9ff0cd1e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@
 
 FROM ubuntu:14.04
 
-ENV REBUILD_COUNTER=6
+ENV REBUILD_COUNTER=8
 
 ENV QT5_VERSION=59
 ENV QT5_PPA_VERSION=${QT5_VERSION}4
@@ -42,6 +42,7 @@ RUN set -x \
         libgcrypt20-18-dev \
         libargon2-0-dev \
         libsodium-dev \
+        libcurl-no-gcrypt-dev \
         qt${QT5_VERSION}base \
         qt${QT5_VERSION}tools \
         qt${QT5_VERSION}x11extras \
@@ -51,17 +52,17 @@ RUN set -x \
         libxtst-dev \
         mesa-common-dev \
         libyubikey-dev \
-        libykpers-1-dev \
-        libcurl4-openssl-dev
+        libykpers-1-dev
 
 ENV CMAKE_PREFIX_PATH="/opt/qt${QT5_VERSION}/lib/cmake"
-ENV CMAKE_INCLUDE_PATH="/opt/libgcrypt20-18/include:/opt/gpg-error-127/include"
-ENV CMAKE_LIBRARY_PATH="/opt/libgcrypt20-18/lib/x86_64-linux-gnu:/opt/gpg-error-127/lib/x86_64-linux-gnu"
-ENV LD_LIBRARY_PATH="/opt/qt${QT5_VERSION}/lib:/opt/libgcrypt20-18/lib/x86_64-linux-gnu:/opt/gpg-error-127/lib/x86_64-linux-gnu"
+ENV CMAKE_INCLUDE_PATH="/opt/keepassxc-libs/include"
+ENV CMAKE_LIBRARY_PATH="/opt/keepassxc-libs/lib/x86_64-linux-gnu"
+ENV CPATH="${CMAKE_INCLUDE_PATH}"
+ENV LD_LIBRARY_PATH="${CMAKE_LIBRARY_PATH}:/opt/qt${QT5_VERSION}/lib"
+
 RUN set -x \
-    && echo "/opt/qt${QT_VERSION}/lib" > /etc/ld.so.conf.d/qt${QT5_VERSION}.conf \
-    && echo "/opt/libgcrypt20-18/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/libgcrypt20-18.conf \
-    && echo "/opt/gpg-error-127/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/libgpg-error-127.conf
+    && echo "/opt/qt${QT5_VERSION}/lib" > /etc/ld.so.conf.d/qt${QT5_VERSION}.conf \
+    && echo "/opt/keepassxc-libs/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/keepassxc.conf
 
 # AppImage dependencies
 RUN set -x \
diff --git a/ci/trusty/Dockerfile b/ci/trusty/Dockerfile
index 5ef9cac23..d10c609a0 100644
--- a/ci/trusty/Dockerfile
+++ b/ci/trusty/Dockerfile
@@ -18,7 +18,7 @@
 
 FROM ubuntu:14.04
 
-ENV REBUILD_COUNTER=2
+ENV REBUILD_COUNTER=4
 
 ENV QT5_VERSION=53
 ENV QT5_PPA_VERSION=${QT5_VERSION}2
@@ -43,7 +43,7 @@ RUN set -x \
       libgcrypt20-18-dev \
       libargon2-0-dev \
       libsodium-dev \
-      libcurl4-openssl-dev \
+      libcurl-no-gcrypt-dev \
       qt${QT5_VERSION}base \
       qt${QT5_VERSION}tools \
       qt${QT5_VERSION}x11extras \
@@ -56,13 +56,14 @@ RUN set -x \
       xvfb
 
 ENV CMAKE_PREFIX_PATH="/opt/qt${QT5_VERSION}/lib/cmake"
-ENV CMAKE_INCLUDE_PATH="/opt/libgcrypt20-18/include:/opt/gpg-error-127/include"
-ENV CMAKE_LIBRARY_PATH="/opt/libgcrypt20-18/lib/x86_64-linux-gnu:/opt/gpg-error-127/lib/x86_64-linux-gnu"
-ENV LD_LIBRARY_PATH="/opt/qt${QT5_VERSION}/lib:/opt/libgcrypt20-18/lib/x86_64-linux-gnu:/opt/gpg-error-127/lib/x86_64-linux-gnu"
+ENV CMAKE_INCLUDE_PATH="/opt/keepassxc-libs/include"
+ENV CMAKE_LIBRARY_PATH="/opt/keepassxc-libs/lib/x86_64-linux-gnu"
+ENV CPATH="${CMAKE_INCLUDE_PATH}"
+ENV LD_LIBRARY_PATH="${CMAKE_LIBRARY_PATH}:/opt/qt${QT5_VERSION}/lib"
+
 RUN set -x \
-    && echo "/opt/qt${QT_VERSION}/lib" > /etc/ld.so.conf.d/qt${QT5_VERSION}.conf \
-    && echo "/opt/libgcrypt20-18/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/libgcrypt20-18.conf \
-    && echo "/opt/gpg-error-127/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/libgpg-error-127.conf
+    && echo "/opt/qt${QT5_VERSION}/lib" > /etc/ld.so.conf.d/qt${QT5_VERSION}.conf \
+    && echo "/opt/keepassxc-libs/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/keepassxc.conf
 
 RUN set -x \
     && apt-get autoremove --purge \