kde: fix kf6-kcmutils build + declare kde-cli-tools KCM/Parts deps
redbear-ci / check (push) Waiting to run
redbear-ci / check (push) Waiting to run
kf6-kcmutils: (1) add the missing 'source local/scripts/lib/qt-sysroot.sh' before redbear_qt_link_sysroot_dirs (undefined-function crash); (2) drop Qt6::Test from the REQUIRED components (qtbase FEATURE_testlib=OFF, tests off); (3) declare the kirigami dependency so its org.kde.kirigami QML module is in the sysroot (an ecm_find_qmlmodule REQUIRED check). kde-cli-tools: declare kf6-kcmutils + kf6-parts deps (find_package(KF6 REQUIRED COMPONENTS KCMUtils Parts)); add -DBUILD_DOC=OFF (the doc subdir hard-requires KF6DocTools + the docbook/xsltproc toolchain, not needed for a working desktop).
This commit is contained in:
@@ -22,6 +22,8 @@ dependencies = [
|
||||
"kf6-kwindowsystem",
|
||||
"kf6-kdbusaddons",
|
||||
"kf6-kio",
|
||||
"kf6-kcmutils",
|
||||
"kf6-parts",
|
||||
]
|
||||
script = """
|
||||
DYNAMIC_INIT
|
||||
@@ -51,6 +53,7 @@ cmake "${COOKBOOK_SOURCE}" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" \
|
||||
-DBUILD_TESTING=OFF \
|
||||
-DBUILD_DOC=OFF \
|
||||
-DBUILD_QCH=OFF \
|
||||
-DUSE_DBUS=OFF \
|
||||
-Wno-dev
|
||||
|
||||
@@ -22,14 +22,21 @@ dependencies = [
|
||||
"kf6-kxmlgui",
|
||||
"kf6-kio",
|
||||
"kf6-kdeclarative",
|
||||
"kirigami",
|
||||
]
|
||||
script = """
|
||||
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 qml
|
||||
|
||||
# Qt6::Test is not built for the cross target (qtbase FEATURE_testlib=OFF) and is
|
||||
# only used by autotests (BUILD_TESTING=OFF). Drop it from the REQUIRED list.
|
||||
sed -i 's/NO_MODULE REQUIRED Widgets Qml Quick QuickWidgets Test)/NO_MODULE REQUIRED Widgets Qml Quick QuickWidgets)/' \
|
||||
"${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
|
||||
|
||||
rm -f CMakeCache.txt
|
||||
rm -rf CMakeFiles
|
||||
|
||||
|
||||
Reference in New Issue
Block a user