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

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit b95cea7f6d903a36996e6799dd15d4d4b9d1c808
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Aug 11 09:14:35 2015 +0200

    remove upstream patch
---
 .../patches/upstream_workaround_boost_ftbfs.diff   | 33 ----------------------
 1 file changed, 33 deletions(-)

diff --git a/debian/patches/upstream_workaround_boost_ftbfs.diff b/debian/patches/upstream_workaround_boost_ftbfs.diff
deleted file mode 100644
index 0a32a33..0000000
--- a/debian/patches/upstream_workaround_boost_ftbfs.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-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