diff --git a/var/spack/repos/builtin/packages/mapl/package.py b/var/spack/repos/builtin/packages/mapl/package.py index b070be4f1c8fb3..78e40df7c6829d 100644 --- a/var/spack/repos/builtin/packages/mapl/package.py +++ b/var/spack/repos/builtin/packages/mapl/package.py @@ -40,6 +40,7 @@ class Mapl(CMakePackage): version("2.54.2", sha256="70b7be425d07a7be7d9bb0e53b93a372887a048caf23260e0ae602ca6e3670ed") version("2.54.1", sha256="2430ded45a98989e9100037f54cf22f5a5083e17196514b3667d3003413e49e1") + version("2.53.4", sha256="da38348a72fcbaa2b888578bfa630ab36261206136d33700344ed6792f9f9aeb") version("2.53.2", sha256="0f294a5289541b0028773f8e5ab2bf04734ec09241baa5a3dcea0e939d40336f") version("2.53.1", sha256="8371a75d4d81294eb9d99d66702f8cf62d4bd954cec3e247e1afae621b4e4726") version("2.53.0", sha256="68c24e6c0e3340645b1fb685972c96ef80746d5a289572c9883e520680708ebe") diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index effa6e42035434..ea11a84165be0a 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -636,6 +636,8 @@ def common_config_args(self): use_spack_dep("freetype") if spec.satisfies("platform=linux") or spec.satisfies("platform=freebsd"): config_args.append("-fontconfig") + # Explicitly disable vulkan to avoid build-time bug; this could be a variant + config_args.append("-no-vulkan") else: config_args.append("-no-freetype") config_args.append("-no-gui") @@ -815,8 +817,7 @@ def configure(self, spec, prefix): config_args.extend(["-skip", "wayland"]) if "~location" in spec: - if version >= Version("5.15"): - config_args.extend(["-skip", "qtlocation"]) + config_args.extend(["-skip", "qtlocation"]) if IS_WINDOWS: config_args.extend(["-skip", "qtspeech"]) diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 9a5e91360b445e..c1dca919cfe250 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -19,6 +19,7 @@ class Scotch(CMakePackage, MakefilePackage): maintainers("pghysels") + version("7.0.7", sha256="02084471d2ca525f8a59b4bb8c607eb5cca452d6a38cf5c89f5f92f7edc1a5b5") version("7.0.6", sha256="b44acd0d2f53de4b578fa3a88944cccc45c4d2961cd8cefa9b9a1d5431de8e2b") version("7.0.4", sha256="8ef4719d6a3356e9c4ca7fefd7e2ac40deb69779a5c116f44da75d13b3d2c2c3") version("7.0.3", sha256="5b5351f0ffd6fcae9ae7eafeccaa5a25602845b9ffd1afb104db932dd4d4f3c5") @@ -86,6 +87,10 @@ class Scotch(CMakePackage, MakefilePackage): conflicts("metis", when="+metis") conflicts("parmetis", when="+metis") + # https://github.com/ufs-community/ufs-weather-model/pull/2650 + # https://github.com/spack/spack-packages/issues/161 + conflicts("%oneapi") + parallel = False # NOTE: Versions of Scotch up to version 6.0.0 don't include support for