dev-util/qbs: backport upstream patch to install missing header

Gentoo-Bug: 625640
Package-Manager: Portage-2.3.8, Repoman-2.3.3

2 files changed, 172 insertions, 0 deletions

diff --git a/dev-util/qbs/files/1.8.1-Install-missing-public-header.patch b/dev-util/qbs/files/1.8.1-Install-missing-public-header.patch
new file mode 100644
index 000000000000..09aa6aec519e
--- /dev/null
+++ b/dev-util/qbs/files/1.8.1-Install-missing-public-header.patch
@@ -0,0 +1,52 @@
+From 4143de9ab93283c6331418610902da4648db5b67 Mon Sep 17 00:00:00 2001
+From: Joerg Bornemann <joerg.bornemann@qt.io>
+Date: Mon, 10 Jul 2017 09:49:19 +0200
+Subject: [PATCH] Install missing public header
+
+Since commit 7ccc08f3, tools/version.h is needed by a public header.
+It must be installed.
+
+Change-Id: I79cb243463abb9390a581144467b3cd89f46eadd
+Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
+---
+ src/lib/corelib/corelib.qbs     | 2 +-
+ src/lib/corelib/tools/tools.pri | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
+index 1b137925..6dd6f082 100644
+--- a/src/lib/corelib/corelib.qbs
++++ b/src/lib/corelib/corelib.qbs
+@@ -405,7 +405,6 @@ QbsLibrary {
+             "stlutils.h",
+             "toolchains.cpp",
+             "version.cpp",
+-            "version.h",
+             "visualstudioversioninfo.cpp",
+             "visualstudioversioninfo.h",
+             "vsenvironmentdetector.cpp",
+@@ -435,6 +434,7 @@ QbsLibrary {
+             "settingsmodel.h",
+             "setupprojectparameters.h",
+             "toolchains.h",
++            "version.h",
+         ]
+         qbs.install: qbsbuildconfig.installApiHeaders
+         qbs.installDir: headerInstallPrefix + "/tools"
+diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri
+index 0fa91147..fb0c225b 100644
+--- a/src/lib/corelib/tools/tools.pri
++++ b/src/lib/corelib/tools/tools.pri
+@@ -125,7 +125,8 @@ qbs_enable_unit_tests {
+         $$PWD/generatorpluginmanager.h \
+         $$PWD/installoptions.h \
+         $$PWD/setupprojectparameters.h \
+-        $$PWD/toolchains.h
++        $$PWD/toolchains.h \
++        $$PWD/version.h
+     tools_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/tools
+     INSTALLS += tools_headers
+ }
+-- 
+2.14.1
+
diff --git a/dev-util/qbs/qbs-1.8.1-r1.ebuild b/dev-util/qbs/qbs-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..434c804c9c88
--- /dev/null
+++ b/dev-util/qbs/qbs-1.8.1-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://wiki.qt.io/Qbs"
+SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples test"
+
+# see bug 581874 for the qttest dep in RDEPEND
+RDEPEND="
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	test? ( dev-qt/qttest:5 )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-qt/qdoc:5
+		dev-qt/qthelp:5
+	)
+	test? ( dev-qt/qtdeclarative:5 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	# bug 625640
+	"${FILESDIR}/1.8.1-Install-missing-public-header.patch"
+)
+
+src_prepare() {
+	default
+
+	# don't add /usr/include to INCLUDEPATH
+	# avoids a build failure in qt-creator with gcc-6 (bug 618424)
+	sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die
+
+	if ! use examples; then
+		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+	fi
+
+	if use test; then
+		sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
+	else
+		sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
+	fi
+
+	# skip several tests that fail and/or have additional deps
+	sed -i \
+		-e 's/findArchiver("7z")/""/'		`# requires p7zip, fails` \
+		-e 's/findArchiver(binaryName,.*/"";/'	`# requires zip and jar` \
+		-e 's/p\.value("nodejs\./true||&/'	`# requires nodejs, bug 527652` \
+		-e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
+		tests/auto/blackbox/tst_blackbox.cpp || die
+
+	# requires jdk, fails, bug 585398
+	sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
+}
+
+src_configure() {
+	local myqmakeargs=(
+		qbs.pro # bug 523218
+		-recursive
+		CONFIG+=qbs_disable_rpath
+		CONFIG+=qbs_enable_project_file_updates
+		$(usex test 'CONFIG+=qbs_enable_unit_tests' '')
+		QBS_INSTALL_PREFIX="${EPREFIX}/usr"
+		QBS_LIBRARY_DIRNAME="$(get_libdir)"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_test() {
+	einfo "Setting up test environment in ${T}"
+
+	export HOME=${T}
+	export LD_LIBRARY_PATH=${S}/$(get_libdir)
+
+	"${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
+	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
+
+	einfo "Running autotests"
+
+	# simply exporting LD_LIBRARY_PATH doesn't work
+	# we have to use a custom testrunner script
+	local testrunner=${WORKDIR}/gentoo-testrunner
+	cat <<-EOF > "${testrunner}"
+	#!/bin/sh
+	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
+	exec "\$@"
+	EOF
+	chmod +x "${testrunner}"
+
+	emake TESTRUNNER="'${testrunner}'" check
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	# install documentation
+	if use doc; then
+		emake docs
+		dodoc -r doc/qbs/html
+		dodoc doc/qbs.qch
+		docompress -x /usr/share/doc/${PF}/qbs.qch
+	fi
+}