Salome HOME
Merge master branch to integrate new petsc 3.15 use
[tools/sat_salome.git] / products / patches / qt-mapbox-FD32.patch
1 diff -rupN qt_ref/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/convert.hpp qt/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-09-22 09:51:10.824285795 +0200
3 +++ qt/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/convert.hpp   2020-09-22 12:36:07.546531484 +0200
4 @@ -3,7 +3,7 @@
5  #include <array>
6  #include <type_traits>
7  #include <utility>
8 -
9 +#include <stdint.h>
10  namespace mbgl {
11  namespace util {
12  
13 diff -rupN qt_ref/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp qt/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
14 --- qt_ref/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp   2020-09-22 09:51:10.850286258 +0200
15 +++ qt/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp       2020-09-22 12:39:55.042544429 +0200
16 @@ -5,6 +5,7 @@
17  #include <unicode/ushape.h>
18  
19  #include <memory>
20 +#include <stdexcept>
21  
22  namespace mbgl {
23  
24 diff -rupN qt_ref/qtlocation/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp qt/qtlocation/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp
25 --- qt_ref/qtlocation/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp    2020-09-22 09:51:10.903287202 +0200
26 +++ qt/qtlocation/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp        2020-09-22 12:40:52.602559767 +0200
27 @@ -1,5 +1,5 @@
28  #include <memory>
29 -
30 +#include <stdexcept>
31  #include <mbgl/text/bidi.hpp>
32  
33  #include <QString>