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
This commit is contained in:
parent
da7a4e1337
commit
2c82cd7083
12
qt5-qtmultimedia-gcc11.patch
Normal file
12
qt5-qtmultimedia-gcc11.patch
Normal file
@ -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 <limits>
|
||||
#include <qendian.h>
|
||||
#include "wavfile.h"
|
||||
|
@ -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 <law@redhat.com> - 5.15.1-2
|
||||
- Fix missing #include for gcc-11
|
||||
|
||||
* Thu Sep 10 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.1-1
|
||||
- 5.15.1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user