Salome HOME
spns #32755 : TopIIVolMesh: move back to master branch
[tools/sat_salome.git] / products / patches / qt-mapbox-FD32-gcc-10.0.patch
1 diff -Naur qt_ref/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/convert.hpp qt_new/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/convert.hpp
2 --- qt_ref/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/convert.hpp       2020-10-15 08:53:19.000000000 +0200
3 +++ qt_new/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/convert.hpp       2021-05-18 14:27:22.215207025 +0200
4 @@ -3,6 +3,12 @@
5  #include <array>
6  #include <type_traits>
7  #include <utility>
8 +#ifdef __GNUC__
9 +#  include <features.h>
10 +#  if __GNUC_PREREQ(10,0)
11 +#    include <stdint.h>
12 +#  endif
13 +#endif // __GNUC__
14  
15  namespace mbgl {
16  namespace util {
17 diff -Naur qt_ref/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp qt_new/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
18 --- qt_ref/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp   2020-10-15 08:53:19.000000000 +0200
19 +++ qt_new/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp   2021-05-18 14:30:10.072271805 +0200
20 @@ -5,6 +5,12 @@
21  #include <unicode/ushape.h>
22  
23  #include <memory>
24 +#ifdef __GNUC__
25 +#  include <features.h>
26 +#  if __GNUC_PREREQ(10,0)
27 +#   include <stdexcept>
28 +#  endif
29 +#endif // __GNUC__
30  
31  namespace mbgl {
32  
33 diff -Naur qt_ref/qtlocation/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp qt_new/qtlocation/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp
34 --- qt_ref/qtlocation/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp    2020-10-15 08:53:19.000000000 +0200
35 +++ qt_new/qtlocation/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp    2021-05-18 14:32:30.936842655 +0200
36 @@ -1,5 +1,11 @@
37  #include <memory>
38  
39 +#ifdef __GNUC__
40 +#  include <features.h>
41 +#  if __GNUC_PREREQ(10,0)
42 +#    include <stdexcept>
43 +#  endif
44 +#endif // __GNUC__
45  #include <mbgl/text/bidi.hpp>
46  
47  #include <QString>