From c581dc998d21ab42ca779de60cb1470cc1acb034 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 12 Oct 2022 09:15:34 +0200 Subject: [PATCH] bos #32505 - patches have been implemented --- applications/SALOME-master-native.pyconf | 33 +++++++++++------------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index e473142..ede8313 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -227,20 +227,19 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } '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' } - 'APPLICATION.products.SHAPER' : {tag:'master', base: 'no', section: 'version_V9_9_0_UB22_04', hpc: 'no' } } { # DB10: # - Qt minimal version 5.12 # - xmlpatterns executable __condition__ : "VARS.dist in ['DB10']" - 'APPLICATION.products.opencv' : '3.2.0' - 'APPLICATION.products.cminpack': 'native' - 'APPLICATION.products.PyFMI' : {tag:'2.6', base: 'no', section: 'version_2_6_no_pip' } - 'APPLICATION.products.qt' : '5.12.10' - 'APPLICATION.products.qwt' : '6.1.2' - 'APPLICATION.products.PyQt' : '5.15.3' - 'APPLICATION.products.sip' : '5.5.0' + 'APPLICATION.products.opencv' : '3.2.0' + 'APPLICATION.products.cminpack' : 'native' + 'APPLICATION.products.PyFMI' : {tag:'2.6', base: 'no', section: 'version_2_6_no_pip' } + 'APPLICATION.products.qt' : '5.12.10' + 'APPLICATION.products.qwt' : '6.1.2' + 'APPLICATION.products.PyQt' : '5.15.3' + 'APPLICATION.products.sip' : '5.5.0' 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_DB10', hpc: 'yes'} } { @@ -259,16 +258,16 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } 'APPLICATION.products.statsmodels' : {tag: '0.6.1', base: 'no', section: 'version_0_6_1_no_pip' } 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_CO8' } # spns #29324 - 'APPLICATION.products.StaticMeshPlugin' : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_CO8' } + 'APPLICATION.products.StaticMeshPlugin' : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_CO8' } } { __condition__ : "VARS.dist in ['FD32']" - 'APPLICATION.products.opencv' : '3.2.0' - 'APPLICATION.products.qwt' : '6.1.4' - 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } - 'APPLICATION.products.Sphinx' : {tag: '1.7.6', base: 'no', section: 'version_1_7_6_no_pip' } - 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_FD32' } # spns #29324 - 'APPLICATION.products.StaticMeshPlugin' : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_FD32' } + 'APPLICATION.products.opencv' : '3.2.0' + 'APPLICATION.products.qwt' : '6.1.4' + 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } + 'APPLICATION.products.Sphinx' : {tag: '1.7.6', base: 'no', section: 'version_1_7_6_no_pip' } + 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_FD32' } # spns #29324 + 'APPLICATION.products.StaticMeshPlugin' : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_FD32' } } { __condition__ : "VARS.dist in ['FD34']" @@ -284,7 +283,7 @@ __overwrite__ : { __condition__ : "VARS.dist in ['FD36']" 'APPLICATION.products.cmake' : 'native' # TTK requires cmake > 3.21 - 'APPLICATION.products.opencv' : {tag: '3.2.0', base: 'no', section: 'version_3_2_0_FD36'} + 'APPLICATION.products.opencv' : {tag: '3.2.0', base: 'no', section: 'version_3_2_0_FD36' } 'APPLICATION.products.omniORB' : '4.2.5' 'APPLICATION.products.omniORBpy' : '4.2.5' 'APPLICATION.products.qwt' : '6.1.6' @@ -294,8 +293,6 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_FD36' } 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_FD36' } - 'APPLICATION.products.SMESH' : {tag:'master', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no' } - 'APPLICATION.products.SHAPER' : {tag:'master', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no' } 'APPLICATION.products.StaticMeshPlugin' : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_FD36' } } ] -- 2.39.2