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

cgns: patch for include path for 4.5 (#49161)

Browse Source 
Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
This commit is contained in:
Melven Roehrig-Zoellner 2025-03-17 11:19:13 +01:00 committed by GitHub
parent 40268634b6
commit d4bd3e298a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
var/spack/repos/builtin/packages/cgns/cgns-4.5-tk-private.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/cgnstools/tkogl/tkogl.c b/src/cgnstools/tkogl/tkogl.c
index 506599d..71b4fb8 100644
--- a/src/cgnstools/tkogl/tkogl.c
+++ b/src/cgnstools/tkogl/tkogl.c
@@ -25,7 +25,7 @@
#if ! defined(__WIN32__) && ! defined(_WIN32)
/* For TkWmAddToColormapWindows. */
#define _TKPORT /* Typical installations cannot find tkPort.h. */
-#include <tk-private/generic/tkInt.h>
+#include <tkInt.h>
#endif
#ifndef CONST

2
var/spack/repos/builtin/packages/cgns/package.py
View File

@ -81,6 +81,8 @@ class Cgns(CMakePackage):
# copied from https://github.com/CGNS/CGNS/pull/757 # copied from https://github.com/CGNS/CGNS/pull/757
# (adjusted an include from tk-private/generic/tkInt.h to tkInt.h) # (adjusted an include from tk-private/generic/tkInt.h to tkInt.h)
patch("gcc14.patch", when="@:4.4.0 %gcc@14:") patch("gcc14.patch", when="@:4.4.0 %gcc@14:")
# "wrong" include for spack (tk-private) from the patch above made it into the official version
patch("cgns-4.5-tk-private.patch", when="@4.5.0")
def cmake_args(self): def cmake_args(self):
spec = self.spec spec = self.spec