fix: Copy all the Qt imageformats, but not all kimageformats.

Builds fail if we delete some.
TokTok · Jan 8, 2025 · eb483dd · eb483dd
1 parent 6ed091b
commit eb483dd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -118,11 +118,12 @@ RUN mkdir -p /src/tox \
 # We're selective about Qt 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