From 6004e1452579b3b737b225fb667d39a415b8b713 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 2 Mar 2017 22:39:27 +0100
Subject: [PATCH] qbs: bump version.

* enable x86_64.
* fix the packaging for primary architectures.
---
 ..._x86-1.4.2.patchset => qbs-1.7.1.patchset} | 18 ++++-----
 .../{qbs-1.4.2.recipe => qbs-1.7.1.recipe}    | 39 +++++++++++--------
 2 files changed, 32 insertions(+), 25 deletions(-)
 rename dev-util/qbs/patches/{qbs_x86-1.4.2.patchset => qbs-1.7.1.patchset} (74%)
 rename dev-util/qbs/{qbs-1.4.2.recipe => qbs-1.7.1.recipe} (50%)

diff --git a/dev-util/qbs/patches/qbs_x86-1.4.2.patchset b/dev-util/qbs/patches/qbs-1.7.1.patchset
similarity index 74%
rename from dev-util/qbs/patches/qbs_x86-1.4.2.patchset
rename to dev-util/qbs/patches/qbs-1.7.1.patchset
index a0b122397..02bc6661f 100644
--- a/dev-util/qbs/patches/qbs_x86-1.4.2.patchset
+++ b/dev-util/qbs/patches/qbs-1.7.1.patchset
@@ -1,23 +1,23 @@
-From 99018c66a7e83aca455da3e88689cbd451dde65d Mon Sep 17 00:00:00 2001
+From 43bdb6fd510c68b2972adffde381003e1cefb3bb Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Tue, 3 Nov 2015 14:31:04 +0300
 Subject: Haiku: implement processNameByPid
 
 
 diff --git a/src/lib/corelib/tools/processutils.cpp b/src/lib/corelib/tools/processutils.cpp
-index e02f445..9a0149c 100644
+index 2f8254a..edafaa4 100644
 --- a/src/lib/corelib/tools/processutils.cpp
 +++ b/src/lib/corelib/tools/processutils.cpp
-@@ -40,6 +40,8 @@
+@@ -49,6 +49,8 @@
  #   include "fileinfo.h"
  #   include <unistd.h>
  #   include <cstdio>
 +#elif defined(Q_OS_HAIKU)
 +#   include <OS.h>
  #elif defined(Q_OS_BSD4)
- #   include <libutil.h>
- #   include <sys/types.h>
-@@ -81,6 +83,13 @@ QString processNameByPid(qint64 pid)
+ # include <QFile>
+ #   include <sys/cdefs.h>
+@@ -94,6 +96,13 @@ QString processNameByPid(qint64 pid)
      sprintf(exePath, "/proc/%lld/exe", pid);
      readlink(exePath, buf, sizeof(buf));
      return FileInfo::fileName(QString::fromUtf8(buf));
@@ -29,8 +29,8 @@ index e02f445..9a0149c 100644
 +	}
 +	return QString();
  #elif defined(Q_OS_BSD4)
-     kinfo_proc *proc = kinfo_getproc(pid);
-     if (!proc)
+ # if defined(Q_OS_NETBSD)
+     struct kinfo_proc2 kp;
 -- 
-2.2.2
+2.10.2
 
diff --git a/dev-util/qbs/qbs-1.4.2.recipe b/dev-util/qbs/qbs-1.7.1.recipe
similarity index 50%
rename from dev-util/qbs/qbs-1.4.2.recipe
rename to dev-util/qbs/qbs-1.7.1.recipe
index 9afbc15de..3099f2805 100644
--- a/dev-util/qbs/qbs-1.4.2.recipe
+++ b/dev-util/qbs/qbs-1.7.1.recipe
@@ -5,11 +5,11 @@ COPYRIGHT="2016, Digia Plc and/or its subsidiary(-ies)"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="http://download.qt.io/official_releases/qbs/$portVersion/qbs-src-$portVersion.tar.gz"
-CHECKSUM_SHA256="b9d36118c3ae0f7d4df6bf7239a0a0163c0340b701d00191fa5f832cef341ce5"
+CHECKSUM_SHA256="e4f5627ffcdba4d74a432f89215e7df1c1657f5416b61612467a7a9267cd4851"
 SOURCE_DIR="qbs-src-$portVersion"
-PATCHES="qbs_x86-1.4.2.patchset"
+PATCHES="qbs-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -21,18 +21,28 @@ PROVIDES="
 	cmd:qbs_setup_android = $portVersion
 	cmd:qbs_setup_qt = $portVersion
 	cmd:qbs_setup_toolchains = $portVersion
-	lib:libqbscore$secondaryArchSuffix
-	lib:libqbsqtprofilesetup$secondaryArchSuffix
+	lib:libqbscore$secondaryArchSuffix = $portVersion
+	lib:libqbsqtprofilesetup$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libgl$secondaryArchSuffix
-	lib:libqt5$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Network$secondaryArchSuffix
+	lib:libQt5Script$secondaryArchSuffix
+	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libQt5Xml$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libqt5$secondaryArchSuffix
+	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
+	devel:libQt5Network$secondaryArchSuffix
+	devel:libQt5Script$secondaryArchSuffix
+	devel:libQt5Widgets$secondaryArchSuffix
+	devel:libQt5Xml$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
@@ -50,13 +60,10 @@ INSTALL()
 {
 	make install
 
-	mkdir -p $libDir $includeDir $dataDir
-	cp lib/libqbscore.so* $libDir	
-	cd $prefix
+	mv $prefix/lib $prefix/lib2
+	mkdir -p $(dirname $libDir) $(dirname $includeDir) $(diname $dataDir)
 
-	mv include/qbs $includeDir
-	mv lib/*qbs* $libDir
-	mv share/qbs $dataDir
-
-	rm -rf include share
+	mv $prefix/include $includeDir
+	mv $prefix/lib2 $libDir
+	mv $prefix/share $dataDir
 }