From c71280740cb460d55da5b090155a945d87a77de5 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Mon, 11 Dec 2017 10:17:02 +0300
Subject: [PATCH] Notepadqq; fix build

---
 app-editors/notepadqq/notepadqq-1.2.0.recipe | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app-editors/notepadqq/notepadqq-1.2.0.recipe b/app-editors/notepadqq/notepadqq-1.2.0.recipe
index a85b428ff..12061fb2c 100644
--- a/app-editors/notepadqq/notepadqq-1.2.0.recipe
+++ b/app-editors/notepadqq/notepadqq-1.2.0.recipe
@@ -5,17 +5,17 @@ tasks."
 HOMEPAGE="http://notepadqq.altervista.org/"
 COPYRIGHT="2012-2017 Notepadqq Project"
 LICENSE="GNU LGPL v3"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://github.com/notepadqq/notepadqq/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="423d224724deb5298837327ce7efa0d71dbe73693c783241eeb7bb2327ee97d4"
 ADDITIONAL_FILES="notepadqq.rdef.in"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	notepadqq$secondaryArchSuffix = $portVersion
-	app:notepadqq$secondaryArchSuffix = $portVersion
+	app:Notepadqq$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -33,21 +33,21 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libGL$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix >= 5
-	devel:libQt5Gui$secondaryArchSuffix >= 5
-	devel:libQt5Network$secondaryArchSuffix >= 5
-	devel:libQt5PrintSupport$secondaryArchSuffix >= 5
-	devel:libQt5Svg$secondaryArchSuffix >= 5
-	devel:libQt5WebKit$secondaryArchSuffix >= 5
-	devel:libQt5WebKitWidgets$secondaryArchSuffix >= 5
-	devel:libQt5Widgets$secondaryArchSuffix >= 5
+	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
+	devel:libQt5Network$secondaryArchSuffix
+	devel:libQt5PrintSupport$secondaryArchSuffix
+	devel:libQt5Svg$secondaryArchSuffix
+	devel:libQt5WebKit$secondaryArchSuffix
+	devel:libQt5WebKitWidgets$secondaryArchSuffix
+	devel:libQt5Widgets$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
 	cmd:g++$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:lrelease$secondaryArchSuffix
+	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:qmake$secondaryArchSuffix >= 5
@@ -71,7 +71,7 @@ INSTALL()
 	# Fun with hardcoded paths :(
 	mv $appsDir/Notepadqq/lib/notepadqq/notepadqq-bin \
 		$appsDir/Notepadqq/lib/notepadqq/Notepadqq
-	rm -rf $appsDir/Notepadqq/{bin}
+	rm -rf $appsDir/Notepadqq/bin
 
 	# Icon
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
@@ -87,5 +87,5 @@ INSTALL()
 	addResourcesToBinaries notepadqq.rdef \
 		$appsDir/Notepadqq/lib/notepadqq/Notepadqq
 
-	addAppDeskbarSymlink $appsDir/Notepadqq/lib/notepadqq/Notepadqq "Notepadqq"
+	addAppDeskbarSymlink $appsDir/Notepadqq/lib/notepadqq/Notepadqq
 }