1
0

build: appimage: bump base from debian buster(2019) to bullseye(2021)

This commit is contained in:
SomberNight
2025-05-30 15:59:15 +00:00
parent 491b808cc5
commit 37ca5f7eff
7 changed files with 10 additions and 34 deletions

View File

@@ -1,2 +1,2 @@
deb https://snapshot.debian.org/archive/debian/20230629T090352Z/ bookworm main deb https://snapshot.debian.org/archive/debian/20250530T143637Z/ bookworm main
deb-src https://snapshot.debian.org/archive/debian/20230629T090352Z/ bookworm main deb-src https://snapshot.debian.org/archive/debian/20250530T143637Z/ bookworm main

View File

@@ -2,7 +2,7 @@
# from https://docs.appimage.org/introduction/concepts.html : # from https://docs.appimage.org/introduction/concepts.html :
# "[AppImages] should be built on the oldest possible system, allowing them to run on newer system[s]" # "[AppImages] should be built on the oldest possible system, allowing them to run on newer system[s]"
FROM debian:buster@sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459 FROM debian:bullseye@sha256:cf48c31af360e1c0a0aedd33aae4d928b68c2cdf093f1612650eb1ff434d1c34
ENV LC_ALL=C.UTF-8 LANG=C.UTF-8 ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
@@ -57,8 +57,7 @@ RUN apt-get update -q && \
libxcb-icccm4 \ libxcb-icccm4 \
libxcb-image0 \ libxcb-image0 \
libxcb-keysyms1 \ libxcb-keysyms1 \
libxcb-util0 \ libxcb-util1 \
#libxcb-util1 \
libxcb-render-util0 \ libxcb-render-util0 \
libxcb-cursor0 \ libxcb-cursor0 \
libx11-xcb1 \ libx11-xcb1 \

View File

@@ -4,7 +4,7 @@ AppImage binary for Electrum
✓ _This binary should be reproducible, meaning you should be able to generate ✓ _This binary should be reproducible, meaning you should be able to generate
binaries that match the official releases._ binaries that match the official releases._
- _Minimum supported target system (i.e. what end-users need): x86_64, glibc 2.28_ - _Minimum supported target system (i.e. what end-users need): x86_64, glibc 2.31_
This assumes an Ubuntu host, but it should not be too hard to adapt to another This assumes an Ubuntu host, but it should not be too hard to adapt to another
similar system. The host architecture should be x86_64 (amd64). similar system. The host architecture should be x86_64 (amd64).

View File

@@ -1,2 +1,2 @@
deb https://snapshot.debian.org/archive/debian/20230317T205011Z/ buster main deb https://snapshot.debian.org/archive/debian/20250530T143637Z/ bullseye main
deb-src https://snapshot.debian.org/archive/debian/20230317T205011Z/ buster main deb-src https://snapshot.debian.org/archive/debian/20250530T143637Z/ bullseye main

View File

@@ -95,29 +95,6 @@ fi
cp -f "$DLL_TARGET_DIR/libzbar.so.0" "$APPDIR/usr/lib/" || fail "Could not copy libzbar to its destination" 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)
download_if_not_exist "$CACHEDIR/xcb-util_0.4.0.orig.tar.gz" "http://deb.debian.org/debian/pool/main/x/xcb-util/xcb-util_0.4.0.orig.tar.gz"
verify_hash "$CACHEDIR/xcb-util_0.4.0.orig.tar.gz" "0ed0934e2ef4ddff53fcc70fc64fb16fe766cd41ee00330312e20a985fd927a7"
info "building libxcb-util1."
(
if [ -f "$CACHEDIR/libxcb-util1/util/src/.libs/libxcb-util.so.1" ]; then
info "libxcb-util1 already built, skipping"
exit 0
fi
cd "$CACHEDIR"
mkdir "libxcb-util1"
cd "libxcb-util1"
tar xf "$CACHEDIR/xcb-util_0.4.0.orig.tar.gz" -C .
mv "xcb-util-0.4.0" util
cd util
./autogen.sh
./configure --enable-shared
make "-j$CPU_COUNT" -s || fail "Could not build libxcb-util1"
) || fail "Could build libxcb-util1"
cp "$CACHEDIR/libxcb-util1/util/src/.libs/libxcb-util.so.1" "$APPDIR/usr/lib/libxcb-util.so.1"
appdir_python() { appdir_python() {
env \ env \
PYTHONNOUSERSITE=1 \ PYTHONNOUSERSITE=1 \

View File

@@ -1,2 +1,2 @@
deb https://snapshot.debian.org/archive/debian/20240419T084725Z/ bookworm main deb https://snapshot.debian.org/archive/debian/20250530T143637Z/ bookworm main
deb-src https://snapshot.debian.org/archive/debian/20240419T084725Z/ bookworm main deb-src https://snapshot.debian.org/archive/debian/20250530T143637Z/ bookworm main

View File

@@ -5,7 +5,7 @@
set -e set -e
DEBIAN_SNAPSHOT_BASE="https://snapshot.debian.org/archive/debian/" DEBIAN_SNAPSHOT_BASE="https://snapshot.debian.org/archive/debian/"
DEBIAN_APPIMAGE_DISTRO="buster" # should match build-linux/appimage Dockerfile base DEBIAN_APPIMAGE_DISTRO="bullseye" # should match build-linux/appimage Dockerfile base
DEBIAN_WINE_DISTRO="bookworm" # should match build-wine Dockerfile base DEBIAN_WINE_DISTRO="bookworm" # should match build-wine Dockerfile base
DEBIAN_ANDROID_DISTRO="bookworm" # should match android Dockerfile base DEBIAN_ANDROID_DISTRO="bookworm" # should match android Dockerfile base