mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-29 14:57:28 +03:00
50 lines
1.1 KiB
Diff
50 lines
1.1 KiB
Diff
|
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>
|