File fix-boost-moc.patch of Package gstreamer-plugins-qt

Overview Repositories Revisions Requests Users Attributes Meta

File fix-boost-moc.patch of Package gstreamer-plugins-qt (Revision 8b07b065bcad9ad2a8ac516cbaf8b055)

Currently displaying revision 8b07b065bcad9ad2a8ac516cbaf8b055 , Show latest

Index: qt-gstreamer-1.2.0/src/QGlib/connect.cpp
===================================================================
--- qt-gstreamer-1.2.0.orig/src/QGlib/connect.cpp
+++ qt-gstreamer-1.2.0/src/QGlib/connect.cpp
@@ -20,10 +20,13 @@
 #include <glib-object.h>
 #include <QtCore/QHash>
 #include <QtCore/QMutex>
+
+#ifndef Q_MOC_RUN
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/sequenced_index.hpp>
 #include <boost/multi_index/ordered_index.hpp>
 #include <boost/multi_index/member.hpp>
+#endif
 
 namespace QGlib {
 namespace Private {
Index: qt-gstreamer-1.2.0/src/QGlib/connect.h
===================================================================
--- qt-gstreamer-1.2.0.orig/src/QGlib/connect.h
+++ qt-gstreamer-1.2.0/src/QGlib/connect.h
@@ -25,8 +25,11 @@
 #include <QtCore/QSharedPointer>
 #include <QtCore/QFlags>
 #include <QtCore/QHash>
+
+#ifndef Q_MOC_RUN
 #include <boost/type_traits.hpp>
 #include <boost/utility/enable_if.hpp>
+#endif
 
 namespace QGlib {
 
Index: qt-gstreamer-1.2.0/src/QGlib/connectimpl.h
===================================================================
--- qt-gstreamer-1.2.0.orig/src/QGlib/connectimpl.h
+++ qt-gstreamer-1.2.0/src/QGlib/connectimpl.h
@@ -26,8 +26,9 @@
 # include "refpointer.h"
 # include <QtCore/QList>
 # include <stdexcept>
+#ifndef Q_MOC_RUN
 # include <boost/type_traits.hpp>
-
+#endif
 
 namespace QGlib {
 namespace Private {
Index: qt-gstreamer-1.2.0/src/QGlib/emitimpl.h
===================================================================
--- qt-gstreamer-1.2.0.orig/src/QGlib/emitimpl.h
+++ qt-gstreamer-1.2.0/src/QGlib/emitimpl.h
@@ -125,7 +125,9 @@ R emitWithDetail(void *instance, const c
 
 # else //QGLIB_HAVE_CXX0X
 
+#ifndef Q_MOC_RUN
 #  include <boost/preprocessor.hpp>
+#endif
 
 // include the second part of this file as many times as QGLIB_SIGNAL_MAX_ARGS specifies
 #  define BOOST_PP_ITERATION_PARAMS_1 (3,(0, QGLIB_SIGNAL_MAX_ARGS, "QGlib/emitimpl.h"))
Index: qt-gstreamer-1.2.0/src/QGlib/global.h
===================================================================
--- qt-gstreamer-1.2.0.orig/src/QGlib/global.h
+++ qt-gstreamer-1.2.0/src/QGlib/global.h
@@ -17,13 +17,10 @@
 #ifndef QGLIB_GLOBAL_H
 #define QGLIB_GLOBAL_H
 
-// workaround for https://bugreports.qt-project.org/browse/QTBUG-22829
-#if defined(Q_MOC_RUN) && !defined(BOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
-#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
-#endif
-
 #include <QtCore/QtGlobal>
+#ifndef Q_MOC_RUN
 #include <boost/config.hpp>
+#endif
 
 /* defined by cmake when building this library */
 #if defined(QtGLib_EXPORTS) || defined(Qt5GLib_EXPORTS)
Index: qt-gstreamer-1.2.0/src/QGlib/refpointer.h
===================================================================
--- qt-gstreamer-1.2.0.orig/src/QGlib/refpointer.h
+++ qt-gstreamer-1.2.0/src/QGlib/refpointer.h
@@ -23,8 +23,10 @@
 #include "type.h"
 #include "wrap.h"
 #include <cstddef>
+#ifndef Q_MOC_RUN
 #include <boost/type_traits.hpp>
 #include <boost/utility/enable_if.hpp>
+#endif
 #include <QtCore/QHash>
 
 namespace QGlib {
Index: qt-gstreamer-1.2.0/src/QGlib/type.h
===================================================================
--- qt-gstreamer-1.2.0.orig/src/QGlib/type.h
+++ qt-gstreamer-1.2.0/src/QGlib/type.h
@@ -21,7 +21,9 @@
 
 #include "global.h"
 #include <QtCore/QList>
+#ifndef Q_MOC_RUN
 #include <boost/mpl/if.hpp>
+#endif
 
 /*
  * This is a re-definition of GType inside the QGlib::Private namespace.
Index: qt-gstreamer-1.2.0/src/QGlib/value.cpp
===================================================================
--- qt-gstreamer-1.2.0.orig/src/QGlib/value.cpp
+++ qt-gstreamer-1.2.0/src/QGlib/value.cpp
@@ -19,7 +19,9 @@
 #include "value.h"
 #include "string.h"
 #include <cstring>
+#ifndef Q_MOC_RUN
 #include <boost/type_traits.hpp>
+#endif
 #include <glib-object.h>
 #include <QtCore/QDebug>
 #include <QtCore/QReadWriteLock>
Index: qt-gstreamer-1.2.0/src/QGlib/value.h
===================================================================
--- qt-gstreamer-1.2.0.orig/src/QGlib/value.h
+++ qt-gstreamer-1.2.0/src/QGlib/value.h
@@ -23,8 +23,10 @@
 #include "type.h"
 #include "refpointer.h"
 #include "error.h"
+#ifndef Q_MOC_RUN
 #include <boost/mpl/if.hpp>
 #include <boost/type_traits.hpp>
+#endif
 #include <stdexcept>
 #include <QtCore/QString>
 #include <QtCore/QDebug>

Places

File fix-boost-moc.patch of Package gstreamer-plugins-qt (Revision 8b07b065bcad9ad2a8ac516cbaf8b055)

Places