Add KF6 frameworks, kwallet6 and compat for KF5 (#10504)

2026-04-22 19:50:05 +02:00 · 2024-05-29 09:05:39 +02:00
parent ba4fc67857
commit 0dcb9dd7de
3 changed files with 190 additions and 24 deletions
--- a/kde-frameworks/kwallet/kwallet-5.115.0.recipe
+++ b/kde-frameworks/kwallet/kwallet-5.115.0.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="Safe desktop-wide storage for passwords."
 HOMEPAGE="https://invent.kde.org/frameworks/kwallet/"
 COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kwallet-${portVersion}.tar.xz"
 CHECKSUM_SHA256="f2b3fc21c89440c9290703929a8bcb77461fa510fd060c33d64787c9e0eaef3d"
 PATCHES="kwallet-$portVersion.patchset"
@@ -13,10 +13,10 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	kwallet$secondaryArchSuffix = $portVersion
-	cmd:kwallet_query$secondaryArchSuffix = $portVersion
-	cmd:kwalletd5$secondaryArchSuffix = $portVersion
+#	cmd:kwallet_query$secondaryArchSuffix = $portVersion
+#	cmd:kwalletd5$secondaryArchSuffix = $portVersion
 	lib:libKF5Wallet$secondaryArchSuffix = $portVersion compat >= 5
-	lib:libkwalletbackend5$secondaryArchSuffix = $portVersion compat >= 5
+#	lib:libkwalletbackend5$secondaryArchSuffix = $portVersion compat >= 5
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -40,13 +40,13 @@ REQUIRES="
 	lib:libQt5DBus$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
-	lib:libQt5Xml$secondaryArchSuffix	
+	lib:libQt5Xml$secondaryArchSuffix
 	"

 PROVIDES_devel="
 	kwallet${secondaryArchSuffix}_devel = $portVersion
 	devel:libKF5Wallet$secondaryArchSuffix = $portVersion compat >= 5
-	devel:libkwalletbackend5$secondaryArchSuffix = $portVersion compat >= 5
+#	devel:libkwalletbackend5$secondaryArchSuffix = $portVersion compat >= 5
 	"
 REQUIRES_devel="
 	kwallet$secondaryArchSuffix == $portVersion base
@@ -85,31 +85,25 @@ BUILD_PREREQUIRES="
 	cmd:python3.10
 	"

-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 \
 		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
-
-	make $jobArgs
+		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DBUILD_KWALLETD=OFF \
+		-DBUILD_TESTING=OFF \
+		-DBUILD_KWALLET_QUERY=OFF
+	make -Cbuild $jobArgs
 }

 INSTALL()
 {
-	cd build
-	make install
+	make -Cbuild install

-	prepareInstalledDevelLibs \
-		libKF5Wallet libkwalletbackend5
+	prepareInstalledDevelLib \
+		libKF5Wallet
+		# libkwalletbackend5

 	packageEntries devel \
 		$libDir/cmake \
@@ -119,6 +113,5 @@ INSTALL()

 TEST()
 {
-	cd build
-	make test
+	make -Cbuild test
 }
--- a/kde-frameworks/kwallet/kwallet6-6.2.0.recipe
+++ b/kde-frameworks/kwallet/kwallet6-6.2.0.recipe
@@ -0,0 +1,126 @@
+SUMMARY="The KWallet Framework"
+DESCRIPTION="Safe desktop-wide storage for passwords."
+HOMEPAGE="https://invent.kde.org/frameworks/kwallet"
+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"
+SOURCE_DIR="kwallet-$portVersion"
+PATCHES="kwallet-$portVersion.patchset"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	kwallet6$secondaryArchSuffix = $portVersion
+	cmd:kwallet_query$secondaryArchSuffix = $portVersion
+	cmd:kwalletd6$secondaryArchSuffix = $portVersion
+	lib:libKF6Wallet$secondaryArchSuffix = $libVersionCompat
+	lib:libKF6WalletBackend$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libassuan$secondaryArchSuffix
+	lib:libgcrypt$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libgpgme$secondaryArchSuffix
+	lib:libgpgmepp$secondaryArchSuffix
+	lib:libKF6Codecs$secondaryArchSuffix
+	lib:libKF6ColorScheme$secondaryArchSuffix
+	lib:libKF6ConfigCore$secondaryArchSuffix
+	lib:libKF6ConfigWidgets$secondaryArchSuffix
+	lib:libKF6CoreAddons$secondaryArchSuffix
+	lib:libKF6DBusAddons$secondaryArchSuffix
+	lib:libKF6I18n$secondaryArchSuffix
+	lib:libKF6IconThemes$secondaryArchSuffix
+	lib:libKF6Notifications$secondaryArchSuffix
+	lib:libKF6Service$secondaryArchSuffix
+	lib:libKF6WidgetsAddons$secondaryArchSuffix
+	lib:libKF6WindowSystem$secondaryArchSuffix
+	lib:libqca_Qt6$secondaryArchSuffix
+	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6DBus$secondaryArchSuffix
+	lib:libQt6Gui$secondaryArchSuffix
+	lib:libQt6Widgets$secondaryArchSuffix
+	lib:libQt6Xml$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	kwallet6${secondaryArchSuffix}_devel = $portVersion
+	devel:libKF6Wallet$secondaryArchSuffix = $libVersionCompat
+	devel:libKF6WalletBackend$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	kwallet6$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules$secondaryArchSuffix >= $portVersion
+	qt6_tools${secondaryArchSuffix}_devel
+	devel:libgcrypt$secondaryArchSuffix
+	devel:libgpgmepp$secondaryArchSuffix
+	devel:libKF6Codecs$secondaryArchSuffix == $portVersion
+	devel:libKF6ColorScheme$secondaryArchSuffix == $portVersion
+	devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion
+	devel:libKF6ConfigWidgets$secondaryArchSuffix == $portVersion
+	devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion
+	devel:libKF6DBusAddons$secondaryArchSuffix == $portVersion
+#	devel:libKF6DocTools$secondaryArchSuffix == $portVersion
+	devel:libKF6I18n$secondaryArchSuffix == $portVersion
+	devel:libKF6IconThemes$secondaryArchSuffix == $portVersion
+	devel:libKF6Notifications$secondaryArchSuffix == $portVersion
+	devel:libKF6Service$secondaryArchSuffix == $portVersion
+	devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion
+	devel:libKF6WindowSystem$secondaryArchSuffix == $portVersion
+	devel:libqca_Qt6$secondaryArchSuffix
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6DBus$secondaryArchSuffix
+	devel:libQt6Gui$secondaryArchSuffix
+	devel:libQt6Qml$secondaryArchSuffix
+	devel:libQt6Widgets$secondaryArchSuffix
+	devel:libQt6Xml$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:dot
+	cmd:doxygen >= 1.9
+	cmd:g++$secondaryArchSuffix
+	cmd:make
+	cmd:python3
+	"
+
+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
+
+	prepareInstalledDevelLibs \
+		libKF6Wallet \
+		libKF6WalletBackend
+
+	packageEntries devel \
+		$developDir \
+		$dataDir/doc \
+		$libDir/cmake
+}
+
+TEST()
+{
+	# 50% tests passed, 1 tests failed out of 2 (1 crash)
+	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
+	make -Cbuild test
+}
--- a/kde-frameworks/kwallet/patches/kwallet-6.2.0.patchset
+++ b/kde-frameworks/kwallet/patches/kwallet-6.2.0.patchset
@@ -0,0 +1,47 @@
+From ce863f1f42f786fcf8cca3dde3c69ab4ceb0de39 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.43.2
+
+
+From 9a5cbc6f4b3e0126f09efc9d6909796d453e0389 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.43.2
+