zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5: patch internal RapidJSON (#48078)

Browse Source 
* 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 <wdconinc@gmail.com>
This commit is contained in:
Chris Marsh 2024-12-16 20:06:30 -06:00 committed by GitHub
parent b54227d5e9
commit 5db597ff87
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/qt/package.py
View File

@ -184,6 +184,16 @@ class Qt(Package):
# causing qt to fail in ci. This increases that limit to 1024. # causing qt to fail in ci. This increases that limit to 1024.
patch("qt59-qtbase-qtconfig256.patch", working_dir="qtbase", when="@5.9:5") 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@10:", when="@5.9:5.12.6 +opengl")
conflicts("%gcc@11:", when="@5.8") conflicts("%gcc@11:", when="@5.8")
conflicts("%apple-clang@13:", when="@:5.13") conflicts("%apple-clang@13:", when="@:5.13")