aboutsummaryrefslogtreecommitdiff
path: root/vcpkg/ports/qt5-location
diff options
context:
space:
mode:
Diffstat (limited to 'vcpkg/ports/qt5-location')
-rw-r--r--vcpkg/ports/qt5-location/add-float-cast.diff13
-rw-r--r--vcpkg/ports/qt5-location/add-stdint.diff84
-rw-r--r--vcpkg/ports/qt5-location/disable-enum-warning.patch14
-rw-r--r--vcpkg/ports/qt5-location/missing-include.patch12
-rw-r--r--vcpkg/ports/qt5-location/portfile.cmake3
-rw-r--r--vcpkg/ports/qt5-location/vcpkg.json16
6 files changed, 142 insertions, 0 deletions
diff --git a/vcpkg/ports/qt5-location/add-float-cast.diff b/vcpkg/ports/qt5-location/add-float-cast.diff
new file mode 100644
index 0000000..035b759
--- /dev/null
+++ b/vcpkg/ports/qt5-location/add-float-cast.diff
@@ -0,0 +1,13 @@
+diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/layout/symbol_projection.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/layout/symbol_projection.cpp
+index ef669c6..6c6a35e 100644
+--- a/src/3rdparty/mapbox-gl-native/src/mbgl/layout/symbol_projection.cpp
++++ b/src/3rdparty/mapbox-gl-native/src/mbgl/layout/symbol_projection.cpp
+@@ -95,7 +95,7 @@ namespace mbgl {
+ PointAndCameraDistance project(const Point<float>& point, const mat4& matrix) {
+ vec4 pos = {{ point.x, point.y, 0, 1 }};
+ matrix::transformMat4(pos, pos, matrix);
+- return {{ static_cast<float>(pos[0] / pos[3]), static_cast<float>(pos[1] / pos[3]) }, pos[3] };
++ return {{ static_cast<float>(pos[0] / pos[3]), static_cast<float>(pos[1] / pos[3]) }, static_cast<float>(pos[3]) };
+ }
+
+ float evaluateSizeForFeature(const ZoomEvaluatedSize& zoomEvaluatedSize, const PlacedSymbol& placedSymbol) {
diff --git a/vcpkg/ports/qt5-location/add-stdint.diff b/vcpkg/ports/qt5-location/add-stdint.diff
new file mode 100644
index 0000000..58cd4e2
--- /dev/null
+++ b/vcpkg/ports/qt5-location/add-stdint.diff
@@ -0,0 +1,84 @@
+diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_backend.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_backend.hpp
+index 1d5f4e8..fdfec87 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_backend.hpp
++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_backend.hpp
+@@ -7,6 +7,7 @@
+
+ #include <memory>
+ #include <mutex>
++#include <stdint.h>
+
+ namespace mbgl {
+
+diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp
+index 551b5c8..e169aa3 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp
++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp
+@@ -1,6 +1,7 @@
+ #pragma once
+
+ #include <exception>
++#include <stdint.h>
+
+ namespace mbgl {
+
+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..8186483 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
+@@ -3,6 +3,7 @@
+ #include <mapbox/geometry/geometry.hpp>
+ #include <mapbox/geometry/point_arithmetic.hpp>
+ #include <mapbox/geometry/for_each_point.hpp>
++#include <stdint.h>
+
+ namespace mbgl {
+
+diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/image.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/image.hpp
+index 4887058..e818922 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/image.hpp
++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/image.hpp
+@@ -8,6 +8,7 @@
+ #include <cstring>
+ #include <memory>
+ #include <algorithm>
++#include <stdint.h>
+
+ namespace mbgl {
+
+diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/size.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/size.hpp
+index 12c0ad0..f4cccb8 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/size.hpp
++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/size.hpp
+@@ -2,6 +2,7 @@
+
+ #include <cstdint>
+ #include <array>
++#include <stdint.h>
+
+ namespace mbgl {
+
+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..6b67df2 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
+@@ -5,6 +5,7 @@
+ #include <cassert>
+ #include <cstdlib>
+ #include <exception>
++#include <stdint.h>
+
+ // Polyfill needed by Qt when building for Android with GCC
+ #if defined(__ANDROID__) && defined(__GLIBCXX__)
+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..c53dca3 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,6 +1,7 @@
+ #pragma once
+
+ #include <mbgl/util/variant.hpp>
++#include <stdint.h>
+
+ namespace mbgl {
+ namespace gl {
diff --git a/vcpkg/ports/qt5-location/disable-enum-warning.patch b/vcpkg/ports/qt5-location/disable-enum-warning.patch
new file mode 100644
index 0000000..198e084
--- /dev/null
+++ b/vcpkg/ports/qt5-location/disable-enum-warning.patch
@@ -0,0 +1,14 @@
+diff --git a/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro b/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro
+index ed974db..f17d45a 100644
+--- a/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro
++++ b/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro
+@@ -34,6 +34,9 @@ android|gcc {
+ }
+
+ darwin {
++ QMAKE_CXXFLAGS += \
++ -Wno-enum-constexpr-conversion
++
+ LIBS += \
+ -framework Foundation
+ }
diff --git a/vcpkg/ports/qt5-location/missing-include.patch b/vcpkg/ports/qt5-location/missing-include.patch
new file mode 100644
index 0000000..8d2b5b3
--- /dev/null
+++ b/vcpkg/ports/qt5-location/missing-include.patch
@@ -0,0 +1,12 @@
+diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp
+index c7dc8b3..0fb25b8 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp
++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp
+@@ -3,6 +3,7 @@
+ #include <typeinfo>
+ #include <type_traits>
+ #include <stdexcept>
++#include <utility>
+ namespace mbgl {
+ namespace util {
+
diff --git a/vcpkg/ports/qt5-location/portfile.cmake b/vcpkg/ports/qt5-location/portfile.cmake
new file mode 100644
index 0000000..a708f81
--- /dev/null
+++ b/vcpkg/ports/qt5-location/portfile.cmake
@@ -0,0 +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 add-stdint.diff add-float-cast.diff)
diff --git a/vcpkg/ports/qt5-location/vcpkg.json b/vcpkg/ports/qt5-location/vcpkg.json
new file mode 100644
index 0000000..7186460
--- /dev/null
+++ b/vcpkg/ports/qt5-location/vcpkg.json
@@ -0,0 +1,16 @@
+{
+ "name": "qt5-location",
+ "version": "5.15.18",
+ "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": [
+ {
+ "name": "qt5-base",
+ "default-features": false
+ },
+ "qt5-declarative",
+ "qt5-quickcontrols",
+ "qt5-quickcontrols2",
+ "qt5-serialport"
+ ]
+}