<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/830e7cf9ccb5239c84041504927b3df9da7ace8d">https://github.com/macports/macports-ports/commit/830e7cf9ccb5239c84041504927b3df9da7ace8d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 830e7cf9ccb5239c84041504927b3df9da7ace8d
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Fri Nov 29 08:08:54 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> vtk: backport upstream fix for DataObjectBackendInterface
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/71421
</span>---
graphics/vtk/Portfile | 4 ++++
.../files/patch-fix-DataObjectBackendInterface.diff | 20 ++++++++++++++++++++
2 files changed, 24 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 eaf8eb52ecb..17875c57f83 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;'>@@ -103,6 +103,10 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> # /usr/include/sys/random.h:37:32: error: unknown type name 'u_int'; did you mean 'int'?
# Adding sys/types.h fixes that.
patchfiles-append patch-libxml2-getentropy.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/71421
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://gitlab.kitware.com/vtk/vtk/-/issues/19547
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Patch from upstream:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-DataObjectBackendInterface.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-fix-DataObjectBackendInterface.diff b/graphics/vtk/files/patch-fix-DataObjectBackendInterface.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3585cabe84d
</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-fix-DataObjectBackendInterface.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/Common/DataModel/CMakeLists.txt b/Common/DataModel/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 98631ffbe1e91a7df003d7438b1ee55f8cbc2aca..959b489c0c49088c0a589be3e87c0c599e05249f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Common/DataModel/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Common/DataModel/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -315,9 +315,12 @@ set(private_templates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(vtkTypeLists)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(instantiation_sources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-foreach (_type IN LISTS vtk_numeric_types)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(INSTANTIATION_VALUE_TYPE "${_type}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vtk_type_to_camel_case("${_type}" _cased_type)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++foreach (INSTANTIATION_VALUE_TYPE IN LISTS vtk_numeric_types)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # only instantiate fundamental types, not typedefs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (INSTANTIATION_VALUE_TYPE STREQUAL "vtkIdType")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ continue()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vtk_type_to_camel_case("${INSTANTIATION_VALUE_TYPE}" _cased_type)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${CMAKE_CURRENT_SOURCE_DIR}/vtkDataObjectImplicitBackendInstantiate.cxx.in"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${CMAKE_CURRENT_BINARY_DIR}/vtkDataObjectImplicitBackendInstantiate${_cased_type}.cxx")
</span></pre><pre style='margin:0'>
</pre>