diff options
author | Song Wenwu <iyzsong@gmail.com> | 2013-12-23 23:21:43 +0800 |
---|---|---|
committer | Song Wenwu <iyzsong@gmail.com> | 2014-01-10 20:51:24 +0800 |
commit | 97d7c0abe592140e0a9663dfaf2f94ea1a63e4e3 (patch) | |
tree | 1d028c94e920e12ab196611db032abc4897111f4 /pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch | |
parent | e49656fcf7293017fb7fb4ff223154dc906d084e (diff) | |
download | nixlib-97d7c0abe592140e0a9663dfaf2f94ea1a63e4e3.tar nixlib-97d7c0abe592140e0a9663dfaf2f94ea1a63e4e3.tar.gz nixlib-97d7c0abe592140e0a9663dfaf2f94ea1a63e4e3.tar.bz2 nixlib-97d7c0abe592140e0a9663dfaf2f94ea1a63e4e3.tar.lz nixlib-97d7c0abe592140e0a9663dfaf2f94ea1a63e4e3.tar.xz nixlib-97d7c0abe592140e0a9663dfaf2f94ea1a63e4e3.tar.zst nixlib-97d7c0abe592140e0a9663dfaf2f94ea1a63e4e3.zip |
gstreamer-0.10: move to gstreamer/legacy
Diffstat (limited to 'pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch')
-rw-r--r-- | pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch new file mode 100644 index 000000000000..c48eec68a640 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch @@ -0,0 +1,49 @@ +Description: Work around moc limitations + Some parts of Boost, introduced in Boost 1.48 are not + understood by the limited C++ parser of moc. This + patch defines header guards that prevent the troublesome boost + headers from being processed. +Bug-Debian: #653796 +Author: Tobias Frost <tobi@coldtobi.de> +Reviewed-By: Steve Robbins <smr@debian.org> + +--- a/src/QGlib/connect.h ++++ b/src/QGlib/connect.h +@@ -19,6 +19,11 @@ + #ifndef QGLIB_CONNECT_H + #define QGLIB_CONNECT_H + ++#ifdef Q_MOC_RUN ++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED ++#endif ++ ++ + #include "global.h" + #include "quark.h" + #include <QtCore/QObject> +--- a/src/QGst/bin.h ++++ b/src/QGst/bin.h +@@ -19,6 +19,10 @@ + #ifndef QGST_BIN_H + #define QGST_BIN_H + ++#ifdef Q_MOC_RUN ++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED ++#endif ++ + #include "element.h" + #include "childproxy.h" + +--- a/src/QGst/Ui/videowidget.h ++++ b/src/QGst/Ui/videowidget.h +@@ -19,6 +19,10 @@ + #ifndef QGST_UI_VIDEOWIDGET_H + #define QGST_UI_VIDEOWIDGET_H + ++#ifdef Q_MOC_RUN ++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED ++#endif ++ + #include "global.h" + #include "../element.h" + #include <QtGui/QWidget> |