Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 8, 2025
+9 −5
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions qtox/build_qtimageformats_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
11 changes: 6 additions & 5 deletions qtox/docker/Dockerfile.alpine-appimage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading