diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2016-02-13 09:26:10 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2016-02-13 09:26:10 +0800 |
| commit | 4a98e5d35ec9dd324812a4092147c7aed18662cb (patch) | |
| tree | 758284d0fd86bb147c51196ffd052d044d356a7b /multimedia | |
| parent | 6deb630fbb2dad976fc47a042d19918113dc4880 (diff) | |
| download | freebsd-ports-gnome-4a98e5d35ec9dd324812a4092147c7aed18662cb.tar.gz freebsd-ports-gnome-4a98e5d35ec9dd324812a4092147c7aed18662cb.tar.zst freebsd-ports-gnome-4a98e5d35ec9dd324812a4092147c7aed18662cb.zip | |
- Fix build with boost 1.60
PR: 199601
Diffstat (limited to 'multimedia')
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 000000000000..2666a823c44d --- /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 000000000000..112f0a600fe1 --- /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 000000000000..5ef0f390a670 --- /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 000000000000..b8a188fd20fe --- /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 000000000000..6be012c52c13 --- /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 000000000000..1b4a6b12dbe5 --- /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> |