- Fix build with boost 1.60

PR:		199601

6 files changed, 80 insertions, 0 deletions

diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.cpp b/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.cpp
new file mode 100644
index 0000000..2666a82
--- /dev/null
+++ b/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.cpp
@@ -0,0 +1,16 @@
+--- src/QGlib/connect.cpp.orig	2013-10-14 08:44:40 UTC
++++ 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 {
diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.h b/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.h
new file mode 100644
index 0000000..112f0a6
--- /dev/null
+++ b/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.h
@@ -0,0 +1,14 @@
+--- src/QGlib/connect.h.orig	2013-10-14 08:44:40 UTC
++++ 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 {
+ 
diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_connectimpl.h b/multimedia/gstreamer-qt4/files/patch-src_QGlib_connectimpl.h
new file mode 100644
index 0000000..5ef0f39
--- /dev/null
+++ b/multimedia/gstreamer-qt4/files/patch-src_QGlib_connectimpl.h
@@ -0,0 +1,12 @@
+--- src/QGlib/connectimpl.h.orig	2013-10-14 08:44:40 UTC
++++ src/QGlib/connectimpl.h
+@@ -26,7 +26,9 @@
+ # include "refpointer.h"
+ # include <QtCore/QList>
+ # include <stdexcept>
++#ifndef Q_MOC_RUN
+ # include <boost/type_traits.hpp>
++#endif
+ 
+ 
+ namespace QGlib {
diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_refpointer.h b/multimedia/gstreamer-qt4/files/patch-src_QGlib_refpointer.h
new file mode 100644
index 0000000..b8a188f
--- /dev/null
+++ b/multimedia/gstreamer-qt4/files/patch-src_QGlib_refpointer.h
@@ -0,0 +1,13 @@
+--- src/QGlib/refpointer.h.orig	2013-10-14 08:44:40 UTC
++++ 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 {
diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_type.h b/multimedia/gstreamer-qt4/files/patch-src_QGlib_type.h
new file mode 100644
index 0000000..6be012c
--- /dev/null
+++ b/multimedia/gstreamer-qt4/files/patch-src_QGlib_type.h
@@ -0,0 +1,12 @@
+--- src/QGlib/type.h.orig	2013-10-14 08:44:40 UTC
++++ 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.
diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_value.h b/multimedia/gstreamer-qt4/files/patch-src_QGlib_value.h
new file mode 100644
index 0000000..1b4a6b1
--- /dev/null
+++ b/multimedia/gstreamer-qt4/files/patch-src_QGlib_value.h
@@ -0,0 +1,13 @@
+--- src/QGlib/value.h.orig	2013-10-14 08:44:40 UTC
++++ 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>