feat: qtdeclarative dep added to kirigami/kwin, QML stripping removed from kirigami
Qt6Core5Compat built (kwin dep). Kirigami still fails — QQmlEngine/QQuickItem headers exist in sysroot but cmake find_package(Qt6Qml) include paths are not being set. This is the exact QML gate: cmake integration needed between qtdeclarative build output and downstream recipes. Build evidence: - qt5compat: built (libQt6Core5Compat now available) - kglobalacceld: built - kirigami: fails at C++ include stage (cmake finds Qt6Qml but -I/usr/include/QtQml not in compile flags) - kwin: fails at Qt6Gui Wayland plugin cmake target issue
This commit is contained in:
@@ -6,6 +6,7 @@ tar = "https://invent.kde.org/frameworks/kirigami/-/archive/v6.10.0/kirigami-v6.
|
|||||||
template = "custom"
|
template = "custom"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"qtbase",
|
"qtbase",
|
||||||
|
"qtdeclarative",
|
||||||
"kf6-extra-cmake-modules",
|
"kf6-extra-cmake-modules",
|
||||||
]
|
]
|
||||||
script = """
|
script = """
|
||||||
@@ -19,18 +20,8 @@ for qtdir in plugins mkspecs metatypes modules; do
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
sed -i 's/COMPONENTS Core Gui Concurrent Qml Quick Qml Quick Qml Quick/COMPONENTS Core Gui Concurrent/' \
|
# Full QML/Quick build — qtdeclarative provides Qt6Qml/Qt6Quick with qml_jit=OFF
|
||||||
"${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
|
# (line 23 was previously stripping QML/Quick components)
|
||||||
sed -i 's/^ find_package(Qt6QuickTest .*/# find_package(Qt6QuickTest disabled for Redox core-only build)/' \
|
|
||||||
"${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
|
|
||||||
sed -i 's/^ add_subdirectory(templates)/# add_subdirectory(templates) # disabled for Redox core-only build/' \
|
|
||||||
"${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
|
|
||||||
sed -i 's/^ add_subdirectory(autotests)/# add_subdirectory(autotests) # disabled for Redox core-only build/' \
|
|
||||||
"${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
|
|
||||||
|
|
||||||
rm -f CMakeCache.txt
|
|
||||||
rm -rf CMakeFiles
|
|
||||||
|
|
||||||
cmake "${COOKBOOK_SOURCE}" \
|
cmake "${COOKBOOK_SOURCE}" \
|
||||||
-DCMAKE_TOOLCHAIN_FILE="${COOKBOOK_ROOT}/local/recipes/qt/redox-toolchain.cmake" \
|
-DCMAKE_TOOLCHAIN_FILE="${COOKBOOK_ROOT}/local/recipes/qt/redox-toolchain.cmake" \
|
||||||
-DQT_HOST_PATH="${HOST_BUILD}" \
|
-DQT_HOST_PATH="${HOST_BUILD}" \
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ template = "custom"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"qtbase",
|
"qtbase",
|
||||||
"qtdeclarative",
|
"qtdeclarative",
|
||||||
|
"qt5compat",
|
||||||
"qt6-sensors",
|
"qt6-sensors",
|
||||||
"kf6-extra-cmake-modules",
|
"kf6-extra-cmake-modules",
|
||||||
"kf6-kcoreaddons",
|
"kf6-kcoreaddons",
|
||||||
|
|||||||
Reference in New Issue
Block a user