Backport two upstream patches, one of which fixes bug 548086.

Thanks to RazrFalcon for reporting and Jake Petroules for the quick fix.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

4 files changed, 127 insertions, 7 deletions

diff --git a/dev-util/qbs/ChangeLog b/dev-util/qbs/ChangeLog
index 3f15a8830557..c9d02e69f628 100644
--- a/dev-util/qbs/ChangeLog
+++ b/dev-util/qbs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/qbs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.16 2015/05/03 11:40:23 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.17 2015/05/04 14:02:12 pesa Exp $
+
+*qbs-1.4.0-r1 (04 May 2015)
+
+  04 May 2015; Davide Pesavento <pesa@gentoo.org>
+  +files/1.4.0-fix-plugins-destdir.patch,
+  +files/1.4.0-install-missing-header.patch, +qbs-1.4.0-r1.ebuild,
+  -qbs-1.4.0.ebuild:
+  Backport two upstream patches, one of which fixes bug 548086. Thanks to
+  RazrFalcon for reporting and Jake Petroules for the quick fix.
 
   03 May 2015; Davide Pesavento <pesa@gentoo.org> qbs-1.4.0.ebuild:
   Add examples USE flag.
diff --git a/dev-util/qbs/files/1.4.0-fix-plugins-destdir.patch b/dev-util/qbs/files/1.4.0-fix-plugins-destdir.patch
new file mode 100644
index 000000000000..733b4cf1d66b
--- /dev/null
+++ b/dev-util/qbs/files/1.4.0-fix-plugins-destdir.patch
@@ -0,0 +1,38 @@
+From 15a64cec8b3ca7111fa631861fce8227a9a3dda8 Mon Sep 17 00:00:00 2001
+From: Jake Petroules <jake.petroules@petroules.com>
+Date: Thu, 30 Apr 2015 04:05:54 -0700
+Subject: qmake: fix DESTDIR of qbs plugin shared libraries.
+
+Change-Id: Ib8941b0d9232155545792215803556be5a5d4d17
+Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
+---
+ src/plugins/plugins.pri | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
+index 3775c60..70bc0e0 100644
+--- a/src/plugins/plugins.pri
++++ b/src/plugins/plugins.pri
+@@ -1,7 +1,9 @@
++include(../library_dirname.pri)
++
+ !isEmpty(QBS_PLUGINS_BUILD_DIR) {
+     destdirPrefix = $${QBS_PLUGINS_BUILD_DIR}
+ } else {
+-    destdirPrefix = $$shadowed($$PWD)/../../lib
++    destdirPrefix = $$shadowed($$PWD)/../../$${QBS_LIBRARY_DIRNAME}
+ }
+ DESTDIR = $${destdirPrefix}/qbs/plugins
+ TEMPLATE = lib
+@@ -10,8 +12,6 @@ CONFIG += depend_includepath
+ CONFIG += shared
+ unix: CONFIG += plugin
+ 
+-include(../library_dirname.pri)
+-
+ !isEmpty(QBS_PLUGINS_INSTALL_DIR): \
+     installPrefix = $${QBS_PLUGINS_INSTALL_DIR}
+ else: \
+-- 
+2.4.0
+
diff --git a/dev-util/qbs/files/1.4.0-install-missing-header.patch b/dev-util/qbs/files/1.4.0-install-missing-header.patch
new file mode 100644
index 000000000000..3af545f16de9
--- /dev/null
+++ b/dev-util/qbs/files/1.4.0-install-missing-header.patch
@@ -0,0 +1,75 @@
+From d2aa95c50c6b884905ed93484f4d3b0b39ef68c5 Mon Sep 17 00:00:00 2001
+From: Jake Petroules <jake.petroules@petroules.com>
+Date: Sat, 2 May 2015 14:24:26 -0700
+Subject: Install headers necessary for Qt Creator to build with
+ QBS_INSTALL_DIR.
+
+Task-number: QBS-792
+Change-Id: I4930970c97176d6598a780e917eeb8ccc17124ce
+Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
+---
+ src/app/qbs/commandlinefrontend.cpp | 1 +
+ src/lib/corelib/corelib.qbs         | 2 +-
+ src/lib/corelib/qbs.h               | 1 -
+ src/lib/corelib/tools/tools.pri     | 1 +
+ 4 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp
+index c4ec96b..3602d41 100644
+--- a/src/app/qbs/commandlinefrontend.cpp
++++ b/src/app/qbs/commandlinefrontend.cpp
+@@ -39,6 +39,7 @@
+ #include <api/runenvironment.h>
+ #include <logging/translator.h>
+ #include <tools/qbsassert.h>
++#include <tools/projectgeneratormanager.h>
+ 
+ #include <QDir>
+ #include <QFile>
+diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
+index a5fb92a..8dca80d 100644
+--- a/src/lib/corelib/corelib.qbs
++++ b/src/lib/corelib/corelib.qbs
+@@ -304,7 +304,6 @@ QbsLibrary {
+             "cleanoptions.cpp",
+             "codelocation.cpp",
+             "commandechomode.cpp",
+-            "commandechomode.h",
+             "error.cpp",
+             "executablefinder.cpp",
+             "executablefinder.h",
+@@ -356,6 +355,7 @@ QbsLibrary {
+             "buildoptions.h",
+             "cleanoptions.h",
+             "codelocation.h",
++            "commandechomode.h",
+             "error.h",
+             "generateoptions.h",
+             "installoptions.h",
+diff --git a/src/lib/corelib/qbs.h b/src/lib/corelib/qbs.h
+index 73bea54..8b5bfe6 100644
+--- a/src/lib/corelib/qbs.h
++++ b/src/lib/corelib/qbs.h
+@@ -41,7 +41,6 @@
+ #include "tools/cleanoptions.h"
+ #include "tools/error.h"
+ #include "tools/generateoptions.h"
+-#include "tools/projectgeneratormanager.h"
+ #include "tools/installoptions.h"
+ #include "tools/preferences.h"
+ #include "tools/profile.h"
+diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri
+index 3bf459d..17beb63 100644
+--- a/src/lib/corelib/tools/tools.pri
++++ b/src/lib/corelib/tools/tools.pri
+@@ -86,6 +86,7 @@ qbs_enable_unit_tests {
+         $$PWD/architectures.h \
+         $$PWD/cleanoptions.h \
+         $$PWD/codelocation.h \
++        $$PWD/commandechomode.h \
+         $$PWD/error.h \
+         $$PWD/settings.h \
+         $$PWD/settingsmodel.h \
+-- 
+2.4.0
+
diff --git a/dev-util/qbs/qbs-1.4.0.ebuild b/dev-util/qbs/qbs-1.4.0-r1.ebuild
index 39cbfdf6ff26..7a891a86195a 100644
--- a/dev-util/qbs/qbs-1.4.0.ebuild
+++ b/dev-util/qbs/qbs-1.4.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.4.0.ebuild,v 1.3 2015/05/03 11:40:23 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.4.0-r1.ebuild,v 1.1 2015/05/04 14:02:12 pesa Exp $
 
 EAPI=5
 
-inherit multilib pax-utils qmake-utils
+inherit eutils multilib pax-utils qmake-utils
 
 DESCRIPTION="Qt Build Suite"
 HOMEPAGE="http://wiki.qt.io/Qbs"
@@ -34,10 +34,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	# fix plugins libdir
-	# v1.4.1 will contain a fix: https://codereview.qt-project.org/111532
-	sed -i -e "/destdirPrefix/ s:/lib:/$(get_libdir):" \
-		src/plugins/plugins.pri || die
+	epatch "${FILESDIR}"/${PV}-fix-plugins-destdir.patch
+	epatch "${FILESDIR}"/${PV}-install-missing-header.patch
 
 	# disable tests that require nodejs (bug 527652)
 	sed -i -e 's/!haveNodeJs()/true/' \