From cb2e75e640e85774e6c1a8f6b86c24f5178c4b6f Mon Sep 17 00:00:00 2001
From: Vasilito <adminpupkin@gmail.com>
Date: Wed, 29 Apr 2026 14:42:05 +0100
Subject: [PATCH] feat: enable knewstuff+kwallet in config, fix Phase 6
 packaging

- config/redbear-full.toml: 22 KF6 + kglobalacceld enabled, kirigami only suppressed
- kf6-knewstuff + kf6-kwallet now enabled (real cmake builds with stub fallback)
- recipe.toml: added redbear-phase6-kde-check to package.files (was in Cargo.toml but not packaged)
---
 config/redbear-full.toml                      | 34 ++++---------------
 .../system/redbear-hwutils/recipe.toml        |  1 +
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/config/redbear-full.toml b/config/redbear-full.toml
index 2a810e05..bf81a88c 100644
--- a/config/redbear-full.toml
+++ b/config/redbear-full.toml
@@ -51,31 +51,11 @@ qtsvg = {}
 qtwayland = {}
 qt6-wayland-smoke = {}
 
-# KF6 Frameworks — enabled non-cascading subset (suppressed: kirigami, knewstuff, kwallet)
-kf6-extra-cmake-modules = {}
-kf6-kcoreaddons = {}
-kf6-kconfig = {}
-kf6-ki18n = {}
-kf6-kcolorscheme = {}
-kf6-kauth = {}
-kf6-kwindowsystem = {}
-kf6-knotifications = {}
-kf6-kconfigwidgets = {}
-kf6-kcrash = {}
-kf6-kdbusaddons = {}
-kf6-kdeclarative = {}
-kf6-kglobalaccel = {}
-kf6-kservice = {}
-kf6-kpackage = {}
-kf6-kiconthemes = {}
-kf6-kio = {}
-kf6-kcmutils = {}
-kf6-kwayland = {}
-kf6-kded6 = {}
-kglobalacceld = {}
-#kirigami = {}  # suppressed: QML stub, requires Qt6Quick
-#kf6-knewstuff = {}  # suppressed: stub-only recipe (dummy KF6NewStuff targets)
-#kf6-kwallet = {}  # suppressed: stub-only recipe (dummy KF6Wallet target)
+# KF6 Frameworks — enabled: 22 KF6 + kglobalacceld (suppressed: kirigami only)
+# knewstuff/kwallet now have real cmake builds with stub fallback
+#kirigami = {}  # suppressed: QML stub, requires Qt6Quick downstream proof
+kf6-knewstuff = {}
+kf6-kwallet = {}
 
 # KWin Wayland compositor (stub recipe provides cmake configs + kwin_wayland_wrapper delegating to redbear-compositor)
 kwin = {}
@@ -282,16 +262,16 @@ data = """
 [unit]
 description = "Red Bear greeter service"
 requires_weak = [
+    "00_pcid-spawner.service",
     "12_dbus.service",
     "13_redbear-sessiond.service",
     "13_seatd.service",
     "19_redbear-authd.service",
-    "00_pcid-spawner.service",
 ]
 
 [service]
 cmd = "/usr/bin/redbear-greeterd"
-envs = { VT = "3", REDBEAR_GREETER_USER = "greeter", KWIN_DRM_DEVICES = "/scheme/drm/card0" }
+envs = { VT = "3", REDBEAR_GREETER_USER = "greeter", KWIN_DRM_DEVICES = "/scheme/drm/card0", REDBEAR_DRM_WAIT_SECONDS = "10" }
 type = "oneshot_async"
 """
 
diff --git a/local/recipes/system/redbear-hwutils/recipe.toml b/local/recipes/system/redbear-hwutils/recipe.toml
index 804af625..69ed360f 100644
--- a/local/recipes/system/redbear-hwutils/recipe.toml
+++ b/local/recipes/system/redbear-hwutils/recipe.toml
@@ -27,4 +27,5 @@ template = "cargo"
 "/usr/bin/redbear-phase4-kde-check" = "redbear-phase4-kde-check"
 "/usr/bin/redbear-phase5-gpu-check" = "redbear-phase5-gpu-check"
 "/usr/bin/redbear-boot-check" = "redbear-boot-check"
+"/usr/bin/redbear-phase6-kde-check" = "redbear-phase6-kde-check"
 "/usr/bin/redbear-phase5-cs-check" = "redbear-phase5-cs-check"