From db3782926188da2e3f8970a4f6dca80888a15b6c Mon Sep 17 00:00:00 2001 From: vasilito Date: Sat, 25 Jul 2026 00:15:25 +0900 Subject: [PATCH] qt/kde: link sysroot qml dir so Qt QML-plugin targets resolve (systemic) Qt installs QML plugins under /usr/qml, but the generated CMake plugin targets (Qt6Qml/QmlPlugins/*Targets.cmake) resolve each plugin .so via an _IMPORT_PREFIX computed from the cmake files at /lib/cmake, i.e. /qml/... . Recipes symlink plugins/mkspecs/metatypes/modules into the sysroot but omit qml, so /qml was missing and any Qt6Qml consumer failed: imported target references ".../sysroot/qml/QtWayland/.../plugin.so" but this file does not exist (it is at usr/qml/...). This blocked kf6-kwindowsystem (direct sddm dep). Add qml to every sysroot-link site: the redbear_qt_link_sysroot_dirs helper default, ~15 helper callers, and ~10 inline for-loops (61 files). Also corrects qtsvg CVE patch ref "qtsvg/CVE-..." -> bare "CVE-..." (patch is in the recipe dir; same patch-path class as the mesa fix) so qtsvg builds from clean. --- local/recipes/kde/breeze/recipe.toml | 2 +- local/recipes/kde/kde-cli-tools/recipe.toml | 2 +- local/recipes/kde/kdecoration/recipe.toml | 2 +- local/recipes/kde/kf6-attica/recipe.toml | 2 +- local/recipes/kde/kf6-extra-cmake-modules/recipe.toml | 2 +- local/recipes/kde/kf6-karchive/recipe.toml | 2 +- local/recipes/kde/kf6-kauth/recipe.toml | 2 +- local/recipes/kde/kf6-kbookmarks/recipe.toml | 2 +- local/recipes/kde/kf6-kcmutils/recipe.toml | 2 +- local/recipes/kde/kf6-kcodecs/recipe.toml | 2 +- local/recipes/kde/kf6-kcolorscheme/recipe.toml | 2 +- local/recipes/kde/kf6-kcompletion/recipe.toml | 2 +- local/recipes/kde/kf6-kconfig/recipe.toml | 2 +- local/recipes/kde/kf6-kconfigwidgets/recipe.toml | 2 +- local/recipes/kde/kf6-kcoreaddons/recipe.toml | 2 +- local/recipes/kde/kf6-kdbusaddons/recipe.toml | 2 +- local/recipes/kde/kf6-kdeclarative/recipe.toml | 2 +- local/recipes/kde/kf6-kguiaddons/recipe.toml | 2 +- local/recipes/kde/kf6-ki18n/recipe.toml | 2 +- local/recipes/kde/kf6-kiconthemes/recipe.toml | 2 +- local/recipes/kde/kf6-kidletime/recipe.toml | 2 +- local/recipes/kde/kf6-kimageformats/recipe.toml | 2 +- local/recipes/kde/kf6-kio/recipe.toml | 2 +- local/recipes/kde/kf6-kitemmodels/recipe.toml | 2 +- local/recipes/kde/kf6-kitemviews/recipe.toml | 2 +- local/recipes/kde/kf6-kjobwidgets/recipe.toml | 2 +- local/recipes/kde/kf6-knewstuff/recipe.toml | 2 +- local/recipes/kde/kf6-knotifications/recipe.toml | 2 +- local/recipes/kde/kf6-kpackage/recipe.toml | 2 +- local/recipes/kde/kf6-kservice/recipe.toml | 2 +- local/recipes/kde/kf6-ksvg/recipe.toml | 2 +- local/recipes/kde/kf6-ktexteditor/recipe.toml | 2 +- local/recipes/kde/kf6-ktextwidgets/recipe.toml | 2 +- local/recipes/kde/kf6-kwallet/recipe.toml | 2 +- local/recipes/kde/kf6-kwayland/recipe.toml | 2 +- local/recipes/kde/kf6-kwidgetsaddons/recipe.toml | 2 +- local/recipes/kde/kf6-kwindowsystem/recipe.toml | 2 +- local/recipes/kde/kf6-kxmlgui/recipe.toml | 2 +- local/recipes/kde/kf6-notifyconfig/recipe.toml | 2 +- local/recipes/kde/kf6-parts/recipe.toml | 2 +- local/recipes/kde/kf6-plasma-activities/recipe.toml | 2 +- local/recipes/kde/kf6-prison/recipe.toml | 2 +- local/recipes/kde/kf6-pty/recipe.toml | 2 +- local/recipes/kde/kf6-solid/recipe.toml | 2 +- local/recipes/kde/kf6-sonnet/recipe.toml | 2 +- local/recipes/kde/kf6-syntaxhighlighting/recipe.toml | 2 +- local/recipes/kde/kirigami/recipe.toml | 2 +- local/recipes/kde/konsole/recipe.toml | 2 +- local/recipes/kde/kwin/recipe.toml | 2 +- local/recipes/kde/plasma-desktop/recipe.toml | 2 +- local/recipes/kde/plasma-framework/recipe.toml | 2 +- local/recipes/kde/plasma-workspace/recipe.toml | 2 +- local/recipes/kde/sddm/recipe.toml | 2 +- local/recipes/libs/polkit-qt6/recipe.toml | 2 +- local/recipes/qt/qtdeclarative/recipe.toml | 2 +- local/recipes/qt/qtshadertools/recipe.toml | 2 +- local/recipes/qt/qtsvg/recipe.toml | 4 ++-- local/recipes/qt/qtwayland/recipe.toml | 2 +- local/recipes/system/redbear-greeter/recipe.toml | 2 +- local/recipes/wayland/qt6-wayland-smoke/recipe.toml | 2 +- local/scripts/lib/qt-sysroot.sh | 2 +- 61 files changed, 62 insertions(+), 62 deletions(-) diff --git a/local/recipes/kde/breeze/recipe.toml b/local/recipes/kde/breeze/recipe.toml index 868f63fb89..63752214a4 100644 --- a/local/recipes/kde/breeze/recipe.toml +++ b/local/recipes/kde/breeze/recipe.toml @@ -33,7 +33,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kde-cli-tools/recipe.toml b/local/recipes/kde/kde-cli-tools/recipe.toml index ff58936a1f..d33b9fc47e 100644 --- a/local/recipes/kde/kde-cli-tools/recipe.toml +++ b/local/recipes/kde/kde-cli-tools/recipe.toml @@ -28,7 +28,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kdecoration/recipe.toml b/local/recipes/kde/kdecoration/recipe.toml index 9510831b5b..234579aa78 100644 --- a/local/recipes/kde/kdecoration/recipe.toml +++ b/local/recipes/kde/kdecoration/recipe.toml @@ -20,7 +20,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kf6-attica/recipe.toml b/local/recipes/kde/kf6-attica/recipe.toml index 9fd5033cb6..67b222e646 100644 --- a/local/recipes/kde/kf6-attica/recipe.toml +++ b/local/recipes/kde/kf6-attica/recipe.toml @@ -24,7 +24,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml #DISABLED: sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-extra-cmake-modules/recipe.toml b/local/recipes/kde/kf6-extra-cmake-modules/recipe.toml index c7917c73e5..99b2a74247 100644 --- a/local/recipes/kde/kf6-extra-cmake-modules/recipe.toml +++ b/local/recipes/kde/kf6-extra-cmake-modules/recipe.toml @@ -11,7 +11,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml rm -f CMakeCache.txt rm -rf CMakeFiles diff --git a/local/recipes/kde/kf6-karchive/recipe.toml b/local/recipes/kde/kf6-karchive/recipe.toml index 3a90896729..8cb81c8d8a 100644 --- a/local/recipes/kde/kf6-karchive/recipe.toml +++ b/local/recipes/kde/kf6-karchive/recipe.toml @@ -19,7 +19,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kf6-kauth/recipe.toml b/local/recipes/kde/kf6-kauth/recipe.toml index 3bc35a5dff..ee432abb1d 100644 --- a/local/recipes/kde/kf6-kauth/recipe.toml +++ b/local/recipes/kde/kf6-kauth/recipe.toml @@ -20,7 +20,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml #DISABLED: sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-kbookmarks/recipe.toml b/local/recipes/kde/kf6-kbookmarks/recipe.toml index 65d709a318..fc8528e31c 100644 --- a/local/recipes/kde/kf6-kbookmarks/recipe.toml +++ b/local/recipes/kde/kf6-kbookmarks/recipe.toml @@ -23,7 +23,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml find "${COOKBOOK_SYSROOT}/lib/cmake" -name 'Qt6SvgConfig.cmake' -exec sed -i \ 's|PACKAGE_PREFIX_DIR "/usr"|PACKAGE_PREFIX_DIR "${COOKBOOK_SYSROOT}"|g' {} + 2>/dev/null || true diff --git a/local/recipes/kde/kf6-kcmutils/recipe.toml b/local/recipes/kde/kf6-kcmutils/recipe.toml index e31ed935b4..cb9240dc05 100644 --- a/local/recipes/kde/kf6-kcmutils/recipe.toml +++ b/local/recipes/kde/kf6-kcmutils/recipe.toml @@ -28,7 +28,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml REDBEAR_PATCHES_DIR="${REDBEAR_PATCHES_DIR:-$(cd "$(dirname "${COOKBOOK_RECIPE}")/../../../.." && pwd)}/local/patches/kf6-kcmutils" cookbook_apply_patches "${REDBEAR_PATCHES_DIR}" diff --git a/local/recipes/kde/kf6-kcodecs/recipe.toml b/local/recipes/kde/kf6-kcodecs/recipe.toml index 9670237208..c5971e1ecf 100644 --- a/local/recipes/kde/kf6-kcodecs/recipe.toml +++ b/local/recipes/kde/kf6-kcodecs/recipe.toml @@ -20,7 +20,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml #DISABLED: sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm # translations deferred until lupdate/lrelease is built for target/" \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-kcolorscheme/recipe.toml b/local/recipes/kde/kf6-kcolorscheme/recipe.toml index 7779c38853..6ccc719c99 100644 --- a/local/recipes/kde/kf6-kcolorscheme/recipe.toml +++ b/local/recipes/kde/kf6-kcolorscheme/recipe.toml @@ -23,7 +23,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml #DISABLED: sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-kcompletion/recipe.toml b/local/recipes/kde/kf6-kcompletion/recipe.toml index 7522448cc7..5928ee211b 100644 --- a/local/recipes/kde/kf6-kcompletion/recipe.toml +++ b/local/recipes/kde/kf6-kcompletion/recipe.toml @@ -23,7 +23,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml #DISABLED: sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-kconfig/recipe.toml b/local/recipes/kde/kf6-kconfig/recipe.toml index 0d4ece7cec..9a2160bb0e 100644 --- a/local/recipes/kde/kf6-kconfig/recipe.toml +++ b/local/recipes/kde/kf6-kconfig/recipe.toml @@ -20,7 +20,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml #DISABLED: sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-kconfigwidgets/recipe.toml b/local/recipes/kde/kf6-kconfigwidgets/recipe.toml index ee349a2669..d843e33f89 100644 --- a/local/recipes/kde/kf6-kconfigwidgets/recipe.toml +++ b/local/recipes/kde/kf6-kconfigwidgets/recipe.toml @@ -28,7 +28,7 @@ source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml #DISABLED: sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-kcoreaddons/recipe.toml b/local/recipes/kde/kf6-kcoreaddons/recipe.toml index c6b6ad150a..23819f63e4 100644 --- a/local/recipes/kde/kf6-kcoreaddons/recipe.toml +++ b/local/recipes/kde/kf6-kcoreaddons/recipe.toml @@ -15,7 +15,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml rm -f CMakeCache.txt rm -rf CMakeFiles diff --git a/local/recipes/kde/kf6-kdbusaddons/recipe.toml b/local/recipes/kde/kf6-kdbusaddons/recipe.toml index 479823829a..60744bf184 100644 --- a/local/recipes/kde/kf6-kdbusaddons/recipe.toml +++ b/local/recipes/kde/kf6-kdbusaddons/recipe.toml @@ -19,7 +19,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml for tool in qdbuscpp2xml qdbusxml2cpp; do if [ -f "${HOST_BUILD}/libexec/$tool" ] && [ ! -e "${HOST_BUILD}/bin/$tool" ]; then diff --git a/local/recipes/kde/kf6-kdeclarative/recipe.toml b/local/recipes/kde/kf6-kdeclarative/recipe.toml index 9b76ece7ad..8e040dc449 100644 --- a/local/recipes/kde/kf6-kdeclarative/recipe.toml +++ b/local/recipes/kde/kf6-kdeclarative/recipe.toml @@ -26,7 +26,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kf6-kguiaddons/recipe.toml b/local/recipes/kde/kf6-kguiaddons/recipe.toml index 387330cc61..fb8fe124d3 100644 --- a/local/recipes/kde/kf6-kguiaddons/recipe.toml +++ b/local/recipes/kde/kf6-kguiaddons/recipe.toml @@ -19,7 +19,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml #DISABLED: sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-ki18n/recipe.toml b/local/recipes/kde/kf6-ki18n/recipe.toml index 6391339b99..be12cd59fe 100644 --- a/local/recipes/kde/kf6-ki18n/recipe.toml +++ b/local/recipes/kde/kf6-ki18n/recipe.toml @@ -20,7 +20,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml # ECMGenerateQDoc requires Qt6Tools which we don't build. Remove. find "${COOKBOOK_SOURCE}" -name "CMakeLists.txt" -exec sed -i '/include(ECMGenerateQDoc)/d; /ecm_generate_qdoc/d' {} + diff --git a/local/recipes/kde/kf6-kiconthemes/recipe.toml b/local/recipes/kde/kf6-kiconthemes/recipe.toml index 60fd51807d..b8be04377f 100644 --- a/local/recipes/kde/kf6-kiconthemes/recipe.toml +++ b/local/recipes/kde/kf6-kiconthemes/recipe.toml @@ -28,7 +28,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml #DISABLED: sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm # translations deferred until lupdate/lrelease is built for target/" \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-kidletime/recipe.toml b/local/recipes/kde/kf6-kidletime/recipe.toml index e43e3772a6..775418b7c3 100644 --- a/local/recipes/kde/kf6-kidletime/recipe.toml +++ b/local/recipes/kde/kf6-kidletime/recipe.toml @@ -23,7 +23,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kf6-kimageformats/recipe.toml b/local/recipes/kde/kf6-kimageformats/recipe.toml index 857df2acf8..292477da9b 100644 --- a/local/recipes/kde/kf6-kimageformats/recipe.toml +++ b/local/recipes/kde/kf6-kimageformats/recipe.toml @@ -20,7 +20,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml rm -f CMakeCache.txt diff --git a/local/recipes/kde/kf6-kio/recipe.toml b/local/recipes/kde/kf6-kio/recipe.toml index cae22c68a7..bff9516b5c 100644 --- a/local/recipes/kde/kf6-kio/recipe.toml +++ b/local/recipes/kde/kf6-kio/recipe.toml @@ -50,7 +50,7 @@ for tool in moc rcc uic qdbuscpp2xml qdbusxml2cpp wayland-scanner; do fi done -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kf6-kitemmodels/recipe.toml b/local/recipes/kde/kf6-kitemmodels/recipe.toml index fdce95882c..4013a43901 100644 --- a/local/recipes/kde/kf6-kitemmodels/recipe.toml +++ b/local/recipes/kde/kf6-kitemmodels/recipe.toml @@ -21,7 +21,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml #DISABLED: sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-kitemviews/recipe.toml b/local/recipes/kde/kf6-kitemviews/recipe.toml index b9508b5b90..875ae699a4 100644 --- a/local/recipes/kde/kf6-kitemviews/recipe.toml +++ b/local/recipes/kde/kf6-kitemviews/recipe.toml @@ -21,7 +21,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml #DISABLED: sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-kjobwidgets/recipe.toml b/local/recipes/kde/kf6-kjobwidgets/recipe.toml index 854d5681e1..c03b4b4375 100644 --- a/local/recipes/kde/kf6-kjobwidgets/recipe.toml +++ b/local/recipes/kde/kf6-kjobwidgets/recipe.toml @@ -23,7 +23,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml # Local source already retains KNotificationJobUiDelegate and KF6Notifications. # poqm translations remain disabled because lupdate/lrelease are not built for target. diff --git a/local/recipes/kde/kf6-knewstuff/recipe.toml b/local/recipes/kde/kf6-knewstuff/recipe.toml index 0aaa1f0a8e..07b0666274 100644 --- a/local/recipes/kde/kf6-knewstuff/recipe.toml +++ b/local/recipes/kde/kf6-knewstuff/recipe.toml @@ -27,7 +27,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml sed -i 's/^include(ECMQmlModule)/# include(ECMQmlModule) # QML module kept disabled — lupdate not built for target/' \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-knotifications/recipe.toml b/local/recipes/kde/kf6-knotifications/recipe.toml index 0f967adcaf..c2e15c119e 100644 --- a/local/recipes/kde/kf6-knotifications/recipe.toml +++ b/local/recipes/kde/kf6-knotifications/recipe.toml @@ -24,7 +24,7 @@ HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" QDBUSXML2CPP="${HOST_BUILD}/bin/qdbusxml2cpp" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml #DISABLED: sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-kpackage/recipe.toml b/local/recipes/kde/kf6-kpackage/recipe.toml index d747201743..350457d413 100644 --- a/local/recipes/kde/kf6-kpackage/recipe.toml +++ b/local/recipes/kde/kf6-kpackage/recipe.toml @@ -24,7 +24,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml #DISABLED: sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-kservice/recipe.toml b/local/recipes/kde/kf6-kservice/recipe.toml index d51441239e..de2097e2a2 100644 --- a/local/recipes/kde/kf6-kservice/recipe.toml +++ b/local/recipes/kde/kf6-kservice/recipe.toml @@ -23,7 +23,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml #DISABLED: sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-ksvg/recipe.toml b/local/recipes/kde/kf6-ksvg/recipe.toml index 72f06b8967..fd6bedbcd7 100644 --- a/local/recipes/kde/kf6-ksvg/recipe.toml +++ b/local/recipes/kde/kf6-ksvg/recipe.toml @@ -27,7 +27,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml # Disable QML/Quick declarative imports — not needed without Qt6Quick diff --git a/local/recipes/kde/kf6-ktexteditor/recipe.toml b/local/recipes/kde/kf6-ktexteditor/recipe.toml index 572de93cf7..ba08c85947 100644 --- a/local/recipes/kde/kf6-ktexteditor/recipe.toml +++ b/local/recipes/kde/kf6-ktexteditor/recipe.toml @@ -27,7 +27,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml # Disable QTextToSpeech include unconditionally in all files for f in "${COOKBOOK_SOURCE}/src/view/kateview.cpp" "${COOKBOOK_SOURCE}/src/utils/kateglobal.cpp" "${COOKBOOK_SOURCE}/src/utils/kateglobal.h"; do diff --git a/local/recipes/kde/kf6-ktextwidgets/recipe.toml b/local/recipes/kde/kf6-ktextwidgets/recipe.toml index ffcf278abc..e074889fc4 100644 --- a/local/recipes/kde/kf6-ktextwidgets/recipe.toml +++ b/local/recipes/kde/kf6-ktextwidgets/recipe.toml @@ -27,7 +27,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml #DISABLED: sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-kwallet/recipe.toml b/local/recipes/kde/kf6-kwallet/recipe.toml index ab308fc9f1..f11b1c6738 100644 --- a/local/recipes/kde/kf6-kwallet/recipe.toml +++ b/local/recipes/kde/kf6-kwallet/recipe.toml @@ -22,7 +22,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kf6-kwayland/recipe.toml b/local/recipes/kde/kf6-kwayland/recipe.toml index 109bdc5757..895f865797 100644 --- a/local/recipes/kde/kf6-kwayland/recipe.toml +++ b/local/recipes/kde/kf6-kwayland/recipe.toml @@ -23,7 +23,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml if [ ! -e "${COOKBOOK_SYSROOT}/bin/wayland-scanner" ] || [ -f "${COOKBOOK_SYSROOT}/bin/wayland-scanner" ]; then mkdir -p "${COOKBOOK_SYSROOT}/bin" diff --git a/local/recipes/kde/kf6-kwidgetsaddons/recipe.toml b/local/recipes/kde/kf6-kwidgetsaddons/recipe.toml index f31b06adf1..b4ba53146c 100644 --- a/local/recipes/kde/kf6-kwidgetsaddons/recipe.toml +++ b/local/recipes/kde/kf6-kwidgetsaddons/recipe.toml @@ -18,7 +18,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kf6-kwindowsystem/recipe.toml b/local/recipes/kde/kf6-kwindowsystem/recipe.toml index 79fe60a468..844a0ce662 100644 --- a/local/recipes/kde/kf6-kwindowsystem/recipe.toml +++ b/local/recipes/kde/kf6-kwindowsystem/recipe.toml @@ -29,7 +29,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kf6-kxmlgui/recipe.toml b/local/recipes/kde/kf6-kxmlgui/recipe.toml index 13b1357038..56ae2dd7c4 100644 --- a/local/recipes/kde/kf6-kxmlgui/recipe.toml +++ b/local/recipes/kde/kf6-kxmlgui/recipe.toml @@ -28,7 +28,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kf6-notifyconfig/recipe.toml b/local/recipes/kde/kf6-notifyconfig/recipe.toml index a96d65c869..323ed7abc4 100644 --- a/local/recipes/kde/kf6-notifyconfig/recipe.toml +++ b/local/recipes/kde/kf6-notifyconfig/recipe.toml @@ -24,7 +24,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kf6-parts/recipe.toml b/local/recipes/kde/kf6-parts/recipe.toml index a9705cd3ef..ef4ecdeb3b 100644 --- a/local/recipes/kde/kf6-parts/recipe.toml +++ b/local/recipes/kde/kf6-parts/recipe.toml @@ -27,7 +27,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kf6-plasma-activities/recipe.toml b/local/recipes/kde/kf6-plasma-activities/recipe.toml index 24c705af67..09b05d0d77 100644 --- a/local/recipes/kde/kf6-plasma-activities/recipe.toml +++ b/local/recipes/kde/kf6-plasma-activities/recipe.toml @@ -25,7 +25,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml rm -f CMakeCache.txt diff --git a/local/recipes/kde/kf6-prison/recipe.toml b/local/recipes/kde/kf6-prison/recipe.toml index c9b3302b84..2f5a2b676d 100644 --- a/local/recipes/kde/kf6-prison/recipe.toml +++ b/local/recipes/kde/kf6-prison/recipe.toml @@ -22,7 +22,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kf6-pty/recipe.toml b/local/recipes/kde/kf6-pty/recipe.toml index 6dc14a5e66..fd05770cae 100644 --- a/local/recipes/kde/kf6-pty/recipe.toml +++ b/local/recipes/kde/kf6-pty/recipe.toml @@ -21,7 +21,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kf6-solid/recipe.toml b/local/recipes/kde/kf6-solid/recipe.toml index e58fef75e8..6e05e511d9 100644 --- a/local/recipes/kde/kf6-solid/recipe.toml +++ b/local/recipes/kde/kf6-solid/recipe.toml @@ -22,7 +22,7 @@ HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" export LDFLAGS="${LDFLAGS} -Wl,--copy-dt-needed-entries -lc" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml #DISABLED: sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true diff --git a/local/recipes/kde/kf6-sonnet/recipe.toml b/local/recipes/kde/kf6-sonnet/recipe.toml index 4a65d160b8..87f67a82b3 100644 --- a/local/recipes/kde/kf6-sonnet/recipe.toml +++ b/local/recipes/kde/kf6-sonnet/recipe.toml @@ -20,7 +20,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kf6-syntaxhighlighting/recipe.toml b/local/recipes/kde/kf6-syntaxhighlighting/recipe.toml index 8139dc6c5e..1a9cbf68ca 100644 --- a/local/recipes/kde/kf6-syntaxhighlighting/recipe.toml +++ b/local/recipes/kde/kf6-syntaxhighlighting/recipe.toml @@ -20,7 +20,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kirigami/recipe.toml b/local/recipes/kde/kirigami/recipe.toml index c34cba93ad..0c9bc8b444 100644 --- a/local/recipes/kde/kirigami/recipe.toml +++ b/local/recipes/kde/kirigami/recipe.toml @@ -21,7 +21,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/konsole/recipe.toml b/local/recipes/kde/konsole/recipe.toml index b088af5b82..c90b9e5d63 100644 --- a/local/recipes/kde/konsole/recipe.toml +++ b/local/recipes/kde/konsole/recipe.toml @@ -50,7 +50,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/kwin/recipe.toml b/local/recipes/kde/kwin/recipe.toml index 82fe5a7e9f..39e14e5780 100644 --- a/local/recipes/kde/kwin/recipe.toml +++ b/local/recipes/kde/kwin/recipe.toml @@ -52,7 +52,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" STAGE="${COOKBOOK_STAGE}/usr" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/plasma-desktop/recipe.toml b/local/recipes/kde/plasma-desktop/recipe.toml index b873d11d08..d4a01b79b8 100644 --- a/local/recipes/kde/plasma-desktop/recipe.toml +++ b/local/recipes/kde/plasma-desktop/recipe.toml @@ -49,7 +49,7 @@ HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" rm -f CMakeCache.txt rm -rf CMakeFiles -for d in plugins mkspecs metatypes modules; do +for d in plugins mkspecs metatypes modules qml; do if [ ! -e "${COOKBOOK_SYSROOT}/${d}" ] && [ -d "${COOKBOOK_SYSROOT}/usr/${d}" ]; then ln -sf "usr/${d}" "${COOKBOOK_SYSROOT}/${d}" fi diff --git a/local/recipes/kde/plasma-framework/recipe.toml b/local/recipes/kde/plasma-framework/recipe.toml index d6a9523086..161d9479b8 100644 --- a/local/recipes/kde/plasma-framework/recipe.toml +++ b/local/recipes/kde/plasma-framework/recipe.toml @@ -31,7 +31,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/kde/plasma-workspace/recipe.toml b/local/recipes/kde/plasma-workspace/recipe.toml index b7fdfaa23e..4ac70512f0 100644 --- a/local/recipes/kde/plasma-workspace/recipe.toml +++ b/local/recipes/kde/plasma-workspace/recipe.toml @@ -63,7 +63,7 @@ HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" rm -f CMakeCache.txt rm -rf CMakeFiles -for d in plugins mkspecs metatypes modules; do +for d in plugins mkspecs metatypes modules qml; do if [ ! -e "${COOKBOOK_SYSROOT}/${d}" ] && [ -d "${COOKBOOK_SYSROOT}/usr/${d}" ]; then ln -sf "usr/${d}" "${COOKBOOK_SYSROOT}/${d}" fi diff --git a/local/recipes/kde/sddm/recipe.toml b/local/recipes/kde/sddm/recipe.toml index f13afc19c0..c892c1693f 100644 --- a/local/recipes/kde/sddm/recipe.toml +++ b/local/recipes/kde/sddm/recipe.toml @@ -40,7 +40,7 @@ HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" STAGE="${COOKBOOK_STAGE}/usr" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml if [ -d "${COOKBOOK_SYSROOT}/plugins" ] && [ ! -L "${COOKBOOK_SYSROOT}/plugins" ]; then if [ -d "${COOKBOOK_SYSROOT}/usr/plugins" ]; then diff --git a/local/recipes/libs/polkit-qt6/recipe.toml b/local/recipes/libs/polkit-qt6/recipe.toml index ed4f3005f3..76f0edba8c 100644 --- a/local/recipes/libs/polkit-qt6/recipe.toml +++ b/local/recipes/libs/polkit-qt6/recipe.toml @@ -14,7 +14,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml rm -f CMakeCache.txt rm -rf CMakeFiles diff --git a/local/recipes/qt/qtdeclarative/recipe.toml b/local/recipes/qt/qtdeclarative/recipe.toml index a24cf8d14c..53bd3dbcb1 100644 --- a/local/recipes/qt/qtdeclarative/recipe.toml +++ b/local/recipes/qt/qtdeclarative/recipe.toml @@ -148,7 +148,7 @@ fi rm -f CMakeCache.txt rm -rf CMakeFiles -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml # Patch masm/CheckedArithmetic.h: add missing ArithmeticOperations # specialization for LP64 (sizeof(long) != sizeof(int)). The existing code only diff --git a/local/recipes/qt/qtshadertools/recipe.toml b/local/recipes/qt/qtshadertools/recipe.toml index f306584eb8..ae9082a565 100644 --- a/local/recipes/qt/qtshadertools/recipe.toml +++ b/local/recipes/qt/qtshadertools/recipe.toml @@ -26,7 +26,7 @@ HOST_PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/lib/jvm/default/bin:/usr source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml if [ -f "${COOKBOOK_SYSROOT}/lib/libredbear-qt-strtold-compat.so" ]; then mkdir -p "${COOKBOOK_SYSROOT}/usr/lib" diff --git a/local/recipes/qt/qtsvg/recipe.toml b/local/recipes/qt/qtsvg/recipe.toml index 79cfa42663..734bf5fc42 100644 --- a/local/recipes/qt/qtsvg/recipe.toml +++ b/local/recipes/qt/qtsvg/recipe.toml @@ -15,7 +15,7 @@ DYNAMIC_INIT HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build" source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh" -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml # Ensure the strtold compat library is available for linking # (needed because qtbase's CMake config adds -lredbear-qt-strtold-compat to linker flags) @@ -96,5 +96,5 @@ redbear_qt_copy_optional_stage_dir_to_sysroot "${STAGE_USR}" "${SYSROOT}" metaty tar = "https://download.qt.io/official_releases/qt/6.11/6.11.1/submodules/qtsvg-everywhere-src-6.11.1.tar.xz" blake3 = "49b947e1a96bf0a29a1ee84c231a518a1413d9f3ec360617e405400e510508b2" patches = [ - "qtsvg/CVE-2026-6210.patch", + "CVE-2026-6210.patch", ] # heap-overflow fix from Qt patch, cherry-picked from upstream 6.8 diff --git a/local/recipes/qt/qtwayland/recipe.toml b/local/recipes/qt/qtwayland/recipe.toml index 5f4c682327..a3cf26e44d 100644 --- a/local/recipes/qt/qtwayland/recipe.toml +++ b/local/recipes/qt/qtwayland/recipe.toml @@ -76,7 +76,7 @@ FilesAnalyzed: false SBOMEOF fi -redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules +redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml # Copy Qt6 wayland protocol XMLs from qtbase staging (not propagated by cookbook) QTBASE_STAGE="${COOKBOOK_ROOT}/local/recipes/qt/qtbase/target/x86_64-unknown-redox/stage/usr" diff --git a/local/recipes/system/redbear-greeter/recipe.toml b/local/recipes/system/redbear-greeter/recipe.toml index ebde043656..e0dfcc6665 100644 --- a/local/recipes/system/redbear-greeter/recipe.toml +++ b/local/recipes/system/redbear-greeter/recipe.toml @@ -13,7 +13,7 @@ set -ex DYNAMIC_INIT -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ -d "${COOKBOOK_SYSROOT}/${qtdir}" ] && [ ! -L "${COOKBOOK_SYSROOT}/${qtdir}" ]; then rm -rf "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/recipes/wayland/qt6-wayland-smoke/recipe.toml b/local/recipes/wayland/qt6-wayland-smoke/recipe.toml index 0f5326fb02..95ae6029d3 100644 --- a/local/recipes/wayland/qt6-wayland-smoke/recipe.toml +++ b/local/recipes/wayland/qt6-wayland-smoke/recipe.toml @@ -61,7 +61,7 @@ if [ -d "${RELIBC_STAGE_INCLUDE}" ]; then export CXXFLAGS="${CXXFLAGS} -I${RELIBC_STAGE_INCLUDE}" fi -for qtdir in plugins mkspecs metatypes modules; do +for qtdir in plugins mkspecs metatypes modules qml; do if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ -d "${COOKBOOK_SYSROOT}/${qtdir}" ] && [ ! -L "${COOKBOOK_SYSROOT}/${qtdir}" ]; then rm -rf "${COOKBOOK_SYSROOT}/${qtdir}" fi diff --git a/local/scripts/lib/qt-sysroot.sh b/local/scripts/lib/qt-sysroot.sh index c92cca4a9b..2b88c16ed1 100644 --- a/local/scripts/lib/qt-sysroot.sh +++ b/local/scripts/lib/qt-sysroot.sh @@ -26,7 +26,7 @@ redbear_qt_link_plugins_dir() { redbear_qt_prepare_common_sysroot() { local sysroot="$1" - redbear_qt_link_sysroot_dirs "$sysroot" plugins mkspecs metatypes modules + redbear_qt_link_sysroot_dirs "$sysroot" plugins mkspecs metatypes modules qml redbear_qt_link_plugins_dir "$sysroot" }