[SCM] qtbase packaging branch, master, updated. debian/5.9.2+dfsg-6-4-gdb13e37

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=db13e37

The following commit has been merged in the master branch:
commit db13e37bf2ac52079eefef62356cd4d0d737b92a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jan 19 15:07:57 2018 +0300

    Cherry-pick cross wrappers related fixes from experimental.
---
 debian/changelog              |  6 ++++++
 debian/qmake-cross-wrapper.in | 16 ++++++++++++++++
 debian/qt.conf.in             | 20 ++++++++++----------
 debian/rules                  | 14 ++++----------
 4 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0973a9a..4a07156 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ qtbase-opensource-src (5.9.2+dfsg-7) UNRELEASED; urgency=medium
   * Remove qtlogging.ini file, the underlying issue has been fixed, and
     it causes too many problems (closes: #886437, LP: #1744260).
   * Backport upstream patch to add missing dead key symbols (closes: #799824).
+  * Make ${DEB_HOST_GNU_TYPE}-qmake script set QMAKE_QMAKE to itself.
+    This is needed for properly building configuration tests.
+  * Pass toolchain-related variable assignments as early flags to qmake.
+    Switch to default mode after passing them.
+  * Support <triplet>-qmake -query something (closes: #886542). Thanks to
+    Helmut Grohne.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 19 Jan 2018 14:43:25 +0300
 
diff --git a/debian/qmake-cross-wrapper.in b/debian/qmake-cross-wrapper.in
new file mode 100644
index 0000000..91cf85e
--- /dev/null
+++ b/debian/qmake-cross-wrapper.in
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if [ "x$1" = x-query ]; then
+	exec /usr/lib/qt5/bin/qmake "$@" -qtconf /usr/lib/@DEB_HOST_MULTIARCH@/qt5/qt.conf
+fi
+
+exec /usr/lib/qt5/bin/qmake \
+	-qtconf /usr/lib/@DEB_HOST_MULTIARCH@/qt5/qt.conf \
+	-early \
+	QMAKE_CC=${CC:- at DEB_HOST_GNU_TYPE@-gcc} \
+	QMAKE_CXX=${CXX:- at DEB_HOST_GNU_TYPE@-g++} \
+	QMAKE_LINK=${CXX:- at DEB_HOST_GNU_TYPE@-g++} \
+	QMAKE_QMAKE=/usr/bin/@DEB_HOST_GNU_TYPE at -qmake \
+	PKG_CONFIG=@DEB_HOST_GNU_TYPE at -pkg-config \
+	-before \
+	"$@"
diff --git a/debian/qt.conf.in b/debian/qt.conf.in
index e1afaba..aba2bcd 100644
--- a/debian/qt.conf.in
+++ b/debian/qt.conf.in
@@ -1,18 +1,18 @@
 [Paths]
 Prefix=/usr
-ArchData=lib/DEB_HOST_MULTIARCH/qt5
+ArchData=lib/@DEB_HOST_MULTIARCH@/qt5
 Binaries=lib/qt5/bin
 Data=share/qt5
 Documentation=share/qt5/doc
-Examples=lib/DEB_HOST_MULTIARCH/qt5/examples
-Headers=include/DEB_HOST_MULTIARCH/qt5
+Examples=lib/@DEB_HOST_MULTIARCH@/qt5/examples
+Headers=include/@DEB_HOST_MULTIARCH@/qt5
 HostBinaries=lib/qt5/bin
-HostData=lib/DEB_HOST_MULTIARCH/qt5
-HostLibraries=lib/DEB_HOST_MULTIARCH
-Imports=lib/DEB_HOST_MULTIARCH/qt5/imports
-Libraries=lib/DEB_HOST_MULTIARCH
-LibraryExecutables=lib/DEB_HOST_MULTIARCH/qt5/libexec
-Plugins=lib/DEB_HOST_MULTIARCH/qt5/plugins
-Qml2Imports=lib/DEB_HOST_MULTIARCH/qt5/qml
+HostData=lib/@DEB_HOST_MULTIARCH@/qt5
+HostLibraries=lib/@DEB_HOST_MULTIARCH@
+Imports=lib/@DEB_HOST_MULTIARCH@/qt5/imports
+Libraries=lib/@DEB_HOST_MULTIARCH@
+LibraryExecutables=lib/@DEB_HOST_MULTIARCH@/qt5/libexec
+Plugins=lib/@DEB_HOST_MULTIARCH@/qt5/plugins
+Qml2Imports=lib/@DEB_HOST_MULTIARCH@/qt5/qml
 Settings=/etc/xdg
 Translations=share/qt5/translations
diff --git a/debian/rules b/debian/rules
index 36890ec..f4b1364 100755
--- a/debian/rules
+++ b/debian/rules
@@ -257,19 +257,13 @@ endif
 
 	# Helper files for cross-building
 	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5
-	sed s/DEB_HOST_MULTIARCH/$(DEB_HOST_MULTIARCH)/ debian/qt.conf.in \
+	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/' debian/qt.conf.in \
 		> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf
 
 	mkdir -p debian/tmp/usr/bin
-	echo "#!/bin/sh" > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
-	echo "exec /usr/lib/qt5/bin/qmake" \
-		"-qtconf /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf" \
-		'QMAKE_CC=$${CC:-$(DEB_HOST_GNU_TYPE)-gcc}' \
-		'QMAKE_CXX=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \
-		'QMAKE_LINK=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \
-		"PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config" \
-		'"$$@"' \
-		>> debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
+	sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \
+		-e 's/@DEB_HOST_GNU_TYPE@/$(DEB_HOST_GNU_TYPE)/g' \
+		< debian/qmake-cross-wrapper.in > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
 	chmod +x debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
 
 override_dh_auto_install-indep:

-- 
qtbase packaging