From 1ce9116e1f5d1e7f75075f2c4e216eeb53f88d9c Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 21 Mar 2025 14:21:30 +0000
Subject: [PATCH] kpimtextedit_kf6, add KF6 version 24.12.3 (#12030)

---
 ...recipe => kpimtextedit_kf6-24.12.3.recipe} | 46 +++++++++++++------
 1 file changed, 32 insertions(+), 14 deletions(-)
 rename kde-apps/kpimtextedit/{kpimtextedit24-24.05.1.recipe => kpimtextedit_kf6-24.12.3.recipe} (80%)

diff --git a/kde-apps/kpimtextedit/kpimtextedit24-24.05.1.recipe b/kde-apps/kpimtextedit/kpimtextedit_kf6-24.12.3.recipe
similarity index 80%
rename from kde-apps/kpimtextedit/kpimtextedit24-24.05.1.recipe
rename to kde-apps/kpimtextedit/kpimtextedit_kf6-24.12.3.recipe
index 3d1c0d4b0..23ff35afc 100644
--- a/kde-apps/kpimtextedit/kpimtextedit24-24.05.1.recipe
+++ b/kde-apps/kpimtextedit/kpimtextedit_kf6-24.12.3.recipe
@@ -2,21 +2,21 @@ SUMMARY="Advanced text editor which provide advanced html feature"
 DESCRIPTION="KPIMTextedit is a library that provides an enhanced text edit class, see TextEdit. \
 This text is highlighted with a EMailQuoteHighlighter."
 HOMEPAGE="https://api.kde.org/kdepim/kpimtextedit/html"
-COPYRIGHT="2010-2024 KDE Organisation"
+COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kpimtextedit-$portVersion.tar.xz"
-CHECKSUM_SHA256="f8faf3ffb234fcd92146f736a8eb2dc4eba30016d04e477ab39e8624b54cfc31"
+CHECKSUM_SHA256="2f3239d612b7617815fa1748fadce28110814047db2bab7c6ec2b760b1eebc2e"
 SOURCE_DIR="kpimtextedit-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
-libVersion="6.1.1"
+libVersion="6.3.3"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
-	kpimtextedit24$secondaryArchSuffix = $portVersion
+	kpimtextedit_kf6$secondaryArchSuffix = $portVersion
 	lib:libKPim6TextEdit$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -31,6 +31,7 @@ REQUIRES="
 	lib:libKF6ConfigGui$secondaryArchSuffix
 	lib:libKF6ConfigWidgets$secondaryArchSuffix
 	lib:libKF6CoreAddons$secondaryArchSuffix
+	lib:libKF6GuiAddons$secondaryArchSuffix
 	lib:libKF6I18n$secondaryArchSuffix
 	lib:libKF6KIOCore$secondaryArchSuffix
 	lib:libKF6JobWidgets$secondaryArchSuffix
@@ -52,13 +53,25 @@ REQUIRES="
 	lib:libQt6Widgets$secondaryArchSuffix
 	lib:libQt6Xml$secondaryArchSuffix
 	"
+REPLACES="
+	kpimtextedit24$secondaryArchSuffix
+	"
 
 PROVIDES_devel="
-	kpimtextedit24${secondaryArchSuffix}_devel = $portVersion
+	kpimtextedit_kf6${secondaryArchSuffix}_devel = $portVersion
 	devel:libKPim6TextEdit$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	kpimtextedit24$secondaryArchSuffix == $portVersion base
+	kpimtextedit_kf6$secondaryArchSuffix == $portVersion base
+	"
+
+ARCHITECTURES_doc="any"
+
+PROVIDES_doc="
+	kpimtextedit_kf6${secondaryArchSuffix}_doc = $portVersion
+	"
+REQUIRES_doc="
+	kpimtextedit_kf6$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
@@ -73,6 +86,7 @@ BUILD_REQUIRES="
 	devel:libKF6ConfigCore$secondaryArchSuffix
 	devel:libKF6ConfigWidgets$secondaryArchSuffix
 	devel:libKF6CoreAddons$secondaryArchSuffix
+	devel:libKF6GuiAddons$secondaryArchSuffix
 	devel:libKF6I18n$secondaryArchSuffix
 	devel:libKF6IconThemes$secondaryArchSuffix
 	devel:libKF6ItemViews$secondaryArchSuffix
@@ -105,8 +119,8 @@ BUILD_PREREQUIRES="
 	cmd:doxygen
 	cmd:g++$secondaryArchSuffix
 	cmd:make
-	cmd:msgfmt
-	cmd:msgmerge
+	cmd:msgfmt$secondaryArchSuffix
+	cmd:msgmerge$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
@@ -116,12 +130,14 @@ TEST_REQUIRES="
 
 BUILD()
 {
-	cmake -Bbuild -S. $cmakeDirArgs \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
+	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON \
-		-DBUILD_TESTING=OFF
+		-DBUILD_TESTING=OFF \
+		-Wno-dev
+
 	make -C build $jobArgs
 }
 
@@ -134,13 +150,15 @@ INSTALL()
 
 	packageEntries devel \
 		$developDir \
-		$documentationDir \
 		$libDir/cmake
+
+	packageEntries doc \
+		$documentationDir
 }
 
 TEST()
 {
-	# 78% tests passed, 2 tests failed out of 9 (manual intervention needed)
+	# 89% tests passed, 1 tests failed out of 9
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
 	ctest --test-dir build --output-on-failure
 }