rpms/qt5-qtmultimedia
6
0
Fork 0
Code Issues Pull Requests Releases Activity

BR: qt5-qtbase-private-devel, nullptr el6 FTBFS

Browse Source
This commit is contained in:
Rex Dieter 2016-06-15 15:50:08 -05:00
parent 27ff35fabf
commit 50a1a0a2aa
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qt5-qtmultimedia.spec
View File

@ -24,13 +24,17 @@
Summary: Qt5 - Multimedia support Summary: Qt5 - Multimedia support
Name: qt5-%{qt_module} Name: qt5-%{qt_module}
Version: 5.6.1 Version: 5.6.1
Release: 1%{?prerelease:.%{prerelease}}%{?dist} Release: 2%{?prerelease:.%{prerelease}}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://www.qt.io 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 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: cmake
BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-devel >= %{version}
BuildRequires: pkgconfig(Qt5Quick) >= %{version} BuildRequires: pkgconfig(Qt5Quick) >= %{version}
@ -51,6 +55,7 @@ BuildRequires: pkgconfig(openal)
%endif %endif
BuildRequires: pkgconfig(xv) BuildRequires: pkgconfig(xv)
BuildRequires: qt5-qtbase-private-devel
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
%description %description
@ -89,6 +94,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep %prep
%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} %setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}
%patch50 -p1 -b .nullptr
%build %build
mkdir %{_target_platform} mkdir %{_target_platform}
@ -177,6 +184,9 @@ popd
%changelog %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 * Thu Jun 09 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.1-1
- Update to 5.6.1 - Update to 5.6.1

12
qtmultimedia-opensource-src-5.6.1-nullptr.patch Normal file
View File

@ -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();