KDE frameworks, bump to 6.19.0 part3 (#13117)

2026-04-08 21:00:05 +02:00 · 2025-10-28 13:20:07 +01:00
parent 94e17ffa6c
commit c7f417045f
13 changed files with 270 additions and 249 deletions
--- a/kde-frameworks/kbookmarks/kbookmarks6-6.19.0.recipe
+++ b/kde-frameworks/kbookmarks/kbookmarks6-6.19.0.recipe
@@ -9,7 +9,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kbookmarks-${portVersion}.tar.xz"
-CHECKSUM_SHA256="ca4656ad49add524b4b68bc286071a5ae47f83ec46a1fd8e0c3713d70ad6adb5"
+CHECKSUM_SHA256="7a3d7fdbfe4c7787b1a1941ecbfa261fd44fa7bd4d8275672e0d22c2a3504390"
 SOURCE_DIR="kbookmarks-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -40,20 +40,27 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	kbookmarks6$secondaryArchSuffix == $portVersion base
-	devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion
+	devel:libKF6WidgetsAddons$secondaryArchSuffix
+	"
+
+ARCHITECTURES_doc="any"
+
+PROVIDES_doc="
+	kbookmarks6_doc = $portVersion
 	"

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix == $portVersion
+	extra_cmake_modules$secondaryArchSuffix >= $portVersion
 	qt6_tools${secondaryArchSuffix}_devel
-	devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
-	devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion
-	devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion
+	devel:libKF6ConfigCore$secondaryArchSuffix >= $libVersion
+	devel:libKF6CoreAddons$secondaryArchSuffix >= $libVersion
+	devel:libKF6WidgetsAddons$secondaryArchSuffix >= $libVersion
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6Qml$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	kde_qdoc_common
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
 	cmd:make
@@ -66,22 +73,25 @@ TEST_REQUIRES="

 BUILD()
 {
+	export KDE_DOCS="`finddir B_SYSTEM_DATA_DIRECTORY`"/kde-qdoc-common
+
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev

 	make -C build $jobArgs
+	cmake --build build --target prepare_docs
+	cmake --build build --target generate_docs
+	cmake --build build --target generate_qch
 }

 INSTALL()
 {
 	make -C build install
+#	cmake --build build --target install_html_docs
+	cmake --build build --target install_qch_docs

 	prepareInstalledDevelLibs \
 		libKF6Bookmarks \
@@ -90,6 +100,9 @@ INSTALL()
 	packageEntries devel \
 		$developDir \
 		$libDir/cmake
+
+	packageEntries doc \
+		$documentationDir
 }

 TEST()
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets6-6.19.0.recipe
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets6-6.19.0.recipe
@@ -7,7 +7,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kconfigwidgets-${portVersion}.tar.xz"
-CHECKSUM_SHA256="61c0256fdae049b12586bd1e0d931e80515d3c702f1785a88994ee54eee2d5c5"
+CHECKSUM_SHA256="1d785b68307c054a6133b8e4e462b569f02ec7adb8aafe1b95f49531b9a87f7c"
 SOURCE_DIR="kconfigwidgets-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -39,27 +39,34 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	kconfigwidgets6$secondaryArchSuffix == $portVersion base
-	devel:libKF6ColorScheme$secondaryArchSuffix == $libVersion
-	devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
-	devel:libKF6Codecs$secondaryArchSuffix == $libVersion
-	devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion
+	devel:libKF6ColorScheme$secondaryArchSuffix
+	devel:libKF6ConfigCore$secondaryArchSuffix
+	devel:libKF6Codecs$secondaryArchSuffix
+	devel:libKF6WidgetsAddons$secondaryArchSuffix
+	"
+
+ARCHITECTURES_doc="any"
+
+PROVIDES_doc="
+	kconfigwidgets6_doc = $portVersion
 	"

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix == $portVersion
+	extra_cmake_modules$secondaryArchSuffix >= $portVersion
 	qt6_tools${secondaryArchSuffix}_devel
-	devel:libKF6Codecs$secondaryArchSuffix == $libVersion
-	devel:libKF6ColorScheme$secondaryArchSuffix == $libVersion
-	devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
-	devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion
-	devel:libKF6GuiAddons$secondaryArchSuffix == $libVersion
-	devel:libKF6I18n$secondaryArchSuffix == $libVersion
-	devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion
+	devel:libKF6Codecs$secondaryArchSuffix >= $libVersion
+	devel:libKF6ColorScheme$secondaryArchSuffix >= $libVersion
+	devel:libKF6ConfigCore$secondaryArchSuffix >= $libVersion
+	devel:libKF6CoreAddons$secondaryArchSuffix >= $libVersion
+	devel:libKF6GuiAddons$secondaryArchSuffix >= $libVersion
+	devel:libKF6I18n$secondaryArchSuffix >= $libVersion
+	devel:libKF6WidgetsAddons$secondaryArchSuffix >= $libVersion
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6Qml$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	kde_qdoc_common
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
 	cmd:make
@@ -74,22 +81,25 @@ TEST_REQUIRES="

 BUILD()
 {
+	export KDE_DOCS="`finddir B_SYSTEM_DATA_DIRECTORY`"/kde-qdoc-common
+
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev

 	make -C build $jobArgs
+	cmake --build build --target prepare_docs
+	cmake --build build --target generate_docs
+	cmake --build build --target generate_qch
 }

 INSTALL()
 {
 	make -C build install
+#	cmake --build build --target install_html_docs
+	cmake --build build --target install_qch_docs

 	prepareInstalledDevelLib \
 		libKF6ConfigWidgets
@@ -97,6 +107,9 @@ INSTALL()
 	packageEntries devel \
 		$developDir \
 		$libDir/cmake
+
+	packageEntries doc \
+		$documentationDir
 }

 TEST()
--- a/kde-frameworks/kglobalaccel/kglobalaccel6-6.19.0.recipe
+++ b/kde-frameworks/kglobalaccel/kglobalaccel6-6.19.0.recipe
@@ -7,7 +7,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kglobalaccel-${portVersion}.tar.xz"
-CHECKSUM_SHA256="6663461a82798b5dccb9f44e91c0c37e12c951f87e295c3ba7f465dac7bd4aa1"
+CHECKSUM_SHA256="1bbe7502658319767c048039e8dac2bd17bc120422d8e58ef6f22ba63840ae49"
 SOURCE_DIR="kglobalaccel-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -38,13 +38,20 @@ REQUIRES_devel="
 	kglobalaccel6$secondaryArchSuffix == $portVersion base
 	"

+ARCHITECTURES_doc="any"
+
+PROVIDES_doc="
+	kglobalaccel6_doc = $portVersion
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix == $portVersion
+	extra_cmake_modules$secondaryArchSuffix >= $portVersion
 	qt6_tools${secondaryArchSuffix}_devel
 	devel:libQt6Core$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	kde_qdoc_common
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
 	cmd:make
@@ -57,23 +64,26 @@ TEST_REQUIRES="

 BUILD()
 {
+	export KDE_DOCS="`finddir B_SYSTEM_DATA_DIRECTORY`"/kde-qdoc-common
+
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_TESTING=OFF \
 		-DWITH_X11=OFF \
 		-Wno-dev

 	make -C build $jobArgs
+	cmake --build build --target prepare_docs
+	cmake --build build --target generate_docs
+	cmake --build build --target generate_qch
 }

 INSTALL()
 {
 	make -C build install
+#	cmake --build build --target install_html_docs
+	cmake --build build --target install_qch_docs

 	prepareInstalledDevelLib \
 		libKF6GlobalAccel
@@ -81,6 +91,9 @@ INSTALL()
 	packageEntries devel \
 		$developDir \
 		$libDir/cmake
+
+	packageEntries doc \
+		$documentationDir
 }

 TEST()
--- a/kde-frameworks/kio/kio6-6.19.1.recipe
+++ b/kde-frameworks/kio/kio6-6.19.1.recipe
@@ -13,9 +13,9 @@ other KIO enabled infrastructure."
 HOMEPAGE="https://invent.kde.org/frameworks/kio"
 COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU LGPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kio-${portVersion}.tar.xz"
-CHECKSUM_SHA256="675ebf8a0c72bfdfd434ef73530cb7ae92127aeff0968896d67cc5aa22333e8c"
+CHECKSUM_SHA256="2f0ea7af4ca227031f0f0341a232d186d40db001d5bb6287ef9fa4bca127ee3f"
 SOURCE_DIR="kio-$portVersion"
 PATCHES="kio-$portVersion.patchset"

@@ -66,42 +66,48 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	kio6$secondaryArchSuffix == $portVersion base
-	devel:libKF6Bookmarks$secondaryArchSuffix == $libVersion
-	devel:libKF6Completion$secondaryArchSuffix == $libVersion
-	devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
-	devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion
-	devel:libKF6Crash$secondaryArchSuffix == $libVersion
-	devel:libKF6ItemViews$secondaryArchSuffix == $libVersion
-	devel:libKF6JobWidgets$secondaryArchSuffix == $libVersion
-	devel:libKF6Service$secondaryArchSuffix == $libVersion
-	devel:libKF6Solid$secondaryArchSuffix == $libVersion
-	devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion
-	devel:libKF6WindowSystem$secondaryArchSuffix == $libVersion
+	devel:libKF6Bookmarks$secondaryArchSuffix
+	devel:libKF6Completion$secondaryArchSuffix
+	devel:libKF6ConfigCore$secondaryArchSuffix
+	devel:libKF6CoreAddons$secondaryArchSuffix
+	devel:libKF6Crash$secondaryArchSuffix
+	devel:libKF6ItemViews$secondaryArchSuffix
+	devel:libKF6JobWidgets$secondaryArchSuffix
+	devel:libKF6Service$secondaryArchSuffix
+	devel:libKF6Solid$secondaryArchSuffix
+	devel:libKF6WidgetsAddons$secondaryArchSuffix
+	devel:libKF6WindowSystem$secondaryArchSuffix
+	"
+
+ARCHITECTURES_doc="any"
+
+PROVIDES_doc="
+	kio6_doc = $portVersion
 	"

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix == $portVersion
+	extra_cmake_modules$secondaryArchSuffix
 	qt6_tools${secondaryArchSuffix}_devel
 #	devel:libacl$secondaryArchSuffix
 	devel:kded6$secondaryArchSuffix
-	devel:libKF6Archive$secondaryArchSuffix == $libVersion
-	devel:libKF6AuthCore$secondaryArchSuffix == $libVersion
-	devel:libKF6Bookmarks$secondaryArchSuffix == $libVersion
-	devel:libKF6ColorScheme$secondaryArchSuffix == $libVersion
-	devel:libKF6Completion$secondaryArchSuffix == $libVersion
-	devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
-	devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion
-	devel:libKF6Crash$secondaryArchSuffix == $libVersion
-	devel:libKF6GuiAddons$secondaryArchSuffix == $libVersion
-	devel:libKF6I18n$secondaryArchSuffix == $libVersion
-	devel:libKF6IconThemes$secondaryArchSuffix == $libVersion
-	devel:libKF6ItemViews$secondaryArchSuffix == $libVersion
-	devel:libKF6JobWidgets$secondaryArchSuffix == $libVersion
-	devel:libKF6Service$secondaryArchSuffix == $libVersion
-	devel:libKF6Solid$secondaryArchSuffix == $libVersion
-	devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion
-	devel:libKF6WindowSystem$secondaryArchSuffix == $libVersion
+	devel:libKF6Archive$secondaryArchSuffix
+	devel:libKF6AuthCore$secondaryArchSuffix
+	devel:libKF6Bookmarks$secondaryArchSuffix
+	devel:libKF6ColorScheme$secondaryArchSuffix
+	devel:libKF6Completion$secondaryArchSuffix
+	devel:libKF6ConfigCore$secondaryArchSuffix
+	devel:libKF6CoreAddons$secondaryArchSuffix
+	devel:libKF6Crash$secondaryArchSuffix
+	devel:libKF6GuiAddons$secondaryArchSuffix
+	devel:libKF6I18n$secondaryArchSuffix
+	devel:libKF6IconThemes$secondaryArchSuffix
+	devel:libKF6ItemViews$secondaryArchSuffix
+	devel:libKF6JobWidgets$secondaryArchSuffix
+	devel:libKF6Service$secondaryArchSuffix
+	devel:libKF6Solid$secondaryArchSuffix
+	devel:libKF6WidgetsAddons$secondaryArchSuffix
+	devel:libKF6WindowSystem$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6Qml$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
@@ -109,6 +115,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	kde_qdoc_common
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
 	cmd:make
@@ -130,23 +137,26 @@ PATCH()

 BUILD()
 {
+	export KDE_DOCS="`finddir B_SYSTEM_DATA_DIRECTORY`"/kde-qdoc-common
+
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
 		-DKAUTH_HELPER_INSTALL_DIR:PATH=$addOnsDir/Qt6/kauth/helper \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev

 	make -C build $jobArgs
+	cmake --build build --target prepare_docs
+	cmake --build build --target generate_docs
+	cmake --build build --target generate_qch
 }

 INSTALL()
 {
 	make -C build install
+#	cmake --build build --target install_html_docs
+	cmake --build build --target install_qch_docs

 	# cleanup
 	rm -rf $dataDir/applications
@@ -160,6 +170,9 @@ INSTALL()
 	packageEntries devel \
 		$developDir \
 		$libDir/cmake
+
+	packageEntries doc \
+		$documentationDir
 }

 TEST()
--- a/kde-frameworks/kio/patches/kio-6.19.1.patchset
+++ b/kde-frameworks/kio/patches/kio-6.19.1.patchset
@@ -1,4 +1,4 @@
-From cb743541b17c4ef823a8cf941c4907503b8744b5 Mon Sep 17 00:00:00 2001
+From c0ac6de846282c134a2ca316a1a1511a49a7be2e Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Tue, 17 May 2022 21:28:27 +1000
 Subject: Add OpenWith handler for Haiku
@@ -18,10 +18,10 @@ index 5a44c3d..dd1377f 100644
         // For Windows and MacOS, the mimetypes handling is different, so use QDesktopServices
         qtOpenUrl();
 diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
-index 83bfa36..d9efcd6 100644
+index a88dfcf..3ce32a1 100644
 --- a/src/widgets/CMakeLists.txt
 +++ b/src/widgets/CMakeLists.txt
-@@ -139,6 +139,10 @@ if(ACL_FOUND)
+@@ -138,6 +138,10 @@ if(ACL_FOUND)
     target_link_libraries(KF6KIOWidgets PRIVATE ${ACL_LIBS})
 endif()
 
@@ -101,20 +101,20 @@ index 0000000..9614b87
 +    return false;
 +}
 -- 
-2.48.1
+2.51.0


-From 85241bbbf5590dec5b116b4f25d591c766e37bfa Mon Sep 17 00:00:00 2001
+From a3b31f0086b9f245acdf3022598070af962b504b Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 25 Feb 2024 23:14:26 +1000
 Subject: Fix build


 diff --git a/src/kioworkers/file/file_unix.cpp b/src/kioworkers/file/file_unix.cpp
-index b7ff71f..01799df 100644
+index cd37a6b..dcd3b25 100644
 --- a/src/kioworkers/file/file_unix.cpp
 +++ b/src/kioworkers/file/file_unix.cpp
-@@ -69,6 +69,15 @@
+@@ -63,6 +63,15 @@
 #include <sys/extattr.h>
 #endif
 
@@ -131,10 +131,10 @@ index b7ff71f..01799df 100644
 
 /* 512 kB */
 -- 
-2.48.1
+2.51.0


-From caa9c8eed44dd8ae7030f557e31b050d0c04b4c9 Mon Sep 17 00:00:00 2001
+From 7d8f183c04044032de9063723f77fc7d6a2b34e0 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 10 Mar 2024 15:28:06 +1000
 Subject: Disable threads kio_file support for now. It's totally broken on
@@ -142,10 +142,10 @@ Subject: Disable threads kio_file support for now. It's totally broken on


 diff --git a/src/core/worker.cpp b/src/core/worker.cpp
-index 3bfe6b7..bc7a3a5 100644
+index 4f72eaf..3201891 100644
 --- a/src/core/worker.cpp
 +++ b/src/core/worker.cpp
-@@ -417,7 +417,7 @@ Worker *Worker::createWorker(const QString &protocol, const QUrl &url, int &erro
+@@ -429,7 +429,7 @@ Worker *Worker::createWorker(const QString &protocol, const QUrl &url, int &erro
     const auto useThreads = []() {
         return qgetenv("KIO_ENABLE_WORKER_THREADS") != "0";
     };
@@ -155,5 +155,5 @@ index 3bfe6b7..bc7a3a5 100644
     // Threads have performance benefits, but degrade robustness
     // (a worker crashing kills the app). So let's only enable the feature for kio_file, for now.
 -- 
-2.48.1
+2.51.0

--- a/kde-frameworks/kirigami/kirigami6-6.19.0.recipe
+++ b/kde-frameworks/kirigami/kirigami6-6.19.0.recipe
@@ -10,9 +10,8 @@ COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kirigami-${portVersion}.tar.xz"
-CHECKSUM_SHA256="16d1142aacd8514f95cf9bdb44b2a720f3397b5ee68a489a54c86a560af55516"
+CHECKSUM_SHA256="8c6685dde55f001cc621b38c61486d0e9e2ef7fb1d502ca5dd049112229ea7cc"
 SOURCE_DIR="kirigami-$portVersion"
-PATCHES="kirigami6-6.16.0.patchset"

 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -31,6 +30,7 @@ PROVIDES="
 	lib:libKirigamiPolyfill$secondaryArchSuffix = $libVersionCompat
 	lib:libKirigamiPrimitives$secondaryArchSuffix = $libVersionCompat
 	lib:libKirigamiPrivate$secondaryArchSuffix = $libVersionCompat
+	lib:libKirigamiTemplates$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -56,14 +56,21 @@ PROVIDES_devel="
 	devel:libKirigamiPolyfill$secondaryArchSuffix = $libVersionCompat
 	devel:libKirigamiPrimitives$secondaryArchSuffix = $libVersionCompat
 	devel:libKirigamiPrivate$secondaryArchSuffix = $libVersionCompat
+	devel:libKirigamiTemplates$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	kirigami6$secondaryArchSuffix == $portVersion base
 	"

+ARCHITECTURES_doc="any"
+
+PROVIDES_doc="
+	kirigami6_doc = $portVersion
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix == $portVersion
+	extra_cmake_modules$secondaryArchSuffix >= $portVersion
 	qt6_tools${secondaryArchSuffix}_devel
 #	devel:libgomp$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix
@@ -73,6 +80,7 @@ BUILD_REQUIRES="
 	devel:libQt6Svg$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	kde_qdoc_common
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
 	cmd:make
@@ -85,12 +93,10 @@ TEST_REQUIRES="

 BUILD()
 {
+	export KDE_DOCS="`finddir B_SYSTEM_DATA_DIRECTORY`"/kde-qdoc-common
+
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DCMAKE_SKIP_RPATH=YES \
 		-DDESKTOP_ENABLED=ON \
 		-DBUILD_EXAMPLES=OFF \
@@ -98,11 +104,16 @@ BUILD()
 		-Wno-dev

 	make -C build $jobArgs
+	cmake --build build --target prepare_docs
+	cmake --build build --target generate_docs
+	cmake --build build --target generate_qch
 }

 INSTALL()
 {
 	make -C build install
+#	cmake --build build --target install_html_docs
+	cmake --build build --target install_qch_docs

 	prepareInstalledDevelLibs \
 		libKirigami \
@@ -113,11 +124,15 @@ INSTALL()
 		libKirigamiPlatform \
 		libKirigamiPolyfill \
 		libKirigamiPrimitives \
-		libKirigamiPrivate
+		libKirigamiPrivate \
+		libKirigamiTemplates

 	packageEntries devel \
 		$developDir \
 		$libDir/cmake
+
+	packageEntries doc \
+		$documentationDir
 }

 TEST()
--- a/kde-frameworks/kirigami/patches/kirigami6-6.16.0.patchset
+++ b/kde-frameworks/kirigami/patches/kirigami6-6.16.0.patchset
@@ -1,111 +0,0 @@
-From 72f2c9c02a0052e4e4148af5ca57e86b664bcaa9 Mon Sep 17 00:00:00 2001
-From: Luc Schrijvers <begasus@gmail.com>
-Date: Mon, 7 Jul 2025 12:18:20 +0200
-Subject: Fix crash for software rendering on Haiku
-
-
-Revert: https://invent.kde.org/frameworks/kirigami/-/merge_requests/1839
-Bug report: https://bugs.kde.org/show_bug.cgi?id=506707
-
-diff --git a/src/primitives/scenegraph/softwarerectanglenode.cpp b/src/primitives/scenegraph/softwarerectanglenode.cpp
-index 5c0c466..1337102 100644
--- a/src/primitives/scenegraph/softwarerectanglenode.cpp
-+++ b/src/primitives/scenegraph/softwarerectanglenode.cpp
-@@ -53,6 +53,18 @@ void SoftwareRectangleNode::setImage(const QImage &image)
-         return;
-     }
- 
-+    if (m_imageNode) {
-+        removeChildNode(m_imageNode);
-+        delete m_imageNode;
-+    }
-+
-+    m_imageNode = m_window->createImageNode();
-+    if (!m_imageNode) {
-+        return;
-+    }
-+
-+    m_imageNode->setFiltering(QSGTexture::Filtering::Linear);
-+
-     m_textureInfo = ShaderNode::TextureInfo{
-         .channel = 0,
-         .options = {},
-@@ -60,6 +72,9 @@ void SoftwareRectangleNode::setImage(const QImage &image)
-         .provider = nullptr,
-         .providerConnection = {},
-     };
-+
-+    m_imageNode->setTexture(m_textureInfo.texture.get());
-+    appendChildNode(m_imageNode);
- }
- 
- void SoftwareRectangleNode::setTextureProvider(QSGTextureProvider *provider)
-@@ -68,6 +83,18 @@ void SoftwareRectangleNode::setTextureProvider(QSGTextureProvider *provider)
-         return;
-     }
- 
-+    if (m_imageNode) {
-+        removeChildNode(m_imageNode);
-+        delete m_imageNode;
-+    }
-+
-+    m_imageNode = m_window->createImageNode();
-+    if (!m_imageNode) {
-+        return;
-+    }
-+
-+    m_imageNode->setFiltering(QSGTexture::Filtering::Linear);
-+
-     m_textureInfo = ShaderNode::TextureInfo{
-         .channel = 0,
-         .options = {},
-@@ -75,6 +102,9 @@ void SoftwareRectangleNode::setTextureProvider(QSGTextureProvider *provider)
-         .provider = provider,
-         .providerConnection = {},
-     };
-+
-+    m_imageNode->setTexture(m_textureInfo.provider->texture());
-+    appendChildNode(m_imageNode);
- }
- 
- void SoftwareRectangleNode::setRadius(qreal radius)
-@@ -114,33 +144,12 @@ QSGRenderNode::RenderingFlags SoftwareRectangleNode::flags() const
- 
- void SoftwareRectangleNode::preprocess()
- {
-    QSGTexture *texture = nullptr;
-    if (QSGTextureProvider *provider = m_textureInfo.provider) {
-        texture = provider->texture();
-+    auto provider = m_textureInfo.provider;
-+    if (provider && m_imageNode) {
-+        m_imageNode->setTexture(provider->texture());
-         if (QSGDynamicTexture *dynamic_texture = qobject_cast<QSGDynamicTexture *>(provider->texture())) {
-             dynamic_texture->updateTexture();
-         }
-    } else if (m_textureInfo.texture) {
-        texture = m_textureInfo.texture.get();
-    }
-
-    if (texture) {
-        if (!m_imageNode) {
-            m_imageNode = m_window->createImageNode();
-            m_imageNode->setFlag(OwnedByParent);
-        }
-
-        // The rect will be set in render().
-        m_imageNode->setFiltering(QSGTexture::Filtering::Linear);
-        m_imageNode->setTexture(texture);
-
-        if (!m_imageNode->parent()) {
-            appendChildNode(m_imageNode);
-        }
-    } else if (m_imageNode) {
-        removeChildNode(m_imageNode);
-        delete m_imageNode;
-        m_imageNode = nullptr;
-     }
- }
- 
-- 
-2.48.1
-
--- a/kde-frameworks/kjobwidgets/kjobwidgets6-6.19.0.recipe
+++ b/kde-frameworks/kjobwidgets/kjobwidgets6-6.19.0.recipe
@@ -6,7 +6,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kjobwidgets-${portVersion}.tar.xz"
-CHECKSUM_SHA256="517703f0188ec7dd759af38da2c0322ee2a7631225189853626af9aff0b94b2a"
+CHECKSUM_SHA256="dbd4936d08990cd767496922aa10e8af98aeeeba1f9233a93701564e032eac75"
 SOURCE_DIR="kjobwidgets-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -36,17 +36,24 @@ REQUIRES_devel="
 	kjobwidgets6$secondaryArchSuffix == $portVersion base
 	"

+ARCHITECTURES_doc="any"
+
+PROVIDES_doc="
+	kjobwidgets6_doc = $portVersion
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix == $portVersion
+	extra_cmake_modules$secondaryArchSuffix >= $portVersion
 	qt6_tools${secondaryArchSuffix}_devel
-	devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion
-	devel:libKF6Notifications$secondaryArchSuffix == $libVersion
-	devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion
+	devel:libKF6CoreAddons$secondaryArchSuffix >= $libVersion
+	devel:libKF6Notifications$secondaryArchSuffix >= $libVersion
+	devel:libKF6WidgetsAddons$secondaryArchSuffix >= $libVersion
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6DBus$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	kde_qdoc_common
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
 	cmd:make
@@ -59,22 +66,25 @@ TEST_REQUIRES="

 BUILD()
 {
+	export KDE_DOCS="`finddir B_SYSTEM_DATA_DIRECTORY`"/kde-qdoc-common
+
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev

 	make -C build $jobArgs
+	cmake --build build --target prepare_docs
+	cmake --build build --target generate_docs
+	cmake --build build --target generate_qch
 }

 INSTALL()
 {
 	make -C build install
+#	cmake --build build --target install_html_docs
+	cmake --build build --target install_qch_docs

 	prepareInstalledDevelLib \
 		libKF6JobWidgets
@@ -82,6 +92,9 @@ INSTALL()
 	packageEntries devel \
 		$developDir \
 		$libDir/cmake
+
+	packageEntries doc \
+		$documentationDir
 }

 TEST()
--- a/kde-frameworks/ktextwidgets/ktextwidgets6-6.19.0.recipe
+++ b/kde-frameworks/ktextwidgets/ktextwidgets6-6.19.0.recipe
@@ -6,7 +6,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/ktextwidgets-${portVersion}.tar.xz"
-CHECKSUM_SHA256="cb718ae12c28a1b17f2e552f08f121aea99a6dd5ff437b270581ab9270a02ea1"
+CHECKSUM_SHA256="d9fa49ee95cf03321d2b2d89bd6952734323b75a2d983b97702d14bce4809f16"
 SOURCE_DIR="ktextwidgets-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -43,25 +43,32 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	ktextwidgets6$secondaryArchSuffix == $portVersion base
-	devel:libKF6I18n$secondaryArchSuffix == $libVersion
-	devel:libKF6SonnetCore$secondaryArchSuffix == $libVersion
+	devel:libKF6I18n$secondaryArchSuffix
+	devel:libKF6SonnetCore$secondaryArchSuffix
+	"
+
+ARCHITECTURES_doc="any"
+
+PROVIDES_doc="
+	ktextwidgets6_doc = $portVersion
 	"

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix == $portVersion
+	extra_cmake_modules$secondaryArchSuffix >= $portVersion
 	qt6_tools${secondaryArchSuffix}_devel
-	devel:libKF6ColorScheme$secondaryArchSuffix == $libVersion
-	devel:libKF6Completion$secondaryArchSuffix == $libVersion
-	devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
-	devel:libKF6I18n$secondaryArchSuffix == $libVersion
-	devel:libKF6SonnetCore$secondaryArchSuffix == $libVersion
-	devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion
+	devel:libKF6ColorScheme$secondaryArchSuffix >= $libVersion
+	devel:libKF6Completion$secondaryArchSuffix >= $libVersion
+	devel:libKF6ConfigCore$secondaryArchSuffix >= $libVersion
+	devel:libKF6I18n$secondaryArchSuffix >= $libVersion
+	devel:libKF6SonnetCore$secondaryArchSuffix >= $libVersion
+	devel:libKF6WidgetsAddons$secondaryArchSuffix >= $libVersion
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6Qml$secondaryArchSuffix
 	devel:libQt6TextToSpeech$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	kde_qdoc_common
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
 	cmd:make
@@ -76,22 +83,25 @@ TEST_REQUIRES="

 BUILD()
 {
+	export KDE_DOCS="`finddir B_SYSTEM_DATA_DIRECTORY`"/kde-qdoc-common
+
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev

 	make -C build $jobArgs
+	cmake --build build --target prepare_docs
+	cmake --build build --target generate_docs
+	cmake --build build --target generate_qch
 }

 INSTALL()
 {
 	make -C build install
+#	cmake --build build --target install_html_docs
+	cmake --build build --target install_qch_docs

 	prepareInstalledDevelLib \
 		libKF6TextWidgets
@@ -99,6 +109,9 @@ INSTALL()
 	packageEntries devel \
 		$developDir \
 		$libDir/cmake
+
+	packageEntries doc \
+		$documentationDir
 }

 TEST()
--- a/kde-frameworks/kwallet/kwallet6-6.19.0.recipe
+++ b/kde-frameworks/kwallet/kwallet6-6.19.0.recipe
@@ -5,7 +5,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kwallet-${portVersion}.tar.xz"
-CHECKSUM_SHA256="d8dd330d2c4643d335050c1709252294108a75ab77cdb672b56f40bca6854eed"
+CHECKSUM_SHA256="1de4a3f60b0c170d8d9d0476ed8e0cfdf37f6711bf4e507a8f7ec4268eadc4ad"
 SOURCE_DIR="kwallet-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -56,27 +56,34 @@ REQUIRES_devel="
 	kwallet6$secondaryArchSuffix == $portVersion base
 	"

+ARCHITECTURES_doc="any"
+
+PROVIDES_doc="
+	kwallet6_doc = $portVersion
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix == $portVersion
+	extra_cmake_modules$secondaryArchSuffix >= $portVersion
 	qt6_tools${secondaryArchSuffix}_devel
 	devel:libgcrypt$secondaryArchSuffix
 	devel:libgpgmepp$secondaryArchSuffix
-	devel:libKF6ColorScheme$secondaryArchSuffix == $libVersion
-	devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
-	devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion
-	devel:libKF6Crash$secondaryArchSuffix == $libVersion
-	devel:libKF6DBusAddons$secondaryArchSuffix == $libVersion
-	devel:libKF6I18n$secondaryArchSuffix == $libVersion
-	devel:libKF6Notifications$secondaryArchSuffix == $libVersion
-	devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion
-	devel:libKF6WindowSystem$secondaryArchSuffix == $libVersion
+	devel:libKF6ColorScheme$secondaryArchSuffix >= $libVersion
+	devel:libKF6ConfigCore$secondaryArchSuffix >= $libVersion
+	devel:libKF6CoreAddons$secondaryArchSuffix >= $libVersion
+	devel:libKF6Crash$secondaryArchSuffix >= $libVersion
+	devel:libKF6DBusAddons$secondaryArchSuffix >= $libVersion
+	devel:libKF6I18n$secondaryArchSuffix >= $libVersion
+	devel:libKF6Notifications$secondaryArchSuffix >= $libVersion
+	devel:libKF6WidgetsAddons$secondaryArchSuffix >= $libVersion
+	devel:libKF6WindowSystem$secondaryArchSuffix >= $libVersion
 	devel:libqca_qt6$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6Qml$secondaryArchSuffix
 	devel:libsecret_1$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	kde_qdoc_common
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
 	cmd:make
@@ -93,22 +100,25 @@ TEST_REQUIRES="

 BUILD()
 {
+	export KDE_DOCS="`finddir B_SYSTEM_DATA_DIRECTORY`"/kde-qdoc-common
+
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev

 	make -C build $jobArgs
+	cmake --build build --target prepare_docs
+	cmake --build build --target generate_docs
+	cmake --build build --target generate_qch
 }

 INSTALL()
 {
 	make -C build install
+#	cmake --build build --target install_html_docs
+	cmake --build build --target install_qch_docs

 	# cleanup
 	rm -rf $dataDir/{applications,knotifications6,qlogging-categories6,xdg-desktop-portal}
@@ -120,6 +130,9 @@ INSTALL()
 	packageEntries devel \
 		$developDir \
 		$libDir/cmake
+
+	packageEntries doc \
+		$documentationDir
 }

 TEST()
--- a/kde-frameworks/solid/solid6-6.19.0.recipe
+++ b/kde-frameworks/solid/solid6-6.19.0.recipe
@@ -12,7 +12,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/solid-${portVersion}.tar.xz"
-CHECKSUM_SHA256="00ec609d799335bafb97b6a7d4a5c061ab4a0eb10e4089e8e104942321beb8a0"
+CHECKSUM_SHA256="3ac9a98b201eede1ae0782b1a320a27557672be8d3c5c81bba446751793ca3cb"
 SOURCE_DIR="solid-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -40,13 +40,20 @@ REQUIRES_devel="
 	solid6$secondaryArchSuffix == $portVersion base
 	"

+ARCHITECTURES_doc="any"
+
+PROVIDES_doc="
+	solid6_doc = $portVersion
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix == $portVersion
+	extra_cmake_modules$secondaryArchSuffix >= $portVersion
 	qt6_tools${secondaryArchSuffix}_devel
 	devel:libQt6Core$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	kde_qdoc_common
 	cmd:bison
 	cmd:cmake
 	cmd:flex
@@ -57,22 +64,25 @@ BUILD_PREREQUIRES="

 BUILD()
 {
+	export KDE_DOCS="`finddir B_SYSTEM_DATA_DIRECTORY`"/kde-qdoc-common
+
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev

 	make -C build $jobArgs
+	cmake --build build --target prepare_docs
+	cmake --build build --target generate_docs
+	cmake --build build --target generate_qch
 }

 INSTALL()
 {
 	make -C build install
+#	cmake --build build --target install_html_docs
+	cmake --build build --target install_qch_docs

 	prepareInstalledDevelLib \
 		libKF6Solid
@@ -80,6 +90,9 @@ INSTALL()
 	packageEntries devel \
 		$developDir \
 		$libDir/cmake
+
+	packageEntries doc \
+		$documentationDir
 }

 TEST()
--- a/kde-frameworks/sonnet/patches/sonnet-6.19.0.patchset
+++ b/kde-frameworks/sonnet/patches/sonnet-6.19.0.patchset
--- a/kde-frameworks/sonnet/sonnet6-6.19.0.recipe
+++ b/kde-frameworks/sonnet/sonnet6-6.19.0.recipe
@@ -13,7 +13,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/sonnet-${portVersion}.tar.xz"
-CHECKSUM_SHA256="1742cd3a1dc4b3b7a3871efd9715efd2710bffb7a29a0eab15d4c17aaccac2b8"
+CHECKSUM_SHA256="4b102a359c5da1796862dbc24fb395c1220847f0584fa7a974ec118d644acfa0"
 SOURCE_DIR="sonnet-$portVersion"
 PATCHES="sonnet-$portVersion.patchset"

@@ -49,9 +49,15 @@ REQUIRES_devel="
 	sonnet6$secondaryArchSuffix == $portVersion base
 	"

+ARCHITECTURES_doc="any"
+
+PROVIDES_doc="
+	sonnet6_doc = $portVersion
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix == $portVersion
+	extra_cmake_modules$secondaryArchSuffix >= $portVersion
 	qt6_tools${secondaryArchSuffix}_devel
 	devel:libaspell$secondaryArchSuffix
 	devel:libhunspell_1.7$secondaryArchSuffix
@@ -59,6 +65,7 @@ BUILD_REQUIRES="
 	devel:libQt6Qml$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	kde_qdoc_common
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
 	cmd:make
@@ -71,22 +78,25 @@ TEST_REQUIRES="

 BUILD()
 {
+	export KDE_DOCS="`finddir B_SYSTEM_DATA_DIRECTORY`"/kde-qdoc-common
+
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev

 	make -C build $jobArgs
+	cmake --build build --target prepare_docs
+	cmake --build build --target generate_docs
+	cmake --build build --target generate_qch
 }

 INSTALL()
 {
 	make -C build install
+#	cmake --build build --target install_html_docs
+	cmake --build build --target install_qch_docs

 	prepareInstalledDevelLibs \
 		libKF6SonnetCore \
@@ -95,6 +105,9 @@ INSTALL()
 	packageEntries devel \
 		$developDir \
 		$libDir/cmake
+
+	packageEntries doc \
+		$documentationDir
 }

 TEST()