notepadqq: bump version (ote) (#6535)

app-editors/notepadqq/notepadqq-1.4.8.ote.recipe

@@ -5,9 +5,11 @@ tasks."
 HOMEPAGE="http://notepadqq.altervista.org/"
 COPYRIGHT="2012-2019 Notepadqq Project"
 LICENSE="GNU LGPL v3"
-REVISION="3"
-SOURCE_URI="https://github.com/notepadqq/notepadqq/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="13fba9abd84c59de27fbe92f74e2763b57588fcf9c88af10ec67313b0abbc9d0"
+REVISION="1"
+SOURCE_URI="https://github.com/JuBan1/notepadqq/archive/ote.tar.gz"
+CHECKSUM_SHA256="4528c5be728396007630ee91723a2107894611b9f7149713ad276529b7297bd6"
+SOURCE_FILENAME="notepadqq-ote.tar.gz"
+SOURCE_DIR="notepadqq-ote"
 PATCHES="notepadqq-$portVersion.patchset"
 ADDITIONAL_FILES="notepadqq.rdef.in"
 
@@ -26,9 +28,8 @@ REQUIRES="
 	lib:libQt5Network$secondaryArchSuffix
 	lib:libQt5PrintSupport$secondaryArchSuffix
 	lib:libQt5Svg$secondaryArchSuffix
-	lib:libQt5WebKit$secondaryArchSuffix
-	lib:libQt5WebKitWidgets$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libuchardet$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -39,9 +40,8 @@ BUILD_REQUIRES="
 	devel:libQt5Network$secondaryArchSuffix
 	devel:libQt5PrintSupport$secondaryArchSuffix
 	devel:libQt5Svg$secondaryArchSuffix
-	devel:libQt5WebKit$secondaryArchSuffix
-	devel:libQt5WebKitWidgets$secondaryArchSuffix
 	devel:libQt5Widgets$secondaryArchSuffix
+	devel:libuchardet$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:find
@@ -78,16 +78,13 @@ INSTALL()
 	# Icon
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-	local MINOR="`echo "$portVersion" | cut -d. -f3`"
-
+	local MINOR="`echo "$portVersion" | cut -d. -f3 | cut -d~ -f1`"
 	sed \
 		-e "s|@MAJOR@|$MAJOR|" \
 		-e "s|@MIDDLE@|$MIDDLE|" \
 		-e "s|@MINOR@|$MINOR|" \
 		$portDir/additional-files/notepadqq.rdef.in > notepadqq.rdef
 
-	addResourcesToBinaries notepadqq.rdef \
-		$appsDir/Notepadqq/Notepadqq
-
+	addResourcesToBinaries notepadqq.rdef $appsDir/Notepadqq/Notepadqq
 	addAppDeskbarSymlink $appsDir/Notepadqq/Notepadqq
 }

app-editors/notepadqq/patches/notepadqq-1.4.8.ote.patchset

@@ -1,53 +1,57 @@
-From ad36c58d4ded001703a53e5cb32b1ffda333d9a8 Mon Sep 17 00:00:00 2001
+From 183f0aeec7e7b6ddc315c4da1039fb3866129d09 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
+Subject: [PATCH 1/2] Disable root check for haiku
 
 
 diff --git a/src/ui/main.cpp b/src/ui/main.cpp
-index da417af..9a358e6 100644
+index a1be0b7..d047a04 100644
 --- a/src/ui/main.cpp
 +++ b/src/ui/main.cpp
-@@ -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());
+@@ -92,6 +92,7 @@ int main(int argc, char *argv[])
+         return EXIT_SUCCESS;
+     }
  
-+#ifndef Q_OS_HAIKU
++    #ifndef Q_OS_HAIKU
      // Check if we're running as root
      if( getuid() == 0 && !parser->isSet("allow-root") ) {
          qWarning() << QObject::tr(
-@@ -95,6 +96,7 @@ int main(int argc, char *argv[])
+@@ -100,6 +101,7 @@ int main(int argc, char *argv[])
  
          return EXIT_SUCCESS;
      }
-+#endif
++    #endif
  
      if (a.attachToOtherInstance()) {
          return EXIT_SUCCESS;
 -- 
-2.23.0
+2.30.2
 
 
-From ea2dd9ad34997684e5a76abd4aacfce014762ba7 Mon Sep 17 00:00:00 2001
+From d6df9d46cab0be8f8ed4b590b7bc268acbe03896 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 24 Aug 2019 11:18:35 +1000
-Subject: Fix resources path
+Subject: [PATCH 2/2] Fix resources path
 
 
 diff --git a/src/ui/notepadqq.cpp b/src/ui/notepadqq.cpp
-index ae84c27..c017024 100644
+index b93c0e4..fedee8f 100644
 --- a/src/ui/notepadqq.cpp
 +++ b/src/ui/notepadqq.cpp
-@@ -22,6 +22,9 @@ QString Notepadqq::appDataPath(QString fileName)
+@@ -23,9 +23,12 @@ QString Notepadqq::appDataPath(QString fileName)
  #ifdef Q_OS_MACX
      QString def = QString("%1/../Resources/").
              arg(qApp->applicationDirPath());
 +#elif defined(Q_OS_HAIKU)
 +    QString def = QString("%1/Resources/").
-+            arg(qApp->applicationDirPath());
++        arg(qApp->applicationDirPath());
  #else
      QString def = QString("%1/../appdata/").
-             arg(qApp->applicationDirPath());
+-            arg(qApp->applicationDirPath());
++        arg(qApp->applicationDirPath());
+ #endif
+ 
+     if(!QDir(def).exists())
 -- 
-2.23.0
+2.30.2