[gentoo-commits] gentoo-x86 commit in media-libs/qt-gstreamer/files: qt-gstreamer-1.2.0-boost157.patch

[Johannes Huber (johu)]

johu        15/05/30 11:39:48

  Added:                qt-gstreamer-1.2.0-boost157.patch
  Log:
  Add patch to fix build with dev-libs/boost-1.57, bug #550016. Thanks to David Kredba <nheghathivhistha@×××××.com> and Heiko Becker <heirecka@×××××××.org>.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xF3CFD2BD)

Revision  Changes    Path
1.1                  media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch?rev=1.1&content-type=text/plain

Index: qt-gstreamer-1.2.0-boost157.patch
===================================================================
From fbb9dc6e291eaa058f3ef1cd93711265bfbfd162 Mon Sep 17 00:00:00 2001
From: Heiko Becker <heirecka@×××××××.org>
Date: Fri, 7 Nov 2014 00:11:02 +0100
Subject: [PATCH] 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.
---
 src/QGlib/connect.cpp | 2 ++
 1 file changed, 2 insertions(+)

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 {
-- 
2.1.3