From 18837057c4cfdb7cb2e5aebcc3f47fef5778c38f Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 4 May 2024 09:55:33 +0200
Subject: [PATCH] kdsoap, bump version, add qt6 package (#10411)

---
 ...p-2.0.0.recipe => kdsoap_qt5-2.2.0.recipe} | 23 ++---
 net-libs/kdsoap/kdsoap_qt6-2.2.0.recipe       | 93 +++++++++++++++++++
 2 files changed, 105 insertions(+), 11 deletions(-)
 rename net-libs/kdsoap/{kdsoap-2.0.0.recipe => kdsoap_qt5-2.2.0.recipe} (82%)
 create mode 100644 net-libs/kdsoap/kdsoap_qt6-2.2.0.recipe

diff --git a/net-libs/kdsoap/kdsoap-2.0.0.recipe b/net-libs/kdsoap/kdsoap_qt5-2.2.0.recipe
similarity index 82%
rename from net-libs/kdsoap/kdsoap-2.0.0.recipe
rename to net-libs/kdsoap/kdsoap_qt5-2.2.0.recipe
index b5ee57c69..9225e5c83 100644
--- a/net-libs/kdsoap/kdsoap-2.0.0.recipe
+++ b/net-libs/kdsoap/kdsoap_qt5-2.2.0.recipe
@@ -12,9 +12,10 @@ HOMEPAGE="https://github.com/KDAB/KDSoap"
 COPYRIGHT="KDAB"
 LICENSE="GNU GPL v3
 	GNU LGPL v3"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/KDAB/KDSoap/releases/download/kdsoap-$portVersion/kdsoap-$portVersion.tar.gz"
-CHECKSUM_SHA256="d18963104fa6f7d02b044631cddbe78f18f70e06c607af680c7ace04d6cf04ee"
+CHECKSUM_SHA256="d9ef11948442197c9fa44bd6fbadc842b7280a60dfc40577af66fded637af356"
+SOURCE_DIR="kdsoap-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -30,7 +31,7 @@ libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
-	kdsoap$secondaryArchSuffix = $portVersion	
+	kdsoap_qt5$secondaryArchSuffix = $portVersion
 	cmd:kdwsdl2cpp$commandSuffix = $portVersion
 	lib:libkdsoap$secondaryArchSuffix = $libVersionCompat
 	lib:libkdsoap_server$secondaryArchSuffix = $libVersionCompat
@@ -43,12 +44,12 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	kdsoap${secondaryArchSuffix}_devel = $portVersion
+	kdsoap_qt5${secondaryArchSuffix}_devel = $portVersion
 	devel:libkdsoap$secondaryArchSuffix = $libVersionCompat
 	devel:libkdsoap_server$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	kdsoap$secondaryArchSuffix == $portVersion base
+	kdsoap_qt5$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
@@ -60,7 +61,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix	
+	cmd:ld$secondaryArchSuffix
 	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
@@ -71,7 +72,7 @@ BUILD()
 	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
 		-DCMAKE_INSTALL_BINDIR=$commandBinDir \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DINSTALL_DATADIR=$dataDir/Qt5 \
 		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs
 	make -C build $jobArgs
 }
@@ -80,15 +81,15 @@ INSTALL()
 {
 	make -C build install
 
-	mv $dataDir/mkspecs/features $dataDir/Qt5/mkspecs
-	rm -rf $dataDir/mkspecs $docDir
-
 	# prepare develop/lib
-	prepareInstalledDevelLibs libkdsoap libkdsoap-server
+	prepareInstalledDevelLibs \
+		libkdsoap \
+		libkdsoap-server
 
 	# devel package
 	packageEntries devel \
 		$dataDir \
 		$developDir \
+		$documentationDir \
 		$libDir/cmake
 }
diff --git a/net-libs/kdsoap/kdsoap_qt6-2.2.0.recipe b/net-libs/kdsoap/kdsoap_qt6-2.2.0.recipe
new file mode 100644
index 000000000..5d27628cd
--- /dev/null
+++ b/net-libs/kdsoap/kdsoap_qt6-2.2.0.recipe
@@ -0,0 +1,93 @@
+SUMMARY="Qt-based client-side and server-side SOAP component"
+DESCRIPTION="KD Soap is a Qt-based client-side and server-side SOAP component.
+
+It can be used to create client applications for web services and also provides \
+the means to create web services without the need for any further component \
+such as a dedicated web server.
+
+KDSoap also supports writing SOAP servers easily.
+
+KD Soap targets C++ programmers who use Qt in their applications."
+HOMEPAGE="https://github.com/KDAB/KDSoap"
+COPYRIGHT="KDAB"
+LICENSE="GNU GPL v3
+	GNU LGPL v3"
+REVISION="1"
+SOURCE_URI="https://github.com/KDAB/KDSoap/releases/download/kdsoap-$portVersion/kdsoap-$portVersion.tar.gz"
+CHECKSUM_SHA256="d9ef11948442197c9fa44bd6fbadc842b7280a60dfc40577af66fded637af356"
+SOURCE_DIR="kdsoap-$portVersion"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	kdsoap_qt6$secondaryArchSuffix = $portVersion
+	cmd:kdwsdl2cpp_qt6$commandSuffix = $portVersion
+	lib:libkdsoap_qt6$secondaryArchSuffix = $libVersionCompat
+	lib:libkdsoap_server_qt6$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6Network$secondaryArchSuffix
+	lib:libQt6Xml$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	kdsoap_qt6${secondaryArchSuffix}_devel = $portVersion
+	devel:libkdsoap_qt6$secondaryArchSuffix = $libVersionCompat
+	devel:libkdsoap_server_qt6$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	kdsoap_qt6$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6Network$secondaryArchSuffix
+	devel:libQt6Xml$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:g++$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs \
+		-DKDSoap_QT6=ON \
+		-DCMAKE_INSTALL_BINDIR=$commandBinDir \
+		-DINSTALL_DATADIR=$dataDir/Qt6 \
+		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs
+	make -Cbuild $jobArgs
+}
+
+INSTALL()
+{
+	make -Cbuild install
+
+	prepareInstalledDevelLibs \
+		libkdsoap-qt6 \
+		libkdsoap-server-qt6
+
+	packageEntries devel \
+		$dataDir \
+		$developDir \
+		$documentationDir \
+		$libDir/cmake
+}