<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4feaf8020ad6da36efbc51e710f41ae15e78ceea">https://github.com/macports/macports-ports/commit/4feaf8020ad6da36efbc51e710f41ae15e78ceea</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4feaf8020ad6da36efbc51e710f41ae15e78ceea
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Fri Nov 29 05:56:54 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> vtk: use legacysupport for strnlen etc. for < 10.7
</span>---
graphics/vtk/Portfile | 11 +++++++++++
graphics/vtk/files/patch-libxml2-getentropy.diff | 16 ++++++++++++++++
2 files changed, 27 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk/Portfile b/graphics/vtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9194ee59988..e14d83fd38c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,9 +3,13 @@
</span> PortSystem 1.0
PortGroup cmake 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span> PortGroup mpi 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# strnlen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Require C++11
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,6 +91,13 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> patchfiles-append patch-pthread_threadid_np.diff
# Ensure Cocoa does not get picked and fix GL linking:
patchfiles-append patch-use-x11.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # With legacysupport getentropy is detected, but sys/random.h is not.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This breaks the build, since we need sys/random.h included.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # dict.c:970:17: error: implicit declaration of function 'getentropy'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Once that is fixed, u_int is not recognized:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # /usr/include/sys/random.h:37:32: error: unknown type name 'u_int'; did you mean 'int'?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Adding sys/types.h fixes that.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-libxml2-getentropy.diff
</span> # Fix 32-bit builds with gcc:
if {[string match *gcc* ${configure.compiler}] \
&& ${configure.build_arch} in [list arm i386 ppc]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk/files/patch-libxml2-getentropy.diff b/graphics/vtk/files/patch-libxml2-getentropy.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..38315e35ced
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vtk/files/patch-libxml2-getentropy.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ThirdParty/libxml2/vtklibxml2/dict.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ThirdParty/libxml2/vtklibxml2/dict.c 2024-11-29 05:44:11.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -929,12 +929,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <windows.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <bcrypt.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(HAVE_GETENTROPY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #ifdef HAVE_UNISTD_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #ifdef HAVE_SYS_RANDOM_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/random.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>