From 6da9eb3857be9fbdee9150d3562ce67c447e0bfd Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 15:22:51 +0000 Subject: [PATCH 1/4] qt: explicitly disable vulkan; always disable location if disabled --- var/spack/repos/builtin/packages/qt/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index f02c0a96748fea..9489473db1f3da 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -626,6 +626,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") @@ -805,8 +807,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"]) From 33b4832d8563ce1b22b6763548d2806e54a91ff2 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 15:26:00 +0000 Subject: [PATCH 2/4] mapl: add 2.53.4 --- var/spack/repos/builtin/packages/mapl/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/repos/builtin/packages/mapl/package.py b/var/spack/repos/builtin/packages/mapl/package.py index 1006d7ce22a6a5..f6f3ec5cc0ebb2 100644 --- a/var/spack/repos/builtin/packages/mapl/package.py +++ b/var/spack/repos/builtin/packages/mapl/package.py @@ -38,6 +38,7 @@ class Mapl(CMakePackage): version("develop", branch="develop") version("main", branch="main") + version("2.53.4", sha256="da38348a72fcbaa2b888578bfa630ab36261206136d33700344ed6792f9f9aeb") version("2.53.0", sha256="68c24e6c0e3340645b1fb685972c96ef80746d5a289572c9883e520680708ebe") version("2.52.0", sha256="c30be3a6ed3fca40aea903e10ee51e2fb50b4ef2445fdc959d4871baf3c20585") version("2.51.2", sha256="f6df2be24d0c113af3d0424b674d970621660bf11e59a699373f014a14d0716e") From 19fb1828beea16dbff506ed8c8442d22a98b6b3e Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 15:26:14 +0000 Subject: [PATCH 3/4] scotch: add 7.0.7 --- var/spack/repos/builtin/packages/scotch/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 368452face4091..8414391a358903 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -20,6 +20,7 @@ class Scotch(CMakePackage, MakefilePackage): maintainers("pghysels") + version("7.0.7", sha256="02084471d2ca525f8a59b4bb8c607eb5cca452d6a38cf5c89f5f92f7edc1a5b5") version("7.0.4", sha256="8ef4719d6a3356e9c4ca7fefd7e2ac40deb69779a5c116f44da75d13b3d2c2c3") version("7.0.3", sha256="5b5351f0ffd6fcae9ae7eafeccaa5a25602845b9ffd1afb104db932dd4d4f3c5") version("7.0.1", sha256="0618e9bc33c02172ea7351600fce4fccd32fe00b3359c4aabb5e415f17c06fed") From b1db55742eb6ec6dc3879c1b02875dc607bee89c Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 17:40:14 +0000 Subject: [PATCH 4/4] scotch: fix oneapi conflict logic --- var/spack/repos/builtin/packages/scotch/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 8414391a358903..58f3d11565cc02 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -88,7 +88,7 @@ class Scotch(CMakePackage, MakefilePackage): # https://github.com/ufs-community/ufs-weather-model/pull/2650 # https://github.com/spack/spack-packages/issues/161 - conflicts("@oneapi") + conflicts("%oneapi") parallel = False