From a102fef06419feaeb059b10d9d86a56478ec1fe6 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 17 Sep 2024 07:41:43 -0400 Subject: [PATCH] Try to add debian's patch --- recipe/meta.yaml | 3 +++ recipe/patches/0022-gcc_13.patch | 37 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 recipe/patches/0022-gcc_13.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 69333da2..2ce56629 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -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] diff --git a/recipe/patches/0022-gcc_13.patch b/recipe/patches/0022-gcc_13.patch new file mode 100644 index 00000000..255c3495 --- /dev/null +++ b/recipe/patches/0022-gcc_13.patch @@ -0,0 +1,37 @@ +Description: add missing includes to fix build with GCC 13 +Author: Dmitry Shachnev +Forwarded: https://github.com/mapbox/mapbox-gl-native/pull/16669 +Last-Update: 2023-06-18 + +--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp ++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp +@@ -4,6 +4,8 @@ + #include + #include + ++#include ++ + namespace mbgl { + + enum class FeatureType : uint8_t { +--- 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 +--- a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp ++++ b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp +@@ -2,6 +2,8 @@ + + #include + ++#include ++ + namespace mbgl { + namespace gl { +