From: Guytri Kastane <Guytri.Kastane@cea.fr>
Date: Tue, 3 Sep 2024 11:16:48 +0000 (+0200)
Subject: spns #41954: support Ubuntu 24.04
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7061e22bf27527c303834606dd2832b8a661a879;p=tools%2Fsat_salome.git

spns #41954: support Ubuntu 24.04
---

diff --git a/applications/MEDCOUPLING-9.13.0-native.pyconf b/applications/MEDCOUPLING-9.13.0-native.pyconf
index 7147488..b9bfced 100644
--- a/applications/MEDCOUPLING-9.13.0-native.pyconf
+++ b/applications/MEDCOUPLING-9.13.0-native.pyconf
@@ -98,14 +98,19 @@ __overwrite__ :
     }
     {
         __condition__ : "VARS.dist in ['UB22.04']"
-        'APPLICATION.products.medfile'          : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_UB22_04'}
+        'APPLICATION.products.medfile'          : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_UB24_04'}
     }
     {
-        __condition__ : "VARS.dist in ['FD37']"
-        'APPLICATION.products.medfile'          : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_FD37'}
+        __condition__ : "VARS.dist in ['UB24.04']"
+        'APPLICATION.products.cmake'            : 'native'
+        'APPLICATION.products.medfile'          : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_UB22_04'}
     }
     {
         __condition__ : "VARS.dist in ['FD36']"
         'APPLICATION.products.medfile'          : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_FD36'}
     }
+    {
+        __condition__ : "VARS.dist in ['FD38']"
+        'APPLICATION.products.medfile'          : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_FD38'}
+    }
 ]
diff --git a/applications/SALOME-9.13.0-native.pyconf b/applications/SALOME-9.13.0-native.pyconf
index 4374f0e..6a8b11e 100644
--- a/applications/SALOME-9.13.0-native.pyconf
+++ b/applications/SALOME-9.13.0-native.pyconf
@@ -273,8 +273,8 @@ __overwrite__ :
         'APPLICATION.products.omniORBpy'        : {tag: '4.2.5',     base: 'no', section: 'version_4_2_5_UB24_04'                  }
         'APPLICATION.products.nose_py3'         : {tag: '1.6.9',     base: 'no', section: 'version_1_6_9_no_pip'                   }
         'APPLICATION.products.rkCommon'         : {tag: '1.5.1',     base: 'no', section: 'version_1_5_1_UB24_04'                  }
-        'APPLICATION.products.catalyst'         : {tag: '2.0',       base: 'no', section: 'version_2_0_FD38'                       }
-        'APPLICATION.products.medfile'          : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_UB22_04'                  }
+        'APPLICATION.products.catalyst'         : {tag: '2.0',       base: 'no', section: 'version_2_0_UB24_04'                    }
+        'APPLICATION.products.medfile'          : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_UB24_04'                  }
         'APPLICATION.products.gmsh'             : {tag: '4.10.3',    base: 'no', section: 'version_4_10_3_with_CAS_7_8_UB24_04'    }
         'APPLICATION.products.ParaView'         : {tag: '5.11.0',    base: 'no', section: 'version_5_11_0_MPI_UB24_04', hpc: 'yes' }
         'APPLICATION.products.KERNEL'           : {tag: 'V9_13_0',   base: 'no', section: 'version_V9_13_0_UB24_04'                }
diff --git a/products/catalyst.pyconf b/products/catalyst.pyconf
index 2af498d..6fab55e 100644
--- a/products/catalyst.pyconf
+++ b/products/catalyst.pyconf
@@ -35,9 +35,14 @@ version_2_0:
     archive_info : {archive_name : "catalyst-2.0-431a8a1.tar.gz"}
 }
 
+version_2_0_UB24_04:
+{
+    archive_info : {archive_name : "catalyst-2.0-431a8a1.tar.gz"}
+    patches : ['catalyst-2.0.p001.patch']
+}
+
 version_2_0_FD38:
 {
     archive_info : {archive_name : "catalyst-2.0-431a8a1.tar.gz"}
     patches : ['catalyst-2.0.p001.patch']
 }
-  
\ No newline at end of file
diff --git a/products/medfile.pyconf b/products/medfile.pyconf
index 316001a..182766c 100644
--- a/products/medfile.pyconf
+++ b/products/medfile.pyconf
@@ -51,6 +51,15 @@ version_4_1_1_win :
     }
 }
 
+# needed in order to screen with windows version - see below
+version_4_1_1_UB24_04 :
+{
+    compil_script : 'med-4.1.1.sh'
+    test_build : "make check"
+    build_depend : ['swig']
+    patches: ['SPNS-29880-medfile.patch']
+}
+
 # needed in order to screen with windows version - see below
 version_4_1_1_UB22_04 :
 {