From f891eb1ce3efa44856e34144143ad30cb90d9ae4 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 7 Sep 2022 09:06:43 +0200 Subject: [PATCH] spns #29880: Ubuntu 22.04 - SALOME 9.9.0 --- applications/SALOME-9.9.0-native.pyconf | 15 +++++++++++++++ products/root.pyconf | 5 ++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/applications/SALOME-9.9.0-native.pyconf b/applications/SALOME-9.9.0-native.pyconf index 66096f5..40647e3 100644 --- a/applications/SALOME-9.9.0-native.pyconf +++ b/applications/SALOME-9.9.0-native.pyconf @@ -212,6 +212,21 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' } 'APPLICATION.products.netcdf' : '4.6.2' } + { + # + __condition__ : "VARS.dist in ['UB22.04']" + 'APPLICATION.products.opencv' : '3.2.0' + 'APPLICATION.products.nlopt' : '2.5.0' + 'APPLICATION.products.cminpack': 'native' + 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' } + 'APPLICATION.products.netcdf' : '4.6.2' + 'APPLICATION.rm_products' : ['mesa'] + 'APPLICATION.products.omniORB' : '4.2.5' + 'APPLICATION.products.omniORBpy' : '4.2.5' + 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_UB22_04', hpc: 'yes'} + 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_UB22_04'} + 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_UB22_04'} + } { # DB10: # - Qt minimal version 5.12 diff --git a/products/root.pyconf b/products/root.pyconf index 5ed66eb..a23b576 100644 --- a/products/root.pyconf +++ b/products/root.pyconf @@ -69,7 +69,10 @@ version_6_22_02: version_6_22_02_UB22_04: { get_source : "archive" - patches : ['root-6.22.02.patch', 'root-6.22-afterImage.UB22.patch'] + patches : ['root-6.22.02.patch', + 'root-6.22-afterImage.UB22.patch', + 'root-6.22-string_view.UB22.patch' + ] } version_6_22_02_win: -- 2.39.2