summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorWouter Deconinck <wdconinc@gmail.com>2023-12-17 06:35:46 -0600
committerGitHub <noreply@github.com>2023-12-17 07:35:46 -0500
commit17d47accf90b6a33f4da83767caf35cb7f6b290d (patch)
tree9cda28ebc534ab14b5290a8468c7f3219db49e11 /var
parentd7fb298a6b0e376b6a2ef249d573b5ad8b08d8fa (diff)
downloadspack-17d47accf90b6a33f4da83767caf35cb7f6b290d.tar.gz
spack-17d47accf90b6a33f4da83767caf35cb7f6b290d.tar.bz2
spack-17d47accf90b6a33f4da83767caf35cb7f6b290d.tar.xz
spack-17d47accf90b6a33f4da83767caf35cb7f6b290d.zip
qt: apply patch for apple-clang@15: (#41695)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/qt/package.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index 2654a295da..e949ad8ace 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -150,6 +150,14 @@ class Qt(Package):
)
# https://github.com/microsoft/vcpkg/issues/21055
patch("qt5-macos12.patch", working_dir="qtbase", when="@5.14: %apple-clang@13:")
+ # https://codereview.qt-project.org/c/qt/qtbase/+/503172
+ patch(
+ "https://github.com/qt/qtbase/commit/cdf64b0e47115cc473e1afd1472b4b09e130b2a5.patch?full_index=1",
+ sha256="2b881ffb2808f8fa79f51f8bec71be91a886bcdc59b1d7b6986cba26ed18d1d3",
+ working_dir="qtbase",
+ when="@5.12.1: %apple-clang@15:",
+ )
+ conflicts("%apple-clang@15:", when="@:5.12.0")
# Spack path substitution uses excessively long paths that exceed the hard-coded
# limit of 256 used by teh generated code with the prefix path as string literals