[SCM] telepathy-qt4 packaging branch, master, updated. debian/0.9.6.1-6-12-ge24e20d

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/telepathy-qt4.git;a=commitdiff;h=a21f77e

The following commit has been merged in the master branch:
commit a21f77e47ea78bc17e01f8fc7ba4bc8cd349e593
Author: Dr. Tobias Quathamer <toddy at debian.org>
Date:   Sun Dec 3 09:12:20 2017 +0100

    Import NMU 0.9.6.1-6.1
---
 debian/changelog                      |  8 ++++++++
 debian/patches/fix-failing-test.patch | 15 +++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 54d9688..385a79d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+telepathy-qt (0.9.6.1-6.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add fix-failing-test.patch to fix failing tests on some architectures
+    (Closes: #859462)
+
+ -- Dr. Tobias Quathamer <toddy at debian.org>  Wed, 03 May 2017 22:56:53 +0200
+
 telepathy-qt (0.9.6.1-6) unstable; urgency=medium
 
   * Add fix-deprecated-bsd-source.patch
diff --git a/debian/patches/fix-failing-test.patch b/debian/patches/fix-failing-test.patch
new file mode 100644
index 0000000..48a7c8b
--- /dev/null
+++ b/debian/patches/fix-failing-test.patch
@@ -0,0 +1,15 @@
+Author: David Edmundson <kde at davidedmundson.co.uk>
+Description: Use C++ bool type rather than mixing with gboolean
+ They are not always the same size.
+ This fixes a compile error on some systems.
+--- a/tests/dbus/contacts-capabilities.cpp
++++ b/tests/dbus/contacts-capabilities.cpp
+@@ -111,7 +111,7 @@
+     QStringList ids = QStringList() << QLatin1String("alice")
+         << QLatin1String("bob") << QLatin1String("chris");
+ 
+-    gboolean supportTextChat[] = { TRUE, FALSE, FALSE };
++    bool supportTextChat[] = { true, false, false };
+ 
+     TpHandleRepoIface *serviceRepo =
+         tp_base_connection_get_handles(TP_BASE_CONNECTION(mConn->service()),
diff --git a/debian/patches/series b/debian/patches/series
index de7e11a..2743040 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ update-doxygen.patch
 gstreamer-1.5.patch
 force-service-pic.patch
 fix-deprecated-bsd-source.patch
+fix-failing-test.patch

-- 
telepathy-qt4 packaging