From 6464f02754d78fe6d8ecd2bcebf1e2d30a4c9356 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Fri, 15 Jul 2016 23:39:22 +0200 Subject: [PATCH] - Update Qt 5.7.0 --- .gitignore | 1 + qt5-qtmultimedia.spec | 25 +++++++------------ ...timedia-opensource-src-5.6.1-nullptr.patch | 12 --------- sources | 2 +- 4 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 qtmultimedia-opensource-src-5.6.1-nullptr.patch diff --git a/.gitignore b/.gitignore index e79d17e..4e4f45e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /qtmultimedia-opensource-src-5.6.0-rc.tar.xz /qtmultimedia-opensource-src-5.6.0.tar.xz /qtmultimedia-opensource-src-5.6.1.tar.xz +/qtmultimedia-opensource-src-5.7.0.tar.xz diff --git a/qt5-qtmultimedia.spec b/qt5-qtmultimedia.spec index f33ddb6..997b5b3 100644 --- a/qt5-qtmultimedia.spec +++ b/qt5-qtmultimedia.spec @@ -19,25 +19,21 @@ %global gst 1.0 %endif -#define prerelease +#define prerelease rc Summary: Qt5 - Multimedia support Name: qt5-%{qt_module} -Version: 5.6.1 -Release: 3%{?prerelease:.%{prerelease}}%{?dist} +Version: 5.7.0 +Release: 2%{?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 +Source0: http://download.qt.io/official_releases/qt/5.7/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz BuildRequires: cmake BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: qt5-qtdeclarative-devel >= %{version} +BuildRequires: pkgconfig(Qt5Quick) >= %{version} BuildRequires: pkgconfig(alsa) %if "%{?gst}" == "0.10" BuildRequires: pkgconfig(gstreamer-interfaces-0.10) @@ -55,7 +51,6 @@ BuildRequires: pkgconfig(openal) %endif BuildRequires: pkgconfig(xv) -BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} %description @@ -94,8 +89,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep %setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} -%patch50 -p1 -b .nullptr - %build mkdir %{_target_platform} @@ -184,11 +177,11 @@ popd %changelog -* Wed Jun 15 2016 Rex Dieter - 5.6.1-3 -- drop pkgconfig-style Qt5 deps +* Mon Jul 04 2016 Helio Chissini de Castro - 5.7.0-2 +- Compiled with gcc -* Wed Jun 15 2016 Rex Dieter - 5.6.1-2 -- BR: qt5-qtbase-private-devel, nullptr el6 FTBFS +* Mon Jun 13 2016 Helio Chissini de Castro - 5.7.0-1 +- Qt 5.7.0 release * Thu Jun 09 2016 Jan Grulich - 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 deleted file mode 100644 index 9a1b2c6..0000000 --- a/qtmultimedia-opensource-src-5.6.1-nullptr.patch +++ /dev/null @@ -1,12 +0,0 @@ -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(); diff --git a/sources b/sources index 0e10c80..965b719 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01e90a2ba304625305170f04cf3e6704 qtmultimedia-opensource-src-5.6.1.tar.xz +44c1b9a1dfb0e8b13f2d9571829500ee qtmultimedia-opensource-src-5.7.0.tar.xz