From b779e648a5a87eb2579893ff1f0bc6a514b80832 Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Fri, 23 Aug 2019 13:59:43 +0200
Subject: [PATCH] NotepadQQ: bump (#4122)

---
 ...padqq-1.4.0.recipe => notepadqq-1.4.8.recipe} |  6 +++---
 ...q-1.4.0.patchset => notepadqq-1.4.8.patchset} | 16 +++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)
 rename app-editors/notepadqq/{notepadqq-1.4.0.recipe => notepadqq-1.4.8.recipe} (94%)
 rename app-editors/notepadqq/patches/{notepadqq-1.4.0.patchset => notepadqq-1.4.8.patchset} (59%)

diff --git a/app-editors/notepadqq/notepadqq-1.4.0.recipe b/app-editors/notepadqq/notepadqq-1.4.8.recipe
similarity index 94%
rename from app-editors/notepadqq/notepadqq-1.4.0.recipe
rename to app-editors/notepadqq/notepadqq-1.4.8.recipe
index e9c182460..9cd458e02 100644
--- a/app-editors/notepadqq/notepadqq-1.4.0.recipe
+++ b/app-editors/notepadqq/notepadqq-1.4.8.recipe
@@ -5,10 +5,10 @@ tasks."
 HOMEPAGE="http://notepadqq.altervista.org/"
 COPYRIGHT="2012-2018 Notepadqq Project"
 LICENSE="GNU LGPL v3"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/notepadqq/notepadqq/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="f295353224848c06fafcc71c7f6a38780a98890075ab33f0179181ebf21bad08"
-PATCHES="notepadqq-$portVersion.patchset"
+CHECKSUM_SHA256="13fba9abd84c59de27fbe92f74e2763b57588fcf9c88af10ec67313b0abbc9d0"
+#PATCHES="notepadqq-$portVersion.patchset"
 ADDITIONAL_FILES="notepadqq.rdef.in"
 
 ARCHITECTURES="!x86_gcc2 x86_64"
diff --git a/app-editors/notepadqq/patches/notepadqq-1.4.0.patchset b/app-editors/notepadqq/patches/notepadqq-1.4.8.patchset
similarity index 59%
rename from app-editors/notepadqq/patches/notepadqq-1.4.0.patchset
rename to app-editors/notepadqq/patches/notepadqq-1.4.8.patchset
index 7bf6da308..1bff386a7 100644
--- a/app-editors/notepadqq/patches/notepadqq-1.4.0.patchset
+++ b/app-editors/notepadqq/patches/notepadqq-1.4.8.patchset
@@ -1,21 +1,23 @@
-From 2cce2c0b4390c278f13564b13f16180f001d25c8 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Wed, 2 May 2018 21:41:35 +1000
+From be93e5135dee02eb8a7d0b9588fd793400933419 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Fri, 23 Aug 2019 13:46:42 +0200
 Subject: Disable root check for haiku
 
 
 diff --git a/src/ui/main.cpp b/src/ui/main.cpp
-index 7bae071..712b2e5 100644
+index da417af..9a358e6 100644
 --- a/src/ui/main.cpp
 +++ b/src/ui/main.cpp
-@@ -83,11 +83,13 @@ int main(int argc, char *argv[])
+@@ -87,6 +87,7 @@ int main(int argc, char *argv[])
      // Check for "run-and-exit" options like -h or -v
      const auto parser = Notepadqq::getCommandLineArgumentsParser(QApplication::arguments());
  
 +#ifndef Q_OS_HAIKU
      // Check if we're running as root
      if( getuid() == 0 && !parser->isSet("allow-root") ) {
-         qWarning() << QObject::tr("Running Notepadqq as root is not recommended. Use --allow-root if you really want to.");
+         qWarning() << QObject::tr(
+@@ -95,6 +96,7 @@ int main(int argc, char *argv[])
+ 
          return EXIT_SUCCESS;
      }
 +#endif
@@ -23,5 +25,5 @@ index 7bae071..712b2e5 100644
      if (a.attachToOtherInstance()) {
          return EXIT_SUCCESS;
 -- 
-2.16.2
+2.23.0