From 1a34a0c110427d473ba69a5afb0556f25a440412 Mon Sep 17 00:00:00 2001
From: Vasilito <adminpupkin@gmail.com>
Date: Fri, 1 May 2026 07:21:26 +0100
Subject: [PATCH] feat: qtdeclarative dep added to kirigami/kwin, QML stripping
 removed from kirigami
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 local/recipes/kde/kirigami/recipe.toml | 15 +++------------
 local/recipes/kde/kwin/recipe.toml     |  1 +
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/local/recipes/kde/kirigami/recipe.toml b/local/recipes/kde/kirigami/recipe.toml
index 7894e642..d6baecca 100644
--- a/local/recipes/kde/kirigami/recipe.toml
+++ b/local/recipes/kde/kirigami/recipe.toml
@@ -6,6 +6,7 @@ tar = "https://invent.kde.org/frameworks/kirigami/-/archive/v6.10.0/kirigami-v6.
 template = "custom"
 dependencies = [
     "qtbase",
+    "qtdeclarative",
     "kf6-extra-cmake-modules",
 ]
 script = """
@@ -19,18 +20,8 @@ for qtdir in plugins mkspecs metatypes modules; do
     fi
 done
 
-sed -i 's/COMPONENTS Core Gui Concurrent Qml Quick Qml Quick Qml Quick/COMPONENTS Core Gui Concurrent/' \
-    "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
-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
-
+# Full QML/Quick build — qtdeclarative provides Qt6Qml/Qt6Quick with qml_jit=OFF
+# (line 23 was previously stripping QML/Quick components)
 cmake "${COOKBOOK_SOURCE}" \
     -DCMAKE_TOOLCHAIN_FILE="${COOKBOOK_ROOT}/local/recipes/qt/redox-toolchain.cmake" \
     -DQT_HOST_PATH="${HOST_BUILD}" \
diff --git a/local/recipes/kde/kwin/recipe.toml b/local/recipes/kde/kwin/recipe.toml
index c343ea4b..5a1affeb 100644
--- a/local/recipes/kde/kwin/recipe.toml
+++ b/local/recipes/kde/kwin/recipe.toml
@@ -12,6 +12,7 @@ template = "custom"
 dependencies = [
     "qtbase",
     "qtdeclarative",
+    "qt5compat",
     "qt6-sensors",
     "kf6-extra-cmake-modules",
     "kf6-kcoreaddons",