From 9551cc448adb47673d7486ba487cafb9377ac51e Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 13 Nov 2025 17:56:37 +0100
Subject: [PATCH] konsole, revbump, fix install (wrong $appsDir/etc in there)
 (#13213)

---
 kde-apps/konsole/konsole-23.08.5.recipe | 41 ++++++++++++++-----------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/kde-apps/konsole/konsole-23.08.5.recipe b/kde-apps/konsole/konsole-23.08.5.recipe
index 76d62b0d2..ab24a4bde 100644
--- a/kde-apps/konsole/konsole-23.08.5.recipe
+++ b/kde-apps/konsole/konsole-23.08.5.recipe
@@ -4,7 +4,7 @@ line interface for directly controlling your computer."
 HOMEPAGE="https://apps.kde.org/konsole"
 COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/konsole-$portVersion.tar.xz"
 CHECKSUM_SHA256="c6fb20753ac27a46bce62e31f7b105b6b99497035830b34a7bba1bc60260c1ca"
 PATCHES="konsole-$portVersion.patchset"
@@ -13,6 +13,10 @@ ADDITIONAL_FILES="konsole.rdef.in"
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/xdg/konsolerc keep-old
+	"
+
 PROVIDES="
 	konsole$secondaryArchSuffix = $portVersion
 	app:Konsole = $portVersion
@@ -119,38 +123,39 @@ BUILD_PREREQUIRES="
 	cmd:g++$secondaryArchSuffix
 	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
+	cmd:msgfmt$secondaryArchSuffix
+	cmd:msgmerge$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python3
 	"
 
-BUILD()
+PATCH()
 {
 	# disable docs generation
 	sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
+}
 
-	mkdir -p build
-	cd build
-
-	cmake .. \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=$appsDir \
-		-DCMAKE_INSTALL_LIBDIR=$libDir \
-		-DCMAKE_INSTALL_DATADIR=$dataDir \
-		-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
+BUILD()
+{
+	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs \
+		-DCMAKE_INSTALL_BINDIR=$prefix/bin \
 		-DSHARE_INSTALL_PREFIX=$dataDir \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
+		-DBUILD_TESTING=OFF \
+		-Wno-dev
 
-	make $jobArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install
+	make -C build install
 
-	mv $appsDir/bin/konsole $appsDir/Konsole
-	mv $appsDir/bin $prefix
+	# cleanup
+	rm -rf $dataDir/{applications,metainfo}
+
+	mkdir -p $appsDir
+	mv $prefix/bin/konsole $appsDir/Konsole
 	ln -s $appsDir/Konsole $prefix/bin/konsole
 
 	local APP_SIGNATURE="application/x-vnd.kde-konsole"