From e6810190ede8aeb647fc4f6456cff71201261407 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Tue, 26 May 2026 22:30:41 +1000 Subject: [PATCH] Don't build qtsvg --- build-dependencies-linux-cross.sh | 14 -------------- build-dependencies-linux.sh | 14 -------------- build-dependencies-mac.sh | 19 ------------------- build-dependencies-windows-arm64.bat | 13 ------------- build-dependencies-windows-x64.bat | 13 ------------- download-sources.sh | 4 ---- patches/qtbase-macdeploy-imageformats.patch | 19 ------------------- versions | 2 -- 8 files changed, 98 deletions(-) delete mode 100644 patches/qtbase-macdeploy-imageformats.patch diff --git a/build-dependencies-linux-cross.sh b/build-dependencies-linux-cross.sh index 58f68e6..aa282bc 100755 --- a/build-dependencies-linux-cross.sh +++ b/build-dependencies-linux-cross.sh @@ -80,7 +80,6 @@ if [[ "$SKIP_DOWNLOAD" != true && ! -f "libbacktrace-$LIBBACKTRACE_COMMIT.tar.gz -O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \ - -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtwayland-everywhere-src-$QT.tar.xz" \ @@ -106,7 +105,6 @@ $ZLIBNG_GZ_HASH zlib-ng-$ZLIBNG.tar.gz $ZSTD_GZ_HASH zstd-$ZSTD.tar.gz $QTBASE_XZ_HASH qtbase-everywhere-src-$QT.tar.xz $QTIMAGEFORMATS_XZ_HASH qtimageformats-everywhere-src-$QT.tar.xz -$QTSVG_XZ_HASH qtsvg-everywhere-src-$QT.tar.xz $QTTOOLS_XZ_HASH qttools-everywhere-src-$QT.tar.xz $QTTRANSLATIONS_XZ_HASH qttranslations-everywhere-src-$QT.tar.xz $QTWAYLAND_XZ_HASH qtwayland-everywhere-src-$QT.tar.xz @@ -322,18 +320,6 @@ ninja install cd ../../ rm -fr "qtbase-everywhere-src-$QT" -echo "Building Qt SVG..." -rm -fr "qtsvg-everywhere-src-$QT" -tar xf "qtsvg-everywhere-src-$QT.tar.xz" -cd "qtsvg-everywhere-src-$QT" -mkdir build -cd build -"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DQT_GENERATE_SBOM=OFF -cmake --build . --parallel -ninja install -cd ../../ -rm -fr "qtsvg-everywhere-src-$QT" - echo "Building Qt Image Formats..." rm -fr "qtimageformats-everywhere-src-$QT" tar xf "qtimageformats-everywhere-src-$QT.tar.xz" diff --git a/build-dependencies-linux.sh b/build-dependencies-linux.sh index 3e47b1f..8c46a84 100755 --- a/build-dependencies-linux.sh +++ b/build-dependencies-linux.sh @@ -49,7 +49,6 @@ if [[ "$SKIP_DOWNLOAD" != true && ! -f "libbacktrace-$LIBBACKTRACE_COMMIT.tar.gz -O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \ - -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtwayland-everywhere-src-$QT.tar.xz" \ @@ -75,7 +74,6 @@ $ZLIBNG_GZ_HASH zlib-ng-$ZLIBNG.tar.gz $ZSTD_GZ_HASH zstd-$ZSTD.tar.gz $QTBASE_XZ_HASH qtbase-everywhere-src-$QT.tar.xz $QTIMAGEFORMATS_XZ_HASH qtimageformats-everywhere-src-$QT.tar.xz -$QTSVG_XZ_HASH qtsvg-everywhere-src-$QT.tar.xz $QTTOOLS_XZ_HASH qttools-everywhere-src-$QT.tar.xz $QTTRANSLATIONS_XZ_HASH qttranslations-everywhere-src-$QT.tar.xz $QTWAYLAND_XZ_HASH qtwayland-everywhere-src-$QT.tar.xz @@ -264,18 +262,6 @@ ninja install cd ../../ rm -fr "qtbase-everywhere-src-$QT" -echo "Building Qt SVG..." -rm -fr "qtsvg-everywhere-src-$QT" -tar xf "qtsvg-everywhere-src-$QT.tar.xz" -cd "qtsvg-everywhere-src-$QT" -mkdir build -cd build -"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DQT_GENERATE_SBOM=OFF -cmake --build . --parallel -ninja install -cd ../../ -rm -fr "qtsvg-everywhere-src-$QT" - echo "Building Qt Image Formats..." rm -fr "qtimageformats-everywhere-src-$QT" tar xf "qtimageformats-everywhere-src-$QT.tar.xz" diff --git a/build-dependencies-mac.sh b/build-dependencies-mac.sh index 5962df8..860532f 100755 --- a/build-dependencies-mac.sh +++ b/build-dependencies-mac.sh @@ -91,7 +91,6 @@ $FFMPEG_XZ_HASH ffmpeg-$FFMPEG_VERSION.tar.xz $MOLTENVK_GZ_HASH v$MOLTENVK_VERSION.tar.gz $QTBASE_XZ_HASH qtbase-everywhere-src-$QT.tar.xz $QTIMAGEFORMATS_XZ_HASH qtimageformats-everywhere-src-$QT.tar.xz -$QTSVG_XZ_HASH qtsvg-everywhere-src-$QT.tar.xz $QTTOOLS_XZ_HASH qttools-everywhere-src-$QT.tar.xz $QTTRANSLATIONS_XZ_HASH qttranslations-everywhere-src-$QT.tar.xz $CPUINFO_GZ_HASH cpuinfo-$CPUINFO_COMMIT.tar.gz @@ -117,7 +116,6 @@ if [[ "$SKIP_DOWNLOAD" != true && ! -f "brotli-$BROTLI.tar.gz" ]]; then -O "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v$MOLTENVK_VERSION.tar.gz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \ - -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \ -o "cpuinfo-$CPUINFO_COMMIT.tar.gz" "https://github.com/stenzek/cpuinfo/archive/$CPUINFO_COMMIT.tar.gz" \ @@ -324,29 +322,12 @@ patch -p1 < "$SCRIPTDIR/patches/qtbase-fusion-style.patch" # Allow window-modal dialog boxes in Tahoe, it's not a problem for us. patch -p1 < "$SCRIPTDIR/patches/qtbase-window-modal-tahoe.patch" -# since we don't have a direct reference to QtSvg, it doesn't deployed directly from the main binary -# (only indirectly from iconengines), and the libqsvg.dylib imageformat plugin does not get deployed. -# We could run macdeployqt twice, but that's even more janky than patching it. -patch -p1 < "$SCRIPTDIR/patches/qtbase-macdeploy-imageformats.patch" - cmake -B build "${CMAKE_COMMON[@]}" "${CMAKE_COMMON_QT[@]}" -DFEATURE_dbus=OFF -DFEATURE_framework=OFF -DFEATURE_icu=OFF -DFEATURE_opengl=OFF -DFEATURE_sql=OFF -DFEATURE_gssapi=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON -DFEATURE_brotli=OFF make -C build "-j$NPROCS" make -C build install cd .. rm -fr "qtbase-everywhere-src-$QT" -echo "Building Qt SVG..." -rm -fr "qtsvg-everywhere-src-$QT" -tar xf "qtsvg-everywhere-src-$QT.tar.xz" -cd "qtsvg-everywhere-src-$QT" -mkdir build -cd build -"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "${CMAKE_COMMON_QT[@]}" -make "-j$NPROCS" -make install -cd ../.. -rm -fr "qtsvg-everywhere-src-$QT" - echo "Building Qt Image Formats..." rm -fr "qtimageformats-everywhere-src-$QT" tar xf "qtimageformats-everywhere-src-$QT.tar.xz" diff --git a/build-dependencies-windows-arm64.bat b/build-dependencies-windows-arm64.bat index 4f21883..46530f3 100644 --- a/build-dependencies-windows-arm64.bat +++ b/build-dependencies-windows-arm64.bat @@ -68,7 +68,6 @@ call :downloadfile "SDL3-%SDL3%.zip" "https://github.com/libsdl-org/SDL/releases call :downloadfile "sqlite-amalgamation-%SQLITE%.zip" "https://sqlite.org/2026/sqlite-amalgamation-%SQLITE%.zip" "%SQLITE_ZIP_HASH%" || goto error call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" "%QTBASE_ZIP_HASH%" || goto error call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" "%QTIMAGEFORMATS_ZIP_HASH%" || goto error -call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" "%QTSVG_ZIP_HASH%" || goto error call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" "%QTTOOLS_ZIP_HASH%" || goto error call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" "%QTTRANSLATIONS_ZIP_HASH%" || goto error call :downloadfile "libwebp-%LIBWEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%LIBWEBP%.tar.gz" "%LIBWEBP_GZ_HASH%" || goto error @@ -237,18 +236,6 @@ ninja -C build install || goto error cd .. || goto error rmdir /S /Q "qtbase-everywhere-src-%QT%" -echo Building Qt SVG... -rmdir /S /Q "qtsvg-everywhere-src-%QT%" -%SEVENZIP% x "qtsvg-everywhere-src-%QT%.zip" || goto error -cd "qtsvg-everywhere-src-%QT%" || goto error -mkdir build || goto error -cd build || goto error -call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DQT_GENERATE_SBOM=OFF || goto error -cmake --build . --parallel || goto error -ninja install || goto error -cd ..\.. || goto error -rmdir /S /Q "qtsvg-everywhere-src-%QT%" - echo Building Qt Image Formats... rmdir /S /Q "qtimageformats-everywhere-src-%QT%" %SEVENZIP% x "qtimageformats-everywhere-src-%QT%.zip" || goto error diff --git a/build-dependencies-windows-x64.bat b/build-dependencies-windows-x64.bat index e280803..be72212 100644 --- a/build-dependencies-windows-x64.bat +++ b/build-dependencies-windows-x64.bat @@ -66,7 +66,6 @@ call :downloadfile "SDL3-%SDL3%.zip" "https://github.com/libsdl-org/SDL/releases call :downloadfile "sqlite-amalgamation-%SQLITE%.zip" "https://sqlite.org/2026/sqlite-amalgamation-%SQLITE%.zip" "%SQLITE_ZIP_HASH%" || goto error call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" "%QTBASE_ZIP_HASH%" || goto error call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" "%QTIMAGEFORMATS_ZIP_HASH%" || goto error -call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" "%QTSVG_ZIP_HASH%" || goto error call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" "%QTTOOLS_ZIP_HASH%" || goto error call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" "%QTTRANSLATIONS_ZIP_HASH%" || goto error call :downloadfile "libwebp-%LIBWEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%LIBWEBP%.tar.gz" "%LIBWEBP_GZ_HASH%" || goto error @@ -234,18 +233,6 @@ ninja -C build install || goto error cd .. || goto error rmdir /S /Q "qtbase-everywhere-src-%QT%" -echo Building Qt SVG... -rmdir /S /Q "qtsvg-everywhere-src-%QT%" -%SEVENZIP% x "qtsvg-everywhere-src-%QT%.zip" || goto error -cd "qtsvg-everywhere-src-%QT%" || goto error -mkdir build || goto error -cd build || goto error -call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DQT_GENERATE_SBOM=OFF || goto error -cmake --build . --parallel || goto error -ninja install || goto error -cd ..\.. || goto error -rmdir /S /Q "qtsvg-everywhere-src-%QT%" - echo Building Qt Image Formats... rmdir /S /Q "qtimageformats-everywhere-src-%QT%" %SEVENZIP% x "qtimageformats-everywhere-src-%QT%.zip" || goto error diff --git a/download-sources.sh b/download-sources.sh index e41d842..e1a38e9 100755 --- a/download-sources.sh +++ b/download-sources.sh @@ -25,8 +25,6 @@ curl -C - -L \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.zip" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.zip" \ - -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \ - -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.zip" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.zip" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \ @@ -59,8 +57,6 @@ $QTBASE_XZ_HASH qtbase-everywhere-src-$QT.tar.xz $QTBASE_ZIP_HASH qtbase-everywhere-src-$QT.zip $QTIMAGEFORMATS_XZ_HASH qtimageformats-everywhere-src-$QT.tar.xz $QTIMAGEFORMATS_ZIP_HASH qtimageformats-everywhere-src-$QT.zip -$QTSVG_XZ_HASH qtsvg-everywhere-src-$QT.tar.xz -$QTSVG_ZIP_HASH qtsvg-everywhere-src-$QT.zip $QTTOOLS_XZ_HASH qttools-everywhere-src-$QT.tar.xz $QTTOOLS_ZIP_HASH qttools-everywhere-src-$QT.zip $QTTRANSLATIONS_XZ_HASH qttranslations-everywhere-src-$QT.tar.xz diff --git a/patches/qtbase-macdeploy-imageformats.patch b/patches/qtbase-macdeploy-imageformats.patch deleted file mode 100644 index 790fd59..0000000 --- a/patches/qtbase-macdeploy-imageformats.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/tools/macdeployqt/shared/shared.cpp -+++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1122,14 +1122,8 @@ - addPlugins(QStringLiteral("networkinformation")); - } - -- // All image formats (svg if QtSvg is used) -- const bool usesSvg = deploymentInfo.containsModule("Svg", libInfix); -- addPlugins(QStringLiteral("imageformats"), [usesSvg](const QString &lib) { -- if (lib.contains(QStringLiteral("qsvg")) && !usesSvg) -- return false; -- return true; -- }); -- -+ // All image formats -+ addPlugins(QStringLiteral("imageformats")); - addPlugins(QStringLiteral("iconengines")); - - // Platforminputcontext plugins if QtGui is in use \ No newline at end of file diff --git a/versions b/versions index 8f0d399..efd24f6 100644 --- a/versions +++ b/versions @@ -42,8 +42,6 @@ QTBASE_XZ_HASH=d9594a31228aa23ad6b531719a29b45f0f3989fe6c136d45767ea179f233c1ac QTBASE_ZIP_HASH=3529cc37297a5a7aae4486843b9fd41c30df1d79a770f85e240b537dcc327ca5 QTIMAGEFORMATS_XZ_HASH=b2bf6c6845ac175ed7f819145483ba4676f617aaa6a5012c8efee63c8bbac413 QTIMAGEFORMATS_ZIP_HASH=37fba768f2780580dfae535ad6654cb9dc0bf2272e71b9b9781988de9ed0dac0 -QTSVG_XZ_HASH=7f3cf02f4824bf03c2c5859ea6db173bf1482a1daf24e6cdf7bc78cfa26a8a94 -QTSVG_ZIP_HASH=767730188d4610a89bf8da502f87acf1c8881a3ac54f1e0eb167ab1e08b03a75 QTTOOLS_XZ_HASH=8e61835a679c93fa9c6065b142353c2071ba68e297898937c32a03777fcaf50d QTTOOLS_ZIP_HASH=2d6ed2a98f458152e3cb17bf0be0494250194933a2d937b5a434e5b2006efca9 QTTRANSLATIONS_XZ_HASH=37c02c81206594c7bb4edca85ac93e8e55a9836b70c960fde6cb0f8623ec5677