From 614d432cd399bc4f10263035442d76e4c648e406 Mon Sep 17 00:00:00 2001 From: Tristan Carel Date: Tue, 26 Mar 2024 17:59:58 +0100 Subject: [PATCH] gmsh: backport recipe from upstream --- bluebrain/repo-patches/packages/gmsh/package.py | 16 ---------------- var/spack/repos/builtin/packages/gmsh/package.py | 7 ++++++- 2 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 bluebrain/repo-patches/packages/gmsh/package.py diff --git a/bluebrain/repo-patches/packages/gmsh/package.py b/bluebrain/repo-patches/packages/gmsh/package.py deleted file mode 100644 index 12ad3750a91673..00000000000000 --- a/bluebrain/repo-patches/packages/gmsh/package.py +++ /dev/null @@ -1,16 +0,0 @@ -# flake8: noqa -import os - -from spack.package import * -from spack.pkg.builtin.gmsh import Gmsh as BuiltinGmsh - - -class Gmsh(BuiltinGmsh): - __doc__ = BuiltinGmsh.__doc__ - - version("4.12.2", sha256="13e09d9ca8102e5c40171d6ee150c668742b98c3a6ca57f837f7b64e1e2af48f") - version("4.11.1", sha256="c5fe1b7cbd403888a814929f2fd0f5d69e27600222a18c786db5b76e8005b365") - - def setup_run_environment(self, env): - sitedir = os.path.dirname(find(self.prefix, "gmsh.py")[0]) - env.prepend_path("PYTHONPATH", sitedir) diff --git a/var/spack/repos/builtin/packages/gmsh/package.py b/var/spack/repos/builtin/packages/gmsh/package.py index 166bbe788854ca..7049cd2772db9e 100644 --- a/var/spack/repos/builtin/packages/gmsh/package.py +++ b/var/spack/repos/builtin/packages/gmsh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) @@ -20,7 +20,11 @@ class Gmsh(CMakePackage): url = "https://gmsh.info/src/gmsh-4.4.1-source.tgz" git = "https://gitlab.onelab.info/gmsh/gmsh.git" + license("GPL-2.0-or-later") + version("master", branch="master") + version("4.12.2", sha256="13e09d9ca8102e5c40171d6ee150c668742b98c3a6ca57f837f7b64e1e2af48f") + version("4.12.0", sha256="2a6007872ba85abd9901914826f6986a2437ab7104f564ccefa1b7a3de742c17") version("4.10.3", sha256="a87d59ccea596d493d375b0d6bc380079a5e5a4baebf0d3383018b0cd6bd8e33") version("4.8.4", sha256="760dbdc072eaa3c82d066c5ba3b06eacdd3304eb2a97373fe4ada9509f0b6ace") version("4.7.1", sha256="c984c295116c757ed165d77149bd5fdd1068cbd7835e9bcd077358b503891c6a") @@ -105,6 +109,7 @@ class Gmsh(CMakePackage): conflicts("+slepc", when="~petsc") conflicts("+oce", when="+opencascade") conflicts("+oce", when="^gmsh@4.10:4.10.3") + conflicts("+oce", when="@4.10.3:") conflicts("+metis", when="+external", msg="External Metis cannot build with GMSH") def flag_handler(self, name, flags):