From 0371e8d63a3dae864ab24776120e96bbf26ed295 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 29 Mar 2024 09:04:07 +0100
Subject: [PATCH] ktextaddons, bump version (bugfix release) (#10268)

---
 ...-1.5.3.recipe => ktextaddons-1.5.4.recipe} | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)
 rename dev-libs/ktextaddons/{ktextaddons-1.5.3.recipe => ktextaddons-1.5.4.recipe} (90%)

diff --git a/dev-libs/ktextaddons/ktextaddons-1.5.3.recipe b/dev-libs/ktextaddons/ktextaddons-1.5.4.recipe
similarity index 90%
rename from dev-libs/ktextaddons/ktextaddons-1.5.3.recipe
rename to dev-libs/ktextaddons/ktextaddons-1.5.4.recipe
index 9d3f413fd..1c01632f3 100644
--- a/dev-libs/ktextaddons/ktextaddons-1.5.3.recipe
+++ b/dev-libs/ktextaddons/ktextaddons-1.5.4.recipe
@@ -6,7 +6,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/ktextaddons/ktextaddons-${portVersion}.tar.xz"
-CHECKSUM_SHA256="8a52db8abfa8a9d68d2d291fb0f8be20659fd7899987b4dcafdf2468db0917dc"
+CHECKSUM_SHA256="64b80602e84b25e9164620af3f6341fa865b85e826ab8f5e02061ae24a277b20"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -74,7 +74,7 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= 5.115
+	extra_cmake_modules$secondaryArchSuffix
 	devel:libKF5Archive$secondaryArchSuffix
 	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
@@ -112,6 +112,10 @@ BUILD_PREREQUIRES="
 	cmd:qdbuscpp2xml$secondaryArchSuffix >= 5
 	"
 
+TEST_REQUIRES="
+	qthaikuplugins$secondaryArchSuffix
+	"
+
 PATCH()
 {
 	sed -e '/platforms:/ a \ \ \ \ - name: Haiku' -i $sourceDir/metainfo.yaml
@@ -119,21 +123,17 @@ PATCH()
 
 BUILD()
 {
-	mkdir -p build
-	cd build
-
-	cmake .. $cmakeDirArgs \
+	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \
+		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
+		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt5 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
-
-	make $jobArgs
+	make -Cbuild $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install
+	make -Cbuild install
 
 	prepareInstalledDevelLibs \
 		libKF5TextAddonsWidgets \
@@ -148,12 +148,13 @@ INSTALL()
 		libKF5TextUtils
 
 	packageEntries devel \
-		$libDir/cmake \
-		$developDir
+		$developDir \
+		$libDir/cmake
 }
 
 TEST()
 {
-	cd build
-	make test
+	# 93% tests passed, 5 tests failed out of 76
+	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
+	make -Cbuild test
 }