From fadf16d372ba6ca64d15eb299af2c0958af15bc4 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 8 Nov 2022 01:36:31 -0500 Subject: [PATCH] import qt5-qtmultimedia-5.15.3-1.el8 --- .gitignore | 2 +- .qt5-qtmultimedia.metadata | 2 +- SOURCES/qt5-qtmultimedia-gcc11.patch | 12 ++++++++++++ SPECS/qt5-qtmultimedia.spec | 12 +++++++++--- 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 SOURCES/qt5-qtmultimedia-gcc11.patch diff --git a/.gitignore b/.gitignore index 01d12d4..fbcf3f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtmultimedia-everywhere-src-5.15.2.tar.xz +SOURCES/qtmultimedia-everywhere-opensource-src-5.15.3.tar.xz diff --git a/.qt5-qtmultimedia.metadata b/.qt5-qtmultimedia.metadata index f34b8a9..8f512b3 100644 --- a/.qt5-qtmultimedia.metadata +++ b/.qt5-qtmultimedia.metadata @@ -1 +1 @@ -35a54788c835f8c31af5ce35a04fa54d847855b8 SOURCES/qtmultimedia-everywhere-src-5.15.2.tar.xz +73d3392cc23117fd723dbc35ffa5e46805b7fb90 SOURCES/qtmultimedia-everywhere-opensource-src-5.15.3.tar.xz diff --git a/SOURCES/qt5-qtmultimedia-gcc11.patch b/SOURCES/qt5-qtmultimedia-gcc11.patch new file mode 100644 index 0000000..517a139 --- /dev/null +++ b/SOURCES/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/SPECS/qt5-qtmultimedia.spec b/SPECS/qt5-qtmultimedia.spec index 64125b2..787a4c9 100644 --- a/SPECS/qt5-qtmultimedia.spec +++ b/SPECS/qt5-qtmultimedia.spec @@ -11,15 +11,16 @@ Summary: Qt5 - Multimedia support Name: qt5-%{qt_module} -Version: 5.15.2 -Release: 2%{?dist} +Version: 5.15.3 +Release: 1%{?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 +Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz Patch0: qtmultimedia-python-shebang.patch +Patch1: %{name}-gcc11.patch # filter plugin/qml provides %global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$ @@ -86,6 +87,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %setup -q -n %{qt_module}-everywhere-src-%{version} %patch0 -p1 +%patch1 -p1 %build %{qmake_qt5} \ @@ -178,6 +180,10 @@ popd %endif %changelog +* Mon Mar 28 2022 Jan Grulich - 5.15.3-1 +- 5.15.3 + Resolves: bz#2061396 + * Wed Apr 28 2021 Jan Grulich - 5.15.2-2 - Rebuild (binutils) Resolves: bz#1930048