[SCM] qt-gstreamer packaging branch, kubuntu_unstable, updated. debian/1.2.0-2-5-ga09d952

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/qt-gstreamer.git;a=commitdiff;h=3e014d6

The following commit has been merged in the kubuntu_unstable branch:
commit 3e014d6fc59d96d265de818a2170ac3572333bfc
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sat Aug 8 19:12:11 2015 +0200

    Add upstream_workaround_boost_ftbfs.diff
---
 debian/changelog                                   |  2 ++
 debian/patches/series                              |  1 +
 .../patches/upstream_workaround_boost_ftbfs.diff   | 33 ++++++++++++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2be6c99..f65c02f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qt-gstreamer (1.2.0-2ubuntu1) UNRELEASED; urgency=medium
   * Fix FTBFS because of latest gstreamer:
     - add find_gstconfig_properly.diff
     - add pkg-config to build depends (needed by the above patch)
+  * Workaround FTBFS with boost >= 1.57:
+    - add upstream_workaround_boost_ftbfs.diff
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Fri, 07 Aug 2015 21:47:07 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index f01d05c..42e15e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 disable-doxygen-timestamp.patch
 find_gstconfig_properly.diff
+upstream_workaround_boost_ftbfs.diff
diff --git a/debian/patches/upstream_workaround_boost_ftbfs.diff b/debian/patches/upstream_workaround_boost_ftbfs.diff
new file mode 100644
index 0000000..0a32a33
--- /dev/null
+++ b/debian/patches/upstream_workaround_boost_ftbfs.diff
@@ -0,0 +1,33 @@
+From 1d2edcc9562c8826fd17b5233691f4a313ab71c7 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka at exherbo.org>
+Date: Fri, 7 Nov 2014 00:11:02 +0100
+Subject: Workaround build failures with boost>=1.57 and moc
+
+Otherwise I get the following error message:
+'usr/include/boost/type_traits/detail/has_binary_operator.hp:50:
+Parse error at "BOOST_JOIN"'. See
+https://bugreports.qt-project.org/browse/QTBUG-22829 for details.
+
+The old workaround to define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
+doesn't seem to work here.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=739752
+
+diff --git a/src/QGlib/connect.cpp b/src/QGlib/connect.cpp
+index 9ff6fde..58a3367 100644
+--- a/src/QGlib/connect.cpp
++++ b/src/QGlib/connect.cpp
+@@ -21,8 +21,10 @@
+ #include <QtCore/QHash>
+ #include <QtCore/QMutex>
+ #include <boost/multi_index_container.hpp>
++#ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
+ #include <boost/multi_index/sequenced_index.hpp>
+ #include <boost/multi_index/ordered_index.hpp>
++#endif
+ #include <boost/multi_index/member.hpp>
+ 
+ namespace QGlib {
+-- 
+cgit v0.10.2
+

-- 
qt-gstreamer packaging