From 9bcad307bdd5e206f959d980f8225f6a57f6ff78 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 29 May 2024 10:40:17 +0200
Subject: [PATCH] Add KF6 frameworks, kglobalaccel6 and compat for KF5 (#10510)

---
 .../kglobalaccel/kglobalaccel-5.115.0.recipe  |  30 ++---
 .../kglobalaccel/kglobalaccel6-6.2.0.recipe   | 105 ++++++++++++++++++
 2 files changed, 116 insertions(+), 19 deletions(-)
 create mode 100644 kde-frameworks/kglobalaccel/kglobalaccel6-6.2.0.recipe

diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.115.0.recipe b/kde-frameworks/kglobalaccel/kglobalaccel-5.115.0.recipe
index 14e3e726d..9b8c08082 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.115.0.recipe
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.115.0.recipe
@@ -5,7 +5,7 @@ application\'s window does not need focus for them to be activated."
 HOMEPAGE="https://invent.kde.org/frameworks/kglobalaccel/"
 COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kglobalaccel-${portVersion}.tar.xz"
 CHECKSUM_SHA256="c533d5447d0dded4a349e86dfaf97ca4e4d1def41e2ebed03fb856bfae69acc3"
 
@@ -67,40 +67,32 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-PATCH()
-{
-	sed -e '/platforms:/ a \ \ \ \ - name: Haiku' -i $sourceDir/metainfo.yaml
-}
-
 BUILD()
 {
-	mkdir -p build
-	cd build
-
-	cmake .. $cmakeDirArgs \
+	cmake -Bbuild -S. $cmakeDirArgs \
+		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs
-
-	make $jobArgs
+		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \
+		-DKF6_COMPAT_BUILD=ON \
+		-DBUILD_TESTING=OFF
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install
+	make -C build install
 
-	prepareInstalledDevelLibs \
+	prepareInstalledDevelLib \
 		libKF5GlobalAccel
 
 	packageEntries devel \
 		$libDir/cmake \
-		$dataDir/Qt5/mkspecs \
+		$dataDir/Qt5 \
 		$developDir
 }
 
 TEST()
 {
-	cd build
-	make test
+	make -C build test
 }
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel6-6.2.0.recipe b/kde-frameworks/kglobalaccel/kglobalaccel6-6.2.0.recipe
new file mode 100644
index 000000000..b625da244
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/kglobalaccel6-6.2.0.recipe
@@ -0,0 +1,105 @@
+SUMMARY="Global desktop keyboard shortcuts"
+DESCRIPTION="KGlobalAccel allows you to have global accelerators that are \
+independent of the focused window. Unlike regular shortcuts, the \
+application\'s window does not need focus for them to be activated."
+HOMEPAGE="https://invent.kde.org/frameworks/kglobalaccel"
+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"
+SOURCE_DIR="kglobalaccel-$portVersion"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	kglobalaccel6$secondaryArchSuffix = $portVersion
+	cmd:kglobalaccel6$secondaryArchSuffix = $portVersion
+	lib:libKF6GlobalAccel$secondaryArchSuffix = $libVersionCompat
+	lib:libKF6GlobalAccelPrivate$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libKF6ConfigCore$secondaryArchSuffix
+	lib:libKF6CoreAddons$secondaryArchSuffix
+	lib:libKF6Crash$secondaryArchSuffix
+	lib:libKF6DBusAddons$secondaryArchSuffix
+	lib:libKF6I18n$secondaryArchSuffix
+	lib:libKF6Service$secondaryArchSuffix
+	lib:libKF6WindowSystem$secondaryArchSuffix
+	lib:libQt6Concurrent$secondaryArchSuffix
+	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6DBus$secondaryArchSuffix
+	lib:libQt6Test$secondaryArchSuffix
+	lib:libQt6Widgets$secondaryArchSuffix
+	lib:libQt6Xml$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	kglobalaccel6${secondaryArchSuffix}_devel = $portVersion
+	devel:libKF6GlobalAccel$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	kglobalaccel6$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules$secondaryArchSuffix >= $portVersion
+	qt6_tools${secondaryArchSuffix}_devel
+	devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion
+	devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion
+	devel:libKF6Crash$secondaryArchSuffix == $portVersion
+	devel:libKF6DBusAddons$secondaryArchSuffix == $portVersion
+	devel:libKF6I18n$secondaryArchSuffix == $portVersion
+	devel:libKF6Service$secondaryArchSuffix == $portVersion
+	devel:libKF6WindowSystem$secondaryArchSuffix == $portVersion
+	devel:libQt6Concurrent$secondaryArchSuffix
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6DBus$secondaryArchSuffix
+	devel:libQt6Qml$secondaryArchSuffix
+	devel:libQt6Test$secondaryArchSuffix
+	devel:libQt6Widgets$secondaryArchSuffix
+	devel:libQt6Xml$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:dot
+	cmd:doxygen >= 1.9
+	cmd:g++$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	cmake -Bbuild -S. $cmakeDirArgs \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DBUILD_QCH=ON \
+		-DBUILD_TESTING=OFF
+	make -Cbuild $jobArgs
+}
+
+INSTALL()
+{
+	make -Cbuild install
+
+	prepareInstalledDevelLib \
+		libKF6GlobalAccel
+
+	packageEntries devel \
+		$developDir \
+		$dataDir/doc \
+		$libDir/cmake
+}
+
+TEST()
+{
+	# no tests found
+	make -C build test
+}