From 50a1a0a2aa2e003324020cf8df224d9d43ca9586 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Jun 15 2016 20:50:08 +0000
Subject: BR: qt5-qtbase-private-devel, nullptr el6 FTBFS


---

diff --git a/qt5-qtmultimedia.spec b/qt5-qtmultimedia.spec
index db52d5e..783e059 100644
--- a/qt5-qtmultimedia.spec
+++ b/qt5-qtmultimedia.spec
@@ -24,13 +24,17 @@
 Summary: Qt5 - Multimedia support
 Name:    qt5-%{qt_module}
 Version: 5.6.1
-Release: 1%{?prerelease:.%{prerelease}}%{?dist}
+Release: 2%{?prerelease:.%{prerelease}}%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     http://www.qt.io
 Source0: http://download.qt.io/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz
 
+## upstreamable paches
+# FTBFS on el6
+Patch50: qtmultimedia-opensource-src-5.6.1-nullptr.patch
+
 BuildRequires: cmake
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: pkgconfig(Qt5Quick) >= %{version}
@@ -51,6 +55,7 @@ BuildRequires: pkgconfig(openal)
 %endif
 BuildRequires: pkgconfig(xv)
 
+BuildRequires: qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 
 %description
@@ -89,6 +94,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %prep
 %setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}
 
+%patch50 -p1 -b .nullptr
+
 
 %build
 mkdir %{_target_platform}
@@ -177,6 +184,9 @@ popd
 
 
 %changelog
+* Wed Jun 15 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-2
+- BR: qt5-qtbase-private-devel, nullptr el6 FTBFS
+
 * Thu Jun 09 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.1-1
 - Update to 5.6.1
 
diff --git a/qtmultimedia-opensource-src-5.6.1-nullptr.patch b/qtmultimedia-opensource-src-5.6.1-nullptr.patch
new file mode 100644
index 0000000..9a1b2c6
--- /dev/null
+++ b/qtmultimedia-opensource-src-5.6.1-nullptr.patch
@@ -0,0 +1,12 @@
+diff -up qtmultimedia-opensource-src-5.6.1/src/gsttools/qgstreamerbushelper.cpp.nullptr qtmultimedia-opensource-src-5.6.1/src/gsttools/qgstreamerbushelper.cpp
+--- qtmultimedia-opensource-src-5.6.1/src/gsttools/qgstreamerbushelper.cpp.nullptr	2016-05-31 05:23:00.000000000 -0500
++++ qtmultimedia-opensource-src-5.6.1/src/gsttools/qgstreamerbushelper.cpp	2016-06-15 15:48:15.325108680 -0500
+@@ -52,7 +52,7 @@ public:
+         m_tag(0),
+         m_bus(bus),
+         m_helper(parent),
+-        m_intervalTimer(nullptr)
++        m_intervalTimer(Q_NULLPTR)
+     {
+         // glib event loop can be disabled either by env variable or QT_NO_GLIB define, so check the dispacher
+         QAbstractEventDispatcher *dispatcher = QCoreApplication::eventDispatcher();