rpms
/
qt5-qtlocation
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed FTBFS

This commit is contained in:
Than Ngo 2023-02-20 15:30:03 +01:00
parent ce7e64cb5b
commit 6d763b683c
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qt5-qtlocation.spec
View File

@ -3,7 +3,7 @@
Summary: Qt5 - Location component
Name: qt5-%{qt_module}
Version: 5.15.8
Release: 3%{?dist}
Release: 4%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@ -125,6 +125,9 @@ popd
%changelog
* Mon Feb 20 2023 Than Ngo <than@redhat.com> - 5.15.8-4
- Fixed FTBFS
* Tue Jan 31 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.8-3
- migrated to SPDX license

36
qtlocation-gcc10.patch
View File

@ -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 <mbgl/util/convert.hpp>
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 <cstdint>
+
#include <mapbox/geometry/geometry.hpp>
#include <mapbox/geometry/point_arithmetic.hpp>
#include <mapbox/geometry/for_each_point.hpp>
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 <string>
#include <cassert>
#include <cstdlib>
+#include <cstdint>
#include <exception>
#include <cstdint>
// 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 <cstdint>
#include <mbgl/util/variant.hpp>
namespace mbgl {