From b8f533b8d2c1bf56c3af75552b0ab577d0ebc5ee Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 13 Mar 2026 19:42:14 +0100
Subject: [PATCH] marknote, bump to version 1.5.0 (#13819)

---
 ...ote-1.3.0.recipe => marknote-1.5.0.recipe} | 36 +++++++++----------
 .../marknote/patches/marknote-1.3.0.patchset  | 25 -------------
 2 files changed, 18 insertions(+), 43 deletions(-)
 rename kde-apps/marknote/{marknote-1.3.0.recipe => marknote-1.5.0.recipe} (83%)
 delete mode 100644 kde-apps/marknote/patches/marknote-1.3.0.patchset

diff --git a/kde-apps/marknote/marknote-1.3.0.recipe b/kde-apps/marknote/marknote-1.5.0.recipe
similarity index 83%
rename from kde-apps/marknote/marknote-1.3.0.recipe
rename to kde-apps/marknote/marknote-1.5.0.recipe
index 9d69339c3..88c4e72e6 100644
--- a/kde-apps/marknote/marknote-1.3.0.recipe
+++ b/kde-apps/marknote/marknote-1.5.0.recipe
@@ -5,28 +5,20 @@ easy to distinguish between them and keep your notes at your fingertips. Your no
 Markdown files in your Documents folder, making it easy to use your notes outside of Marknote as \
 well as inside the app."
 HOMEPAGE="https://invent.kde.org/office/marknote"
-COPYRIGHT="2010-2024 KDE Organisation"
+COPYRIGHT="2010-2026 KDE Organisation"
 LICENSE="GNU GPL v2"
-REVISION="6"
+REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/marknote/marknote-$portVersion.tar.xz"
-CHECKSUM_SHA256="ff99598415a6cca5900cb4d10d2b72a6f392eafe07874b6e2eb42e9f7ab3bd28"
+CHECKSUM_SHA256="6c1fa7159da0db50296f231716bbe267b6d7416864ca7da4551a50963ab8abb5"
 SOURCE_DIR="marknote-$portVersion"
-PATCHES="marknote-$portVersion.patchset"
 ADDITIONAL_FILES="marknote.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
-commandBinDir=$binDir
-commandSuffix=$secondaryArchSuffix
-if [ "$targetArchitecture" = x86_gcc2 ]; then
-	commandSuffix=
-	commandBinDir=$prefix/bin
-fi
-
 PROVIDES="
 	marknote$secondaryArchSuffix = $portVersion
-	cmd:marknote$commandSuffix = $portVersion
+	app:Marknote = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -42,8 +34,10 @@ REQUIRES="
 	lib:libKF6CoreAddons$secondaryArchSuffix
 	lib:libKF6Crash$secondaryArchSuffix
 	lib:libKF6I18n$secondaryArchSuffix
+	lib:libKF6IconThemes$secondaryArchSuffix
 	lib:libKF6ItemModels$secondaryArchSuffix
 	lib:libKF6WidgetsAddons$secondaryArchSuffix
+	lib:libKF6WindowSystem$secondaryArchSuffix
 	lib:libKF6XmlGui$secondaryArchSuffix
 	lib:libKirigami$secondaryArchSuffix
 	# KPim6
@@ -64,7 +58,6 @@ BUILD_REQUIRES="
 	devel:libKirigamiAddonsStatefulApp$secondaryArchSuffix
 	devel:libmd4c$secondaryArchSuffix
 	# KF6
-	breeze_icons${secondaryArchSuffix}_devel
 	extra_cmake_modules$secondaryArchSuffix
 	devel:libKF6Codecs$secondaryArchSuffix
 	devel:libKF6ColorScheme$secondaryArchSuffix
@@ -73,7 +66,10 @@ BUILD_REQUIRES="
 	devel:libKF6CoreAddons$secondaryArchSuffix
 	devel:libKF6Crash$secondaryArchSuffix
 	devel:libKF6I18n$secondaryArchSuffix
+	devel:libKF6IconThemes$secondaryArchSuffix
+	devel:libKF6Notifications$secondaryArchSuffix
 	devel:libKF6WidgetsAddons$secondaryArchSuffix
+	devel:libKF6WindowSystem$secondaryArchSuffix
 	devel:libKF6XmlGui$secondaryArchSuffix
 	devel:libKirigami$secondaryArchSuffix
 	# KPim6
@@ -95,10 +91,12 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
+	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
-		-DCMAKE_INSTALL_BINDIR=$commandBinDir \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake -Wno-dev
+		-DCMAKE_INSTALL_BINDIR=$appsDir \
+		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-Wno-dev
+
 	make -C build $jobArgs
 }
 
@@ -109,6 +107,8 @@ INSTALL()
 	# cleanup
 	rm -rf $dataDir/{applications,metainfo}
 
+	mv $appsDir/marknote $appsDir/Marknote
+
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
 	local MINOR="`echo "$portVersion" | cut -d. -f3`"
@@ -124,6 +124,6 @@ INSTALL()
 		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
 		$portDir/additional-files/marknote.rdef.in > marknote.rdef
 
-	addResourcesToBinaries marknote.rdef $commandBinDir/marknote
-	addAppDeskbarSymlink $commandBinDir/marknote Marknote
+	addResourcesToBinaries marknote.rdef $appsDir/Marknote
+	addAppDeskbarSymlink $appsDir/Marknote
 }
diff --git a/kde-apps/marknote/patches/marknote-1.3.0.patchset b/kde-apps/marknote/patches/marknote-1.3.0.patchset
deleted file mode 100644
index 20af37de1..000000000
--- a/kde-apps/marknote/patches/marknote-1.3.0.patchset
+++ /dev/null
@@ -1,25 +0,0 @@
-From 50c02ef7bc299aa867cfc57623941768e95b8b87 Mon Sep 17 00:00:00 2001
-From: Schrijvers Luc <begasus@gmail.com>
-Date: Sat, 18 May 2024 09:30:32 +0200
-Subject: Use software rendering
-
-Text menus don't display too well all the time with Kirigami
-Use fallback to software rendering to solve the display
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 04ebf14..f2112ae 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -31,6 +31,9 @@ using namespace Qt::Literals::StringLiterals;
- 
- int main(int argc, char *argv[])
- {
-+#if defined(Q_OS_HAIKU)
-+       qputenv("QT_QUICK_BACKEND", "software");
-+#endif
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-     QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
- #endif
--- 
-2.45.1
-