- fix 'parse error at BOOST_JOIN' in moc run

diff --git a/boost-moc.patch b/boost-moc.patch
new file mode 100644 (file)
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 {
+ 

diff --git a/qt-gstreamer.spec b/qt-gstreamer.spec
index e7cd418bcfd7e3ff3e0949e0744d37e03946620c..55abe4797dbcdd357ad07c107bd0297420454b20 100644 (file)
--- 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
 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
 URL:           http://gstreamer.net/
 BuildRequires: OpenGL-devel
 BuildRequires: bison


@@ -213,6 +214,7 @@ Wtyczka Qt GStreamer dla Qt5Qml (Quick2).
 
 %prep
 %setup -q
 
 %prep
 %setup -q

+%patch0 -p1

 
 %build
 %if %{with qt4}
 
 %build
 %if %{with qt4}