diff --git a/qt5-qtlocation.spec b/qt5-qtlocation.spec index a5b9439aa857befd26ad6f5ec9aa444eef9c4914..3cca70f0bdcdc7e424fa9b6a3647b00f0dadcc70 100644 --- a/qt5-qtlocation.spec +++ b/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 - 5.15.2-1 +- update to upstream version 5.15.2 + * Sat Jul 31 2021 wangyong - 5.11.1-7 - Patch for GCC-10 diff --git a/qt5-qtlocation.yaml b/qt5-qtlocation.yaml index a33f13a3f2896c1a6d1ada483e6c37a431698af0..21ec19f69db80148a63105b1adf0a324699d7df4 100644 --- a/qt5-qtlocation.yaml +++ b/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: "." diff --git a/qtlocation-everywhere-src-5.11.1.tar.xz b/qtlocation-everywhere-src-5.15.2.tar.xz similarity index 44% rename from qtlocation-everywhere-src-5.11.1.tar.xz rename to qtlocation-everywhere-src-5.15.2.tar.xz index 5cb698f4ae20cd794972c22165fb4460f0ccbd8c..a2cb2f8b0a2ee429dea9b11811722fc6f4d1a2f3 100644 Binary files a/qtlocation-everywhere-src-5.11.1.tar.xz and b/qtlocation-everywhere-src-5.15.2.tar.xz differ diff --git a/qtlocation-gcc10.patch b/qtlocation-gcc10.patch index 70ce34c8e2bc1586fccebdfbe50b09a5ae268d1b..58c84f7c8c784f3cf7fa230b271c7ae0677a4775 100644 --- a/qtlocation-gcc10.patch +++ b/qtlocation-gcc10.patch @@ -1,31 +1,22 @@ -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 - - #include -+#include - - 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 - + #include +#include - + 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 +#include - - namespace mbgl { - namespace util { + + #include +