Date: Sat, 13 Feb 2016 01:26:10 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408773 - head/multimedia/gstreamer-qt4/files Message-ID: <201602130126.u1D1QAlf011913@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sat Feb 13 01:26:10 2016 New Revision: 408773 URL: https://svnweb.freebsd.org/changeset/ports/408773 Log: - Fix build with boost 1.60 PR: 199601 Added: head/multimedia/gstreamer-qt4/files/ head/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.cpp (contents, props changed) head/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.h (contents, props changed) head/multimedia/gstreamer-qt4/files/patch-src_QGlib_connectimpl.h (contents, props changed) head/multimedia/gstreamer-qt4/files/patch-src_QGlib_refpointer.h (contents, props changed) head/multimedia/gstreamer-qt4/files/patch-src_QGlib_type.h (contents, props changed) head/multimedia/gstreamer-qt4/files/patch-src_QGlib_value.h (contents, props changed) Added: head/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.cpp Sat Feb 13 01:26:10 2016 (r408773) @@ -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 { Added: head/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.h Sat Feb 13 01:26:10 2016 (r408773) @@ -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 { + Added: head/multimedia/gstreamer-qt4/files/patch-src_QGlib_connectimpl.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/gstreamer-qt4/files/patch-src_QGlib_connectimpl.h Sat Feb 13 01:26:10 2016 (r408773) @@ -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 { Added: head/multimedia/gstreamer-qt4/files/patch-src_QGlib_refpointer.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/gstreamer-qt4/files/patch-src_QGlib_refpointer.h Sat Feb 13 01:26:10 2016 (r408773) @@ -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 { Added: head/multimedia/gstreamer-qt4/files/patch-src_QGlib_type.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/gstreamer-qt4/files/patch-src_QGlib_type.h Sat Feb 13 01:26:10 2016 (r408773) @@ -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. Added: head/multimedia/gstreamer-qt4/files/patch-src_QGlib_value.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/gstreamer-qt4/files/patch-src_QGlib_value.h Sat Feb 13 01:26:10 2016 (r408773) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602130126.u1D1QAlf011913>