fix flatpak crash on start issue (#13808)

fix flatpak crash issues
This commit is contained in:
SoftFever
2026-05-23 16:19:26 +08:00
committed by GitHub
parent 27d7d5602c
commit f71a79550b
2 changed files with 9 additions and 6 deletions

View File

@@ -177,11 +177,11 @@ format_duration() {
overall_start=$(date +%s) overall_start=$(date +%s)
install_start=$overall_start install_start=$overall_start
# The workspace and .flatpak-builder cache are bind-mounted from the host. # This container runs as root, but the bind-mounted workspace and .flatpak-builder
# Git inside the container may reject cached source repos as unsafe due to # cache are host-user-owned, so git's dubious-ownership check rejects them and
# ownership mismatch, which breaks flatpak-builder when it reuses git sources. # breaks flatpak-builder's git checkouts (e.g. wxWidgets). Trust every repo: safe
git config --global --add safe.directory /src # in this ephemeral build container, and covers the workspace, mirrors and builds.
git config --global --add safe.directory '/src/.flatpak-builder/git/*' git config --global --add safe.directory '*'
# Install required SDK extensions (not pre-installed in the container image) # Install required SDK extensions (not pre-installed in the container image)
flatpak install -y --noninteractive --arch="$BUILD_ARCH" flathub \ flatpak install -y --noninteractive --arch="$BUILD_ARCH" flathub \

View File

@@ -115,7 +115,10 @@ modules:
- -DwxUSE_ZLIB=sys - -DwxUSE_ZLIB=sys
- -DwxUSE_LIBJPEG=sys - -DwxUSE_LIBJPEG=sys
- -DwxUSE_LIBTIFF=OFF - -DwxUSE_LIBTIFF=OFF
- -DwxUSE_LIBWEBP=builtin # sys, not builtin (unlike the static deps build): wxWidgets installs the
# builtin libwxwebp*.so only for static builds, so a shared build leaves
# them missing at runtime. The GNOME runtime provides libwebp.
- -DwxUSE_LIBWEBP=sys
- -DwxUSE_EXPAT=sys - -DwxUSE_EXPAT=sys
- -DwxUSE_NANOSVG=OFF - -DwxUSE_NANOSVG=OFF
- -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld - -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld