<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b2d8d6c187a6e91cf95110d20da583958cdc67d6">https://github.com/macports/macports-ports/commit/b2d8d6c187a6e91cf95110d20da583958cdc67d6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new b2d8d6c187a vtk: use MacPorts libxml2 port
</span>b2d8d6c187a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit b2d8d6c187a6e91cf95110d20da583958cdc67d6
</span>Author: Dave Allured <dave.allured@noaa.gov>
AuthorDate: Tue Dec 31 08:08:06 2024 -0700

<span style='display:block; white-space:pre;color:#404040;'>    vtk: use MacPorts libxml2 port
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/71667
</span>---
 graphics/vtk/Portfile                                | 19 +++++++------------
 .../files/patch-fix-DataObjectBackendInterface.diff  | 20 --------------------
 graphics/vtk/files/patch-libxml2-getentropy.diff     | 16 ----------------
 3 files changed, 7 insertions(+), 48 deletions(-)

<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 b130e7881df..7bcac8bb28d 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;'>@@ -19,7 +19,7 @@ compiler.blacklist-append {clang < 900}
</span> 
 name                vtk
 version             9.4.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories          graphics devel
 license             BSD
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,6 +45,11 @@ checksums           rmd160  7165ecf0a7c79776033fb1fdb30c1380be3170e4 \
</span> 
 mpi.setup
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append  port:libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Re restoring support for legacy macOS, see:
 # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11171
 # https://gitlab.kitware.com/vtk/vtk/-/issues/19352
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,17 +79,7 @@ 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:#ffe0e0;'>-    # With legacysupport getentropy is detected, but sys/random.h is not.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # This breaks the build, since we need sys/random.h included.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # dict.c:970:17: error: implicit declaration of function 'getentropy'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Once that is fixed, u_int is not recognized:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # /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:#ffe0e0;'>-    # Adding sys/types.h fixes that.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append   patch-libxml2-getentropy.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # https://trac.macports.org/ticket/71421
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # https://gitlab.kitware.com/vtk/vtk/-/issues/19547
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Patch from upstream:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append   patch-fix-DataObjectBackendInterface.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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-fix-DataObjectBackendInterface.diff b/graphics/vtk/files/patch-fix-DataObjectBackendInterface.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3585cabe84d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vtk/files/patch-fix-DataObjectBackendInterface.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Common/DataModel/CMakeLists.txt b/Common/DataModel/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 98631ffbe1e91a7df003d7438b1ee55f8cbc2aca..959b489c0c49088c0a589be3e87c0c599e05249f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Common/DataModel/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Common/DataModel/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -315,9 +315,12 @@ set(private_templates
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(vtkTypeLists)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(instantiation_sources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--foreach (_type IN LISTS vtk_numeric_types)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  set(INSTANTIATION_VALUE_TYPE "${_type}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  vtk_type_to_camel_case("${_type}" _cased_type)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+foreach (INSTANTIATION_VALUE_TYPE IN LISTS vtk_numeric_types)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  # only instantiate fundamental types, not typedefs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  if (INSTANTIATION_VALUE_TYPE STREQUAL "vtkIdType")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    continue()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  endif ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  vtk_type_to_camel_case("${INSTANTIATION_VALUE_TYPE}" _cased_type)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   configure_file(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     "${CMAKE_CURRENT_SOURCE_DIR}/vtkDataObjectImplicitBackendInstantiate.cxx.in"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     "${CMAKE_CURRENT_BINARY_DIR}/vtkDataObjectImplicitBackendInstantiate${_cased_type}.cxx")
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 38315e35ced..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vtk/files/patch-libxml2-getentropy.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ThirdParty/libxml2/vtklibxml2/dict.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ThirdParty/libxml2/vtklibxml2/dict.c   2024-11-29 05:44:11.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -929,12 +929,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   #include <windows.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   #include <bcrypt.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_GETENTROPY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  #ifdef HAVE_UNISTD_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  #ifdef HAVE_SYS_RANDOM_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     #include <sys/random.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   #include <time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span></pre><pre style='margin:0'>

</pre>