From 5d34a9dee567b51d2b9fd009d07046f7913f0fde Mon Sep 17 00:00:00 2001 From: Guytri KASTANE Date: Thu, 20 Jun 2024 09:08:36 +0200 Subject: [PATCH] Fix qt 5.15.2 compilation on CO9 --- applications/SALOME-master-native.pyconf | 2 +- products/qt.pyconf | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index d7c6208..ece9625 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -335,7 +335,7 @@ __overwrite__ : 'APPLICATION.products.openmpi' : '4.1.5' 'APPLICATION.products.sip' : '5.5.0' 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_CO9' } - 'APPLICATION.products.qt' : '5.15.2' + 'APPLICATION.products.qt' : {tag: '5.15.2', base: 'no', section: 'version_5_15_2_CO9' } 'APPLICATION.products.mdurl' : {tag: '0.1.2', base: 'no', section: 'version_0_1_2_no_pip' } 'APPLICATION.products.markdown_it_py' : {tag: '3.0.0', base: 'no', section: 'version_3_0_0_no_pip' } 'APPLICATION.products.rich' : {tag: '13.7.1', base: 'no', section: 'version_13_7_1_no_pip' } diff --git a/products/qt.pyconf b/products/qt.pyconf index 8e01825..69cd272 100644 --- a/products/qt.pyconf +++ b/products/qt.pyconf @@ -31,6 +31,13 @@ version_5_15_2 : depend : ["freetype", 'llvm'] } +version_5_15_2_CO9 : +{ + compil_script : "qt-5.15.2" + $VARS.scriptExtension + depend : ["freetype", 'llvm'] + patches: ["qt_5_15_2_numeric_limits.patch"] +} + version_5_15_2_win : { depend : ["freetype"] -- 2.39.2