spns #24303 : intégration des travaux de AZA et alignement des master sur 9.7.0

diff --git a/applications/SALOME-9.7.0-MPI.pyconf b/applications/SALOME-9.7.0-MPI.pyconf
index e7e9081e6aecb299b1582ac2d62e2f16ce6c9d06..eb299c00f6aedbc6b8a07c032ba7312f1ebb4d75 100644 (file)
--- a/applications/SALOME-9.7.0-MPI.pyconf
+++ b/applications/SALOME-9.7.0-MPI.pyconf
@@ -23,6 +23,7 @@ APPLICATION :
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger
         SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER"  # specify the first modules to display in gui
+        SALOME_ACTOR_DELEGATE_TO_VTK : '1'
     }
     products :
     {

diff --git a/applications/SALOME-9.7.0-int32.pyconf b/applications/SALOME-9.7.0-int32.pyconf
index 4d393e5c855e4b1776907949f1c9e9b601fa49d5..5975d06c4a29c970ee85cd13b9c21d64762f0bf3 100644 (file)
--- a/applications/SALOME-9.7.0-int32.pyconf
+++ b/applications/SALOME-9.7.0-int32.pyconf
@@ -17,10 +17,12 @@ APPLICATION :
         {
            CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
            RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
+           VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches
         }
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger
         SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER"  # specify the first modules to display in gui
+        SALOME_ACTOR_DELEGATE_TO_VTK : '1'
     }
     products :
     {
@@ -49,7 +51,7 @@ APPLICATION :
         hdf5 : '1.10.3'
         idna : '2.7'
         imagesize : '1.0.0'
-        ispc : '1.9.2'
+        ispc : '1.15.0'
         Jinja2 : '2.7.3'
         kiwisolver : '1.0.1'
         lapack : '3.8.0'
@@ -67,18 +69,19 @@ APPLICATION :
         omniORB : '4.2.2'
         omniORBpy : '4.2.2'
         opencv : '3.2.0'
-        openturns : '1.16'
-        openVKL : '0.11.0'
+        openturns: '1.16'
+        openVKL: '0.11.0'
         ospray : '2.4.0'
         packaging : '17.1'
         ParaView : {tag : '5.9.0', section : 'version_5_9_0_int32'}
         petsc : {tag : '3.15.0', section: 'version_3_15_0'}
         Pillow : '7.1.1'
         planegcs : '0.18-3cb6890'
+        psutil : '5.7.2'
         Pygments : '2.0.2'
         pyparsing : '2.0.3'
         PyQt : '5.15.3'
-        PyQtChart : '5.9'
+        #PyQtChart : '5.9'
         pyreadline : '2.0'
         Python : '3.6.5'
         pytz : '2015.7'
@@ -86,7 +89,7 @@ APPLICATION :
         qwt : '6.1.2'
         requests : '2.19.1'
         rkCommon : '1.5.1'
-        root : '6.22.02'
+        root: '6.22.02'
         salome_system : 'native'
         scipy : '1.4.1'
         scotch : '6.0.4'
@@ -105,14 +108,13 @@ APPLICATION :
         tk : '8.6.0'
         urllib3 : '1.23'
         URANIE : '4.5.0'
-
         # SALOME MODULES :
         'CONFIGURATION'
         'SALOME'
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag :'V2_4_5'}
+        'LIBBATCH' : {tag : 'V2_4_5'}
         'KERNEL'
         'MEDCOUPLING': {section: 'default_32BIT_IDS'}
         'GUI'
@@ -175,44 +177,8 @@ APPLICATION :
 __overwrite__ :
 [
   {
-   # tbb as a mandatory native product since SMESH with tbb, not installed on DB8 (temporary)
-    __condition__ : "VARS.dist in ['DB08']"
-    'APPLICATION.products.tbb' : '4.4'
-  }
-
-  {
-    #
-    __condition__ : "VARS.dist in ['FD26']"
-    'APPLICATION.products.tbb'    : '2017-7'
-    'APPLICATION.products.embree' : '3.5.2'
-  }
-
-  {
-    #
-    __condition__ : "VARS.dist in ['UB20.04']"
-    'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch']
-  }
-
-  {
-    __condition__ : "VARS.dist in ['FD32']"
-    'APPLICATION.products.scipy' : '1.5.2' # gcc https://github.com/scipy/scipy/issues/11611 - either patch numpy to include -fallow-argument-mismatch or move to that version
-    # see https://bugs.gentoo.org/708730
-    'PRODUCTS.llvm.version_8_0_1_clang.patches' : ['llvm-8.0.1-clang-FD32.patch']
-    'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch', 'qt-5.9.1-mapbox-FD32.patch']
-    'PRODUCTS.mesa.version_19_0_8.patches' : ['mesa-19.0.8-debug_symbol.patch']
-  }
-
-  {
-    # Adapt Paraview CMake files to be compliant with recent distributions
-    __condition__ : "VARS.dist in ['FD30', 'FD32', 'CO8']"
-    'PRODUCTS.ParaView.version_5_8_0_int32.patches' : ['paraview.0010-ParaViewClient.patch',
-                                                 'paraview.0004-ParaView_hdf5.patch',
-                                                 'paraview.0005-ParaView_find_cgns.patch',
-                                                 'paraview.0006-ParaView_find_libxml2.patch',
-                                                 'paraview.0007-ParaView_find_freetype.patch',
-                                                 'paraview.0009-ParaView_volume_mapper.patch',
-                                                 'pv_coincident.patch',
-                                                 'paraview.0017-ParaView_protobuf_crash.patch'
-                                                ]
+   __condition__ : "VARS.dist in ['FD32']"
+   # https://github.com/scipy/scipy/issues/11611
+   'APPLICATION.products.scipy' : '1.5.2'
   }
 ]

diff --git a/applications/SALOME-9.7.0-windows.pyconf b/applications/SALOME-9.7.0-windows.pyconf
index a84cbe607e96bc8ba7ac11cc68bb1c8e7c6cb121..f55bc827b3a322751491b1f4e29741eac6b45b6e 100644 (file)
--- a/applications/SALOME-9.7.0-windows.pyconf
+++ b/applications/SALOME-9.7.0-windows.pyconf
@@ -162,7 +162,7 @@ APPLICATION :
         'EFICAS_TOOLS'
         'ADAO'
         'PARAVISADDONS'
-        'CEATESTBASE' : {tag: 'SalomeV9'}
+        'CEATESTBASE'
     }
     profile :
     {
@@ -190,9 +190,4 @@ APPLICATION :
 
 __overwrite__ :
 [
-  {
-    __condition__ : "APPLICATION.debug == 'yes'"
-    'APPLICATION.products.numpy'      : '1.16.4-win-dbg'
-    'APPLICATION.products.sphinxintl' : '2.0.0-win-dbg'
-  }
 ]

diff --git a/applications/SALOME-9.7.0.pyconf b/applications/SALOME-9.7.0.pyconf
index 5174f566010da391dbe1e3b18d7f534a29593b3f..5856fa44f37b6b9d0dad89f846d2c13d588c44fb 100644 (file)
--- a/applications/SALOME-9.7.0.pyconf
+++ b/applications/SALOME-9.7.0.pyconf
@@ -1,4 +1,4 @@
-s#!/usr/bin/env python
+#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 APPLICATION :
@@ -136,7 +136,7 @@ APPLICATION :
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
-        'SOLVERLAB' : {tag: 'master'}
+        'SOLVERLAB'
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'
@@ -150,7 +150,7 @@ APPLICATION :
         'ADAO'
         'ADAO_INTERFACE'
         'PARAVISADDONS'
-        'CEATESTBASE' : {tag: 'SalomeV9'}
+        'CEATESTBASE'
     }
     profile :
     {
@@ -180,12 +180,6 @@ __overwrite__ :
   {
    __condition__ : "VARS.dist in ['FD32']"
    # https://github.com/scipy/scipy/issues/11611
-    'APPLICATION.products.scipy' : '1.5.2'
-   # https://bugs.gentoo.org/708730 : llvm 8.0.1 build issue with gcc/clang 10.X
-    'PRODUCTS.llvm.version_8_0_1_clang.patches' : ['llvm-8.0.1-clang-FD32.patch']
-   #
-    'PRODUCTS.mesa.version_19_0_8.patches' : ['mesa-19.0.8-debug_symbol.patch']
-   #
-    'PRODUCTS.qt.version_5_12_10.patches' : ['qt-mapbox-FD32.patch']
+   'APPLICATION.products.scipy' : '1.5.2'
   }
 ]

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index db28722db401337666f09e75098314f36900148b..8bf05d4283f24a3cacf3c0cb71ce224fb9800d28 100644 (file)
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -23,14 +23,15 @@ APPLICATION :
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger
         SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER"  # specify the first modules to display in gui
+        SALOME_ACTOR_DELEGATE_TO_VTK : '1'
     }
     products :
     {
         # PREREQUISITES :
         alabaster : '0.7.6'
         Babel : '2.7.0'
-        boost : '1.58.0'
-        CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
+        boost : '1.71.0'
+        CAS : {tag: 'V7_5_0p1', section: 'version_V7_5_0'}
         certifi : '2018.8.24'
         cgns : {tag : '4.1.1', hpc : 'yes'}
         chardet : '3.0.4'
@@ -58,7 +59,7 @@ APPLICATION :
         libxml2 : '2.9.1'
         llvm : '8.0.1-clang'
         markupsafe : '0.23'
-        matplotlib : '2.2.2'
+        matplotlib : '3.0.3'
         medfile : {tag : '4.1.0', hpc : 'yes', section : 'default_Autotools' }
         mesa : '19.0.8'
         MeshGems : {tag : '2.12-1', hpc : 'yes'}
@@ -71,7 +72,6 @@ APPLICATION :
         omniORBpy : '4.2.2'
         opencv : '3.2.0'
         openmpi : '3.1.6'
-        openssl : "native"
         openturns: '1.16'
         openVKL: '0.11.0'
         ospray : '2.4.0'
@@ -93,6 +93,7 @@ APPLICATION :
         requests : '2.19.1'
         rkCommon : '1.5.1'
         root: '6.22.02'
+        salome_system : 'native'
         scipy : '1.4.1'
         scotch : '6.0.4'
         setuptools : '38.4.0'
@@ -116,7 +117,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag :'V2_4_4'}
+        'LIBBATCH' : {tag :'V2_4_5'}
         'KERNEL' : {section : 'default_MPI', verbose : 'yes'}
         'MEDCOUPLING' : {section : 'default_MPI', verbose : 'yes'}
         'GUI' : {verbose : 'yes'}
@@ -147,7 +148,7 @@ APPLICATION :
         'PYHELLO'
         'EFICAS'
         'EFICAS_TOOLS'
-        'PY2CPP' : {tag: 'v2.0'}
+        'PY2CPP'
         'ADAO'
         'ADAO_INTERFACE'
         'PARAVISADDONS'
@@ -178,18 +179,5 @@ APPLICATION :
 }
 __overwrite__ :
 [
-  {
-   __condition__ : "APPLICATION.debug == 'yes'"
-   # https://cplusplus.com/forum/general/250854 : DEBUG symbol is defined twice, need an additional patch
-    'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch',
-                                                 'paraview.0004-ParaView_hdf5.patch',
-                                                 'paraview.0005-ParaView_find_cgns.patch',
-                                                 'paraview.0006-ParaView_find_libxml2.patch',
-                                                 'paraview.0007-ParaView_find_freetype.patch',
-                                                 'paraview-0012-LATA_64BITS_IDS.patch',
-                                                 'ParaView-5.9.0-CATALYST_cmake.patch',
-                                                 'paraview.0008-ParaView_coincident_rendering.patch',
-                                                 'paraview.0015-Paraview_VTKM_ioss.patch']
-  }
 ]
 

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 4ec1d5aac995b4c29b9eded317ffad430d720ee6..8833874182722ed83ec775b2422f0d425d01d0b4 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -27,6 +27,7 @@ APPLICATION :
         SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER"  # specify the first modules to display in gui
         SALOME_TMP_DIR : "%appdata%"
         HOME : "%userprofile%"
+        SALOME_ACTOR_DELEGATE_TO_VTK : '1'
     }
     products :
     {
@@ -34,7 +35,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.67.0'
-        CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0_win'}
+        CAS : {tag: 'V7_5_0p1', section: 'version_V7_5_0_win'}
         certifi : '2019.6.16'
         cgns : '4.1.1'
         chardet : '3.0.4'
@@ -130,7 +131,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag :'V2_4_4'}
+        'LIBBATCH' : {tag :'V2_4_5'}
         'KERNEL'
         'MEDCOUPLING'
         'GUI'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 133fbae2e96690f2f96c8e997b192d8231a32aee..8da714aa760c60dc1ae95b7d7a9ced380ba59e58 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -23,14 +23,15 @@ APPLICATION :
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger
         SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER"  # specify the first modules to display in gui
+        SALOME_ACTOR_DELEGATE_TO_VTK : '1'
     }
     products :
     {
         # PREREQUISITES :
         alabaster : '0.7.6'
         Babel : '2.7.0'
-        boost : '1.58.0'
-        CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
+        boost : '1.71.0'
+        CAS : {tag: 'V7_5_0p1', section: 'version_V7_5_0'}
         certifi : '2018.8.24'
         cgns : '4.1.1'
         chardet : '3.0.4'
@@ -58,7 +59,7 @@ APPLICATION :
         libxml2 : '2.9.1'
         llvm : '8.0.1-clang'
         markupsafe : '0.23'
-        matplotlib : '2.2.2'
+        matplotlib : '3.0.3'
         medfile : {section: 'default_Autotools', tag: '4.1.0'}
         mesa : '19.0.8'
         MeshGems : '2.12-1'
@@ -69,7 +70,6 @@ APPLICATION :
         omniORB : '4.2.2'
         omniORBpy : '4.2.2'
         opencv : '3.2.0'
-        openssl : "native"
         openturns: '1.16'
         openVKL: '0.11.0'
         ospray : '2.4.0'
@@ -91,6 +91,7 @@ APPLICATION :
         requests : '2.19.1'
         rkCommon : '1.5.1'
         root: '6.22.02'
+        salome_system : 'native'
         scipy : '1.4.1'
         scotch : '6.0.4'
         setuptools : '38.4.0'
@@ -101,6 +102,7 @@ APPLICATION :
         sphinxcontrib_websupport : '1.1.0'
         sphinx_rtd_theme : '0.4.3'
         sphinxintl: '0.9.10'
+        StaticMeshPlugin: '5.8.0'
         swig : '3.0.12'
         tbb : '2019_U8'
         tcl : '8.6.0'
@@ -113,7 +115,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag : 'V2_4_4'}
+        'LIBBATCH' : {tag : 'V2_4_5'}
         'KERNEL'
         'MEDCOUPLING'
         'GUI'
@@ -144,7 +146,7 @@ APPLICATION :
         'PYHELLO'
         'EFICAS'
         'EFICAS_TOOLS'
-        'PY2CPP' : {tag: 'v2.0'}
+        'PY2CPP'
         'ADAO'
         'ADAO_INTERFACE'
         'PARAVISADDONS'
@@ -178,25 +180,6 @@ __overwrite__ :
   {
    __condition__ : "VARS.dist in ['FD32']"
    # https://github.com/scipy/scipy/issues/11611
-    'APPLICATION.products.scipy' : '1.5.2'
-   # https://bugs.gentoo.org/708730 : llvm 8.0.1 build issue with gcc/clang 10.X
-    'PRODUCTS.llvm.version_8_0_1_clang.patches' : ['llvm-8.0.1-clang-FD32.patch']
-   #
-    'PRODUCTS.mesa.version_19_0_8.patches' : ['mesa-19.0.8-debug_symbol.patch']
-   #
-    'PRODUCTS.qt.version_5_12_10.patches' : ['qt-mapbox-FD32.patch']
-  }
-  {
-   __condition__ : "APPLICATION.debug == 'yes'"
-   # https://cplusplus.com/forum/general/250854 : DEBUG symbol is defined twice, need an additional patch
-    'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch',
-                                                 'paraview.0004-ParaView_hdf5.patch',
-                                                 'paraview.0005-ParaView_find_cgns.patch',
-                                                 'paraview.0006-ParaView_find_libxml2.patch',
-                                                 'paraview.0007-ParaView_find_freetype.patch',
-                                                 'paraview-0012-LATA_64BITS_IDS.patch',
-                                                 'ParaView-5.9.0-CATALYST_cmake.patch',
-                                                 'paraview.0008-ParaView_coincident_rendering.patch',
-                                                 'paraview.0015-Paraview_VTKM_ioss.patch']
+   'APPLICATION.products.scipy' : '1.5.2'
   }
 ]

diff --git a/products/llvm.pyconf b/products/llvm.pyconf
index 46121c2433069014564af54d4fc20676624debf2..e99bc556b10733e01d1023f542975cc9b1027e86 100644 (file)
--- a/products/llvm.pyconf
+++ b/products/llvm.pyconf
@@ -33,6 +33,7 @@ version_8_0_1_clang :
 {
     build_source : "script"
     compil_script: "llvm-8.0.1.sh"
+    patches : ['llvm-8.0.1-clang-FD32-gcc-10.0.patch']
 }
 
 version_8_0_1_clang_win :
@@ -48,4 +49,5 @@ version_8_0_1_clang_win :
      incremental : "yes"
      compile_time : "yes"
    }
+   patches : []
 }

diff --git a/products/mesa.pyconf b/products/mesa.pyconf
index a0cc7effdecaa045689f35476e8befe18f1a0000..5f76a9d8a02f11a680d6aa288294104db1b2c740 100644 (file)
--- a/products/mesa.pyconf
+++ b/products/mesa.pyconf
@@ -35,6 +35,11 @@ default_win:
 }
 
 version_19_0_8:
+{
+  patches: ['mesa-19.0.8-debug_symbol-gcc-10.0.patch']
+}
+
+version_19_0_8_win:
 {
   patches: []
 }

diff --git a/products/patches/llvm-8.0.1-clang-FD32-gcc-10.0.patch b/products/patches/llvm-8.0.1-clang-FD32-gcc-10.0.patch
new file mode 100644 (file)
index 0000000..94a243e
--- /dev/null
+++ b/products/patches/llvm-8.0.1-clang-FD32-gcc-10.0.patch
@@ -0,0 +1,24 @@
+--- llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h        2019-01-08 22:05:51.000000000 +0100
++++ llvm_new/include/llvm/Demangle/MicrosoftDemangleNodes.h    2021-05-18 12:01:40.155715423 +0200
+@@ -4,7 +4,13 @@
+ #include "llvm/Demangle/Compiler.h"
+ #include "llvm/Demangle/StringView.h"
+ #include <array>
+-
++#ifdef __GNUC__
++#include <features.h>
++# if __GNUC_PREREQ(10,0)
++# include <cstdint>
++# include <string>
++# endif
++#endif
+ class OutputStream;
+ 
+ namespace llvm {
+@@ -602,4 +608,4 @@
+ } // namespace ms_demangle
+ } // namespace llvm
+ 
+-#endif
+\ Pas de fin de ligne à la fin du fichier
++#endif

diff --git a/products/patches/mesa-19.0.8-debug_symbol-gcc-10.0.patch b/products/patches/mesa-19.0.8-debug_symbol-gcc-10.0.patch
new file mode 100644 (file)
index 0000000..0dfd4ae
--- /dev/null
+++ b/products/patches/mesa-19.0.8-debug_symbol-gcc-10.0.patch
@@ -0,0 +1,18 @@
+--- mesa/src/gallium/auxiliary/util/u_debug_symbol.c   2019-06-26 22:14:08.000000000 +0200
++++ mesa_new/src/gallium/auxiliary/util/u_debug_symbol.c       2021-05-18 12:25:33.795494688 +0200
+@@ -270,7 +270,14 @@
+    debug_printf("\t%s\n", buf);
+ }
+ 
+-struct util_hash_table* symbols_hash;
++#ifdef __GNUC__
++#  include <features.h>
++#  if __GNUC_PREREQ(10,0)
++   extern struct util_hash_table* symbols_hash;
++# else
++  struct util_hash_table* symbols_hash;
++# endif
++#endif
+ static mtx_t symbols_mutex = _MTX_INITIALIZER_NP;
+ 
+ static unsigned hash_ptr(void* p)

diff --git a/products/patches/qt-mapbox-FD32-gcc-10.0.patch b/products/patches/qt-mapbox-FD32-gcc-10.0.patch
new file mode 100644 (file)
index 0000000..ec9bae9
--- /dev/null
+++ b/products/patches/qt-mapbox-FD32-gcc-10.0.patch
@@ -0,0 +1,47 @@
+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
+--- qt_ref/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/convert.hpp      2020-10-15 08:53:19.000000000 +0200
++++ qt_new/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/convert.hpp      2021-05-18 14:27:22.215207025 +0200
+@@ -3,6 +3,12 @@
+ #include <array>
+ #include <type_traits>
+ #include <utility>
++#ifdef __GNUC__
++#  include <features.h>
++#  if __GNUC_PREREQ(10,0)
++#    include <stdint.h>
++#  endif
++#endif // __GNUC__
+ 
+ namespace mbgl {
+ namespace util {
+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
+--- qt_ref/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp  2020-10-15 08:53:19.000000000 +0200
++++ qt_new/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp  2021-05-18 14:30:10.072271805 +0200
+@@ -5,6 +5,12 @@
+ #include <unicode/ushape.h>
+ 
+ #include <memory>
++#ifdef __GNUC__
++#  include <features.h>
++#  if __GNUC_PREREQ(10,0)
++#   include <stdexcept>
++#  endif
++#endif // __GNUC__
+ 
+ namespace mbgl {
+ 
+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
+--- qt_ref/qtlocation/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp   2020-10-15 08:53:19.000000000 +0200
++++ qt_new/qtlocation/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp   2021-05-18 14:32:30.936842655 +0200
+@@ -1,5 +1,11 @@
+ #include <memory>
+ 
++#ifdef __GNUC__
++#  include <features.h>
++#  if __GNUC_PREREQ(10,0)
++#    include <stdexcept>
++#  endif
++#endif // __GNUC__
+ #include <mbgl/text/bidi.hpp>
+ 
+ #include <QString>

diff --git a/products/qt.pyconf b/products/qt.pyconf
index 074c9b625dfed8f6974760f3a6e664b3b95a59e7..2d9eb44ac66e3fca9e777b55379a371e10ae5ad1 100644 (file)
--- a/products/qt.pyconf
+++ b/products/qt.pyconf
@@ -48,12 +48,14 @@ version_5_12_10 :
 {
   compil_script : "qt-5.12.10" + $VARS.scriptExtension
   depend : ["freetype", 'llvm']
+  patches : ['qt-mapbox-FD32-gcc-10.0.patch']
 }
 
 version_5_12_10_win :
 {
   depend : ["freetype"]
   build_depend : ["llvm"]
+  patches : []
 }
 
 version_5_9_1 :