From 630c52500ee70b985154a47cefde87f1c73f964a Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 8 May 2025 13:07:15 +0200
Subject: [PATCH] kosmindoormap_kf6, more cleanup (#12348)

---
 .../kosmindoormap_kf6-25.04.0.recipe           | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/dev-libs/kosmindoormap/kosmindoormap_kf6-25.04.0.recipe b/dev-libs/kosmindoormap/kosmindoormap_kf6-25.04.0.recipe
index b12703086..1e0a08501 100644
--- a/dev-libs/kosmindoormap/kosmindoormap_kf6-25.04.0.recipe
+++ b/dev-libs/kosmindoormap/kosmindoormap_kf6-25.04.0.recipe
@@ -4,7 +4,7 @@ a (large) train station."
 HOMEPAGE="https://invent.kde.org/libraries/kosmindoormap"
 COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kosmindoormap-$portVersion.tar.xz"
 CHECKSUM_SHA256="b85994daf6f71629281774825e09aee1b014813a9741ed98b70baff3cf56ab50"
 SOURCE_DIR="kosmindoormap-$portVersion"
@@ -26,10 +26,11 @@ REQUIRES="
 	lib:libDetour$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libKOpeningHours$secondaryArchSuffix
+	lib:libRecast$secondaryArchSuffix
+	# Qt6
 	lib:libQt6Core$secondaryArchSuffix
 	lib:libQt6Gui$secondaryArchSuffix
 	lib:libQt6Network$secondaryArchSuffix
-	lib:libRecast$secondaryArchSuffix
 	"
 REPLACES="
 	kosmindoormap24$secondaryArchSuffix
@@ -47,22 +48,24 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix
 #	osmctools$secondaryArchSuffix
 	devel:libDetour$secondaryArchSuffix
+	devel:libprotobuf$secondaryArchSuffix >= 31
+	devel:libRecast$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	# KF6
+	extra_cmake_modules$secondaryArchSuffix
 	devel:libKF6ConfigCore$secondaryArchSuffix
 	devel:libKF6CoreAddons$secondaryArchSuffix
 	devel:libKF6I18n$secondaryArchSuffix
 	devel:libKF6Service$secondaryArchSuffix
 	devel:libKOpeningHours$secondaryArchSuffix
 	devel:libKPublicTransport$secondaryArchSuffix
-	devel:libprotobuf$secondaryArchSuffix >= 31
+	# Qt6
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6Gui$secondaryArchSuffix
 	devel:libQt6Network$secondaryArchSuffix
 	devel:libQt6Qml$secondaryArchSuffix
-	devel:libRecast$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:bison
@@ -94,6 +97,9 @@ INSTALL()
 {
 	make -C build install
 
+	# cleanup
+	rm -rf $dataDir/qlogging-categories6
+
 	prepareInstalledDevelLibs \
 		libKOSM \
 		libKOSMIndoorMap \