From 0afde446c49ebccebab2e7f254f5ec0e5693be98 Mon Sep 17 00:00:00 2001 From: JordanTheToaster Date: Sat, 27 Sep 2025 17:20:57 +0100 Subject: [PATCH] Deps: Update kddockwidgets to v2.3.0 --- .../common/kddockwidgets-dodgy-include.patch | 13 ------------- .../scripts/linux/build-dependencies-qt.sh | 5 ++--- .../linux/flatpak/modules/23-kddockwidgets.json | 8 ++------ .../scripts/macos/build-dependencies-universal.sh | 5 ++--- .../workflows/scripts/macos/build-dependencies.sh | 5 ++--- .../scripts/windows/build-dependencies-arm64.bat | 5 ++--- .../scripts/windows/build-dependencies.bat | 5 ++--- 7 files changed, 12 insertions(+), 34 deletions(-) delete mode 100644 .github/workflows/scripts/common/kddockwidgets-dodgy-include.patch diff --git a/.github/workflows/scripts/common/kddockwidgets-dodgy-include.patch b/.github/workflows/scripts/common/kddockwidgets-dodgy-include.patch deleted file mode 100644 index 2246f10695..0000000000 --- a/.github/workflows/scripts/common/kddockwidgets-dodgy-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/core/indicators/ClassicDropIndicatorOverlay.h b/src/core/indicators/ClassicDropIndicatorOverlay.h -index 2dfb9718a..9b01f002e 100644 ---- a/src/core/indicators/ClassicDropIndicatorOverlay.h -+++ b/src/core/indicators/ClassicDropIndicatorOverlay.h -@@ -11,7 +11,7 @@ - - #pragma once - --#include "core/DropIndicatorOverlay.h" -+#include - - namespace KDDockWidgets { - diff --git a/.github/workflows/scripts/linux/build-dependencies-qt.sh b/.github/workflows/scripts/linux/build-dependencies-qt.sh index 3393cd19ae..626ed884e8 100755 --- a/.github/workflows/scripts/linux/build-dependencies-qt.sh +++ b/.github/workflows/scripts/linux/build-dependencies-qt.sh @@ -25,7 +25,7 @@ QT=6.9.2 QTAPNG=1.3.0 LZ4=1.10.0 ZSTD=1.5.7 -KDDOCKWIDGETS=2.2.3 +KDDOCKWIDGETS=2.3.0 PLUTOVG=1.3.1 PLUTOSVG=0.0.7 @@ -59,7 +59,7 @@ a8e4a25e5c2686fd36981e527ed05e451fcfc226bddf350f4e76181371190937 shaderc-$SHADE 9427deccbdf4bde6a269938df38c6bd75247493786a310d8d733a2c82065ef47 shaderc-glslang-$SHADERC_GLSLANG.tar.gz c2225a49c3d7efa5c4f4ce4a6b42081e6ea3daca376f3353d9d7c2722d77a28a shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz 44d1005880c583fc00a0fb41c839214c68214b000ea8dcb54d352732fee600ff shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz -b8529755b2d54205341766ae168e83177c6120660539f9afba71af6bca4b81ec KDDockWidgets-$KDDOCKWIDGETS.tar.gz +843baf9e1812c1ab82fd81d85b57cbc0d29bb43245efeb2539039780004b1056 KDDockWidgets-$KDDOCKWIDGETS.tar.gz bea672eb96ee36c2cbeb911b9bac66dfe989b3ad9a9943101e00aeb2df2aefdb plutovg-$PLUTOVG.tar.gz 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3 plutosvg-$PLUTOSVG.tar.gz EOF @@ -271,7 +271,6 @@ echo "Building KDDockWidgets..." rm -fr "KDDockWidgets-$KDDOCKWIDGETS" tar xf "KDDockWidgets-$KDDOCKWIDGETS.tar.gz" cd "KDDockWidgets-$KDDOCKWIDGETS" -patch -p1 < "$SCRIPTDIR/../common/kddockwidgets-dodgy-include.patch" cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DKDDockWidgets_QT6=true -DKDDockWidgets_EXAMPLES=false -DKDDockWidgets_FRONTENDS=qtwidgets -B build -G Ninja cmake --build build --parallel ninja -C build install diff --git a/.github/workflows/scripts/linux/flatpak/modules/23-kddockwidgets.json b/.github/workflows/scripts/linux/flatpak/modules/23-kddockwidgets.json index a37d141280..ad1762d718 100644 --- a/.github/workflows/scripts/linux/flatpak/modules/23-kddockwidgets.json +++ b/.github/workflows/scripts/linux/flatpak/modules/23-kddockwidgets.json @@ -14,13 +14,9 @@ { "type": "git", "url": "https://github.com/KDAB/KDDockWidgets.git", - "tag": "v2.2.3", - "commit": "28d16d0431d7cdc9f36cb619d22621146fdfab44", + "tag": "v2.3.0", + "commit": "c38711026e17e34916dd82c6fcbdcc0d2342f541", "disable-submodules": true - }, - { - "type": "patch", - "path": "../../../common/kddockwidgets-dodgy-include.patch" } ], "cleanup": [ diff --git a/.github/workflows/scripts/macos/build-dependencies-universal.sh b/.github/workflows/scripts/macos/build-dependencies-universal.sh index 53efe5e9bb..89032cc03f 100644 --- a/.github/workflows/scripts/macos/build-dependencies-universal.sh +++ b/.github/workflows/scripts/macos/build-dependencies-universal.sh @@ -50,7 +50,7 @@ FFMPEG=6.0 MOLTENVK=1.2.9 QT=6.7.3 QTAPNG=1.3.0 -KDDOCKWIDGETS=2.2.3 +KDDOCKWIDGETS=2.3.0 PLUTOVG=1.3.1 PLUTOSVG=0.0.7 @@ -99,7 +99,7 @@ a8e4a25e5c2686fd36981e527ed05e451fcfc226bddf350f4e76181371190937 shaderc-$SHADE 9427deccbdf4bde6a269938df38c6bd75247493786a310d8d733a2c82065ef47 shaderc-glslang-$SHADERC_GLSLANG.tar.gz c2225a49c3d7efa5c4f4ce4a6b42081e6ea3daca376f3353d9d7c2722d77a28a shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz 44d1005880c583fc00a0fb41c839214c68214b000ea8dcb54d352732fee600ff shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz -b8529755b2d54205341766ae168e83177c6120660539f9afba71af6bca4b81ec KDDockWidgets-$KDDOCKWIDGETS.tar.gz +843baf9e1812c1ab82fd81d85b57cbc0d29bb43245efeb2539039780004b1056 KDDockWidgets-$KDDOCKWIDGETS.tar.gz bea672eb96ee36c2cbeb911b9bac66dfe989b3ad9a9943101e00aeb2df2aefdb plutovg-$PLUTOVG.tar.gz 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3 plutosvg-$PLUTOSVG.tar.gz EOF @@ -390,7 +390,6 @@ echo "Building KDDockWidgets..." rm -fr "KDDockWidgets-$KDDOCKWIDGETS" tar xf "KDDockWidgets-$KDDOCKWIDGETS.tar.gz" cd "KDDockWidgets-$KDDOCKWIDGETS" -patch -p1 < "$SCRIPTDIR/../common/kddockwidgets-dodgy-include.patch" cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DKDDockWidgets_QT6=true -DKDDockWidgets_EXAMPLES=false -DKDDockWidgets_FRONTENDS=qtwidgets -B build cmake --build build --parallel cmake --install build diff --git a/.github/workflows/scripts/macos/build-dependencies.sh b/.github/workflows/scripts/macos/build-dependencies.sh index 3a2cc8391c..d2c6f0e72e 100755 --- a/.github/workflows/scripts/macos/build-dependencies.sh +++ b/.github/workflows/scripts/macos/build-dependencies.sh @@ -32,7 +32,7 @@ FFMPEG=6.0 MOLTENVK=1.2.9 QT=6.7.3 QTAPNG=1.3.0 -KDDOCKWIDGETS=2.2.3 +KDDOCKWIDGETS=2.3.0 PLUTOVG=1.3.1 PLUTOSVG=0.0.7 @@ -79,7 +79,7 @@ a8e4a25e5c2686fd36981e527ed05e451fcfc226bddf350f4e76181371190937 shaderc-$SHADE 9427deccbdf4bde6a269938df38c6bd75247493786a310d8d733a2c82065ef47 shaderc-glslang-$SHADERC_GLSLANG.tar.gz c2225a49c3d7efa5c4f4ce4a6b42081e6ea3daca376f3353d9d7c2722d77a28a shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz 44d1005880c583fc00a0fb41c839214c68214b000ea8dcb54d352732fee600ff shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz -b8529755b2d54205341766ae168e83177c6120660539f9afba71af6bca4b81ec KDDockWidgets-$KDDOCKWIDGETS.tar.gz +843baf9e1812c1ab82fd81d85b57cbc0d29bb43245efeb2539039780004b1056 KDDockWidgets-$KDDOCKWIDGETS.tar.gz bea672eb96ee36c2cbeb911b9bac66dfe989b3ad9a9943101e00aeb2df2aefdb plutovg-$PLUTOVG.tar.gz 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3 plutosvg-$PLUTOSVG.tar.gz EOF @@ -352,7 +352,6 @@ echo "Building KDDockWidgets..." rm -fr "KDDockWidgets-$KDDOCKWIDGETS" tar xf "KDDockWidgets-$KDDOCKWIDGETS.tar.gz" cd "KDDockWidgets-$KDDOCKWIDGETS" -patch -p1 < "$SCRIPTDIR/../common/kddockwidgets-dodgy-include.patch" cmake "${CMAKE_COMMON[@]}" -DKDDockWidgets_QT6=true -DKDDockWidgets_EXAMPLES=false -DKDDockWidgets_FRONTENDS=qtwidgets -B build make -C build "-j$NPROCS" make -C build install diff --git a/.github/workflows/scripts/windows/build-dependencies-arm64.bat b/.github/workflows/scripts/windows/build-dependencies-arm64.bat index 8fd5985a45..84f2df46cc 100644 --- a/.github/workflows/scripts/windows/build-dependencies-arm64.bat +++ b/.github/workflows/scripts/windows/build-dependencies-arm64.bat @@ -56,7 +56,7 @@ set WEBP=1.6.0 set ZLIB=1.3.1 set ZLIBSHORT=131 set ZSTD=1.5.7 -set KDDOCKWIDGETS=2.2.3 +set KDDOCKWIDGETS=2.3.0 set PLUTOVG=1.3.1 set PLUTOSVG=0.0.7 @@ -81,7 +81,7 @@ call :downloadfile "QtApng-%QTAPNG%.zip" "https://github.com/jurplel/QtApng/arch call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/refs/tags/v%LZ4%.zip" 3224b4c80f351f194984526ef396f6079bd6332dd9825c72ac0d7a37b3cdc565 || goto error call :downloadfile "zlib%ZLIBSHORT%.zip" "https://zlib.net/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 7897bc5d620580d9b7cd3539c44b59d78f3657d33663fe97a145e07b4ebd69a4 || goto error -call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" 1ba8e5b48f3b4d47d2de7121529d448532200fa36d9ed21f93909f6eb03f61cb || goto error +call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" d2b9592ebe5d053ac97a0213ea35139866d8d5e0a1d84b7d3fb581db7f0b01c6 || goto error call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 615184f756d91ce416f2cf883bb67fd4262651417c2e40c4d681c8641a48263e || goto error call :downloadfile "plutosvg-%PLUTOSVG%.zip" "https://github.com/sammycage/plutosvg/archive/v%PLUTOSVG%.zip" 82dee2c57ad712bdd6d6d81d3e76249d89caa4b5a4214353660fd5adff12201a || goto error @@ -282,7 +282,6 @@ echo "Building KDDockWidgets..." rmdir /S /Q "KDDockWidgets-%KDDOCKWIDGETS%" %SEVENZIP% x "KDDockWidgets-%KDDOCKWIDGETS%.zip" || goto error cd "KDDockWidgets-%KDDOCKWIDGETS%" || goto error -%PATCH% -p1 < "%SCRIPTDIR%\..\common\kddockwidgets-dodgy-include.patch" || goto error cmake -B build %ARM64TOOLCHAIN% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DKDDockWidgets_QT6=true -DKDDockWidgets_EXAMPLES=false -DKDDockWidgets_FRONTENDS=qtwidgets %KDDOCKWIDGETSBUILDSPEC% || goto error cmake --build build --parallel || goto error ninja -C build install || goto error diff --git a/.github/workflows/scripts/windows/build-dependencies.bat b/.github/workflows/scripts/windows/build-dependencies.bat index cfc984df69..8dbd043847 100644 --- a/.github/workflows/scripts/windows/build-dependencies.bat +++ b/.github/workflows/scripts/windows/build-dependencies.bat @@ -54,7 +54,7 @@ set WEBP=1.6.0 set ZLIB=1.3.1 set ZLIBSHORT=131 set ZSTD=1.5.7 -set KDDOCKWIDGETS=2.2.3 +set KDDOCKWIDGETS=2.3.0 set PLUTOVG=1.3.1 set PLUTOSVG=0.0.7 @@ -79,7 +79,7 @@ call :downloadfile "QtApng-%QTAPNG%.zip" "https://github.com/jurplel/QtApng/arch call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/refs/tags/v%LZ4%.zip" 3224b4c80f351f194984526ef396f6079bd6332dd9825c72ac0d7a37b3cdc565 || goto error call :downloadfile "zlib%ZLIBSHORT%.zip" "https://zlib.net/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 7897bc5d620580d9b7cd3539c44b59d78f3657d33663fe97a145e07b4ebd69a4 || goto error -call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" 1ba8e5b48f3b4d47d2de7121529d448532200fa36d9ed21f93909f6eb03f61cb || goto error +call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" d2b9592ebe5d053ac97a0213ea35139866d8d5e0a1d84b7d3fb581db7f0b01c6 || goto error call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 615184f756d91ce416f2cf883bb67fd4262651417c2e40c4d681c8641a48263e || goto error call :downloadfile "plutosvg-%PLUTOSVG%.zip" "https://github.com/sammycage/plutosvg/archive/v%PLUTOSVG%.zip" 82dee2c57ad712bdd6d6d81d3e76249d89caa4b5a4214353660fd5adff12201a || goto error @@ -283,7 +283,6 @@ echo "Building KDDockWidgets..." rmdir /S /Q "KDDockWidgets-%KDDOCKWIDGETS%" %SEVENZIP% x "KDDockWidgets-%KDDOCKWIDGETS%.zip" || goto error cd "KDDockWidgets-%KDDOCKWIDGETS%" || goto error -%PATCH% -p1 < "%SCRIPTDIR%\..\common\kddockwidgets-dodgy-include.patch" || goto error cmake -B build -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DKDDockWidgets_QT6=true -DKDDockWidgets_EXAMPLES=false -DKDDockWidgets_FRONTENDS=qtwidgets %KDDOCKWIDGETSBUILDSPEC% || goto error cmake --build build --parallel || goto error ninja -C build install || goto error