commit 2361aedaa777a022d7ed5d108191f5456d1f3f2e
Author: Jan Palus <[email protected]>
Date: Wed Jun 7 12:58:37 2023 +0200
up to 5.15.10
- fix build with gcc 13 by including cstdint in case uint* types are
used
- labs plugin is back since upstream fixed condition in:
https://code.qt.io/cgit/qt/qtlocation.git/commit/src?id=3eaed3d6fa15d8a29cb8d8d683aaea9b256a36b1
gcc13.patch | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++
qt5-qtlocation.spec | 13 +++-
2 files changed, 219 insertions(+), 3 deletions(-)
---
diff --git a/qt5-qtlocation.spec b/qt5-qtlocation.spec
index a99fb3a..d29327a 100644
--- a/qt5-qtlocation.spec
+++ b/qt5-qtlocation.spec
@@ -21,14 +21,15 @@
Summary: The Qt5 Location library
Summary(pl.UTF-8): Biblioteka Qt5 Location
Name: qt5-%{orgname}
-Version: 5.15.9
+Version: 5.15.10
Release: 1
License: LGPL v3 or GPL v2+ or commercial
Group: Libraries
Source0:
https://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%{orgname}-everywhere-opensource-src-%{version}.tar.xz
-# Source0-md5: ea114a64e604f731535517e66ea6f548
+# Source0-md5: 6d7c0a23fe701597815a54cac53c1e62
Source1:
https://download.qt.io/official_releases/qt/5.15/%{version}/submodules/qttranslations-everywhere-opensource-src-%{version}.tar.xz
-# Source1-md5: af998d4bc7ab3484c392520c12d5f3a3
+# Source1-md5: f421a46bfd3cbbdf0a3fa701d3ccbedf
+Patch0: gcc13.patch
URL: https://www.qt.io/
%{?with_gypsy:BuildRequires: GConf2-devel >= 2.0}
BuildRequires: Qt5Concurrent-devel >= %{qtbase_ver}
@@ -187,6 +188,7 @@ Przykłady do bibliotek Qt5 Location i Positioning.
%prep
%setup -q -n %{orgname}-everywhere-src-%{version} %{?with_qm:-a1}
+%patch0 -p1
%build
%{qmake_qt5} -- \
@@ -301,6 +303,11 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{qt5dir}/qml/QtLocation/libdeclarative_location.so
%{qt5dir}/qml/QtLocation/plugins.qmltypes
%{qt5dir}/qml/QtLocation/qmldir
+%dir %{_libdir}/qt5/qml/Qt/labs/location
+# R: Core Location Positioning Qml
+%attr(755,root,root)
%{_libdir}/qt5/qml/Qt/labs/location/liblocationlabsplugin.so
+%{_libdir}/qt5/qml/Qt/labs/location/plugins.qmltypes
+%{_libdir}/qt5/qml/Qt/labs/location/qmldir
%files -n Qt5Location-devel
%defattr(644,root,root,755)
diff --git a/gcc13.patch b/gcc13.patch
new file mode 100644
index 0000000..e94c242
--- /dev/null
+++ b/gcc13.patch
@@ -0,0 +1,209 @@
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_backend.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_backend.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_backend.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_backend.hpp
2023-06-07 11:38:34.315351344 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/renderer/backend_scope.hpp>
+ #include <mbgl/util/image.hpp>
+ #include <mbgl/util/size.hpp>
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp
2023-06-07 11:38:34.325351042 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <exception>
+
+ namespace mbgl {
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/storage/default_file_source.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/storage/default_file_source.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/storage/default_file_source.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/storage/default_file_source.hpp
2023-06-07 11:38:34.332017507 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/actor/actor_ref.hpp>
+ #include <mbgl/storage/file_source.hpp>
+ #include <mbgl/storage/offline.hpp>
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/storage/network_status.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/storage/network_status.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/storage/network_status.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/storage/network_status.hpp
2023-06-07 11:38:34.342017205 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <atomic>
+ #include <mutex>
+ #include <unordered_set>
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/storage/offline.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/storage/offline.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/storage/offline.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/storage/offline.hpp
2023-06-07 11:38:34.348683670 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/util/geo.hpp>
+ #include <mbgl/util/range.hpp>
+ #include <mbgl/util/optional.hpp>
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/storage/resource.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/storage/resource.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/storage/resource.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/storage/resource.hpp
2023-06-07 11:38:34.358683368 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/storage/response.hpp>
+ #include <mbgl/util/optional.hpp>
+ #include <mbgl/util/font_stack.hpp>
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/storage/response.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/storage/response.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/storage/response.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/storage/response.hpp
2023-06-07 11:38:34.365349833 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/util/chrono.hpp>
+ #include <mbgl/util/optional.hpp>
+
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/style/conversion/custom_geometry_source_options.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/style/conversion/custom_geometry_source_options.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/style/conversion/custom_geometry_source_options.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/style/conversion/custom_geometry_source_options.hpp
2023-06-07 11:38:34.375349531 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/style/conversion.hpp>
+ #include <mbgl/style/sources/custom_geometry_source.hpp>
+
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/style/expression/value.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/style/expression/value.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/style/expression/value.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/style/expression/value.hpp
2023-06-07 11:38:34.382015997 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/style/expression/collator.hpp>
+ #include <mbgl/style/expression/type.hpp>
+ #include <mbgl/style/position.hpp>
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/style/sources/custom_geometry_source.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/style/sources/custom_geometry_source.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/style/sources/custom_geometry_source.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/style/sources/custom_geometry_source.hpp
2023-06-07 11:38:34.398682160 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/style/source.hpp>
+ #include <mbgl/util/geo.hpp>
+ #include <mbgl/util/geojson.hpp>
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/style/sources/geojson_source.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/style/sources/geojson_source.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/style/sources/geojson_source.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/style/sources/geojson_source.hpp
2023-06-07 11:38:34.405348625 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/style/source.hpp>
+ #include <mbgl/util/geojson.hpp>
+ #include <mbgl/util/optional.hpp>
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/style/sources/raster_dem_source.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/style/sources/raster_dem_source.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/style/sources/raster_dem_source.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/style/sources/raster_dem_source.hpp
2023-06-07 11:38:34.415348323 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/style/sources/raster_source.hpp>
+ #include <mbgl/util/tileset.hpp>
+ #include <mbgl/util/variant.hpp>
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/style/sources/raster_source.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/style/sources/raster_source.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/style/sources/raster_source.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/style/sources/raster_source.hpp
2023-06-07 11:38:34.425348021 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/style/source.hpp>
+ #include <mbgl/util/tileset.hpp>
+ #include <mbgl/util/variant.hpp>
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/util/constants.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/util/constants.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/util/constants.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/util/constants.hpp
2023-06-07 11:38:34.435347719 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/util/chrono.hpp>
+ #include <mbgl/util/unitbezier.hpp>
+
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/util/feature.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/util/feature.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/util/feature.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/util/feature.hpp
2023-06-07 11:38:34.442014184 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/util/optional.hpp>
+
+ #include <mapbox/geometry/feature.hpp>
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/util/geo.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/util/geo.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/util/geo.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/util/geo.hpp
2023-06-07 11:38:34.448680650 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/math/clamp.hpp>
+ #include <mbgl/math/wrap.hpp>
+ #include <mbgl/util/constants.hpp>
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/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
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
2023-06-07 11:38:34.458680347 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mapbox/geometry/geometry.hpp>
+ #include <mapbox/geometry/point_arithmetic.hpp>
+ #include <mapbox/geometry/for_each_point.hpp>
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/util/image.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/util/image.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/util/image.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/util/image.hpp
2023-06-07 11:38:34.468680045 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/util/noncopyable.hpp>
+ #include <mbgl/util/geometry.hpp>
+ #include <mbgl/util/size.hpp>
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/util/run_loop.hpp
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/util/run_loop.hpp
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/util/run_loop.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/util/run_loop.hpp
2023-06-07 11:38:34.475346511 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/actor/scheduler.hpp>
+ #include <mbgl/actor/mailbox.hpp>
+ #include <mbgl/util/noncopyable.hpp>
+diff --color -ur
qtlocation-everywhere-src-5.15.10.orig/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
+---
qtlocation-everywhere-src-5.15.10.orig/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
2023-04-24 09:13:46.000000000 +0200
++++
qtlocation-everywhere-src-5.15.10/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
2023-06-07 11:38:34.482012976 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <sstream>
+ #include <string>
+ #include <cassert>
+---
qtlocation-everywhere-src-5.15.10.orig/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/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
2023-06-07 11:41:53.092687358 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <mbgl/util/variant.hpp>
+
+ namespace mbgl {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtlocation.git/commitdiff/2361aedaa777a022d7ed5d108191f5456d1f3f2e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
