[SCM] qtwebchannel packaging branch, master, updated. 14b104b967898de756d44549d7321b1d3b600d76

[Sandro Knauß]

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

The following commit has been merged in the master branch:
commit 14b104b967898de756d44549d7321b1d3b600d76
Author: Sandro Knauß <sknauss at kde.org>
Date:   Thu Jul 28 14:17:28 2016 +0200

    build and run tests
    
    disable the failing tests temporarly, to not break the build.
    - cmake tests do not find installed includes
    - qml test needs x11 (maybe it works with xvfb)
---
 debian/patches/disable_unbuilable_tests.diff | 19 +++++++++++++++++++
 debian/patches/series                        |  1 +
 debian/rules                                 |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/debian/patches/disable_unbuilable_tests.diff b/debian/patches/disable_unbuilable_tests.diff
new file mode 100644
index 0000000..6fdb4f4
--- /dev/null
+++ b/debian/patches/disable_unbuilable_tests.diff
@@ -0,0 +1,19 @@
+Description: Disable the tests that break the build
+ Only a temp patch to not break the build of the package
+ and have at least some tests running.
+Author: Sandro Knauß <bugs at sandroknauss.de>
+Last-Update: 2016-07-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/tests/auto/auto.pro	2016-07-28 14:00:16.000000000 +0200
++++ b/tests/auto/auto.pro	2016-07-28 14:00:39.063020991 +0200
+@@ -1,7 +1,3 @@
+ TEMPLATE = subdirs
+ 
+-SUBDIRS += cmake webchannel
+-
+-qtHaveModule(quick) {
+-    SUBDIRS += qml
+-}
++SUBDIRS += webchannel
diff --git a/debian/patches/series b/debian/patches/series
index fe726bc..4e59a37 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 nodetonodejs.diff
 examples_full_path.diff
+disable_unbuilable_tests.diff
diff --git a/debian/rules b/debian/rules
index 93b1fdc..c92e72f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ override_dh_clean:
 	rm -f src/webchannel/QtWebChannel.version.in
 
 override_dh_auto_configure:
-	qmake
+	qmake QT_BUILD_PARTS+=" tests"
 
 override_dh_auto_build-indep:
 	dh_auto_build -- docs

-- 
qtwebchannel packaging