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

haikuports · Aug 28, 2024 · 9e0fd3f · 9e0fd3f
1 parent 7adcfae
commit 9e0fd3f
Show file tree

Hide file tree

Showing 16 changed files with 235 additions and 73 deletions.
diff --git a/kde-frameworks/kauth/kauth6-6.2.0.recipe → kde-frameworks/kauth/kauth6-6.5.0.recipe b/kde-frameworks/kauth/kauth6-6.2.0.recipe → 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,13 +77,13 @@ INSTALL()
 
 	packageEntries devel \
 		$developDir \
-		$dataDir/doc \
+		$documentationDir \
 		$libDir/cmake
 }
 
 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
 }
diff --git a/...works/kbookmarks/kbookmarks6-6.2.0.recipe → ...works/kbookmarks/kbookmarks6-6.5.0.recipe b/...works/kbookmarks/kbookmarks6-6.2.0.recipe → ...works/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
 }
diff --git a/...s/kglobalaccel/kglobalaccel6-6.2.0.recipe → ...s/kglobalaccel/kglobalaccel6-6.5.0.recipe b/...s/kglobalaccel/kglobalaccel6-6.2.0.recipe → ...s/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
 }
diff --git a/kde-frameworks/kio/kio6-6.2.0.recipe → kde-frameworks/kio/kio6-6.5.0.recipe b/kde-frameworks/kio/kio6-6.2.0.recipe → 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
 }
diff --git a/...frameworks/kio/patches/kio-6.2.0.patchset → ...frameworks/kio/patches/kio-6.5.0.patchset b/...frameworks/kio/patches/kio-6.2.0.patchset → ...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
 
diff --git a/...rameworks/kirigami/kirigami6-6.2.0.recipe → ...rameworks/kirigami/kirigami6-6.5.0.recipe b/...rameworks/kirigami/kirigami6-6.2.0.recipe → ...rameworks/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
 }