From 10cf8b4e736dd6c92c92945fba7cc620009e986e Mon Sep 17 00:00:00 2001
From: Vasilito <adminpupkin@gmail.com>
Date: Thu, 7 May 2026 09:10:59 +0100
Subject: [PATCH] fix: build KF6 KNewStuff widgets

---
 local/recipes/kde/kf6-knewstuff/recipe.toml        | 14 ++++++++------
 .../kde/kf6-knewstuff/source/CMakeLists.txt        |  4 ++--
 .../kde/kf6-knewstuff/source/src/CMakeLists.txt    |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/local/recipes/kde/kf6-knewstuff/recipe.toml b/local/recipes/kde/kf6-knewstuff/recipe.toml
index 99cd27799..f8c0fdd13 100644
--- a/local/recipes/kde/kf6-knewstuff/recipe.toml
+++ b/local/recipes/kde/kf6-knewstuff/recipe.toml
@@ -1,6 +1,12 @@
 #TODO: KNewStuff — core-only build on Redox. Qt Quick, widgets, tools, and Kirigami-facing surfaces disabled. KF6Attica now available in-tree (kf6-attica recipe).
+[source]
+tar = "https://invent.kde.org/frameworks/knewstuff/-/archive/v6.10.0/knewstuff-v6.10.0.tar.gz"
+
+[build]
+template = "custom"
 dependencies = [
     "qtbase",
+    "qtdeclarative",
     "kf6-extra-cmake-modules",
     "kf6-kcoreaddons",
     "kf6-ki18n",
@@ -20,22 +26,18 @@ redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes mod
 
 sed -i 's/^include(ECMQmlModule)/# include(ECMQmlModule) # disabled for Redox core-only build/' \
     "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
-sed -i 's/COMPONENTS Gui Widgets Xml Qml Quick QuickWidgets/COMPONENTS Gui Xml/' \
-    "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
 sed -i 's/^find_package(KF6Kirigami2.*/# find_package(KF6Kirigami2 disabled for Redox core-only build)/' \
     "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
+sed -i 's/^# find_package(KF6Attica disabled - KF6Attica not yet available)/find_package(KF6Attica ${KF_DEP_VERSION} REQUIRED)/' \
+    "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
 sed -i 's/^ki18n_install(po)/#ki18n_install(po)/' \
     "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
 sed -i 's/^add_subdirectory(qtquick)/# add_subdirectory(qtquick) # disabled for Redox core-only build/' \
     "${COOKBOOK_SOURCE}/src/CMakeLists.txt" 2>/dev/null || true
 sed -i 's/^add_subdirectory(tools)/# add_subdirectory(tools) # disabled for Redox core-only build/' \
     "${COOKBOOK_SOURCE}/src/CMakeLists.txt" 2>/dev/null || true
-sed -i 's/^add_subdirectory(widgets)/# add_subdirectory(widgets) # disabled for Redox core-only build/' \
-    "${COOKBOOK_SOURCE}/src/CMakeLists.txt" 2>/dev/null || true
 sed -i 's/^add_subdirectory(tools)/# add_subdirectory(tools) # disabled for Redox core-only build/' \
     "${COOKBOOK_SOURCE}/src/CMakeLists.txt" 2>/dev/null || true
-sed -i 's/^add_subdirectory(widgets)/# add_subdirectory(widgets) # disabled for Redox core-only build/' \
-    "${COOKBOOK_SOURCE}/src/CMakeLists.txt" 2>/dev/null || true
 
 rm -f CMakeCache.txt
 rm -rf CMakeFiles
diff --git a/local/recipes/kde/kf6-knewstuff/source/CMakeLists.txt b/local/recipes/kde/kf6-knewstuff/source/CMakeLists.txt
index 53b13a6ad..98865c26e 100644
--- a/local/recipes/kde/kf6-knewstuff/source/CMakeLists.txt
+++ b/local/recipes/kde/kf6-knewstuff/source/CMakeLists.txt
@@ -23,7 +23,7 @@ include(ECMQtDeclareLoggingCategory)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 
 set(REQUIRED_QT_VERSION 6.6.0)
-find_package(Qt6 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Gui Xml)
+find_package(Qt6 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Gui Widgets Xml Qml Quick QuickWidgets)
 find_package(KF6Archive ${KF_DEP_VERSION} REQUIRED)
 find_package(KF6Config ${KF_DEP_VERSION} REQUIRED)
 find_package(KF6CoreAddons ${KF_DEP_VERSION} REQUIRED)
@@ -40,7 +40,7 @@ include(KDEClangFormat)
 include(KDEGitCommitHooks)
 include(CMakeDependentOption)
 
-# find_package(KF6Attica disabled - KF6Attica not yet available)
+find_package(KF6Attica ${KF_DEP_VERSION} REQUIRED)
 set_package_properties(KF6Attica PROPERTIES DESCRIPTION "A Qt library that implements the Open Collaboration Services API"
                        PURPOSE "Support for Get Hot New Stuff in KNewStuff"
                        URL "https://commits.kde.org/attica"
diff --git a/local/recipes/kde/kf6-knewstuff/source/src/CMakeLists.txt b/local/recipes/kde/kf6-knewstuff/source/src/CMakeLists.txt
index 18fadec54..961663e1c 100644
--- a/local/recipes/kde/kf6-knewstuff/source/src/CMakeLists.txt
+++ b/local/recipes/kde/kf6-knewstuff/source/src/CMakeLists.txt
@@ -6,7 +6,7 @@ add_subdirectory(core)
 # add_subdirectory(qtquick) # disabled for Redox core-only build
 # add_subdirectory(tools) # disabled for Redox core-only build
 
-# add_subdirectory(widgets) # disabled for Redox core-only build
+add_subdirectory(widgets)
 ecm_qt_install_logging_categories(
     EXPORT KNEWSTUFF
     FILE knewstuff.categories