From 5db597ff87120e92220f3ff69ee2377dffcc3a28 Mon Sep 17 00:00:00 2001 From: Chris Marsh Date: Mon, 16 Dec 2024 20:06:30 -0600 Subject: [PATCH] qt5: patch internal RapidJSON (#48078) * Fix qt5 internal RapidJSON build error with %gcc@14: * fix style * qt: patch url full_index * qt: fix patch sha * qt: patch when @5.9.2: --------- Co-authored-by: Wouter Deconinck --- var/spack/repos/builtin/packages/qt/package.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 9412b9a3dfb..4fe5d395a13 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -184,6 +184,16 @@ class Qt(Package): # causing qt to fail in ci. This increases that limit to 1024. patch("qt59-qtbase-qtconfig256.patch", working_dir="qtbase", when="@5.9:5") + # with gcc@14: RapidJSON fails to build + # https://github.com/Tencent/rapidjson/issues/2277 + # https://github.com/Tencent/rapidjson/pull/719 + patch( + "https://patch-diff.githubusercontent.com/raw/Tencent/rapidjson/pull/719.patch?full_index=1", + sha256="ce341a69d6c17852fddd5469b6aabe995fd5e3830379c12746a18c3ae858e0e1", + working_dir="qtlocation/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0", + when="@5.9.2: %gcc@14:", + ) + conflicts("%gcc@10:", when="@5.9:5.12.6 +opengl") conflicts("%gcc@11:", when="@5.8") conflicts("%apple-clang@13:", when="@:5.13")