Skip to content

Commit

Permalink
Try to add debian's patch
Browse files Browse the repository at this point in the history
  • Loading branch information
hmaarrfk committed Sep 17, 2024
1 parent 3ba7417 commit 0543cbb
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 0 deletions.
3 changes: 3 additions & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ source:
- patches/0020-compile-mapbox-gl-native-with-cxx17-for-icu75-compat.patch
# mapbox-gl-native uses a old vendored boost, make sure that we used an up-to-date boost instead
- patches/0021-unvendor-boost-from-mapbox-gl-native.patch
# Taken from debian for gcc 13 compatibility
# https://github.com/conda-forge/qt-main-feedstock/pull/289#issuecomment-2354739087
- patches/0022-gcc_13.patch

- url: https://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_12_0_rc2.7z # [win64]
sha256: 2a0d2f92c60e0962ef5f6039d3793424c6f39e49ba27ac04a5b21ca4ae012e15 # [win64]
Expand Down
37 changes: 37 additions & 0 deletions recipe/patches/0022-gcc_13.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
Description: add missing <cstdint> includes to fix build with GCC 13
Author: Dmitry Shachnev <mitya57@debian.org>
Forwarded: https://github.com/mapbox/mapbox-gl-native/pull/16669
Last-Update: 2023-06-18

--- a/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
+++ b/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
@@ -4,6 +4,8 @@
#include <mapbox/geometry/point_arithmetic.hpp>
#include <mapbox/geometry/for_each_point.hpp>

+#include <cstdint>
+
namespace mbgl {

enum class FeatureType : uint8_t {
--- a/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
+++ b/qtlocation/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
--- a/qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
+++ b/qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
@@ -2,6 +2,8 @@

#include <mbgl/util/variant.hpp>

+#include <cstdint>
+
namespace mbgl {
namespace gl {

0 comments on commit 0543cbb

Please sign in to comment.