From c270524a7c4f67e4885a8c18d9133c942ddb5fff Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 24 Aug 2019 11:35:45 +1000
Subject: [PATCH] Notepadqq: enable patchset * fix binary and resources paths

---
 app-editors/notepadqq/notepadqq-1.4.8.recipe  | 25 +++++++++---------
 .../patches/notepadqq-1.4.8.patchset          | 26 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/app-editors/notepadqq/notepadqq-1.4.8.recipe b/app-editors/notepadqq/notepadqq-1.4.8.recipe
index 9cd458e02..d0a62dcf8 100644
--- a/app-editors/notepadqq/notepadqq-1.4.8.recipe
+++ b/app-editors/notepadqq/notepadqq-1.4.8.recipe
@@ -3,12 +3,12 @@ DESCRIPTION="Notepadqq is designed from developers, for developers. With its \
 more than 100 supported languages, it is the ideal text editor for your daily \
 tasks."
 HOMEPAGE="http://notepadqq.altervista.org/"
-COPYRIGHT="2012-2018 Notepadqq Project"
+COPYRIGHT="2012-2019 Notepadqq Project"
 LICENSE="GNU LGPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/notepadqq/notepadqq/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="13fba9abd84c59de27fbe92f74e2763b57588fcf9c88af10ec67313b0abbc9d0"
-#PATCHES="notepadqq-$portVersion.patchset"
+PATCHES="notepadqq-$portVersion.patchset"
 ADDITIONAL_FILES="notepadqq.rdef.in"
 
 ARCHITECTURES="!x86_gcc2 x86_64"
@@ -64,20 +64,21 @@ BUILD()
 
 INSTALL()
 {
-	mkdir -p $appsDir/Notepadqq
+	mkdir -p $appsDir/Notepadqq/Resources
 	make install
 
-	# Cleanup
-	rm -rf $appsDir/Notepadqq/share/{icons,applications}
-	# Fun with hardcoded paths :(
 	mv $appsDir/Notepadqq/lib/notepadqq/notepadqq-bin \
-		$appsDir/Notepadqq/lib/notepadqq/Notepadqq
-	rm -rf $appsDir/Notepadqq/bin
+		$appsDir/Notepadqq/Notepadqq
+	mv $appsDir/Notepadqq/share/notepadqq/* \
+		$appsDir/Notepadqq/Resources
 
+	# Cleanup
+	rm -rf $appsDir/Notepadqq/{bin,share,lib}
+	
 	# Icon
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-	local MINOR="`echo "$portVersion" | cut -d. -f3 | cut -d~ -f1`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
 
 	sed \
 		-e "s|@MAJOR@|$MAJOR|" \
@@ -86,7 +87,7 @@ INSTALL()
 		$portDir/additional-files/notepadqq.rdef.in > notepadqq.rdef
 
 	addResourcesToBinaries notepadqq.rdef \
-		$appsDir/Notepadqq/lib/notepadqq/Notepadqq
+		$appsDir/Notepadqq/Notepadqq
 
-	addAppDeskbarSymlink $appsDir/Notepadqq/lib/notepadqq/Notepadqq
+	addAppDeskbarSymlink $appsDir/Notepadqq/Notepadqq
 }
diff --git a/app-editors/notepadqq/patches/notepadqq-1.4.8.patchset b/app-editors/notepadqq/patches/notepadqq-1.4.8.patchset
index 1bff386a7..9a034734c 100644
--- a/app-editors/notepadqq/patches/notepadqq-1.4.8.patchset
+++ b/app-editors/notepadqq/patches/notepadqq-1.4.8.patchset
@@ -1,4 +1,4 @@
-From be93e5135dee02eb8a7d0b9588fd793400933419 Mon Sep 17 00:00:00 2001
+From ad36c58d4ded001703a53e5cb32b1ffda333d9a8 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
@@ -27,3 +27,27 @@ index da417af..9a358e6 100644
 -- 
 2.23.0
 
+
+From ea2dd9ad34997684e5a76abd4aacfce014762ba7 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
+
+
+diff --git a/src/ui/notepadqq.cpp b/src/ui/notepadqq.cpp
+index ae84c27..c017024 100644
+--- a/src/ui/notepadqq.cpp
++++ b/src/ui/notepadqq.cpp
+@@ -22,6 +22,9 @@ 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());
+ #else
+     QString def = QString("%1/../appdata/").
+             arg(qApp->applicationDirPath());
+-- 
+2.23.0
+