!9 update to upstream version 5.15.2

Merge pull request !9 from pei-jiankang/master

qt5-qtlocation.spec

@@ -1,15 +1,17 @@
 %global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$
 
 Name:             qt5-qtlocation
-Version:          5.11.1
-Release:          7
+Version:          5.15.2
+Release:          1
 Summary:          Qt5 module for Location framework
 License:          LGPLv2 with exceptions or GPLv3 with exceptions
 Url:              http://www.qt.io
-Source0:          https://download.qt.io/new_archive/qt/5.11/5.11.1/submodules/qtlocation-everywhere-src-5.11.1.tar.xz
+%global majmin %(echo %{version} | cut -d. -f1-2)
+Source0:          https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/qtlocation-everywhere-src-%{version}.tar.xz
 
 Patch0:           qtlocation-gcc10.patch
 
+BuildRequires: make
 BuildRequires:    qt5-qtbase-devel >= 5.9.0 qt5-qtbase-private-devel pkgconfig(zlib)
 BuildRequires:    pkgconfig(icu-i18n) pkgconfig(libssl) pkgconfig(libcrypto) qt5-qtdeclarative-devel >= 5.9.0
 %{?_qt5:Requires: %{_qt5} = %{_qt5_version}}
@@ -85,6 +87,9 @@ cd -
 %{_qt5_examplesdir}/
 
 %changelog
+* Wed Oct 13 2021 peijiankang <peijiankang@kylinos.cn> - 5.15.2-1
+- update to upstream version 5.15.2
+
 * Sat Jul 31 2021 wangyong<wangyong187@huawei.com> - 5.11.1-7
 - Patch for GCC-10
 

qt5-qtlocation.yaml

@@ -1,4 +1,4 @@
 version_control: git
 src_repo: https://code.qt.io/qt/qtlocation.git
-tag_prefix: ^v
-seperator: .
+tag_prefix: "^v"
+separator: "."

qtlocation-gcc10.patch

@@ -1,17 +1,7 @@
-diff -Nrup a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
---- a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp   2018-08-10 05:35:38.000000000 -0600
-+++ b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp   2019-09-23 12:51:14.960857485 -0600
-@@ -5,6 +5,7 @@
- #include <unicode/ushape.h>
-
- #include <memory>
-+#include <stdexcept>
-
- namespace mbgl {
-
-diff -Nrup a/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp
---- a/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp    2018-08-10 05:35:38.000000000 -0600
-+++ b/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp    2019-09-23 12:46:08.054689805 -0600
+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>
  
@@ -20,12 +10,13 @@ diff -Nrup a/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp b/src/3rdpar
  
  namespace mbgl {
  
-diff -Nrup a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
---- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp   2018-08-10 05:35:38.000000000 -0600
-+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp   2019-09-23 15:55:06.750723673 -0600
+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>
  
- namespace mbgl {
- namespace util {
+ #include <cstdint>
+