From 41afafe2674b10e321565b5042e766a2eae99cd6 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 8 Feb 2025 08:00:17 +0100
Subject: [PATCH] konversation, bump version (#11746)

---
 ...2.0.recipe => konversation-24.12.2.recipe} | 19 +++++++------------
 ...patchset => konversation-24.12.2.patchset} |  4 ++--
 2 files changed, 9 insertions(+), 14 deletions(-)
 rename net-irc/konversation/{konversation-24.12.0.recipe => konversation-24.12.2.recipe} (91%)
 rename net-irc/konversation/patches/{konversation-24.12.0.patchset => konversation-24.12.2.patchset} (92%)

diff --git a/net-irc/konversation/konversation-24.12.0.recipe b/net-irc/konversation/konversation-24.12.2.recipe
similarity index 91%
rename from net-irc/konversation/konversation-24.12.0.recipe
rename to net-irc/konversation/konversation-24.12.2.recipe
index d2a7e3190..a62966048 100644
--- a/net-irc/konversation/konversation-24.12.0.recipe
+++ b/net-irc/konversation/konversation-24.12.2.recipe
@@ -6,7 +6,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/konversation-$portVersion.tar.xz"
-CHECKSUM_SHA256="1e8080a78372bc09e812c9278550763b8328f7aa78fcb3c93f04e492a5a3cd88"
+CHECKSUM_SHA256="b3a9396a42289ee7c69bd690c0a8961545eb1dc578a5d397b320be0725244a18"
 SOURCE_DIR="konversation-$portVersion"
 PATCHES="konversation-$portVersion.patchset"
 ADDITIONAL_FILES="konversation.rdef.in"
@@ -14,16 +14,9 @@ ADDITIONAL_FILES="konversation.rdef.in"
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
-commandBinDir=$binDir
-commandSuffix=$secondaryArchSuffix
-if [ "$targetArchitecture" = x86_gcc2 ]; then
-	commandSuffix=
-	commandBinDir=$prefix/bin
-fi
-
 PROVIDES="
 	konversation$secondaryArchSuffix = $portVersion
-	cmd:konversation$commandSuffix = $portVersion
+	app:Konversation$commandSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -126,7 +119,7 @@ BUILD()
 {
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
-		-DCMAKE_INSTALL_BINDIR=$commandBinDir \
+		-DCMAKE_INSTALL_BINDIR=$appsDir \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_TESTING=OFF
 
@@ -139,6 +132,8 @@ INSTALL()
 
 	rm -rf $dataDir/{applications,icons,metainfo}
 
+	mv $appsDir/konversation $appsDir/Konversation
+
 	local APP_SIGNATURE="application/x-vnd.kde-konversation"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
@@ -150,8 +145,8 @@ INSTALL()
 		-e "s|@MINOR@|$MINOR|" \
 		$portDir/additional-files/konversation.rdef.in > konversation.rdef
 
-	addResourcesToBinaries konversation.rdef $commandBinDir/konversation
-	addAppDeskbarSymlink $commandBinDir/konversation Konversation
+	addResourcesToBinaries konversation.rdef $appsDir/Konversation
+	addAppDeskbarSymlink $appsDir/Konversation
 }
 
 TEST()
diff --git a/net-irc/konversation/patches/konversation-24.12.0.patchset b/net-irc/konversation/patches/konversation-24.12.2.patchset
similarity index 92%
rename from net-irc/konversation/patches/konversation-24.12.0.patchset
rename to net-irc/konversation/patches/konversation-24.12.2.patchset
index 774616b98..345aecc78 100644
--- a/net-irc/konversation/patches/konversation-24.12.0.patchset
+++ b/net-irc/konversation/patches/konversation-24.12.2.patchset
@@ -1,4 +1,4 @@
-From 855ed856606687aff9763f3b47507ac24fc4bca7 Mon Sep 17 00:00:00 2001
+From f35f1999f7d55ad6f54ec0b1e00b7e7c85b262cb Mon Sep 17 00:00:00 2001
 From: Schrijvers Luc <begasus@gmail.com>
 Date: Fri, 27 Dec 2024 16:58:54 +0100
 Subject: Haiku build fixes
@@ -6,7 +6,7 @@ Subject: Haiku build fixes
 Co-authored-by: Gerasim Troeglazov <3dEyes@gmail.com>
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fe16dc4..560b663 100644
+index 4e8208a..c40d119 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -71,7 +71,7 @@ find_package(KF6 REQUIRED COMPONENTS