Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions ports/qt5-location/mapboxgl-gcc13.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
index a28c59a..92d928a 100644
--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
+++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
@@ -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 --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
index 13498cc..4dc82a8 100644
--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
+++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
@@ -4,6 +4,7 @@
#include <string>
#include <cassert>
#include <cstdlib>
+#include <cstdint>
#include <exception>

// Polyfill needed by Qt when building for Android with GCC
diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
index bc959c9..2fc62bb 100644
--- a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
@@ -1,5 +1,6 @@
#pragma once

+#include <cstdint>
#include <mbgl/util/variant.hpp>

namespace mbgl {
2 changes: 1 addition & 1 deletion ports/qt5-location/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
message(STATUS "${PORT} has a spurious failure in which it is unable to create a parent directory! Just retry.")
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
qt_submodule_installation(PATCHES missing-include.patch disable-enum-warning.patch)
qt_submodule_installation(PATCHES missing-include.patch disable-enum-warning.patch mapboxgl-gcc13.patch)
1 change: 1 addition & 0 deletions ports/qt5-location/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "qt5-location",
"version": "5.15.17",
"port-version": 1,
"description": "The Qt Location API helps you create viable mapping solutions using the data available from some of the popular location services.",
"license": null,
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -7846,7 +7846,7 @@
},
"qt5-location": {
"baseline": "5.15.17",
"port-version": 0
"port-version": 1
},
"qt5-macextras": {
"baseline": "5.15.17",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qt5-location.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fc6c21285624e33ac46156dc3fda37e0ad36cccb",
"version": "5.15.17",
"port-version": 1
},
{
"git-tree": "daca43cb0f4a73337690ca6e8852cb302d66130d",
"version": "5.15.17",
Expand Down