<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2112e9cf3d39d4c902fce4f5dfa9e66890cce733">https://github.com/macports/macports-ports/commit/2112e9cf3d39d4c902fce4f5dfa9e66890cce733</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 2112e9cf3d3 vtk: Fix FT_CALLBACK_DEF with updated freetype
</span>2112e9cf3d3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2112e9cf3d39d4c902fce4f5dfa9e66890cce733
</span>Author: Ruben Di Battista <rubendibattista@gmail.com>
AuthorDate: Sun Oct 18 02:18:37 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> vtk: Fix FT_CALLBACK_DEF with updated freetype
</span>---
graphics/vtk/Portfile | 12 +++++++-----
graphics/vtk/files/patch-FT_CALLBACK_DEF.diff | 18 ++++++++++++++++++
2 files changed, 25 insertions(+), 5 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 ed073902a92..ddd200007fa 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;'>@@ -9,9 +9,9 @@ PortGroup compiler_blacklist_versions 1.0
</span> # Require C++11
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# some older Clang say they support C++11 when they don't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# this is the same blacklisting as for jsoncpp, on which vtk depends.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 900}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# some older Clang say they support C++11 when they don't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this is the same blacklisting as for jsoncpp, on which vtk depends.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 900}
</span>
name vtk
version 8.2.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,13 +62,15 @@ depends_lib-append \
</span>
mpi.enforce_variant hdf5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# FT_CALLBACK_DEF: https://gitlab.kitware.com/vtk/vtk/-/issues/18033
</span> patchfiles patch-pugixml.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-IOMovie-module.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-IOMovie-module.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-FT_CALLBACK_DEF.diff
</span>
if {[variant_isset python38]} {
# https://gitlab.kitware.com/vtk/vtk/-/commit/257b9d7b18d5f3db3fe099dc18f230e23f7dfbab
# Remove this when upgrading the version, because it was merged for VTK9
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-python38-tp_print.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-python38-tp_print.diff
</span> }
configure.pre_args-delete \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk/files/patch-FT_CALLBACK_DEF.diff b/graphics/vtk/files/patch-FT_CALLBACK_DEF.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..043ee1474c9
</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-FT_CALLBACK_DEF.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ThirdParty/freetype/vtk_freetype.h.in.orig 2019-01-30 18:15:13.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ThirdParty/freetype/vtk_freetype.h.in 2020-10-17 00:03:32.730820908 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,6 +20,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef VTK_USE_SYSTEM_FREETYPE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <ft2build.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* has been moved to <freetype/internal/compiler-macros.h> */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifndef FT_CALLBACK_DEF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define FT_CALLBACK_DEF( x ) extern "C" x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define FT_CALLBACK_DEF( x ) static x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif /* FT_CALLBACK_DEF */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <vtkfreetype/include/ft2build.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>