electrum

commit fc5248550c76e4f439c17cf300055c9f7d7bfcc6
parent dfad0f43c036ee9153603bb7540ff8917ebdef65
Author: SomberNight <somber.night@protonmail.com>
Date:   Fri,  9 Aug 2019 20:56:20 +0200

appimage build: change base to ubuntu 16.04

ubuntu 14.04 is EOL

Diffstat:
M
contrib/build-linux/appimage/Dockerfile
 | 
35
+++++++++++++++++------------------
M
contrib/build-linux/appimage/build.sh
 | 
2
+-

2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/contrib/build-linux/appimage/Dockerfile b/contrib/build-linux/appimage/Dockerfile
@@ -1,27 +1,26 @@
-FROM ubuntu:14.04@sha256:cac55e5d97fad634d954d00a5c2a56d80576a08dcc01036011f26b88263f1578
+FROM ubuntu:16.04@sha256:97b54e5692c27072234ff958a7442dde4266af21e7b688e7fca5dc5acc8ed7d9
 
 ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
 
 RUN apt-get update -q && \
     apt-get install -qy \
-        git=1:1.9.1-1ubuntu0.10 \
-        wget=1.15-1ubuntu1.14.04.5 \
-        make=3.81-8.2ubuntu3 \
-        autotools-dev=20130810.1 \
-        autoconf=2.69-6 \
-        libtool=2.4.2-1.7ubuntu1 \
+        git=1:2.7.4-0ubuntu1.6 \
+        wget=1.17.1-1ubuntu1.5 \
+        make=4.1-6 \
+        autotools-dev=20150820.1 \
+        autoconf=2.69-9 \
+        libtool=2.4.6-0.1 \
         xz-utils=5.1.1alpha+20120614-2ubuntu2 \
-        libssl-dev=1.0.1f-1ubuntu2.27 \
-        zlib1g-dev=1:1.2.8.dfsg-1ubuntu1.1 \
-        libffi6=3.1~rc1+r3.0.13-12ubuntu0.2 \
-        libffi-dev=3.1~rc1+r3.0.13-12ubuntu0.2 \
-        libncurses5-dev=5.9+20140118-1ubuntu1 \
-        libsqlite3-dev=3.8.2-1ubuntu2.2 \
-        libusb-1.0-0-dev=2:1.0.17-1ubuntu2 \
-        libudev-dev=204-5ubuntu20.31 \
-        gettext=0.18.3.1-1ubuntu3.1 \
-        libzbar0=0.10+doc-9build1  \
-        libdbus-1-3=1.6.18-0ubuntu4.5 \
+        libssl-dev=1.0.2g-1ubuntu4.15 \
+        zlib1g-dev=1:1.2.8.dfsg-2ubuntu4.1 \
+        libffi-dev=3.2.1-4 \
+        libncurses5-dev=6.0+20160213-1ubuntu1 \
+        libsqlite3-dev=3.11.0-1ubuntu1.2 \
+        libusb-1.0-0-dev=2:1.0.20-1 \
+        libudev-dev=229-4ubuntu21.22 \
+        gettext=0.19.7-2ubuntu3.1 \
+        libzbar0=0.10+doc-10ubuntu1  \
+        libdbus-1-3=1.10.6-1ubuntu3.4 \
         && \
     rm -rf /var/lib/apt/lists/* && \
     apt-get autoremove -y && \
diff --git a/contrib/build-linux/appimage/build.sh b/contrib/build-linux/appimage/build.sh
@@ -141,7 +141,7 @@ mkdir -p "$CACHEDIR/pip_cache"
 
 
 info "copying zbar"
-cp "/usr/lib/libzbar.so.0" "$APPDIR/usr/lib/libzbar.so.0"
+cp "/usr/lib/x86_64-linux-gnu/libzbar.so.0" "$APPDIR/usr/lib/libzbar.so.0"
 
 
 info "desktop integration."