Browse Source

appimage build: build zbar ourselves

to be able to package new version, which has security fixes
master
SomberNight 2 years ago
parent
commit
5369be66da
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
  1. 4
      contrib/build-linux/appimage/Dockerfile
  2. 13
      contrib/build-linux/appimage/make_appimage.sh

4
contrib/build-linux/appimage/Dockerfile

@ -41,7 +41,6 @@ RUN apt-get update -q && \
libudev-dev \
libudev1 \
gettext \
libzbar0 \
libdbus-1-3 \
xutils-dev \
libxkbcommon0 \
@ -65,6 +64,9 @@ RUN apt-get update -q && \
libc6-dev \
libc6 \
libc-dev-bin \
libv4l-dev \
libjpeg62-turbo-dev \
libx11-dev \
&& \
rm -rf /var/lib/apt/lists/* && \
apt-get autoremove -y && \

13
contrib/build-linux/appimage/make_appimage.sh

@ -87,6 +87,15 @@ fi
cp -f "$DLL_TARGET_DIR"/libsecp256k1.so.* "$APPDIR/usr/lib/" || fail "Could not copy libsecp to its destination"
if [ -f "$DLL_TARGET_DIR/libzbar.so.0" ]; then
info "libzbar already built, skipping"
else
# note: could instead just use the libzbar0 pkg from debian/apt, but that is too old and missing fixes for CVE-2023-40889
"$CONTRIB"/make_zbar.sh || fail "Could not build zbar"
fi
cp -f "$DLL_TARGET_DIR/libzbar.so.0" "$APPDIR/usr/lib/" || fail "Could not copy libzbar to its destination"
# note: libxcb-util1 is not available in debian 10 (buster), only libxcb-util0. So we build it ourselves.
# This pkg is needed on some distros for Qt to launch. (see #8011)
info "building libxcb-util1."
@ -176,10 +185,6 @@ info "installing electrum and its dependencies."
"$python" -m pip uninstall -y Cython
info "copying zbar"
cp "/usr/lib/x86_64-linux-gnu/libzbar.so.0" "$APPDIR/usr/lib/libzbar.so.0"
info "desktop integration."
cp "$PROJECT_ROOT/electrum.desktop" "$APPDIR/electrum.desktop"
cp "$PROJECT_ROOT/electrum/gui/icons/electrum.png" "$APPDIR/electrum.png"

Loading…
Cancel
Save