[SCM] qtwayland packaging branch, master, updated. debian/5.9.2-3-3-g0baf3c3

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 0baf3c31bd59ed12142dc22d4c54e20dea541ff8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Dec 15 19:14:31 2017 +0300

    Fix cross building failures.
    
    - Build and use native version of qtwaylandscanner.
    - Set QMAKE_QMAKE and PKG_CONFIG_LIBDIR variables.
---
 debian/changelog |  2 ++
 debian/clean     |  1 +
 debian/control   |  1 +
 debian/rules     | 13 ++++++++++++-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 48d64b9..3d98641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtwayland-opensource-src (5.9.2-4) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Use dh_auto_configure provided by debhelper.
+  * Fix cross builds by building and using native qtwaylandscanner and
+    setting QMAKE_QMAKE and PKG_CONFIG_LIBDIR variables.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 15 Dec 2017 18:34:29 +0300
 
diff --git a/debian/clean b/debian/clean
index 7ec00ed..111a1c4 100644
--- a/debian/clean
+++ b/debian/clean
@@ -14,3 +14,4 @@ src/compositor/qtwaylandcompositor-config.pri
 src/compositor/qtwaylandcompositor-config_p.h
 src/imports/compositor/compositor.qrc
 qml/
+qtwaylandscanner_native
diff --git a/debian/control b/debian/control
index a9b1bd2..12559a9 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Build-Depends: debhelper (>= 10.9.2~),
                pkg-config,
                pkg-kde-tools,
                qtbase5-dev (>= 5.9.2+dfsg~),
+               qtbase5-dev:native (>= 5.9.2+dfsg~),
                qtbase5-private-dev (>= 5.9.2+dfsg-3~),
                qtdeclarative5-private-dev (>= 5.9.2~)
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.9.2+dfsg~) <!nodoc>,
diff --git a/debian/rules b/debian/rules
index 2953201..97ab65c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,24 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
 
 export QT_SELECT := qt5
 
 %:
 	dh $@ --with pkgkde_symbolshelper
 
+ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
+override_dh_auto_configure:
+	cd src/qtwaylandscanner && \
+		g++ qtwaylandscanner.cpp -I/usr/include/$(DEB_BUILD_MULTIARCH)/qt5 \
+		-I/usr/include/$(DEB_BUILD_MULTIARCH)/qt5/QtCore \
+		-fPIC -lQt5Core -o $(CURDIR)/qtwaylandscanner_native
+	dh_auto_configure -- QMAKE_QMAKE=/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake \
+		QT_TOOL.qtwaylandscanner.binary=$(CURDIR)/qtwaylandscanner_native \
+		PKG_CONFIG_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig:/usr/share/pkgconfig
+endif
+
 override_dh_auto_build-indep:
 	dh_auto_build -- docs
 

-- 
qtwayland packaging