Upgrade matplotlib to 3.0.3 and boost to 1.71.0 (Linux) - Add a patch for ParaView...

diff --git a/applications/SALOME-9.7.0-MPI.pyconf b/applications/SALOME-9.7.0-MPI.pyconf
index c3b7d9ddfc2ca5daead800c2bae1e47ec71f9f74..a359c7b18ef2b131826a570cc8f67c555eed54e9 100644 (file)
--- a/applications/SALOME-9.7.0-MPI.pyconf
+++ b/applications/SALOME-9.7.0-MPI.pyconf
@@ -29,7 +29,7 @@ APPLICATION :
         # PREREQUISITES :
         alabaster : '0.7.6'
         Babel : '2.7.0'
-        boost : '1.58.0'
+        boost : '1.71.0'
         CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
         certifi : '2018.8.24'
         cgns : {tag : '4.1.1', hpc : 'yes'}
@@ -58,7 +58,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'}
@@ -189,7 +189,8 @@ __overwrite__ :
                                                  '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']
+                                                 'paraview.0015-Paraview_VTKM_ioss.patch',
+                                                 'paraview.0017-ParaView_protobuf_crash.patch']
   }
 ]
 

diff --git a/applications/SALOME-9.7.0-int32.pyconf b/applications/SALOME-9.7.0-int32.pyconf
index b16b76c4cc4e0dec90cbb91edf6a6593a9aca4e2..6cba232c3f943066bc4dc5610e6976952a80661e 100644 (file)
--- a/applications/SALOME-9.7.0-int32.pyconf
+++ b/applications/SALOME-9.7.0-int32.pyconf
@@ -27,7 +27,7 @@ APPLICATION :
         # PREREQUISITES :
         alabaster : '0.7.6'
         Babel : '2.7.0'
-        boost : '1.58.0'
+        boost : '1.71.0'
         CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
         certifi : '2018.8.24'
         cgns : '4.1.1'
@@ -56,7 +56,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'
@@ -221,7 +221,8 @@ __overwrite__ :
                                                  'paraview.0006-ParaView_find_libxml2.patch',
                                                  'paraview.0007-ParaView_find_freetype.patch',
                                                  'paraview.0009-ParaView_volume_mapper.patch',
-                                                 'pv_coincident.patch'
+                                                 'pv_coincident.patch',
+                                                 'paraview.0017-ParaView_protobuf_crash.patch'
                                                 ]
   }
 ]

diff --git a/applications/SALOME-9.7.0-native.pyconf b/applications/SALOME-9.7.0-native.pyconf
index d8662b44f14372661d70191e7de191bb3ab4eb03..ca8227b03f2428a72dc9e17826e81336ee899ab7 100644 (file)
--- a/applications/SALOME-9.7.0-native.pyconf
+++ b/applications/SALOME-9.7.0-native.pyconf
@@ -195,7 +195,8 @@ __overwrite__ :
                                                    'paraview.0005-ParaView_find_cgns.patch',
                                                    'paraview-0012-LATA_64BITS_IDS.patch',
                                                    'ParaView-5.9.0-CATALYST_cmake.patch',
-                                                   'paraview.0008-ParaView_coincident_rendering.patch']
+                                                   'paraview.0008-ParaView_coincident_rendering.patch',
+                                                   'paraview.0017-ParaView_protobuf_crash.patch']
    }
    {
       # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it
@@ -210,7 +211,8 @@ __overwrite__ :
                                                    'paraview-5.9_qt-minimum-version.patch',
                                                    'paraview.0003-ParaViewClient_native.patch',
                                                    'ParaView-5.9.0-CATALYST_cmake.patch',
-                                                   'paraview.0008-ParaView_coincident_rendering.patch']
+                                                   'paraview.0008-ParaView_coincident_rendering.patch',
+                                                   'paraview.0017-ParaView_protobuf_crash.patch']
    }
    {
       # CentOS 8 repositories don't include sphinxintl package which must be installed through pip.

diff --git a/applications/SALOME-9.7.0.pyconf b/applications/SALOME-9.7.0.pyconf
index cac6d4f28528f430445117e0541cb2d093490e0e..f2727967d8d391bd16438946431994c9156e79dc 100644 (file)
--- a/applications/SALOME-9.7.0.pyconf
+++ b/applications/SALOME-9.7.0.pyconf
@@ -29,7 +29,7 @@ APPLICATION :
         # PREREQUISITES :
         alabaster : '0.7.6'
         Babel : '2.7.0'
-        boost : '1.58.0'
+        boost : '1.71.0'
         CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
         certifi : '2018.8.24'
         cgns : '4.1.1'
@@ -58,7 +58,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'
@@ -198,6 +198,7 @@ __overwrite__ :
                                                  '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']
+                                                 'paraview.0015-Paraview_VTKM_ioss.patch',
+                                                 'paraview.0017-ParaView_protobuf_crash.patch']
   }
 ]

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index 8068633529bfbe6afd6f7a5c71f6e24e3fad1b5b..eb3e260046899456fa7505fd5b6c8e9646e5558d 100755 (executable)
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -42,7 +42,8 @@ version_5_9_0 :
                '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.0008-ParaView_coincident_rendering.patch',
+               'paraview.0017-ParaView_protobuf_crash.patch'
               ]
 }
 
@@ -57,7 +58,8 @@ version_5_9_0_int32 :
                'paraview.0006-ParaView_find_libxml2.patch',
                'paraview.0007-ParaView_find_freetype.patch',
                'ParaView-5.9.0-CATALYST_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch'
+               'paraview.0008-ParaView_coincident_rendering.patch',
+               'paraview.0017-ParaView_protobuf_crash.patch'
               ]
 }
 
@@ -87,7 +89,8 @@ version_5_9_0_win :
                'paraview-0012-LATA_64BITS_IDS.patch',
                'ParaView-5.9.0-CATALYST_cmake.patch',
                'paraview.0010-ParaView_windows_catalyst_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch'
+               'paraview.0008-ParaView_coincident_rendering.patch',
+               'paraview.0017-ParaView_protobuf_crash.patch'
               ]
 }
 
@@ -116,7 +119,8 @@ version_5_9_0_win_int32 :
                'paraview.0008-ParaView_find_zlib.patch',
                'ParaView-5.9.0-CATALYST_cmake.patch',
                'paraview.0010-ParaView_windows_catalyst_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch'
+               'paraview.0008-ParaView_coincident_rendering.patch',
+               'paraview.0017-ParaView_protobuf_crash.patch'
               ]
 }
 
@@ -132,7 +136,8 @@ version_5_9_0_MPI :
                'paraview-5.9-VTKM_MPI.patch',
                'paraview-0012-LATA_64BITS_IDS.patch',
                'ParaView-5.9.0-CATALYST_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch'
+               'paraview.0008-ParaView_coincident_rendering.patch',
+               'paraview.0017-ParaView_protobuf_crash.patch'
               ]
 }
 
@@ -147,7 +152,8 @@ version_5_9_0_MPI_int32 :
                'paraview.0007-ParaView_find_freetype.patch',
                'paraview-5.9-VTKM_MPI.patch',
                'ParaView-5.9.0-CATALYST_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch'
+               'paraview.0008-ParaView_coincident_rendering.patch',
+               'paraview.0017-ParaView_protobuf_crash.patch'
               ]
 }
 

diff --git a/products/patches/paraview.0017-ParaView_protobuf_crash.patch b/products/patches/paraview.0017-ParaView_protobuf_crash.patch
new file mode 100644 (file)
index 0000000..a9623e9
--- /dev/null
+++ b/products/patches/paraview.0017-ParaView_protobuf_crash.patch
@@ -0,0 +1,14 @@
+diff -Naur ParaView-5.9.0_SRC_orig/Remoting/Application/vtkInitializationHelper.cxx ParaView-5.9.0_SRC_modif/Remoting/Application/vtkInitializationHelper.cxx
+index e171735139..47784ec70e 100644
+--- ParaView-5.9.0_SRC_orig/Remoting/Application/vtkInitializationHelper.cxx
++++ ParaView-5.9.0_SRC_modif/Remoting/Application/vtkInitializationHelper.cxx
+@@ -300,7 +300,7 @@ void vtkInitializationHelper::Finalize()
+   vtkProcessModule::Finalize();
+ 
+   // Optional:  Delete all global objects allocated by libprotobuf.
+-  google::protobuf::ShutdownProtobufLibrary();
++  //google::protobuf::ShutdownProtobufLibrary();
+ }
+ 
+ //----------------------------------------------------------------------------
+