From 8bea44475b3ee1e5c6aab7da0e865895b94d38f9 Mon Sep 17 00:00:00 2001 From: iphydf Date: Wed, 8 Jan 2025 15:40:15 +0000 Subject: [PATCH] fix: Copy all the Qt imageformats, but not all kimageformats. Builds fail if we delete some. --- qtox/build_qtimageformats_linux.sh | 3 +++ qtox/docker/Dockerfile.alpine-appimage | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/qtox/build_qtimageformats_linux.sh b/qtox/build_qtimageformats_linux.sh index 8ff77a1..7c333ee 100755 --- a/qtox/build_qtimageformats_linux.sh +++ b/qtox/build_qtimageformats_linux.sh @@ -18,6 +18,9 @@ export OBJCXXFLAGS="$CXXFLAGS" mkdir qtimageformats/_build && pushd qtimageformats/_build "$DEP_PREFIX/qt/bin/qt-configure-module" .. \ + -no-feature-jasper \ + -no-feature-mng \ + -no-feature-tiff \ -- \ -Wno-dev cmake --build . diff --git a/qtox/docker/Dockerfile.alpine-appimage b/qtox/docker/Dockerfile.alpine-appimage index 14ce59b..e57e034 100644 --- a/qtox/docker/Dockerfile.alpine-appimage +++ b/qtox/docker/Dockerfile.alpine-appimage @@ -115,14 +115,15 @@ RUN mkdir -p /src/tox \ && /build/build_toxcore.sh --arch "$SCRIPT_ARCH" --libtype shared \ && rm -fr /src/tox -# We're selective about Qt image format plugins for security reasons. We only +# We're selective about KDE image format plugins for security reasons. We only # include the ones we've tested (e.g. with fuzzing). RUN mkdir /work/tmp \ - && for fmt in kimg_qoi libqgif libqjpeg libqsvg libqwebp; do \ - cp "/work/qt/plugins/imageformats/$fmt.so" /work/tmp; \ + && for fmt in qoi; do \ + cp "/work/qt/plugins/imageformats/kimg_$fmt.so" /work/tmp; \ done \ - && rm -rf /work/qt/plugins/imageformats \ - && mv /work/tmp /work/qt/plugins/imageformats + && rm -f /work/qt/plugins/imageformats/kimg_* \ + && mv /work/tmp/* /work/qt/plugins/imageformats/ \ + && rmdir /work/tmp WORKDIR /qtox ENV HOME=/qtox