From c14fa77ea524dac1650aa5b82d1702796f9dee55 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 30 Sep 2022 11:08:40 +0200 Subject: [PATCH] StaticMeshPlugin compilation issue on DB11 --- applications/SALOME-master-native.pyconf | 3 ++- products/StaticMeshPlugin.pyconf | 8 +++++++- ...in-5.11.0.patch => StaticMeshPlugin-5.11.0.p001.patch} | 0 3 files changed, 9 insertions(+), 2 deletions(-) rename products/patches/{StaticMeshPlugin-5.11.0.patch => StaticMeshPlugin-5.11.0.p001.patch} (100%) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index ddcbf8e..992c85c 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -249,7 +249,8 @@ __overwrite__ : __condition__ : "VARS.dist in ['DB11']" '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.PyFMI' : {tag:'2.6', base: 'no', section: 'version_2_6_no_pip' } + 'APPLICATION.products.StaticMeshPlugin' : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_DB11'} } { # CentOS 8 repositories don't include sphinxintl package which must be installed through pip. diff --git a/products/StaticMeshPlugin.pyconf b/products/StaticMeshPlugin.pyconf index 856c37b..d8d6d27 100644 --- a/products/StaticMeshPlugin.pyconf +++ b/products/StaticMeshPlugin.pyconf @@ -61,7 +61,13 @@ default_win : version_5_11_0: { archive_info : {archive_name : "StaticMeshPlugin-5.11.0-8801743.tar.gz"} - patches: ['StaticMeshPlugin-5.11.0.patch'] + patches: ['StaticMeshPlugin-5.11.0.p001.patch'] +} + +version_5_11_0_DB11: +{ + archive_info : {archive_name : "StaticMeshPlugin-5.11.0-8801743.tar.gz"} + patches: ['StaticMeshPlugin-5.11.0.p001.patch', 'StaticMeshPlugin-5.11.0.p002.patch'] } version_5_8_0: diff --git a/products/patches/StaticMeshPlugin-5.11.0.patch b/products/patches/StaticMeshPlugin-5.11.0.p001.patch similarity index 100% rename from products/patches/StaticMeshPlugin-5.11.0.patch rename to products/patches/StaticMeshPlugin-5.11.0.p001.patch -- 2.39.2