diff --git a/local/recipes/kde/konsole/recipe.toml b/local/recipes/kde/konsole/recipe.toml index c90b9e5d63..e7a586517f 100644 --- a/local/recipes/kde/konsole/recipe.toml +++ b/local/recipes/kde/konsole/recipe.toml @@ -8,9 +8,7 @@ version = "26.04.3" [source] tar = "https://invent.kde.org/utilities/konsole/-/archive/v26.04.3/konsole-v26.04.3.tar.gz" blake3 = "6fca3c2ea807ca0e12d014e2f6b5832bed31c2b15a3dac9ec6e28f3599f14930" -patches = [ - "01-optional-multimedia-printsupport-core5compat.patch", -] +patches = [] # multimedia/printsupport/core5compat now provided by qtmultimedia + qtbase(printsupport) + qt5compat [build] template = "custom" @@ -18,6 +16,7 @@ dependencies = [ "icu", "qtbase", "qt5compat", + "qtmultimedia", "kf6-extra-cmake-modules", "kf6-kcoreaddons", "kf6-ki18n", diff --git a/local/recipes/qt/qtmultimedia/recipe.toml b/local/recipes/qt/qtmultimedia/recipe.toml index 6848aada55..8c51aa18a6 100644 --- a/local/recipes/qt/qtmultimedia/recipe.toml +++ b/local/recipes/qt/qtmultimedia/recipe.toml @@ -15,7 +15,6 @@ blake3 = "5d12f9a49a29e2852f3910643576a34ab77657c8c45351f00e6c1f354aff90df" template = "custom" dependencies = [ "qtbase", - "qtdeclarative", "qtshadertools", ] script = """ @@ -35,7 +34,7 @@ done rm -f CMakeCache.txt rm -rf CMakeFiles -cmake "${COOKBOOK_SOURCE}" -G Ninja -DCMAKE_TOOLCHAIN_FILE="${COOKBOOK_ROOT}/local/recipes/qt/redox-toolchain.cmake" -DQT_HOST_PATH="${HOST_BUILD}" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" -DQT_BUILD_EXAMPLES=OFF -DQT_BUILD_TESTS=OFF -DQT_GENERATE_SBOM=OFF -DFEATURE_ffmpeg=OFF -DFEATURE_gstreamer=OFF -DFEATURE_pulseaudio=OFF -DFEATURE_alsa=OFF -DFEATURE_pipewire=OFF -DFEATURE_v4l2=OFF -Wno-dev +cmake "${COOKBOOK_SOURCE}" -G Ninja -DCMAKE_TOOLCHAIN_FILE="${COOKBOOK_ROOT}/local/recipes/qt/redox-toolchain.cmake" -DQT_HOST_PATH="${HOST_BUILD}" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" -DQT_BUILD_EXAMPLES=OFF -DQT_BUILD_TESTS=OFF -DQT_GENERATE_SBOM=OFF -DFEATURE_ffmpeg=OFF -DFEATURE_gstreamer=OFF -DFEATURE_pulseaudio=OFF -DFEATURE_alsa=OFF -DFEATURE_pipewire=OFF -DFEATURE_v4l2=OFF -DQT_FEATURE_quick_sprite=OFF -DFEATURE_qml=OFF -Wno-dev cmake --build . -j"${COOKBOOK_MAKE_JOBS}"