commit 0ffada70ae0b7f8408c67e89075e6cc53c603da5
Author: Jan Rękorajski <[email protected]>
Date: Sun Apr 5 17:50:39 2015 +0000
- fix 'parse error at BOOST_JOIN' in moc run
boost-moc.patch | 28 ++++++++++++++++++++++++++++
qt-gstreamer.spec | 2 ++
2 files changed, 30 insertions(+)
---
diff --git a/qt-gstreamer.spec b/qt-gstreamer.spec
index e7cd418..55abe47 100644
--- a/qt-gstreamer.spec
+++ b/qt-gstreamer.spec
@@ -13,6 +13,7 @@ License: LGPL v2+
Group: Libraries
Source0:
http://gstreamer.freedesktop.org/src/qt-gstreamer/%{name}-%{version}.tar.xz
# Source0-md5: fd794045a828c184acc1794b08a463fd
+Patch0: boost-moc.patch
URL: http://gstreamer.net/
BuildRequires: OpenGL-devel
BuildRequires: bison
@@ -213,6 +214,7 @@ Wtyczka Qt GStreamer dla Qt5Qml (Quick2).
%prep
%setup -q
+%patch0 -p1
%build
%if %{with qt4}
diff --git a/boost-moc.patch b/boost-moc.patch
new file mode 100644
index 0000000..6d7280b
--- /dev/null
+++ b/boost-moc.patch
@@ -0,0 +1,28 @@
+--- qt-gstreamer-1.2.0/src/QGlib/connect.cpp~ 2014-07-08 18:38:36.000000000
+0000
++++ qt-gstreamer-1.2.0/src/QGlib/connect.cpp 2015-04-05 17:47:44.623508930
+0000
+@@ -20,10 +20,12 @@
+ #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 {
+--- qt-gstreamer-1.2.0/src/QGlib/connect.h~ 2014-07-08 18:38:36.000000000
+0000
++++ qt-gstreamer-1.2.0/src/QGlib/connect.h 2015-04-05 17:47:10.706840481
+0000
+@@ -25,8 +25,10 @@
+ #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 {
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt-gstreamer.git/commitdiff/971c8a299e276c7002351fcecb7904dd2b888bba
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
