From aecb8634f786ee8446c35d7b28626ed13aeddb62 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 1 Nov 2021 14:12:44 +1000
Subject: [PATCH] KWrite: bump version

---
 ...e-20.12.0.recipe => kwrite-21.08.2.recipe} | 12 +++++-----
 .../kwrite/patches/kwrite-20.12.0.patchset    | 22 -------------------
 2 files changed, 7 insertions(+), 27 deletions(-)
 rename kde-base/kwrite/{kwrite-20.12.0.recipe => kwrite-21.08.2.recipe} (95%)
 delete mode 100644 kde-base/kwrite/patches/kwrite-20.12.0.patchset

diff --git a/kde-base/kwrite/kwrite-20.12.0.recipe b/kde-base/kwrite/kwrite-21.08.2.recipe
similarity index 95%
rename from kde-base/kwrite/kwrite-20.12.0.recipe
rename to kde-base/kwrite/kwrite-21.08.2.recipe
index 7c3c5e7ac..d1dd11309 100644
--- a/kde-base/kwrite/kwrite-20.12.0.recipe
+++ b/kde-base/kwrite/kwrite-21.08.2.recipe
@@ -49,13 +49,12 @@ Backup and Restore
 * swap files to recover data on system crash
 * undo / redo system"
 HOMEPAGE="https://www.kde.org/applications/utilities/kwrite/"
-COPYRIGHT="2010-2020 KDE Organisation"
+COPYRIGHT="2010-2021 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="69017d7369bbcac7a3e350fc0e02cbcfbf5ce09e89149e765a1cd647f3cb3c0f"
+CHECKSUM_SHA256="d68898759dd2538051124681e5928ef5fb163ca61b6cd8f59ee056cc068ea6b2"
 SOURCE_DIR="kate-$portVersion"
-PATCHES="kwrite-$portVersion.patchset"
 ADDITIONAL_FILES="kwrite.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -92,6 +91,7 @@ REQUIRES="
 	lib:libKF5Service$secondaryArchSuffix
 	lib:libKF5Solid$secondaryArchSuffix
 	lib:libKF5SonnetUi$secondaryArchSuffix
+	lib:libKF5SyntaxHighlighting$secondaryArchSuffix
 	lib:libKF5TextEditor$secondaryArchSuffix
 	lib:libKF5TextWidgets$secondaryArchSuffix
 	lib:libKF5UnitConversion$secondaryArchSuffix
@@ -109,7 +109,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= 5.77
+	extra_cmake_modules$secondaryArchSuffix >= 5.86
 	devel:libKF5Archive$secondaryArchSuffix
 	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
@@ -135,6 +135,7 @@ BUILD_REQUIRES="
 	devel:libKF5Service$secondaryArchSuffix
 	devel:libKF5Solid$secondaryArchSuffix
 	devel:libKF5SonnetUi$secondaryArchSuffix
+	devel:libKF5SyntaxHighlighting$secondaryArchSuffix
 	devel:libKF5TextEditor$secondaryArchSuffix
 	devel:libKF5TextWidgets$secondaryArchSuffix
 	devel:libKF5UnitConversion$secondaryArchSuffix
@@ -160,6 +161,7 @@ BUILD()
 	cd build
 
 	cmake .. \
+		-DCMAKE_BUILD_TYPE=Release \
 		-DBUILD_kate=FALSE \
 		-DBUILD_addons=FALSE \
 		-DCMAKE_INSTALL_PREFIX=$prefix \
diff --git a/kde-base/kwrite/patches/kwrite-20.12.0.patchset b/kde-base/kwrite/patches/kwrite-20.12.0.patchset
deleted file mode 100644
index ae303f976..000000000
--- a/kde-base/kwrite/patches/kwrite-20.12.0.patchset
+++ /dev/null
@@ -1,22 +0,0 @@
-From 62c9e1bc35523be31a3f089fae605fdee3283fa1 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sun, 24 Mar 2019 20:35:16 +1000
-Subject: Allow running as root on Haiku
-
-
-diff --git a/kwrite/main.cpp b/kwrite/main.cpp
-index e972a9b..84a197b 100644
---- a/kwrite/main.cpp
-+++ b/kwrite/main.cpp
-@@ -50,7 +50,7 @@
- 
- extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
- {
--#ifndef Q_OS_WIN
-+#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
-     // Prohibit using sudo or kdesu (but allow using the root user directly)
-     if (getuid() == 0) {
-         if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
--- 
-2.19.1
-