<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3cf70c5c6a0beb9e17a43781ba164582ae09df22">https://github.com/macports/macports-ports/commit/3cf70c5c6a0beb9e17a43781ba164582ae09df22</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 3cf70c5 vtk: Bump version to 8.2.0
</span>3cf70c5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3cf70c5c6a0beb9e17a43781ba164582ae09df22
</span>Author: Ruben Di Battista <rubendibattista@gmail.com>
AuthorDate: Tue Apr 14 16:19:55 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> vtk: Bump version to 8.2.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - add support for all python 3 versions
</span><span style='display:block; white-space:pre;color:#404040;'> - add new dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> - patch-IO_Movie_module.cmake.diff fix linking error with IO/Movie
</span><span style='display:block; white-space:pre;color:#404040;'> - blacklist incompatible compilers for old Xcode
</span>---
graphics/vtk/Portfile | 122 ++++++++++-----------
graphics/vtk/files/patch-IOMovie-module.cmake.diff | 12 ++
graphics/vtk/files/patch-pugixml.diff | 19 ++++
graphics/vtk/files/patch-python37.diff | 40 -------
4 files changed, 87 insertions(+), 106 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 95502a9..960850b 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;'>@@ -1,14 +1,21 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup mpi 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Require C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.1.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories graphics devel
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,17 +35,20 @@ master_sites http://www.vtk.org/files/release/${branch}
</span>
distname VTK-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6e9b3d00602cb1e34483f4f68cc5f7a522516102 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0995fb36857dd76ccfb8bb07350c214d9f9099e80b1e66b4a8909311f24ff0db \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 33479307
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9c566529757081d65d439d37dadbb533f0b55162 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 34c3dc775261be5e45a8049155f7228b6bd668106c72a3c435d95730d17d57bb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 35511819
</span>
cmake.out_of_source yes
mpi.setup
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:double-conversion \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:eigen3 \
</span> port:expat \
port:freetype \
port:gl2ps \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:glew \
</span> port:hdf5 \
port:jpeg \
port:jsoncpp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,11 +57,15 @@ depends_lib-append \
</span> port:libtheora \
port:lz4 \
port:netcdf-cxx \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pugixml \
</span> port:tiff \
port:zlib
mpi.enforce_variant hdf5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-pugixml.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;'>+
</span> configure.args-delete \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,9 +75,8 @@ configure.args-append \
</span> -DBUILD_EXAMPLES:BOOL=OFF \
-DVTK_WRAP_PYTHON:BOOL=OFF \
-DVTK_WRAP_JAVA:BOOL=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_WRAP_TCL:BOOL=OFF \
</span> -DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_LIBPROJ:BOOL=OFF \
</span> -DVTK_USE_COCOA:BOOL=ON
# As proposed at #46890
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,6 +94,7 @@ variant ffmpeg description {Add support for ffmpeg} {
</span> # As proposed at #46853
variant qt4 description {Add Qt4 support.} {
PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-DQT_QMAKE_EXECUTABLE:PATH=${qt_qmake_cmd} \
-DVTK_Group_Qt:BOOL=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,76 +102,52 @@ variant qt4 description {Add Qt4 support.} {
</span>
variant qt5 description {Add Qt5 support.} {
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-DQT_QMAKE_EXECUTABLE:PATH=${qt_qmake_cmd} \
-DVTK_Group_Qt:BOOL=ON \
-DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python35 python36 python37 description {Add Python 2.7 support.} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_WRAP_PYTHON:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_WRAP_PYTHON:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE:STRING=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_INSTALL_PYTHON_MODULE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py27-mpi4py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Supported pythons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_versions {27 36 37 38}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pyver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Conflicting python versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set other_python_versions {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach other_pyver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${other_pyver} ne ${pyver}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${other_pyver} ni ${other_python_versions}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend other_python_versions python${other_pyver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Get python branch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_branch "[string range ${pyver} 0 end-1].[string index ${pyver} end]"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python27 python36 python37 description {Add Python 3.5 support.} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_WRAP_PYTHON:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_WRAP_PYTHON:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE:STRING=${prefix}/bin/python3.5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_INSTALL_PYTHON_MODULE_DIR=${frameworks_dir}/Python.framework/Versions/3.5/lib/python3.5/site-packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py35-mpi4py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python${pyver} conflicts {*}${other_python_versions} description "Add Python ${python_branch} support" "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python${pyver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_WRAP_PYTHON:BOOL=OFF
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python27 python35 python37 description {Add Python 3.6 support.} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_WRAP_PYTHON:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_WRAP_PYTHON:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE:STRING=${prefix}/bin/python3.6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_INSTALL_PYTHON_MODULE_DIR=${frameworks_dir}/Python.framework/Versions/3.6/lib/python3.6/site-packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py36-mpi4py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_WRAP_PYTHON:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE:STRING=${prefix}/bin/python${python_branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/${python_branch}/Headers/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/libpython${python_branch}.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${pyver}-mpi4py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python27 python35 python36 description {Add Python 3.7 support.} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python37
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_WRAP_PYTHON:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_WRAP_PYTHON:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE:STRING=${prefix}/bin/python3.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_INSTALL_PYTHON_MODULE_DIR=${frameworks_dir}/Python.framework/Versions/3.7/lib/python3.7/site-packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py37-mpi4py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant hdf5 description {Add hdf5 readers} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant xdmf description {Add XDMF readers} {
</span> depends_lib-append port:boost \
port:xdmf
configure.args-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk/files/patch-IOMovie-module.cmake.diff b/graphics/vtk/files/patch-IOMovie-module.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ba4a2d1
</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-IOMovie-module.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git IO/Movie/module.cmake IO/Movie/module.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4275171403..88204ad2ca 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- IO/Movie/module.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ IO/Movie/module.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,6 +14,7 @@ vtk_module(vtkIOMovie
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vtkIO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEPENDS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${vtkIOMovie_vtkoggtheora}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vtkogg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vtkCommonExecutionModel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRIVATE_DEPENDS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vtkCommonCore
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk/files/patch-pugixml.diff b/graphics/vtk/files/patch-pugixml.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ccf0319
</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-pugixml.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git CMake/Findpugixml.cmake CMake/Findpugixml.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+new file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000000..b715568503
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMake/Findpugixml.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_path(pugixml_INCLUDE_DIRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "pugixml.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_library(pugixml_LIBRARIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NAMES pugixml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++include(FindPackageHandleStandardArgs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_package_handle_standard_args(pugixml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ REQUIRED_VARS pugixml_LIBRARIES pugixml_INCLUDE_DIRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk/files/patch-python37.diff b/graphics/vtk/files/patch-python37.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dcef85a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vtk/files/patch-python37.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 706f1b397df09a27ab8981ab9464547028d0c322 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: David Gobbi <david.gobbi@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 11 Jul 2018 17:14:50 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix compilation issue due to Python3.7 API change
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The PyUnicode_AsUTF8() method returns a "const char *" in Py37.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Wrapping/PythonCore/vtkPythonArgs.cxx | 10 +++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 9 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Wrapping/PythonCore/vtkPythonArgs.cxx b/Wrapping/PythonCore/vtkPythonArgs.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1a82af0802..b733458975 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Wrapping/PythonCore/vtkPythonArgs.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Wrapping/PythonCore/vtkPythonArgs.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,13 +95,21 @@ bool vtkPythonGetStringValue(PyObject *o, T *&a, const char *exctext)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (PyBytes_Check(o))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if PY_VERSION_HEX >= 0x03070000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ a = const_cast<char *>(PyBytes_AS_STRING(o));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a = PyBytes_AS_STRING(o);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef Py_USING_UNICODE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (PyUnicode_Check(o))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if PY_VERSION_HEX >= 0x03030000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if PY_VERSION_HEX >= 0x03070000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ a = const_cast<char *>(PyUnicode_AsUTF8(o));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif PY_VERSION_HEX >= 0x03030000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a = PyUnicode_AsUTF8(o);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.18.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>