From 72b78a48dd6fd60945c87620db55d30caf55d40b Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 1 Jun 2024 14:29:25 +0200
Subject: [PATCH] libkomparediff2, bump version (#10558)

---
 ....recipe => libkomparediff2-24.05.0.recipe} | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)
 rename kde-apps/libkomparediff2/{libkomparediff2-24.02.2.recipe => libkomparediff2-24.05.0.recipe} (83%)

diff --git a/kde-apps/libkomparediff2/libkomparediff2-24.02.2.recipe b/kde-apps/libkomparediff2/libkomparediff2-24.05.0.recipe
similarity index 83%
rename from kde-apps/libkomparediff2/libkomparediff2-24.02.2.recipe
rename to kde-apps/libkomparediff2/libkomparediff2-24.05.0.recipe
index eaf04cc7e..c03c17015 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-24.02.2.recipe
+++ b/kde-apps/libkomparediff2/libkomparediff2-24.05.0.recipe
@@ -8,14 +8,18 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/libkomparediff2-$portVersion.tar.xz"
-CHECKSUM_SHA256="df6072b15e7fc86fa86298382fb332acd462ecc5a72ae405fef74d5d1dd272d1"
+CHECKSUM_SHA256="22ba287702dc448b3c9f457ab60c6e4cbf68fb541cd83a67bd287aa05732300e"
+SOURCE_DIR="libkomparediff2-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="5.4.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	libkomparediff2$secondaryArchSuffix = $portVersion
-	lib:libkomparediff2$secondaryArchSuffix = 5.4 compat >= 5
+	lib:libkomparediff2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -37,7 +41,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libkomparediff2${secondaryArchSuffix}_devel = $portVersion
-	devel:libkomparediff2$secondaryArchSuffix = 5.4 compat >= 5
+	devel:libkomparediff2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libkomparediff2$secondaryArchSuffix == $portVersion base
@@ -45,7 +49,7 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= 5.115
+	extra_cmake_modules$secondaryArchSuffix
 	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
 	devel:libKF5Codecs$secondaryArchSuffix
@@ -71,30 +75,23 @@ BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
 	cmd:make
-	cmd:python3.10
+	cmd:python3
 	cmd:qdbuscpp2xml$secondaryArchSuffix >= 5
 	"
 
 BUILD()
 {
-	mkdir -p build
-	cd build
-
-	cmake .. $cmakeDirArgs \
+	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
-		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
-
-	make $jobArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install
+	make -C build install
 
-	prepareInstalledDevelLibs \
+	prepareInstalledDevelLib \
 		libkomparediff2
 
 	packageEntries devel \
@@ -104,6 +101,5 @@ INSTALL()
 
 TEST()
 {
-	cd build
-	make test
+	make -C build test
 }