kf6 frameworks, push bulk version bump nr3 (#10950)

2026-04-09 05:10:05 +02:00 · 2024-08-28 11:12:21 +02:00
parent 7adcfae886
commit 9e0fd3facb
16 changed files with 235 additions and 73 deletions
--- a/kde-frameworks/kauth/kauth6-6.5.0.recipe
+++ b/kde-frameworks/kauth/kauth6-6.5.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%.*}/kauth-${portVersion}.tar.xz"
-CHECKSUM_SHA256="3511d9d857c0f6962b005b381ec5e2fef9ded59244da14e31dd0673e05a69b0a"
+CHECKSUM_SHA256="1af517a509da1c5ddb4420d7430894b751562e07cc4c134abe0dcb606358d394"
 SOURCE_DIR="kauth-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -52,11 +52,16 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"

+TEST_REQUIRES="
+	lib:libdbus_1$secondaryArchSuffix
+	"
+
 BUILD()
 {
 	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
 		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF
@@ -72,7 +77,7 @@ INSTALL()

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

@@ -80,5 +85,5 @@ TEST()
 {
 	# 2 tests run, second one doesn't seem to do anything (no mention in the log)
 	# killed it in the end
-	make -Cbuild test
+	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/kbookmarks/kbookmarks6-6.5.0.recipe
+++ b/kde-frameworks/kbookmarks/kbookmarks6-6.5.0.recipe
@@ -9,7 +9,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kbookmarks-${portVersion}.tar.xz"
-CHECKSUM_SHA256="1af0d6be7c43cb17bc9a8bda464c372b9f27f99d3cdf3be95ec5f24e34368efb"
+CHECKSUM_SHA256="97dabceae5b0eac1107c49c50d1d7d9a7d26b9246c9ab53d123990525c55fbec"
 SOURCE_DIR="kbookmarks-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -85,6 +85,7 @@ BUILD()
 {
 	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF
@@ -101,12 +102,12 @@ INSTALL()

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

 TEST()
 {
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
-	make -Cbuild test
+	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/kglobalaccel/kglobalaccel6-6.5.0.recipe
+++ b/kde-frameworks/kglobalaccel/kglobalaccel6-6.5.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%.*}/kglobalaccel-${portVersion}.tar.xz"
-CHECKSUM_SHA256="c74727fef4a39680e36c5ed27cdb4c5b755043795fa52774ee3bc6a3b568e724"
+CHECKSUM_SHA256="883a1cf48fc4b8ce22ab9f143b6bdd546ac30fbe29c90d4035fb2adf38a339a4"
 SOURCE_DIR="kglobalaccel-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -75,10 +75,15 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"

+TEST_REQUIRES="
+	qthaikuplugins$secondaryArchSuffix
+	"
+
 BUILD()
 {
 	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF
@@ -94,12 +99,14 @@ INSTALL()

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

 TEST()
 {
-	# no tests found
-	make -C build test
+	# manual build, missing some qml modules from other frameworks
+	# stalls with no progress
+	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
+	./build/bin/kglobalacceltest
 }
--- a/kde-frameworks/kio/kio6-6.5.0.recipe
+++ b/kde-frameworks/kio/kio6-6.5.0.recipe
@@ -15,9 +15,10 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kio-${portVersion}.tar.xz"
-CHECKSUM_SHA256="331d6ff6b9cbb0e6521a5d0746b152be2588fd631a73d0e249b78cd2cda69ccf"
+CHECKSUM_SHA256="9c8bf83534577a322d4633d241d9770bc8ba8a45624e2f041e1b8dbdbc198a13"
 SOURCE_DIR="kio-$portVersion"
-PATCHES="kio-$portVersion.patchset"
+PATCHES="kio-$portVersion.patchset
+	1651.patch"

 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -126,6 +127,8 @@ BUILD_PREREQUIRES="
 	cmd:doxygen >= 1.9
 	cmd:g++$secondaryArchSuffix
 	cmd:make
+	cmd:msgfmt
+	cmd:msgmerge
 	cmd:python3
 	"

@@ -146,6 +149,7 @@ BUILD()
 		-DCMAKE_BUILD_TYPE=Release \
 		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
 		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DKAUTH_HELPER_INSTALL_DIR:PATH=$addOnsDir/Qt6/kauth/helper \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DWITH_X11=OFF \
@@ -159,6 +163,9 @@ INSTALL()
 {
 	make -Cbuild install

+	# cleanup
+	rm -rf $dataDir/applications
+
 	prepareInstalledDevelLibs \
 		libKF6KIOCore \
 		libKF6KIOFileWidgets \
@@ -167,13 +174,13 @@ INSTALL()

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

 TEST()
 {
-	# 39% tests passed, 38 tests failed out of 62
+	# 39% tests passed, 37 tests failed out of 61
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
 	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/kio/patches/kio-6.5.0.patchset
+++ b/kde-frameworks/kio/patches/kio-6.5.0.patchset
@@ -1,4 +1,4 @@
-From 7a3859235e0b32918eec8e8b633f4a916c4a8767 Mon Sep 17 00:00:00 2001
+From 09214c74d519605f95115cbdd7df7574a6729bc9 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Sun, 31 Oct 2021 13:15:08 +0300
 Subject: Fix build on Haiku
@@ -18,10 +18,10 @@ index 124e827..183c897 100644
     struct timespec ut[2];
     ut[0].tv_sec = early70sTime;
 diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 3cc15a3..2ecdd33 100644
+index 7b1cb88..9422ab9 100644
 --- a/src/core/CMakeLists.txt
 +++ b/src/core/CMakeLists.txt
-@@ -217,6 +217,10 @@ if (TARGET KF6::AuthCore)
+@@ -215,6 +215,10 @@ if (TARGET KF6::AuthCore)
   target_link_libraries(KF6KIOCore PRIVATE KF6::AuthCore)   #SlaveBase uses KAuth::Action
 endif()
 
@@ -46,7 +46,7 @@ index 9ff3c1c..f45a0de 100644
 #else
 #define WITH_SHM 0
 diff --git a/src/kioworkers/file/CMakeLists.txt b/src/kioworkers/file/CMakeLists.txt
-index 2a63768..6423cd9 100644
+index a8a393a..93c6fea 100644
 --- a/src/kioworkers/file/CMakeLists.txt
 +++ b/src/kioworkers/file/CMakeLists.txt
@@ -35,6 +35,10 @@ if(UNIX)
@@ -101,10 +101,10 @@ index 8d8c0ed..aa164e1 100644
 #kauth_install_helper_files(file_helper org.kde.kio.file root)
 #kauth_install_actions(org.kde.kio.file file.actions)
 -- 
-2.43.2
+2.45.2


-From 28831a00bf7134d6067a199ecaee3348f39274c3 Mon Sep 17 00:00:00 2001
+From b8441d70218f01e8fd7314e531dfe3610bba59ad 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
@@ -124,10 +124,10 @@ index 551bdac..b15f826 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 ae37d70..267d4ef 100644
+index bc91f9e..1268d6b 100644
 --- a/src/widgets/CMakeLists.txt
 +++ b/src/widgets/CMakeLists.txt
-@@ -144,6 +144,10 @@ if(ACL_FOUND)
+@@ -137,6 +137,10 @@ if(ACL_FOUND)
     target_link_libraries(KF6KIOWidgets PRIVATE ${ACL_LIBS})
 endif()
 
@@ -207,10 +207,10 @@ index 0000000..9614b87
 +    return false;
 +}
 -- 
-2.43.2
+2.45.2


-From 4a05e6a053c850e8b36df587189047c28dfeebb2 Mon Sep 17 00:00:00 2001
+From 56f192dbd65bfb283e4624e972d0ab57b287f266 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
@@ -231,10 +231,10 @@ index 8bc8447..7a62ee1 100644
 
 using namespace KIO;
 -- 
-2.43.2
+2.45.2


-From 59314cd4664257d427649469e8c3533d74253773 Mon Sep 17 00:00:00 2001
+From 7d81047dfc2059311bef0f37c87338551ff75d40 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
@@ -255,5 +255,5 @@ index 08c0938..3333ce2 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.43.2
+2.45.2

--- a/kde-frameworks/kirigami/kirigami6-6.5.0.recipe
+++ b/kde-frameworks/kirigami/kirigami6-6.5.0.recipe
@@ -10,8 +10,9 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kirigami-${portVersion}.tar.xz"
-CHECKSUM_SHA256="57245b518d64c46afab42a1a619609afb60e546033a162b718c752b88350b40c"
+CHECKSUM_SHA256="43a73b161e1c85da3eadc63e7cc6c1b3c686aa56951b0d0e2df4a2cc1334759c"
 SOURCE_DIR="kirigami-$portVersion"
+PATCHES="1582.patch"

 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -23,7 +24,10 @@ PROVIDES="
 	kirigami6$secondaryArchSuffix = $portVersion
 	lib:libKirigami$secondaryArchSuffix = $libVersionCompat
 	lib:libKirigamiDelegates$secondaryArchSuffix = $libVersionCompat
+	lib:libKirigamiDialogs$secondaryArchSuffix = $libVersionCompat
+	lib:libKirigamiLayouts$secondaryArchSuffix = $libVersionCompat
 	lib:libKirigamiPlatform$secondaryArchSuffix = $libVersionCompat
+	lib:libKirigamiPrimitives$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -38,7 +42,10 @@ PROVIDES_devel="
 	kirigami6${secondaryArchSuffix}_devel = $portVersion
 	devel:libKirigami$secondaryArchSuffix = $libVersionCompat
 	devel:libKirigamiDelegates$secondaryArchSuffix = $libVersionCompat
+	devel:libKirigamiDialogs$secondaryArchSuffix = $libVersionCompat
+	devel:libKirigamiLayouts$secondaryArchSuffix = $libVersionCompat
 	devel:libKirigamiPlatform$secondaryArchSuffix = $libVersionCompat
+	devel:libKirigamiPrimitives$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	kirigami6$secondaryArchSuffix == $portVersion base
@@ -48,6 +55,7 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	extra_cmake_modules$secondaryArchSuffix >= $portVersion
 	qt6_tools${secondaryArchSuffix}_devel
+#	devel:libgomp$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6Qml$secondaryArchSuffix
 	devel:libQt6Quick$secondaryArchSuffix
@@ -71,10 +79,12 @@ BUILD()
 {
 	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
+		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
 		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DDESKTOP_ENABLED=OFF \
-		-DDISABLE_DBUS=ON \
+		-DUSE_DBUS=OFF \
 		-DBUILD_QCH=ON \
 		-DBUILD_EXAMPLES=OFF \
 		-DBUILD_TESTING=OFF
@@ -88,16 +98,20 @@ INSTALL()
 	prepareInstalledDevelLibs \
 		libKirigami \
 		libKirigamiDelegates \
-		libKirigamiPlatform
+		libKirigamiDialogs \
+		libKirigamiLayouts \
+		libKirigamiPlatform \
+		libKirigamiPrimitives

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

 TEST()
 {
+	# 94% tests passed, 2 tests failed out of 35
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
-	make -Cbuild test
+	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/kirigami/patches/1582.patch
+++ b/kde-frameworks/kirigami/patches/1582.patch
@@ -0,0 +1,74 @@
+From 25c036ca59978e9c07a0a60b9efcbd7e99cae7b3 Mon Sep 17 00:00:00 2001
+From: Carl Schwan <carl@carlschwan.eu>
+Date: Sun, 7 Jul 2024 23:35:50 +0200
+Subject: [PATCH] Make KirigamiPrivate a static lib
+
+So we don't need to install it and add a soversion. This also simplify a
+bit the code.
+---
+ src/CMakeLists.txt | 15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index d6be28437..c668c6544 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -24,7 +24,7 @@ endif()
+ 
+ # Module: org.kde.kirigami.private
+ 
+-add_library(KirigamiPrivate)
+add_library(KirigamiPrivate STATIC)
+ ecm_add_qml_module(KirigamiPrivate
+     URI "org.kde.kirigami.private"
+     GENERATE_PLUGIN_SOURCE
+@@ -37,18 +37,15 @@ target_sources(KirigamiPrivate PRIVATE
+     actionhelper.h
+ )
+ 
+-include_static_dependencies(KirigamiPrivate EXPORT KirigamiTargets)
+-
+ target_link_libraries(KirigamiPrivate PRIVATE Qt6::Gui)
+-
+-ecm_finalize_qml_module(KirigamiPrivate DESTINATION ${KDE_INSTALL_QMLDIR})
+set_target_properties(KirigamiPrivate PROPERTIES POSITION_INDEPENDENT_CODE ON)
+set_target_properties(KirigamiPrivateplugin PROPERTIES POSITION_INDEPENDENT_CODE ON)
+ 
+ if (NOT BUILD_SHARED_LIBS)
+     install(TARGETS KirigamiPrivateplugin EXPORT KirigamiTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
+    install(TARGETS KirigamiPrivate EXPORT KirigamiTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
+ endif()
+ 
+-install(TARGETS KirigamiPrivate EXPORT KirigamiTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
+-
+ # Module: org.kde.kirigami
+ 
+ ecm_add_qml_module(Kirigami URI "org.kde.kirigami" VERSION 2.0
+@@ -263,6 +260,8 @@ target_link_libraries(Kirigami
+     Qt6::Quick
+     PRIVATE
+     Qt6::Concurrent
+    KirigamiPrivate
+    KirigamiPrivateplugin
+     ${Kirigami_EXTRA_LIBS}
+ )
+ 
+@@ -280,7 +279,6 @@ if (NOT BUILD_SHARED_LIBS)
+             KirigamiPrimitivesplugin
+             KirigamiDialogsplugin
+             KirigamiLayoutsplugin
+-            KirigamiPrivateplugin
+     )
+     install(TARGETS Kirigamiplugin EXPORT KirigamiTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
+ else()
+@@ -292,7 +290,6 @@ else()
+             KirigamiPrimitives
+             KirigamiDialogs
+             KirigamiLayouts
+-            KirigamiPrivate
+     )
+ endif()
+ 
+-- 
+GitLab
+
--- a/kde-frameworks/kjobwidgets/kjobwidgets6-6.5.0.recipe
+++ b/kde-frameworks/kjobwidgets/kjobwidgets6-6.5.0.recipe
@@ -6,7 +6,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kjobwidgets-${portVersion}.tar.xz"
-CHECKSUM_SHA256="2fb7602f2bba818bcfffe1ad1310d7900889e10e53e384b874295fb3593fb3a1"
+CHECKSUM_SHA256="67c5dab1191ae6830d452751767e94991b34feaf4228f18ab042c2c120910ad8"
 SOURCE_DIR="kjobwidgets-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -67,9 +67,9 @@ BUILD()
 {
 	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-		-DBUILD_QCH=ON \
-		-DBUILD_TESTING=OFF
+		-DBUILD_QCH=ON
 	make -Cbuild $jobArgs
 }

@@ -82,15 +82,6 @@ INSTALL()

 	packageEntries devel \
 		$developDir \
-		$dataDir/doc \
+		$documentationDir \
 		$libDir/cmake
 }
-
-TEST()
-{
-	make -Cbuild test
-	# individual tests, opens window, manual intervention needed
-	# export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
-	# build/bin/kjobcreator
-	# build/bin/kjobtrackerstest # crashes
-}
--- a/kde-frameworks/kservice/kservice6-6.5.0.recipe
+++ b/kde-frameworks/kservice/kservice6-6.5.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%.*}/kservice-${portVersion}.tar.xz"
-CHECKSUM_SHA256="0646c9219c0d7d9a2371b90dc427ebc86cf30adafcb22b458f130f011de28882"
+CHECKSUM_SHA256="48cdd204bc9fb9282c37b6bcc2364f7dbc124057547ddb6b1471988b464cf8bd"
 SOURCE_DIR="kservice-$portVersion"
 PATCHES="kservice-$portVersion.patchset"

@@ -28,7 +28,6 @@ REQUIRES="
 	lib:libKF6ConfigCore$secondaryArchSuffix
 	lib:libKF6CoreAddons$secondaryArchSuffix
 	lib:libKF6Crash$secondaryArchSuffix
-	lib:libKF6DBusAddons$secondaryArchSuffix
 	lib:libKF6I18n$secondaryArchSuffix
 	lib:libQt6Core$secondaryArchSuffix
 	lib:libQt6DBus$secondaryArchSuffix
@@ -50,7 +49,6 @@ BUILD_REQUIRES="
 	devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion
 	devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion
 	devel:libKF6Crash$secondaryArchSuffix == $portVersion
-	devel:libKF6DBusAddons$secondaryArchSuffix == $portVersion
 	devel:libKF6I18n$secondaryArchSuffix == $portVersion
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6DBus$secondaryArchSuffix
@@ -65,6 +63,8 @@ BUILD_PREREQUIRES="
 	cmd:flex
 	cmd:g++$secondaryArchSuffix
 	cmd:make
+	cmd:msgfmt
+	cmd:msgmerge
 	cmd:python3
 	cmd:update_mime_database$secondaryArchSuffix
 	"
@@ -73,6 +73,7 @@ BUILD()
 {
 	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF
@@ -88,7 +89,7 @@ INSTALL()

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

@@ -96,5 +97,5 @@ TEST()
 {
 	# 0% tests passed, 6 tests failed out of 6 (1 crash)
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
-	make -C build test
+	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/kservice/patches/kservice-6.5.0.patchset
+++ b/kde-frameworks/kservice/patches/kservice-6.5.0.patchset
@@ -1,11 +1,11 @@
-From fac3d12fbb219570c6feb2497ad382e9aedd7934 Mon Sep 17 00:00:00 2001
+From 099ef438e3d4efdbc57a50249bc2989ed59fe4be Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Tue, 7 Jan 2020 18:16:42 +1000
 Subject: Set path for sycoca databases


 diff --git a/src/sycoca/ksycoca.cpp b/src/sycoca/ksycoca.cpp
-index 981342e..5b72e29 100644
+index 981342e..eaff8e4 100644
 --- a/src/sycoca/ksycoca.cpp
 +++ b/src/sycoca/ksycoca.cpp
@@ -694,7 +694,11 @@ QString KSycoca::absoluteFilePath()
@@ -13,7 +13,7 @@ index 981342e..5b72e29 100644
 #endif
         const QString fileName = QLatin1String("ksycoca6") + suffix;
 +#ifdef Q_OS_HAIKU
-+		return QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1String("/kdesycoca/") + fileName;
+		return QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1String("/kdesycoca6/") + fileName;
 +#else
         return QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1Char('/') + fileName;
 +#endif
@@ -21,5 +21,5 @@ index 981342e..5b72e29 100644
         return QFile::decodeName(ksycoca_env);
     }
 -- 
-2.43.2
+2.45.2

--- a/kde-frameworks/kwallet/kwallet6-6.5.0.recipe
+++ b/kde-frameworks/kwallet/kwallet6-6.5.0.recipe
@@ -5,7 +5,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kwallet-${portVersion}.tar.xz"
-CHECKSUM_SHA256="2e58119a6442cb00e3014f01636e872337cff362ec1ef120caf2ba01813bd2c1"
+CHECKSUM_SHA256="9eb9ef50a10319afdf8ddbab06bb76c05f43d8d4095483f2d8efed752d5d815a"
 SOURCE_DIR="kwallet-$portVersion"
 PATCHES="kwallet-$portVersion.patchset"

@@ -77,7 +77,7 @@ BUILD_REQUIRES="
 	devel:libKF6Service$secondaryArchSuffix == $portVersion
 	devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion
 	devel:libKF6WindowSystem$secondaryArchSuffix == $portVersion
-	devel:libqca_Qt6$secondaryArchSuffix
+	devel:libqca_qt6$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6DBus$secondaryArchSuffix
 	devel:libQt6Gui$secondaryArchSuffix
@@ -91,13 +91,22 @@ BUILD_PREREQUIRES="
 	cmd:doxygen >= 1.9
 	cmd:g++$secondaryArchSuffix
 	cmd:make
+	cmd:msgfmt
+	cmd:msgmerge
 	cmd:python3
 	"

+TEST_REQUIRES="
+	lib:libdbus_1$secondaryArchSuffix
+	lib:libqca_Qt6$secondaryArchSuffix
+	devel:libnss3$secondaryArchSuffix
+	"
+
 BUILD()
 {
 	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF
@@ -114,13 +123,15 @@ INSTALL()

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

 TEST()
 {
+	# 2024-07-10 18:32:58 KERN: runtime_loader: /boot/system/add-ons/Qt6/crypto/libqca-nss.so: Version dependency "/packages/nss-3.73.1-1/.self/develop/lib/libnss3.so" not found
+	# 2024-07-10 18:32:58 KERN: vm_soft_fault: va 0x82db7d9000 not covered by area in address space
 	# 50% tests passed, 1 tests failed out of 2 (1 crash)
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
-	make -Cbuild test
+	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/kwallet/patches/kwallet-6.5.0.patchset
+++ b/kde-frameworks/kwallet/patches/kwallet-6.5.0.patchset
@@ -0,0 +1,47 @@
+From 1f3dacb20835c4da4c54f5d67783f0f1d0e65ede Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+Date: Wed, 15 Sep 2021 11:17:06 +0300
+Subject: Fix build on Haiku
+
+
+diff --git a/src/runtime/kwalletd/CMakeLists.txt b/src/runtime/kwalletd/CMakeLists.txt
+index 2a0c3da..e541855 100644
+--- a/src/runtime/kwalletd/CMakeLists.txt
+++ b/src/runtime/kwalletd/CMakeLists.txt
+@@ -142,6 +142,10 @@ install(
+     DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}
+ )
+ 
+if (HAIKU)
+    target_link_libraries(kwalletd6 network)
+endif ()
+
+ target_link_libraries(kwalletd6
+     KF6WalletBackend
+     KF6Wallet
+-- 
+2.45.2
+
+
+From 10ebc35010c2135597daf5af83dc3398f65f5bb4 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sun, 25 Feb 2024 22:49:23 +1000
+Subject: Disable HAVE_X11
+
+
+diff --git a/src/runtime/kwalletd/kwalletd.cpp b/src/runtime/kwalletd/kwalletd.cpp
+index f6fd29a..16eedca 100644
+--- a/src/runtime/kwalletd/kwalletd.cpp
+++ b/src/runtime/kwalletd/kwalletd.cpp
+@@ -36,7 +36,7 @@
+ #include <kwalletentry.h>
+ #include <kwindowsystem.h>
+ 
+-#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU)
+ #define HAVE_X11 1
+ #include <KX11Extras>
+ #else
+-- 
+2.45.2
+
--- a/kde-frameworks/solid/patches/solid-6.5.0.patchset
+++ b/kde-frameworks/solid/patches/solid-6.5.0.patchset
@@ -1,14 +1,14 @@
-From 1db2158cad9078669798f2e91d87a7273665aec0 Mon Sep 17 00:00:00 2001
+From c885c45079e8eff5e2a9fd8859ce5a2ae0054e16 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Sat, 14 Dec 2019 17:49:04 +0300
 Subject: Fix build on Haiku


 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4c890d9..32ca2fb 100644
+index 824fac5..5a49055 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -130,7 +130,7 @@ elseif (APPLE)
+@@ -139,7 +139,7 @@ elseif (APPLE)
     add_device_backend(iokit)
 elseif (WIN32)
     add_device_backend(win)
@@ -18,5 +18,5 @@ index 4c890d9..32ca2fb 100644
     add_device_backend(fstab)
 
 -- 
-2.43.2
+2.45.2

--- a/kde-frameworks/solid/solid6-6.5.0.recipe
+++ b/kde-frameworks/solid/solid6-6.5.0.recipe
@@ -13,7 +13,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/solid-${portVersion}.tar.xz"
-CHECKSUM_SHA256="002a0d2b27599bebc721516681d327876962fdcaf9940f033634fb93a4f9d722"
+CHECKSUM_SHA256="e8237c6c9617bef4bf5fc74461bb7417ca57afe15d4f54878cfe8c806e706a5c"
 SOURCE_DIR="solid-$portVersion"
 PATCHES="solid-$portVersion.patchset"

@@ -67,6 +67,7 @@ BUILD()
 	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF
@@ -82,7 +83,7 @@ INSTALL()

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

@@ -90,5 +91,5 @@ TEST()
 {
 	# 67% tests passed, 1 tests failed out of 3
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
-	make -Cbuild test
+	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/sonnet/patches/sonnet-6.5.0.patchset
+++ b/kde-frameworks/sonnet/patches/sonnet-6.5.0.patchset
@@ -1,4 +1,4 @@
-From 13771097640cdc547651e942920871e439b380aa Mon Sep 17 00:00:00 2001
+From 7661299086600dfb5dc507c027584de145b05cc0 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 2 Mar 2019 23:57:01 +1000
 Subject: Add hunspell dictionary paths for Haiku
@@ -19,10 +19,10 @@ index b9359f8..b63bba3 100644
     maybeAddPath(QStringLiteral("/System/Library/Spelling"));
     maybeAddPath(QStringLiteral("/usr/share/hunspell/"));
 -- 
-2.43.2
+2.45.2


-From ca6c9701c46391d7394954447893fc947ce91808 Mon Sep 17 00:00:00 2001
+From 630c3f81572fff6c42973df5b05cb13244ff24bb Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 14 Dec 2020 16:14:26 +0300
 Subject: Set en_US as default language
@@ -42,5 +42,5 @@ index cb792ab..216427a 100644
 
 QStringList Settings::defaultPreferredLanguages()
 -- 
-2.43.2
+2.45.2

--- a/kde-frameworks/sonnet/sonnet6-6.5.0.recipe
+++ b/kde-frameworks/sonnet/sonnet6-6.5.0.recipe
@@ -13,7 +13,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/sonnet-${portVersion}.tar.xz"
-CHECKSUM_SHA256="84e712ad56bc94ff8efc9bddfab41f6c327121b3ddd69030e940acc9133627ed"
+CHECKSUM_SHA256="7e86b6f82b7951c3e81cea75f79baf7a8a0f884fcb024f02a6153a467a3de1aa"
 SOURCE_DIR="sonnet-$portVersion"
 PATCHES="sonnet-$portVersion.patchset"

@@ -35,6 +35,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libaspell$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
+	lib:libhunspell_1.7$secondaryArchSuffix
 	lib:libQt6Core$secondaryArchSuffix
 	lib:libQt6Gui$secondaryArchSuffix
 	lib:libQt6Widgets$secondaryArchSuffix
@@ -54,6 +55,7 @@ BUILD_REQUIRES="
 	extra_cmake_modules$secondaryArchSuffix >= $portVersion
 	qt6_tools${secondaryArchSuffix}_devel
 	devel:libaspell$secondaryArchSuffix
+	devel:libhunspell_1.7$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6Qml$secondaryArchSuffix
 	"
@@ -63,6 +65,7 @@ BUILD_PREREQUIRES="
 	cmd:doxygen >= 1.9
 	cmd:g++$secondaryArchSuffix
 	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
 	"

 TEST_REQUIRES="
@@ -75,8 +78,8 @@ BUILD()
 		-DCMAKE_BUILD_TYPE=Release \
 		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
 		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
 		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF
@@ -93,7 +96,7 @@ INSTALL()

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

@@ -101,5 +104,5 @@ TEST()
 {
 	# 83% tests passed, 1 tests failed out of 6
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
-	make -Cbuild test
+	ctest --test-dir build --output-on-failure
 }