KF6 frameworks, bump to 6.9.0 Part7 (#11459)

2026-04-09 05:10:05 +02:00 · 2024-12-16 19:27:45 +01:00
parent 5e8ab67f9b
commit 68049c12e9
14 changed files with 216 additions and 322 deletions
--- a/kde-apps/kaccounts_integration/kaccounts_integration24-24.12.0.recipe
+++ b/kde-apps/kaccounts_integration/kaccounts_integration24-24.12.0.recipe
@@ -6,7 +6,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kaccounts-integration-$portVersion.tar.xz"
-CHECKSUM_SHA256="76afc9724677c3415a8c86bbf880c08ffac78562d0f5f2c6afd0ce87242fe3c6"
+CHECKSUM_SHA256="04e8a00bdd4539027497edcabc4d7c21932ab00f43a51b1184365735f8d3b433"
 SOURCE_DIR="kaccounts-integration-$portVersion"
 PATCHES="kaccounts_integration-$portVersion.patchset"

@@ -83,12 +83,12 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"

-defineDebugInfoPackage kaccounts_integration24$secondaryArchSuffix \
-	$libDir/libkaccounts6.so.$libVersion
+#defineDebugInfoPackage kaccounts_integration24$secondaryArchSuffix \
+#	$libDir/libkaccounts6.so.$libVersion

 BUILD()
 {
-	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
 		-DCMAKE_SKIP_RPATH=YES \
 		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
@@ -112,5 +112,5 @@ INSTALL()

 TEST()
 {
-	make check
+	ctest --test-dir build --output-on-failure
 }
--- a/kde-apps/kaccounts_integration/patches/kaccounts_integration-24.12.0.patchset
+++ b/kde-apps/kaccounts_integration/patches/kaccounts_integration-24.12.0.patchset
@@ -1,11 +1,11 @@
-From d96541fd7b50ac2084a1f38866bc21c11cd8a8df Mon Sep 17 00:00:00 2001
+From 3a969250f73889e32f8011069b8045c85485edef Mon Sep 17 00:00:00 2001
 From: Schrijvers Luc <begasus@gmail.com>
 Date: Mon, 9 Sep 2024 16:07:36 +0200
 Subject: Disable KDirNotify


 diff --git a/src/plugins/kio-webdav/kioservices.cpp b/src/plugins/kio-webdav/kioservices.cpp
-index bfcea4a..d56e62a 100644
+index 924bdf5..42b9756 100644
 --- a/src/plugins/kio-webdav/kioservices.cpp
 +++ b/src/plugins/kio-webdav/kioservices.cpp
@@ -18,7 +18,9 @@
@@ -19,7 +19,7 @@ index bfcea4a..d56e62a 100644
 #include <KIO/TransferJob>
 #include <KLocalizedString>
 #include <KPluginFactory>
-@@ -214,7 +216,9 @@ QCoro::Task<void> KIOServices::createNetAttach(const Accounts::AccountId account
+@@ -210,7 +212,9 @@ QCoro::Task<void> KIOServices::createNetAttach(const Accounts::AccountId account
     wallet->writeMap(walletUrl + QStringLiteral("webdav"), info);
     wallet->sync();
 
@@ -29,7 +29,7 @@ index bfcea4a..d56e62a 100644
 }
 
 QCoro::Task<QString> KIOServices::getRealm(const QUrl &url)
-@@ -274,7 +278,9 @@ QCoro::Task<void> KIOServices::removeNetAttach(const QString &_id)
+@@ -270,7 +274,9 @@ QCoro::Task<void> KIOServices::removeNetAttach(const QString &_id)
     qCDebug(KACCOUNTS_DAV_LOG) << url.userName() << url.host() << url;
 
     QFile::remove(path);
--- a/kde-apps/kaccounts_providers/kaccounts_providers24-24.12.0.recipe
+++ b/kde-apps/kaccounts_providers/kaccounts_providers24-24.12.0.recipe
@@ -5,7 +5,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kaccounts-providers-$portVersion.tar.xz"
-CHECKSUM_SHA256="af6121ac476080d786a90bb95d70ecc8b3750696dcd2157fd39b08961e2210e4"
+CHECKSUM_SHA256="1ea284d24c34c18af5aeb21fd849a9cd7a23ff945490e0724be17ec267be790a"
 SOURCE_DIR="kaccounts-providers-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -85,8 +85,8 @@ BUILD_PREREQUIRES="
 	cmd:g++$secondaryArchSuffix
 	cmd:intltoolize
 	cmd:make
-	cmd:msgfmt
-	cmd:msgmerge
+	cmd:msgfmt$secondaryArchSuffix
+	cmd:msgmerge$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python3
 	"
@@ -98,7 +98,8 @@ BUILD()
 		-DCMAKE_SKIP_RPATH=YES \
 		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
 		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
+		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DBUILD_TESTING=OFF
 	make -C build $jobArgs
 }

@@ -109,5 +110,6 @@ INSTALL()

 TEST()
 {
-	make check
+	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
+	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/krunner/krunner6-6.9.0.recipe
+++ b/kde-frameworks/krunner/krunner6-6.9.0.recipe
@@ -7,7 +7,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/krunner-${portVersion}.tar.xz"
-CHECKSUM_SHA256="187ffe9180e98e83fbac5bd3644ec6671ba1e8066ca6013a98b4f1d7439cff3a"
+CHECKSUM_SHA256="eb4a5ee730b8d53641d8b08bdeb8d4bb065b19b6de3fa2ae9250436822f00d8c"
 SOURCE_DIR="krunner-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -23,21 +23,13 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
-	lib:libKF6Codecs$secondaryArchSuffix
 	lib:libKF6ConfigCore$secondaryArchSuffix
 	lib:libKF6CoreAddons$secondaryArchSuffix
 	lib:libKF6I18n$secondaryArchSuffix
 	lib:libKF6ItemModels$secondaryArchSuffix
-	lib:libKF6KIOCore$secondaryArchSuffix
-	lib:libKF6Package$secondaryArchSuffix
-	lib:libKF6Service$secondaryArchSuffix
-	lib:libKF6ThreadWeaver$secondaryArchSuffix
 	lib:libQt6Core$secondaryArchSuffix
 	lib:libQt6DBus$secondaryArchSuffix
 	lib:libQt6Gui$secondaryArchSuffix
-	lib:libQt6Network$secondaryArchSuffix
-	lib:libQt6Widgets$secondaryArchSuffix
-	lib:libQt6Xml$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -50,34 +42,14 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= $portVersion
+	extra_cmake_modules$secondaryArchSuffix
 	qt6_tools${secondaryArchSuffix}_devel
-	devel:libKF6AuthCore$secondaryArchSuffix == $portVersion
-	devel:libKF6Bookmarks$secondaryArchSuffix == $portVersion
-	devel:libKF6Codecs$secondaryArchSuffix == $portVersion
-	devel:libKF6Completion$secondaryArchSuffix == $portVersion
-	devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion
-	devel:libKF6ConfigWidgets$secondaryArchSuffix == $portVersion
-	devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion
-	devel:libKF6I18n$secondaryArchSuffix == $portVersion
-	devel:libKF6ItemModels$secondaryArchSuffix == $portVersion
-	devel:libKF6ItemViews$secondaryArchSuffix == $portVersion
-	devel:libKF6JobWidgets$secondaryArchSuffix == $portVersion
-	devel:libKF6KIOCore$secondaryArchSuffix == $portVersion
-	devel:libKF6Package$secondaryArchSuffix == $portVersion
-	devel:libKF6Service$secondaryArchSuffix == $portVersion
-	devel:libKF6Solid$secondaryArchSuffix == $portVersion
-	devel:libKF6ThreadWeaver$secondaryArchSuffix == $portVersion
-	devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion
-	devel:libKF6WindowSystem$secondaryArchSuffix == $portVersion
-	devel:libKF6XmlGui$secondaryArchSuffix == $portVersion
+	devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
+	devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion
+	devel:libKF6I18n$secondaryArchSuffix == $libVersion
+	devel:libKF6ItemModels$secondaryArchSuffix == $libVersion
 	devel:libQt6Core$secondaryArchSuffix
-	devel:libQt6DBus$secondaryArchSuffix
-	devel:libQt6Gui$secondaryArchSuffix
-	devel:libQt6Network$secondaryArchSuffix
 	devel:libQt6Qml$secondaryArchSuffix
-	devel:libQt6Widgets$secondaryArchSuffix
-	devel:libQt6Xml$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
@@ -88,26 +60,27 @@ BUILD_PREREQUIRES="
 	cmd:msgfmt$secondaryArchSuffix
 	cmd:msgmerge$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:xsltproc
 	"

 TEST_REQUIRES="
 	qthaikuplugins
+#	cmd:dbus_launch
+	lib:libdbus_1$secondaryArchSuffix
 	"

-defineDebugInfoPackage krunner6$secondaryArchSuffix \
-	$libDir/libKF6Runner.so.$libVersion
+#defineDebugInfoPackage krunner6$secondaryArchSuffix \
+#	$libDir/libKF6Runner.so.$libVersion

 BUILD()
 {
-	cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	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 \
 		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev
@@ -130,6 +103,7 @@ INSTALL()
 TEST()
 {
 	# 43% tests passed, 4 tests failed out of 7 (dbus related)
+#	export $(dbus-launch)
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
 	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem6-6.9.0.recipe
+++ b/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem6-6.9.0.recipe
@@ -8,7 +8,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kstatusnotifieritem-$portVersion.tar.xz"
-CHECKSUM_SHA256="80eae2693cdb5da669b4ed6a8228bddc39816aca0fde928f231e4894827d1de0"
+CHECKSUM_SHA256="7308a2615a606a44d3ea653925e34cf803a9f4f4cea36342725024fcee63c083"
 SOURCE_DIR="kstatusnotifieritem-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -26,7 +26,6 @@ REQUIRES="
 	lib:libGL$secondaryArchSuffix
 	lib:libKF6WindowSystem$secondaryArchSuffix
 	lib:libQt6Core$secondaryArchSuffix
-	lib:libQt6DBus$secondaryArchSuffix
 	lib:libQt6Gui$secondaryArchSuffix
 	lib:libQt6Widgets$secondaryArchSuffix
 	"
@@ -41,9 +40,9 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= $portVersion
+	extra_cmake_modules$secondaryArchSuffix
 	qt6_tools${secondaryArchSuffix}_devel
-	devel:libKF6WindowSystem$secondaryArchSuffix == $portVersion
+	devel:libKF6WindowSystem$secondaryArchSuffix == $libVersion
 	devel:libQt6Core$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -61,19 +60,19 @@ TEST_REQUIRES="
 	qthaikuplugins
 	"

-defineDebugInfoPackage kstatusnotifieritem6$secondaryArchSuffix \
-	$libDir/libKF6StatusNotifierItem.so.$libVersion
+#defineDebugInfoPackage kstatusnotifieritem6$secondaryArchSuffix \
+#	$libDir/libKF6StatusNotifierItem.so.$libVersion

 BUILD()
 {
-	cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	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 \
 		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev
--- a/kde-frameworks/ksvg/ksvg6-6.9.0.recipe
+++ b/kde-frameworks/ksvg/ksvg6-6.9.0.recipe
@@ -7,7 +7,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/ksvg-$portVersion.tar.xz"
-CHECKSUM_SHA256="bbdf7c786c959707cd9c67c04a67e51a15dbcdd6eff7ab52b03c09544e66f184"
+CHECKSUM_SHA256="ccd736e032a4089e1d1b2f829b55407ffd333a183f8cca1ad41184e68b9ebcd6"
 SOURCE_DIR="ksvg-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -28,12 +28,8 @@ REQUIRES="
 	lib:libKF6ConfigCore$secondaryArchSuffix
 	lib:libKF6CoreAddons$secondaryArchSuffix
 	lib:libKF6GuiAddons$secondaryArchSuffix
-	lib:libKirigamiPlatform$secondaryArchSuffix
 	lib:libQt6Core$secondaryArchSuffix
-	lib:libQt6DBus$secondaryArchSuffix
 	lib:libQt6Gui$secondaryArchSuffix
-	lib:libQt6Qml$secondaryArchSuffix
-	lib:libQt6Quick$secondaryArchSuffix
 	lib:libQt6Svg$secondaryArchSuffix
 	"

@@ -47,14 +43,14 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= $portVersion
+	extra_cmake_modules$secondaryArchSuffix
 	qt6_tools${secondaryArchSuffix}_devel
-	devel:libKF6Archive$secondaryArchSuffix == $portVersion
-	devel:libKF6ColorScheme$secondaryArchSuffix == $portVersion
-	devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion
-	devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion
-	devel:libKF6GuiAddons$secondaryArchSuffix == $portVersion
-	devel:libKirigamiPlatform$secondaryArchSuffix == $portVersion
+	devel:libKF6Archive$secondaryArchSuffix == $libVersion
+	devel:libKF6ColorScheme$secondaryArchSuffix == $libVersion
+	devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
+	devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion
+	devel:libKF6GuiAddons$secondaryArchSuffix == $libVersion
+	devel:libKirigamiPlatform$secondaryArchSuffix == $libVersion
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6Qml$secondaryArchSuffix
 	devel:libQt6Svg$secondaryArchSuffix
@@ -74,19 +70,19 @@ TEST_REQUIRES="
 	qthaikuplugins
 	"

-defineDebugInfoPackage ksvg6$secondaryArchSuffix \
-	$libDir/libKF6Svg.so.$libVersion
+#defineDebugInfoPackage ksvg6$secondaryArchSuffix \
+#	$libDir/libKF6Svg.so.$libVersion

 BUILD()
 {
-	cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	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 \
 		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev
--- a/kde-frameworks/ktexteditor/ktexteditor6-6.9.0.recipe
+++ b/kde-frameworks/ktexteditor/ktexteditor6-6.9.0.recipe
@@ -8,11 +8,11 @@ highlighting and automatic indentation to advanced scripting support, \
 making it suitable for everything from a simple embedded text-file editor \
 to an advanced IDE."
 HOMEPAGE="https://invent.kde.org/frameworks/ktexteditor"
-COPYRIGHT="2010-2023 KDE Organisation"
+COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/ktexteditor-${portVersion}.tar.xz"
-CHECKSUM_SHA256="ed76f72324225a926e00c2c970d48d7f11a576e942e48d092e9837bda79d6991"
+CHECKSUM_SHA256="1b1660dc6a07f21d99fe5495951f25f1e9f61db63f8f50bc2f610482bc15b3ca"
 SOURCE_DIR="ktexteditor-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -36,30 +36,22 @@ REQUIRES="
 	lib:libKF6ColorScheme$secondaryArchSuffix
 	lib:libKF6Completion$secondaryArchSuffix
 	lib:libKF6ConfigCore$secondaryArchSuffix
-	lib:libKF6ConfigGui$secondaryArchSuffix
 	lib:libKF6ConfigWidgets$secondaryArchSuffix
 	lib:libKF6CoreAddons$secondaryArchSuffix
 	lib:libKF6GuiAddons$secondaryArchSuffix
 	lib:libKF6I18n$secondaryArchSuffix
-	lib:libKF6IconThemes$secondaryArchSuffix
 	lib:libKF6ItemViews$secondaryArchSuffix
 	lib:libKF6JobWidgets$secondaryArchSuffix
 	lib:libKF6KIOCore$secondaryArchSuffix
-	lib:libKF6KIOWidgets$secondaryArchSuffix
 	lib:libKF6Parts$secondaryArchSuffix
 	lib:libKF6Service$secondaryArchSuffix
 	lib:libKF6Solid$secondaryArchSuffix
 	lib:libKF6SonnetCore$secondaryArchSuffix
-	lib:libKF6SonnetUi$secondaryArchSuffix
 	lib:libKF6SyntaxHighlighting$secondaryArchSuffix
-	lib:libKF6TextEditor$secondaryArchSuffix
-	lib:libKF6TextWidgets$secondaryArchSuffix
 	lib:libKF6WidgetsAddons$secondaryArchSuffix
-	lib:libKF6WindowSystem$secondaryArchSuffix
 	lib:libKF6XmlGui$secondaryArchSuffix
 	lib:libopenal$secondaryArchSuffix
 	lib:libQt6Core$secondaryArchSuffix
-	lib:libQt6DBus$secondaryArchSuffix
 	lib:libQt6Gui$secondaryArchSuffix
 	lib:libQt6Multimedia$secondaryArchSuffix
 	lib:libQt6Network$secondaryArchSuffix
@@ -76,44 +68,26 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	ktexteditor6$secondaryArchSuffix == $portVersion base
+	devel:libKF6Parts$secondaryArchSuffix == $libVersion
+	devel:libKF6SyntaxHighlighting$secondaryArchSuffix == $libVersion
 	"

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= $portVersion
+	extra_cmake_modules$secondaryArchSuffix
 	qt6_tools${secondaryArchSuffix}_devel
 	devel:libeditorconfig$secondaryArchSuffix
 	devel:libgit2$secondaryArchSuffix
-	devel:libKF6Archive$secondaryArchSuffix == $portVersion
-	devel:libKF6Bookmarks$secondaryArchSuffix == $portVersion
-	devel:libKF6Codecs$secondaryArchSuffix == $portVersion
-	devel:libKF6ColorScheme$secondaryArchSuffix == $portVersion
-	devel:libKF6Completion$secondaryArchSuffix == $portVersion
-	devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion
-	devel:libKF6ConfigGui$secondaryArchSuffix == $portVersion
-	devel:libKF6ConfigWidgets$secondaryArchSuffix == $portVersion
-	devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion
-	devel:libKF6GuiAddons$secondaryArchSuffix == $portVersion
-	devel:libKF6I18n$secondaryArchSuffix == $portVersion
-	devel:libKF6IconThemes$secondaryArchSuffix == $portVersion
-	devel:libKF6ItemViews$secondaryArchSuffix == $portVersion
-	devel:libKF6JobWidgets$secondaryArchSuffix == $portVersion
-	devel:libKF6KIOCore$secondaryArchSuffix == $portVersion
-	devel:libKF6Parts$secondaryArchSuffix == $portVersion
-	devel:libKF6Service$secondaryArchSuffix == $portVersion
-	devel:libKF6Solid$secondaryArchSuffix == $portVersion
-	devel:libKF6SonnetCore$secondaryArchSuffix == $portVersion
-	devel:libKF6SonnetUi$secondaryArchSuffix == $portVersion
-	devel:libKF6SyntaxHighlighting$secondaryArchSuffix == $portVersion
-	devel:libKF6TextWidgets$secondaryArchSuffix == $portVersion
-	devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion
-	devel:libKF6WindowSystem$secondaryArchSuffix == $portVersion
-	devel:libKF6XmlGui$secondaryArchSuffix == $portVersion
+	devel:libKF6Archive$secondaryArchSuffix == $libVersion
+	devel:libKF6GuiAddons$secondaryArchSuffix == $libVersion
+	devel:libKF6I18n$secondaryArchSuffix == $libVersion
+	devel:libKF6KIOCore$secondaryArchSuffix == $libVersion
+	devel:libKF6Parts$secondaryArchSuffix == $libVersion
+	devel:libKF6SonnetCore$secondaryArchSuffix == $libVersion
+	devel:libKF6SyntaxHighlighting$secondaryArchSuffix == $libVersion
 	devel:libQt6Core$secondaryArchSuffix
-	devel:libQt6Gui$secondaryArchSuffix
 	devel:libQt6Qml$secondaryArchSuffix
 	devel:libQt6TextToSpeech$secondaryArchSuffix
-	devel:libQt6Xml$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
@@ -130,20 +104,19 @@ TEST_REQUIRES="
 	qthaikuplugins
 	"

-defineDebugInfoPackage ktexteditor6$secondaryArchSuffix \
-	$libDir/libKF6TextEditor.so.$libVersion
+#defineDebugInfoPackage ktexteditor6$secondaryArchSuffix \
+#	$libDir/libKF6TextEditor.so.$libVersion

 BUILD()
 {
-	cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	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 \
 		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-		-DENABLE_KAUTH=OFF \
+		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev
@@ -165,7 +138,7 @@ INSTALL()

 TEST()
 {
-	# 97% tests passed, 2 tests failed out of 77
+	# 97% tests passed, 2 tests failed out of 76
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
 	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/ktexttemplate/ktexttemplate6-6.9.0.recipe
+++ b/kde-frameworks/ktexttemplate/ktexttemplate6-6.9.0.recipe
@@ -10,7 +10,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/ktexttemplate-$portVersion.tar.xz"
-CHECKSUM_SHA256="d6b75f193f4d8d817cf374872a57427489c61736121c72a69c4dd7ee62e1e233"
+CHECKSUM_SHA256="4c5f6c71ee1895285a97e1329a60c6a0dc5f8aca4875970f4bdf7442f211c8a9"
 SOURCE_DIR="ktexttemplate-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -39,7 +39,7 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= $portVersion
+	extra_cmake_modules$secondaryArchSuffix
 	qt6_tools${secondaryArchSuffix}_devel
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6Qml$secondaryArchSuffix
@@ -55,19 +55,19 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"

-defineDebugInfoPackage ktexttemplate6$secondaryArchSuffix \
-	$libDir/libKF6TextTemplate.so.$libVersion
+#defineDebugInfoPackage ktexttemplate6$secondaryArchSuffix \
+#	$libDir/libKF6TextTemplate.so.$libVersion

 BUILD()
 {
-	cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	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 \
 		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev
--- a/kde-frameworks/kunitconversion/kunitconversion6-6.9.0.recipe
+++ b/kde-frameworks/kunitconversion/kunitconversion6-6.9.0.recipe
@@ -32,7 +32,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kunitconversion-${portVersion}.tar.xz"
-CHECKSUM_SHA256="b303601c623cd66edb66a66fd72e957415b8dd33e70305be8136fa6b43b1a40a"
+CHECKSUM_SHA256="ea57ac6fa0ccc22dbcbcf87057cabc813a7f7b25a5cfa4349829d00e134bfd1c"
 SOURCE_DIR="kunitconversion-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -63,9 +63,9 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= $portVersion
+	extra_cmake_modules$secondaryArchSuffix
 	qt6_tools${secondaryArchSuffix}_devel
-	devel:libKF6I18n$secondaryArchSuffix == $portVersion
+	devel:libKF6I18n$secondaryArchSuffix == $libVersion
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6Network$secondaryArchSuffix
 	devel:libQt6Xml$secondaryArchSuffix
@@ -81,19 +81,19 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"

-defineDebugInfoPackage kunitconversion6$secondaryArchSuffix \
-	$libDir/libKF6UnitConversion.so.$libVersion
+#defineDebugInfoPackage kunitconversion6$secondaryArchSuffix \
+#	$libDir/libKF6UnitConversion.so.$libVersion

 BUILD()
 {
-	cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	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 \
 		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev
--- a/kde-frameworks/kuserfeedback/kuserfeedback6-6.9.0.recipe
+++ b/kde-frameworks/kuserfeedback/kuserfeedback6-6.9.0.recipe
@@ -6,7 +6,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kuserfeedback-$portVersion.tar.xz"
-CHECKSUM_SHA256="4def8d0d6ef227807b6066cb762cec352452a18e0e28b56aecce8ef3ceb52761"
+CHECKSUM_SHA256="d12bec0c0396f589423a77a8a8e3c8e7fdc8e9cb88ec6eb35ad978a3127ae5e8"
 SOURCE_DIR="kuserfeedback-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -45,7 +45,8 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= $portVersion
+	extra_cmake_modules$secondaryArchSuffix
+	qt6_tools${secondaryArchSuffix}_devel
 	devel:libQt6Charts$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6Gui$secondaryArchSuffix
@@ -53,12 +54,13 @@ BUILD_REQUIRES="
 	devel:libQt6Qml$secondaryArchSuffix
 	devel:libQt6Sql$secondaryArchSuffix
 	devel:libQt6Svg$secondaryArchSuffix
-	devel:libQt6UiTools$secondaryArchSuffix
 	devel:libQt6Widgets$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:bison
 	cmd:cmake
+	cmd:dot
+	cmd:doxygen
 	cmd:flex
 	cmd:g++$secondaryArchSuffix
 	cmd:make
@@ -72,13 +74,15 @@ TEST_REQUIRES="
 	qthaikuplugins$secondaryArchSuffix
 	"

-defineDebugInfoPackage kuserfeedback6$secondaryArchSuffix \
-	$libDir/libKF6UserFeedbackCore.so.$libVersion \
-	$libDir/libKF6UserFeedbackWidgets.so.$libVersion
+#defineDebugInfoPackage kuserfeedback6$secondaryArchSuffix \
+#	$binDir/UserFeedbackConsole \
+#	$binDir/userfeedbackctl \
+#	$libDir/libKF6UserFeedbackCore.so.$libVersion \
+#	$libDir/libKF6UserFeedbackWidgets.so.$libVersion

 BUILD()
 {
-	cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
 		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
 		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
@@ -86,6 +90,7 @@ BUILD()
 		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev
--- a/kde-frameworks/prison/prison6-6.9.0.recipe
+++ b/kde-frameworks/prison/prison6-6.9.0.recipe
@@ -7,7 +7,7 @@ COPYRIGHT="2010-2024 KDE Foundations"
 LICENSE="GNU LGPL v3"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/prison-$portVersion.tar.xz"
-CHECKSUM_SHA256="0a053a80beae232cef5da3f6525b14ee649b275cea64de0c0ffad41c3f2ec260"
+CHECKSUM_SHA256="e84135473756a7b6cdfcbc026b464112dc02c158550ec3149b308e065a798443"
 SOURCE_DIR="prison-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -49,7 +49,7 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= $portVersion
+	extra_cmake_modules$secondaryArchSuffix
 	qt6_tools${secondaryArchSuffix}_devel
 	devel:libdmtx$secondaryArchSuffix
 	devel:libqrencode$secondaryArchSuffix
@@ -69,21 +69,21 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"

-defineDebugInfoPackage prison6$secondaryArchSuffix \
-	$libDir/libKF6Prison.so.$libVersion \
-	$libDir/libKF6PrisonScanner.so.$libVersion
+#defineDebugInfoPackage prison6$secondaryArchSuffix \
+#	$libDir/libKF6Prison.so.$libVersion \
+#	$libDir/libKF6PrisonScanner.so.$libVersion

 BUILD()
 {
-	cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
 		-DKDE_INSTALL_LOGGINGCATEGORIESDIR=$settingsDir/xdg \
 		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
 		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
 		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
 		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev
--- a/kde-frameworks/purpose/purpose6-6.9.0.recipe
+++ b/kde-frameworks/purpose/purpose6-6.9.0.recipe
@@ -7,9 +7,9 @@ receive all the information they need."
 HOMEPAGE="https://invent.kde.org/frameworks/purpose"
 COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/purpose-${portVersion}.tar.xz"
-CHECKSUM_SHA256="4f8bbf19022c70df1dc345a4abd81677a505a2e8fef643311287fe8e9212d56a"
+CHECKSUM_SHA256="1709a31d446e7be432179b7fcd2ee26e8e3b9fde0a39ab3557835643873ae558"
 SOURCE_DIR="purpose-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -26,27 +26,14 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
-	lib:libKF6Bookmarks$secondaryArchSuffix
-	lib:libKF6CalendarEvents$secondaryArchSuffix
-	lib:libKF6Codecs$secondaryArchSuffix
-	lib:libKF6Completion$secondaryArchSuffix
 	lib:libKF6ConfigCore$secondaryArchSuffix
-	lib:libKF6ConfigWidgets$secondaryArchSuffix
 	lib:libKF6CoreAddons$secondaryArchSuffix
 	lib:libKF6I18n$secondaryArchSuffix
-	lib:libKF6ItemViews$secondaryArchSuffix
-	lib:libKF6JobWidgets$secondaryArchSuffix
-	lib:libKF6KIOCore$secondaryArchSuffix
-	lib:libKirigami$secondaryArchSuffix
-	lib:libKF6Notifications$secondaryArchSuffix
-	lib:libKF6PrisonScanner$secondaryArchSuffix
-	lib:libKF6Service$secondaryArchSuffix
-	lib:libKF6Solid$secondaryArchSuffix
-	lib:libKF6WidgetsAddons$secondaryArchSuffix
-	lib:libKF6WindowSystem$secondaryArchSuffix
-	lib:libKF6XmlGui$secondaryArchSuffix
 	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6Gui$secondaryArchSuffix
+	lib:libQt6Network$secondaryArchSuffix
 	lib:libQt6Qml$secondaryArchSuffix
+	lib:libQt6Widgets$secondaryArchSuffix
 	"
 if [ "$targetArchitecture" != x86_gcc2 ]; then
 	REQUIRES+="
@@ -66,29 +53,18 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= $portVersion
-	devel:libKF6Bookmarks$secondaryArchSuffix == $portVersion
-	devel:libKF6CalendarEvents$secondaryArchSuffix == $portVersion
-	devel:libKF6Codecs$secondaryArchSuffix == $portVersion
-	devel:libKF6Completion$secondaryArchSuffix == $portVersion
-	devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion
-	devel:libKF6ConfigWidgets$secondaryArchSuffix == $portVersion
-	devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion
-	devel:libKF6I18n$secondaryArchSuffix == $portVersion
-	devel:libKF6ItemViews$secondaryArchSuffix == $portVersion
-	devel:libKF6JobWidgets$secondaryArchSuffix == $portVersion
-	devel:libKF6KIOCore$secondaryArchSuffix == $portVersion
-	devel:libKirigami$secondaryArchSuffix == $portVersion
-	devel:libKF6Notifications$secondaryArchSuffix == $portVersion
-	devel:libKF6PrisonScanner$secondaryArchSuffix == $portVersion
-	devel:libKF6Service$secondaryArchSuffix == $portVersion
-	devel:libKF6Solid$secondaryArchSuffix == $portVersion
-	devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion
-	devel:libKF6WindowSystem$secondaryArchSuffix == $portVersion
-	devel:libKF6XmlGui$secondaryArchSuffix == $portVersion
+	extra_cmake_modules$secondaryArchSuffix
+	devel:libKF6CalendarEvents$secondaryArchSuffix == $libVersion
+	devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
+	devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion
+	devel:libKF6I18n$secondaryArchSuffix == $libVersion
+	devel:libKF6KIOCore$secondaryArchSuffix == $libVersion
+	devel:libKF6Notifications$secondaryArchSuffix == $libVersion
+	devel:libKF6PrisonScanner$secondaryArchSuffix == $libVersion
+	devel:libKF6Service$secondaryArchSuffix == $libVersion
+	devel:libKirigami$secondaryArchSuffix == $libVersion
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6Qml$secondaryArchSuffix
-	devel:libQt6QuickControls2$secondaryArchSuffix
 	"
 if [ "$targetArchitecture" != x86_gcc2 ]; then
 	BUILD_REQUIRES+="
@@ -111,21 +87,20 @@ TEST_REQUIRES="
 	qthaikuplugins
 	"

-defineDebugInfoPackage purpose6$secondaryArchSuffix \
-	$libDir/libKF6Purpose.so.$libVersion \
-	$libDir/libKF6PurposeWidgets.so.$libVersion
+#defineDebugInfoPackage purpose6$secondaryArchSuffix \
+#	$libDir/libKF6Purpose.so.$libVersion \
+#	$libDir/libKF6PurposeWidgets.so.$libVersion

 BUILD()
 {
-	cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	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 \
 		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-		-DBUILD_QCH=ON \
+		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev
 	make -C build $jobArgs
@@ -146,7 +121,7 @@ INSTALL()

 TEST()
 {
-	# 0% tests passed, 2 tests failed out of 2 (both crash)
+	# 0% tests passed, 2 tests failed out of 2
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
 	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/qqc2-desktop-style/qqc2_desktop_style6-6.7.0.recipe
+++ b/kde-frameworks/qqc2-desktop-style/qqc2_desktop_style6-6.7.0.recipe
@@ -1,128 +0,0 @@
-SUMMARY="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
-DESCRIPTION="This is a style for QtQuickControls 2 that uses QWidget's QStyle \
-for painting, making possible to achieve an higher deree of consistency between \
-QWidget-based and QML-based apps."
-HOMEPAGE="https://invent.kde.org/frameworks/qqc2-desktop-style"
-COPYRIGHT="2010-2023 KDE Organisation"
-LICENSE="GNU LGPL v3
-	GNU GPL v2"
-REVISION="1"
-SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/qqc2-desktop-style-${portVersion}.tar.xz"
-CHECKSUM_SHA256="b6602d21ba891a63461827aa4513946aef0d8e0141f4a831aafb2c4d2e3fb329"
-SOURCE_DIR="qqc2-desktop-style-$portVersion"
-
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	qqc2_desktop_style6$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libKF6Archive$secondaryArchSuffix
-	lib:libKF6Codecs$secondaryArchSuffix
-	lib:libKF6ColorScheme$secondaryArchSuffix
-	lib:libKF6ConfigCore$secondaryArchSuffix
-	lib:libKF6ConfigGui$secondaryArchSuffix
-	lib:libKF6ConfigWidgets$secondaryArchSuffix
-	lib:libKF6Completion$secondaryArchSuffix
-	lib:libKF6CoreAddons$secondaryArchSuffix
-	lib:libKF6GlobalAccel$secondaryArchSuffix
-	lib:libKF6GuiAddons$secondaryArchSuffix
-	lib:libKF6I18n$secondaryArchSuffix
-	lib:libKF6IconThemes$secondaryArchSuffix
-	lib:libKF6ItemViews$secondaryArchSuffix
-	lib:libKF6JobWidgets$secondaryArchSuffix
-	lib:libKF6KIOCore$secondaryArchSuffix
-	lib:libKF6KIOGui$secondaryArchSuffix
-	lib:libKirigami$secondaryArchSuffix
-	lib:libKF6Notifications$secondaryArchSuffix
-	lib:libKF6Package$secondaryArchSuffix
-	lib:libKF6Service$secondaryArchSuffix
-	lib:libKF6WidgetsAddons$secondaryArchSuffix
-	lib:libKF6WindowSystem$secondaryArchSuffix
-	lib:libKF6XmlGui$secondaryArchSuffix
-	lib:libQt6Core$secondaryArchSuffix
-	lib:libQt6DBus$secondaryArchSuffix
-	lib:libQt6Gui$secondaryArchSuffix
-	lib:libQt6Network$secondaryArchSuffix
-	lib:libQt6Qml$secondaryArchSuffix
-	lib:libQt6Quick$secondaryArchSuffix
-	lib:libQt6QuickWidgets$secondaryArchSuffix
-	lib:libQt6Widgets$secondaryArchSuffix
-	lib:libQt6Xml$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	qqc2_desktop_style6${secondaryArchSuffix}_devel = $portVersion
-	"
-REQUIRES_devel="
-	qqc2_desktop_style6$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	qt6_tools${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= $portVersion
-	devel:libKF6Archive$secondaryArchSuffix == $portVersion
-	devel:libKF6Bookmarks$secondaryArchSuffix == $portVersion
-	devel:libKF6Codecs$secondaryArchSuffix == $portVersion
-	devel:libKF6ColorScheme$secondaryArchSuffix == $portVersion
-	devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion
-	devel:libKF6ConfigWidgets$secondaryArchSuffix == $portVersion
-	devel:libKF6Completion$secondaryArchSuffix == $portVersion
-	devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion
-	devel:libKF6GlobalAccel$secondaryArchSuffix == $portVersion
-	devel:libKF6GuiAddons$secondaryArchSuffix == $portVersion
-	devel:libKF6DBusAddons$secondaryArchSuffix == $portVersion
-	devel:libKF6I18n$secondaryArchSuffix == $portVersion
-	devel:libKF6Iconthemes$secondaryArchSuffix == $portVersion
-	devel:libKF6ItemViews$secondaryArchSuffix == $portVersion
-	devel:libKF6JobWidgets$secondaryArchSuffix == $portVersion
-	devel:libKF6KIOCore$secondaryArchSuffix == $portVersion
-	devel:libKirigami$secondaryArchSuffix == $portVersion
-	devel:libKF6Notifications$secondaryArchSuffix
-	devel:libKF6Package$secondaryArchSuffix == $portVersion
-	devel:libKF6Service$secondaryArchSuffix == $portVersion
-	devel:libKF6Solid$secondaryArchSuffix == $portVersion
-	devel:libKF6SonnetUi$secondaryArchSuffix == $portVersion
-	devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion
-	devel:libKF6WindowSystem$secondaryArchSuffix == $portVersion
-	devel:libKF6XmlGui$secondaryArchSuffix == $portVersion
-	devel:libQt6Core$secondaryArchSuffix
-	devel:libQt6QuickControls2$secondaryArchSuffix
-	devel:libQt6QuickTemplates2$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:make
-	cmd:msgfmt$secondaryArchSuffix
-	cmd:msgmerge$secondaryArchSuffix
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		$cmakeDirArgs \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-		-DBUILD_QCH=ON \
-		-DBUILD_TESTING=OFF \
-		-Wno-dev
-	make -C build $jobArgs
-}
-
-INSTALL()
-{
-	make -C build install
-
-	packageEntries devel \
-		$libDir/cmake
-}
--- a/kde-frameworks/qqc2-desktop-style/qqc2_desktop_style6-6.9.0.recipe
+++ b/kde-frameworks/qqc2-desktop-style/qqc2_desktop_style6-6.9.0.recipe
@@ -0,0 +1,98 @@
+SUMMARY="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
+DESCRIPTION="This is a style for QtQuickControls 2 that uses QWidget's QStyle \
+for painting, making possible to achieve an higher deree of consistency between \
+QWidget-based and QML-based apps."
+HOMEPAGE="https://invent.kde.org/frameworks/qqc2-desktop-style"
+COPYRIGHT="2010-2023 KDE Organisation"
+LICENSE="GNU LGPL v3
+	GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/qqc2-desktop-style-${portVersion}.tar.xz"
+CHECKSUM_SHA256="3e9c0698e7b392b1110c016d632bce21b32f81e65adfda285b6d01d6d6eb4469"
+SOURCE_DIR="qqc2-desktop-style-$portVersion"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="$portVersion"
+
+PROVIDES="
+	qqc2_desktop_style6$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libKF6ColorScheme$secondaryArchSuffix
+	lib:libKF6ConfigCore$secondaryArchSuffix
+	lib:libKF6IconThemes$secondaryArchSuffix
+	lib:libKF6SonnetCore$secondaryArchSuffix
+	lib:libKirigamiPlatform$secondaryArchSuffix
+	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6DBus$secondaryArchSuffix
+	lib:libQt6Gui$secondaryArchSuffix
+	lib:libQt6Qml$secondaryArchSuffix
+	lib:libQt6Quick$secondaryArchSuffix
+	lib:libQt6Widgets$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	qqc2_desktop_style6${secondaryArchSuffix}_devel = $portVersion
+	"
+REQUIRES_devel="
+	qqc2_desktop_style6$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	qt6_tools${secondaryArchSuffix}_devel
+	extra_cmake_modules$secondaryArchSuffix
+	devel:libKF6ColorScheme$secondaryArchSuffix == $libVersion
+	devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
+	devel:libKF6Iconthemes$secondaryArchSuffix == $libVersion
+	devel:libKF6SonnetCore$secondaryArchSuffix == $libVersion
+	devel:libKirigami$secondaryArchSuffix == $libVersion
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6Qml$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:msgfmt$secondaryArchSuffix
+	cmd:msgmerge$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+TEST_REQUIRES="
+	qthaikuplugins
+	"
+
+BUILD()
+{
+	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
+}
+
+INSTALL()
+{
+	make -C build install
+
+	packageEntries devel \
+		$libDir/cmake
+}
+
+TEST()
+{
+	# 50% tests passed, 1 tests failed out of 2
+	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
+	ctest --test-dir build --output-on-failure
+}