diff --git a/qt5-qtlocation.spec b/qt5-qtlocation.spec index 37da5a4840562737680648257e53cfd46d1d7255..73c521edb8da91006f41ac51c4e5143355005803 100644 --- a/qt5-qtlocation.spec +++ b/qt5-qtlocation.spec @@ -5,8 +5,8 @@ Summary: Qt5 - Location component Name: qt5-%{qt_module} -Version: 5.15.7 -Release: 3%{?dist} +Version: 5.15.9 +Release: 1%{?dist} License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://www.qt.io Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz @@ -85,6 +85,9 @@ popd %{_qt5_examplesdir}/ %changelog +* Fri Jul 14 2023 Shuo Wang - 5.15.9-1 +- update to 5.15.9 + * Fri Apr 28 2023 OpenCloudOS Release Engineering - 5.15.7-3 - Rebuilt for OpenCloudOS Stream 23.05 diff --git a/qtlocation-gcc10.patch b/qtlocation-gcc10.patch index 58c84f7c8c784f3cf7fa230b271c7ae0677a4775..fdb96e610d28f3324ca862f0798f55e1caf2157c 100644 --- a/qtlocation-gcc10.patch +++ b/qtlocation-gcc10.patch @@ -10,13 +10,35 @@ index b75d038..b367ee6 100644 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 +diff -up qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp.me qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp +--- qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp.me 2023-02-20 14:49:09.397384737 +0100 ++++ qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp 2023-02-20 14:50:09.654502801 +0100 +@@ -1,5 +1,7 @@ + #pragma once + ++#include ++ + #include + #include + #include +diff -up qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp.me1 qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp +--- qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp.me1 2023-02-20 15:00:23.967862291 +0100 ++++ qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp 2023-02-20 15:00:41.398058051 +0100 +@@ -4,6 +4,7 @@ + #include + #include + #include +#include + #include - #include + // Polyfill needed by Qt when building for Android with GCC +diff -up qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp.me qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp +--- qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp.me 2023-02-20 15:12:32.276042434 +0100 ++++ qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp 2023-02-20 15:12:58.578501426 +0100 +@@ -1,5 +1,6 @@ + #pragma once ++#include + #include + + namespace mbgl { diff --git a/sources b/sources index 2d2650d1c574ede10d32222d2c12fdf3b2f46a80..9a09d273b3c4e6555ca8c34e49c4b39eca072249 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtlocation-everywhere-opensource-src-5.15.7.tar.xz) = fc4579b14f7f4836ef550d80b867c2655f52da34b0637dce4d83b10f2f7a836530a8f2a6b0f1a41c38e5e391c5d8e2431818e9813fd9d597f67704fcfbfb2f7e +SHA512 (qtlocation-everywhere-opensource-src-5.15.9.tar.xz) = 37517c304240921c600e2aad19baff0efbb5e01c5cc78e5370fb4b084f2a6ba4da94d39ddcbcd33a5f0af37f017d39bb775a40cda195e16697aa70c9d17b6bcf