diff options
| author | Wouter Deconinck <wdconinc@jlab.org> | 2020-11-18 06:51:51 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-18 07:51:51 -0500 |
| commit | a0a15b5cd0eaa4ee5d7a66c3535dd1b9e2c74176 (patch) | |
| tree | 4b9d958888428c162f7acd2f6c4e3f492fdb61f2 | |
| parent | 532fc40e94891c3b4f8b91c28f1a9f5f830f1691 (diff) | |
| download | spack-a0a15b5cd0eaa4ee5d7a66c3535dd1b9e2c74176.tar.gz spack-a0a15b5cd0eaa4ee5d7a66c3535dd1b9e2c74176.tar.bz2 spack-a0a15b5cd0eaa4ee5d7a66c3535dd1b9e2c74176.tar.xz spack-a0a15b5cd0eaa4ee5d7a66c3535dd1b9e2c74176.zip | |
qt: patch missing includes when +opengl %gcc@10: (#19963)
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/qt5-15-gcc-10.patch | 39 |
2 files changed, 42 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index de058431da..4066c53b59 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -116,6 +116,9 @@ class Qt(Package): patch('qt5-12-intel-overflow.patch', when='@5.12:5.14.0 %intel') # https://bugreports.qt.io/browse/QTBUG-78937 patch('qt5-12-configure.patch', when='@5.12') + # https://bugreports.qt.io/browse/QTBUG-93402 + patch('qt5-15-gcc-10.patch', when='@5.12.7:5.15 %gcc@10:') + conflicts('%gcc@10:', when='@5.9:5.12.6 +opengl') # Build-only dependencies depends_on("pkgconfig", type='build') diff --git a/var/spack/repos/builtin/packages/qt/qt5-15-gcc-10.patch b/var/spack/repos/builtin/packages/qt/qt5-15-gcc-10.patch new file mode 100644 index 0000000000..32fbfba130 --- /dev/null +++ b/var/spack/repos/builtin/packages/qt/qt5-15-gcc-10.patch @@ -0,0 +1,39 @@ +diff --git a/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/convert.hpp b/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/convert.hpp +index 02ec7fe..6c1284e 100644 +--- a/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/convert.hpp ++++ b/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/convert.hpp +@@ -1,6 +1,7 @@ + #include <mbgl/util/util.hpp> + + #include <array> ++#include <stdint.h> + #include <type_traits> + #include <utility> + +diff --git a/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp +index d475c38..6947f0b 100644 +--- a/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp ++++ b/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp +@@ -4,6 +4,7 @@ + #include <unicode/ubidi.h> + #include <unicode/ushape.h> + ++#include <stdexcept> + #include <memory> + + namespace mbgl { +diff --git a/qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/renderer/sources/render_vector_source.cpp b/qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/renderer/sources/render_vector_source.cpp +index 4de4f01..afb639d 100644 +--- a/qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/renderer/sources/render_vector_source.cpp ++++ b/qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/renderer/sources/render_vector_source.cpp +@@ -2,6 +2,7 @@ + #include <mbgl/renderer/render_tile.hpp> + #include <mbgl/renderer/paint_parameters.hpp> + #include <mbgl/tile/vector_tile.hpp> ++#include <mbgl/tile/tile_loader_impl.hpp> + + #include <mbgl/algorithm/generate_clip_ids.hpp> + #include <mbgl/algorithm/generate_clip_ids_impl.hpp> +-- +2.26.0 + |