import qt5-qtlocation-5.15.3-1.el8
This commit is contained in:
parent
533f817b58
commit
3d8799bc00
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/qtlocation-everywhere-src-5.15.2.tar.xz
|
||||
SOURCES/qtlocation-everywhere-opensource-src-5.15.3.tar.xz
|
||||
|
@ -1 +1 @@
|
||||
8f2d1594424b2ab616c085cd91148073929b8e48 SOURCES/qtlocation-everywhere-src-5.15.2.tar.xz
|
||||
7937e80d484c678c447ff396605f545bd8737619 SOURCES/qtlocation-everywhere-opensource-src-5.15.3.tar.xz
|
||||
|
22
SOURCES/qtlocation-gcc10.patch
Normal file
22
SOURCES/qtlocation-gcc10.patch
Normal file
@ -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 <mbgl/text/bidi.hpp>
|
||||
|
||||
#include <QString>
|
||||
+#include <stdexcept>
|
||||
|
||||
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 <mbgl/util/convert.hpp>
|
||||
+#include <cstdint>
|
||||
|
||||
#include <cstdint>
|
||||
|
@ -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 <string> which in turn
|
||||
# included <local> and <cerrno>. 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 <jgrulich@redhat.com> - 5.15.3-1
|
||||
- 5.15.3
|
||||
Resolves: bz#2061396
|
||||
|
||||
* Wed Apr 28 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-2
|
||||
- Rebuild (binutils)
|
||||
Resolves: bz#1930047
|
||||
|
Loading…
Reference in New Issue
Block a user