From d947382ab66c1bd31a27ceb15360de65894ded64 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 24 Mar 2019 23:17:24 +1000
Subject: [PATCH] KWrite: bump version

---
 ...-18.04.0.recipe => kwrite-19.03.80.recipe} | 11 +++++-----
 .../kwrite/patches/kwrite-18.04.0.patchset    | 22 -------------------
 .../kwrite/patches/kwrite-19.03.80.patchset   | 22 +++++++++++++++++++
 3 files changed, 28 insertions(+), 27 deletions(-)
 rename kde-base/kwrite/{kwrite-18.04.0.recipe => kwrite-19.03.80.recipe} (95%)
 delete mode 100644 kde-base/kwrite/patches/kwrite-18.04.0.patchset
 create mode 100644 kde-base/kwrite/patches/kwrite-19.03.80.patchset

diff --git a/kde-base/kwrite/kwrite-18.04.0.recipe b/kde-base/kwrite/kwrite-19.03.80.recipe
similarity index 95%
rename from kde-base/kwrite/kwrite-18.04.0.recipe
rename to kde-base/kwrite/kwrite-19.03.80.recipe
index f81951148..7d441840c 100644
--- a/kde-base/kwrite/kwrite-18.04.0.recipe
+++ b/kde-base/kwrite/kwrite-19.03.80.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-2018 KDE Organisation"
+COPYRIGHT="2010-2019 KDE Organisation"
 LICENSE="GNU LGPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/KDE/kate/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="804f395d8f79836825a97c1bc81b800f078d64ceb9af10f842082d3e06e70284"
+CHECKSUM_SHA256="3dfde170d155207e8e77dfe32ce55128425a97131dd3dfda47d8f81b67b414a7"
 SOURCE_DIR="kate-$portVersion"
 PATCHES="kwrite-$portVersion.patchset"
 ADDITIONAL_FILES="kwrite.rdef.in"
@@ -109,7 +109,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules >= 5.45
+	extra_cmake_modules$secondaryArchSuffix >= 5.45
 	devel:libKF5Archive$secondaryArchSuffix
 	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
@@ -141,11 +141,12 @@ BUILD_REQUIRES="
 	devel:libKF5WidgetsAddons$secondaryArchSuffix
 	devel:libKF5WindowSystem$secondaryArchSuffix
 	devel:libKF5XmlGui$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix >= 5.7
+	devel:libQt5Core$secondaryArchSuffix >= 5.12
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
+	cmd:lrelease$secondaryArchSuffix
 	cmd:make
 	cmd:python2
 	"
diff --git a/kde-base/kwrite/patches/kwrite-18.04.0.patchset b/kde-base/kwrite/patches/kwrite-18.04.0.patchset
deleted file mode 100644
index c90953f9a..000000000
--- a/kde-base/kwrite/patches/kwrite-18.04.0.patchset
+++ /dev/null
@@ -1,22 +0,0 @@
-From b1497d02f5f1b1ad89859793cc7f999b62166aca Mon Sep 17 00:00:00 2001
-From: Sergei Reznikov <diver@gelios.net>
-Date: Mon, 23 Apr 2018 15:12:33 +0300
-Subject: Allow running as root on Haiku
-
-
-diff --git a/kwrite/main.cpp b/kwrite/main.cpp
-index 62f4f2d..c5cf5ef 100644
---- a/kwrite/main.cpp
-+++ b/kwrite/main.cpp
-@@ -49,7 +49,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)
-     /**
-      * Check whether we are running as root
-      **/
--- 
-2.16.2
-
diff --git a/kde-base/kwrite/patches/kwrite-19.03.80.patchset b/kde-base/kwrite/patches/kwrite-19.03.80.patchset
new file mode 100644
index 000000000..ae303f976
--- /dev/null
+++ b/kde-base/kwrite/patches/kwrite-19.03.80.patchset
@@ -0,0 +1,22 @@
+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
+