From e2608701fe8838bd5eb286a133eeea5dd421bd32 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 13 Mar 2025 09:04:31 +0000
Subject: [PATCH] kwrite, bump to 24.12.3 (#11945)

---
 ...e-24.12.0.recipe => kwrite-24.12.3.recipe} | 21 ++++++++++++-------
 ....12.0.patchset => kwrite-24.12.3.patchset} |  6 +++---
 2 files changed, 16 insertions(+), 11 deletions(-)
 rename kde-base/kwrite/{kwrite-24.12.0.recipe => kwrite-24.12.3.recipe} (90%)
 rename kde-base/kwrite/patches/{kwrite-24.12.0.patchset => kwrite-24.12.3.patchset} (93%)

diff --git a/kde-base/kwrite/kwrite-24.12.0.recipe b/kde-base/kwrite/kwrite-24.12.3.recipe
similarity index 90%
rename from kde-base/kwrite/kwrite-24.12.0.recipe
rename to kde-base/kwrite/kwrite-24.12.3.recipe
index f577fe550..3dbc12af4 100644
--- a/kde-base/kwrite/kwrite-24.12.0.recipe
+++ b/kde-base/kwrite/kwrite-24.12.3.recipe
@@ -49,11 +49,11 @@ Backup and Restore
 * swap files to recover data on system crash
 * undo / redo system"
 HOMEPAGE="https://www.kde.org/applications/utilities/kwrite/"
-COPYRIGHT="2010-2024 KDE Organisation"
+COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU LGPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kate-$portVersion.tar.xz"
-CHECKSUM_SHA256="a5926a0d85c69ca2cc34d87e567501e795e95050e16f896e39cd8cac4ced2348"
+CHECKSUM_SHA256="c8952fe8730411b301344bcc69c4efcc11e1447c01b99a0916b63d59e5d6357f"
 SOURCE_DIR="kate-$portVersion"
 PATCHES="kwrite-$portVersion.patchset"
 ADDITIONAL_FILES="kwrite.rdef.in"
@@ -63,7 +63,7 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	kwrite$secondaryArchSuffix = $portVersion
-	cmd:kwrite$secondaryArchSuffix = $portVersion
+	app:KWrite$secondaryArchSuffix = $portVersion
 	lib:libkateprivate$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
@@ -76,6 +76,7 @@ REQUIRES="
 	lib:libKF6ConfigWidgets$secondaryArchSuffix
 	lib:libKF6CoreAddons$secondaryArchSuffix
 	lib:libKF6Crash$secondaryArchSuffix
+	lib:libKF6GuiAddons$secondaryArchSuffix
 	lib:libKF6I18n$secondaryArchSuffix
 	lib:libKF6IconThemes$secondaryArchSuffix
 	lib:libKF6JobWidgets$secondaryArchSuffix
@@ -108,12 +109,13 @@ BUILD_REQUIRES="
 	devel:libKF6IconThemes$secondaryArchSuffix
 	devel:libKF6TextEditor$secondaryArchSuffix
 	devel:libKF6UserFeedbackCore$secondaryArchSuffix
+	devel:libKF6XmlGui$secondaryArchSuffix
 	# Qt6
 	devel:libQt6Core$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:find
+#	cmd:find
 	cmd:g++$secondaryArchSuffix
 	cmd:make
 	cmd:msgfmt$secondaryArchSuffix
@@ -125,6 +127,7 @@ BUILD()
 {
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
+		-DCMAKE_INSTALL_BINDIR=$appsDir \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_kate=FALSE \
 		-DBUILD_addons=FALSE \
@@ -142,7 +145,9 @@ INSTALL()
 	rm -rf $dataDir/{applications,icons,metainfo}
 	find $dataDir/locale -type f ! -name 'kwrite.mo' -delete
 
-	local APP_SIGNATURE="application/x-vnd.Qt6-kwrite"
+	mv $appsDir/kwrite $appsDir/KWrite
+
+	local APP_SIGNATURE="application/x-vnd.kde-kwrite"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
 	local MINOR="`echo "$portVersion" | cut -d. -f3`"
@@ -155,8 +160,8 @@ INSTALL()
 		-e "s|@LONG_INFO@|$LONG_INFO|" \
 		$portDir/additional-files/kwrite.rdef.in > kwrite.rdef
 
-	addResourcesToBinaries kwrite.rdef $binDir/kwrite
-	addAppDeskbarSymlink $binDir/kwrite Kwrite
+	addResourcesToBinaries kwrite.rdef $appsDir/KWrite
+	addAppDeskbarSymlink $appsDir/KWrite
 }
 
 TEST()
diff --git a/kde-base/kwrite/patches/kwrite-24.12.0.patchset b/kde-base/kwrite/patches/kwrite-24.12.3.patchset
similarity index 93%
rename from kde-base/kwrite/patches/kwrite-24.12.0.patchset
rename to kde-base/kwrite/patches/kwrite-24.12.3.patchset
index 235e93964..57ef81b33 100644
--- a/kde-base/kwrite/patches/kwrite-24.12.0.patchset
+++ b/kde-base/kwrite/patches/kwrite-24.12.3.patchset
@@ -1,4 +1,4 @@
-From 534e4fdbae238c2834f43f9438390ef8f2efea14 Mon Sep 17 00:00:00 2001
+From fd11714115783e56957a4d1168038deb48ce4512 Mon Sep 17 00:00:00 2001
 From: Schrijvers Luc <begasus@gmail.com>
 Date: Mon, 23 Dec 2024 07:46:09 +0100
 Subject: Use Haiku's icon/color schemes
@@ -21,7 +21,7 @@ index cd392fa..3b11b43 100644
  #if defined(Q_OS_WIN)
      // try to attach to console for terminal detection and output
 diff --git a/apps/lib/katemainwindow.cpp b/apps/lib/katemainwindow.cpp
-index 1ee0a2d..cf4de7c 100644
+index 15d09b8..0b420dd 100644
 --- a/apps/lib/katemainwindow.cpp
 +++ b/apps/lib/katemainwindow.cpp
 @@ -280,10 +280,12 @@ void KateMainWindow::setupImportantActions()
@@ -38,5 +38,5 @@ index 1ee0a2d..cf4de7c 100644
      QAction *a = ac->addAction(KStandardAction::Back, QStringLiteral("view_prev_tab"));
      a->setText(i18n("&Previous Tab"));
 -- 
-2.45.2
+2.48.1