[Pkg-gstreamer-commits] [SCM] UNNAMED PROJECT branch, master, updated. debian/0.10.1-2-7-g9c96dba

[George Kiagiadakis]

The following commit has been merged in the master branch:
commit 4116865bd6f36870b6cab16119a5c52c8d1ee796
Author: Steve M. Robbins <smr at debian.org>
Date:   Sat May 5 13:30:17 2012 +0300

    NMU to fix FTBFS with boost 1.48

diff --git a/debian/changelog b/debian/changelog
index 16337ff..a7edd6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+qt-gstreamer (0.10.1-2.1) unstable; urgency=low
+
+  * Non-Maintainer Upload.
+  
+  * patches/boost1.48.patch: New.  Work around moc limitation.  Closes:
+    #653796.
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 28 Jan 2012 05:41:39 -0600
+
 qt-gstreamer (0.10.1-2) unstable; urgency=low
 
   * Import patch from upstream to fix FTBFS - disable building
diff --git a/debian/patches/boost1.48.patch b/debian/patches/boost1.48.patch
new file mode 100644
index 0000000..c48eec6
--- /dev/null
+++ b/debian/patches/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 at coldtobi.de>
+Reviewed-By: Steve Robbins <smr at 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>
diff --git a/debian/patches/series b/debian/patches/series
index f02d583..b6d72e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 00_no_latex_docs.diff
+boost1.48.patch
+

-- 
UNNAMED PROJECT