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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 5ab11b76c6920b1efdb54c4e4ba9a26ea3f6bb02
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Nov 9 17:18:21 2016 +0100

    Add fix_qt4_test_build.patch
---
 debian/changelog                        |  1 +
 debian/patches/fix_qt4_test_build.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fef7047..2369b6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ telepathy-qt (0.9.7-1) UNRELEASED; urgency=medium
   * New upstream release
   * Drop upstreamed patches
   * Refresh improve-doxygen-build.patch
+  * Add fix_qt4_test_build.patch
 
  -- Diane Trout <diane at ghic.org>  Fri, 22 Apr 2016 10:33:12 -0700
 
diff --git a/debian/patches/fix_qt4_test_build.patch b/debian/patches/fix_qt4_test_build.patch
new file mode 100644
index 0000000..fba2bc3
--- /dev/null
+++ b/debian/patches/fix_qt4_test_build.patch
@@ -0,0 +1,25 @@
+From 180cb51614e4fdaba82c49683512b82f627d0f49 Mon Sep 17 00:00:00 2001
+From: Alexandr Akulich <akulichalexander at gmail.com>
+Date: Thu, 8 Sep 2016 02:38:44 +0500
+Subject: CMakeLists: BaseChannelFileTransferType tests disabled for Qt4
+
+The disabled tests use Qt5 macros
+
+diff --git a/tests/dbus/CMakeLists.txt b/tests/dbus/CMakeLists.txt
+index 41a0706..d676e5a 100644
+--- a/tests/dbus/CMakeLists.txt
++++ b/tests/dbus/CMakeLists.txt
+@@ -93,7 +93,9 @@ tpqt_add_dbus_unit_test(Types types)
+ if(ENABLE_SERVICE_SUPPORT)
+     tpqt_add_dbus_unit_test(BaseConnectionManager base-cm telepathy-qt${QT_VERSION_MAJOR}-service)
+     tpqt_add_dbus_unit_test(BaseProtocol base-protocol telepathy-qt${QT_VERSION_MAJOR}-service)
+-    tpqt_add_dbus_unit_test(BaseChannelFileTransferType base-filetransfer telepathy-qt${QT_VERSION_MAJOR}-service)
++    if (${QT_VERSION_MAJOR} EQUAL 5)
++        tpqt_add_dbus_unit_test(BaseChannelFileTransferType base-filetransfer telepathy-qt${QT_VERSION_MAJOR}-service)
++    endif()
+ endif()
+ 
+ # Make check target. In case of check, output on failure and put it into a log
+-- 
+cgit v0.10.2
+
diff --git a/debian/patches/series b/debian/patches/series
index a9681d3..97ce83b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 improve-doxygen-build.patch
+fix_qt4_test_build.patch

-- 
telepathy-qt4 packaging