From 8ef8d20b24ba7f56023f9a3980550decd306179e Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 9 Oct 2024 23:33:41 +0200 Subject: [PATCH] spns #43020: Fix DB10, 11 and UB22.04 builds --- applications/SALOME-master-native.pyconf | 2 +- products/PyQt.pyconf | 4 ++-- products/cork.pyconf | 13 ++++++------- products/irmb.pyconf | 10 +++++----- products/libigl.pyconf | 5 ++--- products/mcut.pyconf | 14 +++++++++----- products/salome_system.pyconf | 11 ++++++----- 7 files changed, 31 insertions(+), 28 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 2ce5639..2f77cb3 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -297,7 +297,7 @@ __overwrite__ : # - Qt minimal version 5.12 # - xmlpatterns executable __condition__ : "VARS.dist in ['DB10']" - 'APPLICATION.rm_products' : ['nose_py3','assimulo'] # + 'APPLICATION.rm_products' : ['nose_py3','assimulo'] 'APPLICATION.products.nlopt' : '2.4.2' 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.cminpack' : 'native' diff --git a/products/PyQt.pyconf b/products/PyQt.pyconf index 49c7e9f..a645fd2 100644 --- a/products/PyQt.pyconf +++ b/products/PyQt.pyconf @@ -6,9 +6,9 @@ default : get_source : "archive" system_info : { - rpm : ["python3-qt5"] + rpm : ["python3-qt5", "python3-pyqt5.qtsvg"] rpm_dev : ["python3-qt5-devel"] - apt : ["python3-pyqt5"] + apt : ["python3-pyqt5", "python3-pyqt5.qtsvg"] apt_dev : ["pyqt5-dev", "pyqt5-dev-tools"] } environ : diff --git a/products/cork.pyconf b/products/cork.pyconf index eaab7dc..0b3e5f0 100644 --- a/products/cork.pyconf +++ b/products/cork.pyconf @@ -11,7 +11,7 @@ default : github : "https://github.com/gilbo/cork.git" } } - patches : [''] + patches : [] system_info : { rpm : [] @@ -27,14 +27,13 @@ default : "mmg", "PyQt", "Python", - "numpy", - "cgal", - "libigl", - "mcut", - "irmb" + "numpy" ] build_depend : ["cmake", "cppunit"] - opt_depend : [] + opt_depend : [ + "cgal", + "libigl" + ] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name install_dir : 'base' diff --git a/products/irmb.pyconf b/products/irmb.pyconf index c04870f..d07c4dc 100644 --- a/products/irmb.pyconf +++ b/products/irmb.pyconf @@ -27,13 +27,13 @@ default : "mmg", "PyQt", "Python", - "numpy", - "cgal", - "libigl", - "mcut" + "numpy" ] build_depend : ["cmake", "cppunit"] - opt_depend : [] + opt_depend : ["cgal", + "libigl", + "cork" + ] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name install_dir : 'base' diff --git a/products/libigl.pyconf b/products/libigl.pyconf index e1fbfa6..527acf7 100644 --- a/products/libigl.pyconf +++ b/products/libigl.pyconf @@ -27,11 +27,10 @@ default : "mmg", "PyQt", "Python", - "numpy", - "cgal" + "numpy" ] build_depend : ["cmake", "cppunit"] - opt_depend : [] + opt_depend : ["cgal"] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name install_dir : 'base' diff --git a/products/mcut.pyconf b/products/mcut.pyconf index 076100b..010aea0 100644 --- a/products/mcut.pyconf +++ b/products/mcut.pyconf @@ -28,12 +28,16 @@ default : "PyQt", "Python", "numpy", - "eigen", - "cgal", - "libigl" + "eigen" ] build_depend : ["cmake", "cppunit"] - opt_depend : [] + opt_depend : [ + "cgal", + "libigl", + "cork", + "irmb" + ] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name install_dir : 'base' @@ -50,5 +54,5 @@ version_b5b0ec6: compil_script: "mcut" + $VARS.scriptExtension patches : ['mcut-b5b0ec6-p01_cgsboolean.patch', 'mcut-b5b0ec6-p02_cgsboolean.patch' - ] + ] } diff --git a/products/salome_system.pyconf b/products/salome_system.pyconf index 352c409..dd042de 100644 --- a/products/salome_system.pyconf +++ b/products/salome_system.pyconf @@ -110,7 +110,7 @@ default : "libxcb-shape0-dev", "libxcb-shm0-dev", "libxcb-sync-dev", "libxcb-xf86dri0-dev", "libxcb-xfixes0-dev", "libxcb-xinerama0-dev", "libxcb-xinput-dev", "libxcb-xkb-dev", "libxcb-xtest0-dev", "libxcb-xv0-dev", "libxcb-xvmc0-dev", "libxcb-imdkit-dev", "libxcb-image0-dev", "libxcb-keysyms1-dev", "libxcb-render-util0-dev", "libxcb-ewmh-dev", - "libxcb-icccm4-dev", "libxcb-xrm-dev", "libfreetype6-dev"] + "libxcb-icccm4-dev", "libxcb-xrm-dev", "libfreetype6-dev", "libxinerama-dev"] } "DB11" : { @@ -120,7 +120,7 @@ default : apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev", "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools", "libopenmpi-dev", "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev", "libnetcdf-dev", "libgdal-dev", - "texlive-latex-base", "texlive-latex-extra", "dvipng", "libxml++2.6-dev", "libfreetype6-dev"] + "texlive-latex-base", "texlive-latex-extra", "dvipng", "libxml++2.6-dev", "libfreetype6-dev", "libxinerama-dev"] } "DB12" : { @@ -130,7 +130,7 @@ default : apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev", "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools", "libopenmpi-dev", "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev", "libnetcdf-dev", "libgdal-dev", - "texlive-latex-base", "texlive-latex-extra", "dvipng", "libxml++2.6-dev", "libfreetype6-dev", "libgmp-dev","libmpfr-dev"] + "texlive-latex-base", "texlive-latex-extra", "dvipng", "libxml++2.6-dev", "libfreetype6-dev", "libgmp-dev","libmpfr-dev", "libxinerama-dev"] } "UB16.04" : { @@ -165,10 +165,11 @@ default : { apt : ["libdc1394-25", "libopenexr25", "libwebp7", "gfortran-11", "libilmbase25", "libevent-2.1-7", "libpng16-16", "libgcc-11-dev", "libffi7", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "openmpi-bin", "libgdal30", "libopenblas0-serial", "libtbb12", - "libxml++2.6-2v5", "libfreetype6", "libncurses5"] + "libxml++2.6-2v5", "libfreetype6", "libncurses5", "libgmp10", "libmpfr6"] apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev", "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools", "libopenmpi-dev", - "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev", "libgdal-dev", "dvipng", "libxml++2.6-dev", "libfreetype6-dev"] + "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev", "libgdal-dev", "dvipng", "libxml++2.6-dev", "libfreetype6-dev", + "libgmp-dev", "libmpfr-dev"] } "UB24.04" : { -- 2.39.2