From 796c78fcd666a6ac082e2fa890a32240685ccca7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Jun 15 2023 14:12:52 +0000 Subject: Update to 5.15.10 --- diff --git a/.gitignore b/.gitignore index e6baf2d..1a76cc7 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /qtlocation-everywhere-opensource-src-5.15.7.tar.xz /qtlocation-everywhere-opensource-src-5.15.8.tar.xz /qtlocation-everywhere-opensource-src-5.15.9.tar.xz +/qtlocation-everywhere-opensource-src-5.15.10.tar.xz diff --git a/mingw-qt5-qtlocation.spec b/mingw-qt5-qtlocation.spec index 324f73e..b45c1d6 100644 --- a/mingw-qt5-qtlocation.spec +++ b/mingw-qt5-qtlocation.spec @@ -16,7 +16,7 @@ %define release_version %(echo %{version} | awk -F. '{print $1"."$2}') Name: mingw-qt5-%{qt_module} -Version: 5.15.9 +Version: 5.15.10 Release: 1%{?dist} Summary: Qt5 for Windows - QtLocation component @@ -163,6 +163,9 @@ mkdir .git %changelog +* Thu Jun 15 2023 Sandro Mani - 5.15.10-1 +- Update to 5.15.10 + * Thu Apr 13 2023 Sandro Mani - 5.15.9-1 - Update to 5.15.9 diff --git a/qtlocation_cstdint.patch b/qtlocation_cstdint.patch index 14ef324..7fc492f 100644 --- a/qtlocation_cstdint.patch +++ b/qtlocation_cstdint.patch @@ -1,15 +1,6 @@ -diff -rupN --no-dereference qtlocation-everywhere-src-5.15.9/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp qtlocation-everywhere-src-5.15.9-new/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp ---- qtlocation-everywhere-src-5.15.9/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp 2023-03-23 15:00:13.000000000 +0100 -+++ qtlocation-everywhere-src-5.15.9-new/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp 2023-04-13 11:13:12.324979024 +0200 -@@ -1,4 +1,5 @@ - #include -+#include - - #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 +diff -rupN --no-dereference qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp qtlocation-everywhere-src-5.15.10-new/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp +--- qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp 2023-04-24 09:13:46.000000000 +0200 ++++ qtlocation-everywhere-src-5.15.10-new/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp 2023-06-15 16:12:24.220091432 +0200 @@ -1,5 +1,7 @@ #pragma once @@ -18,9 +9,9 @@ diff -up qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/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 +diff -rupN --no-dereference qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp qtlocation-everywhere-src-5.15.10-new/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp +--- qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp 2023-04-24 09:13:46.000000000 +0200 ++++ qtlocation-everywhere-src-5.15.10-new/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp 2023-06-15 16:12:24.221091446 +0200 @@ -4,6 +4,7 @@ #include #include @@ -29,9 +20,9 @@ diff -up qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/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 +diff -rupN --no-dereference qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp qtlocation-everywhere-src-5.15.10-new/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp +--- qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp 2023-04-24 09:13:46.000000000 +0200 ++++ qtlocation-everywhere-src-5.15.10-new/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp 2023-06-15 16:12:24.221091446 +0200 @@ -1,5 +1,6 @@ #pragma once @@ -39,3 +30,12 @@ diff -up qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/src/mbgl #include namespace mbgl { +diff -rupN --no-dereference qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp qtlocation-everywhere-src-5.15.10-new/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp +--- qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp 2023-04-24 09:13:46.000000000 +0200 ++++ qtlocation-everywhere-src-5.15.10-new/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp 2023-06-15 16:12:24.219091417 +0200 +@@ -1,4 +1,5 @@ + #include ++#include + + #include + diff --git a/sources b/sources index 9a09d27..d10ec9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtlocation-everywhere-opensource-src-5.15.9.tar.xz) = 37517c304240921c600e2aad19baff0efbb5e01c5cc78e5370fb4b084f2a6ba4da94d39ddcbcd33a5f0af37f017d39bb775a40cda195e16697aa70c9d17b6bcf +SHA512 (qtlocation-everywhere-opensource-src-5.15.10.tar.xz) = e4fb56ddd2dc50024f02de84323c3299788eb6632672e1bc52ef1399ccf9d0af34b0104548cb108fb372870057426b0cdd52052ad91ba45fc7f8098a675f29a4