From 2c82cd70833bdf86738251e641283c4aaaba1c9a Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 27 Oct 2020 22:03:59 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/qt5-qtmultimedia.git#a9d9c10df2d081b34175cbc1c3ef08b196621acb --- qt5-qtmultimedia-gcc11.patch | 12 ++++++++++++ qt5-qtmultimedia.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 qt5-qtmultimedia-gcc11.patch diff --git a/qt5-qtmultimedia-gcc11.patch b/qt5-qtmultimedia-gcc11.patch new file mode 100644 index 0000000..517a139 --- /dev/null +++ b/qt5-qtmultimedia-gcc11.patch @@ -0,0 +1,12 @@ +diff --git a/examples/multimedia/spectrum/app/wavfile.cpp b/examples/multimedia/spectrum/app/wavfile.cpp +index 475200d..5c786c1 100644 +--- a/examples/multimedia/spectrum/app/wavfile.cpp ++++ b/examples/multimedia/spectrum/app/wavfile.cpp +@@ -48,6 +48,7 @@ + ** + ****************************************************************************/ + ++#include + #include + #include "wavfile.h" + diff --git a/qt5-qtmultimedia.spec b/qt5-qtmultimedia.spec index ef4cf62..f9ffc11 100644 --- a/qt5-qtmultimedia.spec +++ b/qt5-qtmultimedia.spec @@ -10,13 +10,14 @@ Summary: Qt5 - Multimedia support Name: qt5-%{qt_module} Version: 5.15.1 -Release: 1%{?dist} +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 %global majmin %(echo %{version} | cut -d. -f1-2) Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz +Patch0: %{name}-gcc11.patch # filter plugin/qml provides %global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$ @@ -73,6 +74,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep %setup -q -n %{qt_module}-everywhere-src-%{version} +%patch0 -p1 %build @@ -147,6 +149,9 @@ popd %changelog +* Fri Oct 16 2020 Jeff Law - 5.15.1-2 +- Fix missing #include for gcc-11 + * Thu Sep 10 2020 Jan Grulich - 5.15.1-1 - 5.15.1