diff --git a/ports/qt5-location/mapboxgl-gcc13.patch b/ports/qt5-location/mapboxgl-gcc13.patch new file mode 100644 index 00000000000000..202d1eed7ba81d --- /dev/null +++ b/ports/qt5-location/mapboxgl-gcc13.patch @@ -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 + #include + #include + #include +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 + #include + #include ++#include + #include + + // 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 + #include + + namespace mbgl { diff --git a/ports/qt5-location/portfile.cmake b/ports/qt5-location/portfile.cmake index 5b446c6b5025ff..468fec716a49c5 100644 --- a/ports/qt5-location/portfile.cmake +++ b/ports/qt5-location/portfile.cmake @@ -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) diff --git a/ports/qt5-location/vcpkg.json b/ports/qt5-location/vcpkg.json index 690ea6f9242cd8..35f4511adc4a13 100644 --- a/ports/qt5-location/vcpkg.json +++ b/ports/qt5-location/vcpkg.json @@ -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": [ diff --git a/versions/baseline.json b/versions/baseline.json index d07fba33b67dca..9faccbdd31cf9e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7846,7 +7846,7 @@ }, "qt5-location": { "baseline": "5.15.17", - "port-version": 0 + "port-version": 1 }, "qt5-macextras": { "baseline": "5.15.17", diff --git a/versions/q-/qt5-location.json b/versions/q-/qt5-location.json index 6fa700b05732f5..30b8d03a58c180 100644 --- a/versions/q-/qt5-location.json +++ b/versions/q-/qt5-location.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc6c21285624e33ac46156dc3fda37e0ad36cccb", + "version": "5.15.17", + "port-version": 1 + }, { "git-tree": "daca43cb0f4a73337690ca6e8852cb302d66130d", "version": "5.15.17",