diff --git a/.gitignore b/.gitignore index ff5153d..1460a66 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtlocation-everywhere-src-5.15.2.tar.xz +SOURCES/qtlocation-everywhere-opensource-src-5.15.3.tar.xz diff --git a/.qt5-qtlocation.metadata b/.qt5-qtlocation.metadata index 6e128d6..71a47ef 100644 --- a/.qt5-qtlocation.metadata +++ b/.qt5-qtlocation.metadata @@ -1 +1 @@ -8f2d1594424b2ab616c085cd91148073929b8e48 SOURCES/qtlocation-everywhere-src-5.15.2.tar.xz +7937e80d484c678c447ff396605f545bd8737619 SOURCES/qtlocation-everywhere-opensource-src-5.15.3.tar.xz diff --git a/SOURCES/qtlocation-gcc10.patch b/SOURCES/qtlocation-gcc10.patch new file mode 100644 index 0000000..58c84f7 --- /dev/null +++ b/SOURCES/qtlocation-gcc10.patch @@ -0,0 +1,22 @@ +diff --git a/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp +index b75d038..b367ee6 100644 +--- a/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp ++++ b/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp +@@ -3,6 +3,7 @@ + #include + + #include ++#include + + namespace mbgl { + +diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp +index 510ff23..d5e0a92 100644 +--- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp ++++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp +@@ -1,4 +1,5 @@ + #include ++#include + + #include + diff --git a/SPECS/qt5-qtlocation.spec b/SPECS/qt5-qtlocation.spec index 1f6af07..f08f795 100644 --- a/SPECS/qt5-qtlocation.spec +++ b/SPECS/qt5-qtlocation.spec @@ -4,14 +4,21 @@ Summary: Qt5 - Location component 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 + +# build failure with gcc10 +# various C++ runtime headers indirectly included which in turn +# included and . Those indirect inclusions have been +# eliminated which in turn forces packages to include the C++ headers they +# actually need. +Patch0: qtlocation-gcc10.patch # filter plugin/qml provides %global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$ @@ -58,6 +65,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep %setup -q -n %{qt_module}-everywhere-src-%{version} +%patch0 -p1 -b .gcc10 %build @@ -111,9 +119,6 @@ popd %{_qt5_archdatadir}/qml/QtPositioning/* %{_qt5_plugindir}/position/ %{_qt5_libdir}/libQt5PositioningQuick.so.5* -%dir %{_qt5_archdatadir}/qml/Qt -%dir %{_qt5_archdatadir}/qml/Qt/labs -%{_qt5_archdatadir}/qml/Qt/labs/location %files devel %{_qt5_headerdir}/QtLocation/ @@ -148,6 +153,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#1930047