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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit f33452c8043d008c9c5468dae64d4f67ade85c8f
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Apr 27 19:50:23 2016 +0200

    Add fix-failing-test.patch to fix some failing tests
---
 debian/changelog                      |  4 ++++
 debian/patches/fix-failing-test.patch | 33 +++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index da5ae14..926421a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,14 @@ telepathy-qt (0.9.6.1-7) UNRELEASED; urgency=medium
 
 telepathy-qt (0.9.6.1-6) unstable; urgency=medium
 
+  [ Diane Trout ]
   * Add fix-deprecated-bsd-source.patch
   * Update force-service-pic.patch to list some necessary dependencies
     (Closes: #819237)
 
+  [ Rohan Garg ]
+  * Add fix-failing-test.patch to fix some failing tests
+
  -- Diane Trout <diane at debian.org>  Fri, 25 Mar 2016 13:56:45 -0700
 
 telepathy-qt (0.9.6.1-5) unstable; urgency=medium
diff --git a/debian/patches/fix-failing-test.patch b/debian/patches/fix-failing-test.patch
new file mode 100644
index 0000000..b2ff7a7
--- /dev/null
+++ b/debian/patches/fix-failing-test.patch
@@ -0,0 +1,33 @@
+From 15374115fa910ffa41ac2acce71b7f4fc0937674 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde at davidedmundson.co.uk>
+Date: Tue, 26 Apr 2016 15:10:44 +0100
+Subject: Use C++ bool type rather than mixing with gboolean
+
+They are not always the same size.
+This fixes a compile error on some systems.
+
+diff --git a/tests/dbus/contacts-capabilities.cpp b/tests/dbus/contacts-capabilities.cpp
+index 72ea95e..0095f85 100644
+--- a/tests/dbus/contacts-capabilities.cpp
++++ b/tests/dbus/contacts-capabilities.cpp
+@@ -111,7 +111,7 @@ void TestContactsCapabilities::testCapabilities()
+     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()),
+@@ -135,7 +135,7 @@ void TestContactsCapabilities::testCapabilities()
+         QCOMPARE(contact->requestedFeatures().contains(Contact::FeatureCapabilities), true);
+         QCOMPARE(contact->actualFeatures().contains(Contact::FeatureCapabilities), true);
+ 
+-        QCOMPARE(contact->capabilities().textChats(), static_cast<bool>(supportTextChat[i]));
++        QCOMPARE(contact->capabilities().textChats(), supportTextChat[i]);
+         QCOMPARE(contact->capabilities().streamedMediaCalls(), false);
+         QCOMPARE(contact->capabilities().streamedMediaAudioCalls(), false);
+         QCOMPARE(contact->capabilities().streamedMediaVideoCalls(), false);
+-- 
+cgit v0.10.2
+
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