<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/96a0da1bbc833436e9a4e6bbcfe095716f138a15">https://github.com/macports/macports-ports/commit/96a0da1bbc833436e9a4e6bbcfe095716f138a15</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 96a0da1bbc833436e9a4e6bbcfe095716f138a15
</span>Author: Ruben Di Battista <rubendibattista@gmail.com>
AuthorDate: Thu Aug 8 11:38:54 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> paraview: Fix for Sierra and minor refactor
</span>---
science/paraview/Portfile | 25 ++++++++++++++++++----
.../paraview/files/patch-icet_case_sensitive.diff | 13 +++++++++++
2 files changed, 34 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/paraview/Portfile b/science/paraview/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d1196ed..3d67977 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/paraview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/paraview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ PortGroup cmake 1.1
</span> PortGroup cxx11 1.1
PortGroup qt5 1.0
PortGroup mpi 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcodeversion 1.0
</span>
name paraview
version 5.6.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +44,7 @@ checksums sha256 50ef01f54db6358b402e50d1460ef47c04d675bf26f250c69377
</span> # this patch file.
patchfiles patch-icon-size.diff \
patch-vtk_target_export.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-icet_case_sensitive.diff \
</span> patch-ogg_dependency.diff \
patch-system_ok.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,6 +58,7 @@ depends_lib-append path:include/eigen3/Eigen/Eigen:eigen3 \
</span> port:jpeg \
port:libpng \
port:tiff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:icet \
</span> port:jsoncpp \
port:pugixml \
port:protobuf3-cpp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,13 +71,12 @@ depends_lib-append path:include/eigen3/Eigen/Eigen:eigen3 \
</span> port:netcdf-cxx \
port:gl2ps \
port:cgnslib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:icet \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:diy2 \
</span> port:PEGTL \
port:qttesting \
port:readline
<span style='display:block; white-space:pre;background:#ffe0e0;'>-mpi.enforce_variant icet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
qt5.depends_component sqlite-plugin qttools qtxmlpatterns
qt5.min_version 5.6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,6 +93,10 @@ if {[variant_isset debug]} {
</span> cmake.build_type Release
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpi.enforce_variant icet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.pre_args-delete \
-DCMAKE_INSTALL_PREFIX="${cmake.install_prefix}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,6 +110,7 @@ configure.args-append \
</span> -DMACOSX_APP_INSTALL_PREFIX=${destroot}${applications_dir} \
-DBUILD_SHARED_LIBS:BOOL=ON \
-DPARAVIEW_QT_VERSION=5 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPARAVIEW_USE_MPI:BOOL=OFF \
</span> -DQt5_DIR=${qt_dir} \
-DQT_HELP_GENERATOR=${qt_bins_dir}/qhelpgenerator \
-DQT_XMLPATTERNS_EXECUTABLE=${qt_bins_dir}/xmlpatterns \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,13 +122,23 @@ pre-configure {
</span> -DCMAKE_C_COMPILER=${configure.cc}
if {[mpi_variant_isset]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -DPARAVIEW_USE_MPI:BOOL=OFF
</span> configure.args-append \
-DPARAVIEW_USE_MPI:BOOL=ON \
-DMPI_C_COMPILER=${mpi.cc} \
-DMPI_CXX_COMPILER=${mpi.cxx} \
-DMPIEXEC=${mpi.exec} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_Fortran_COMPILER=${mpi.fc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPI_Fortran_COMPILER=${mpi.fc} \
</span> -DVTK_USE_SYSTEM_DIY2:BOOL=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${xcodeversion} 9.0] >= 0 && [vercmp ${xcodeversion} 10.0] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # resolves a problem on Sierra:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/__threading_support:156:1: error: unknown type name 'mach_port_t'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # mach_port_t __libcpp_thread_get_port();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/arvidn/libtorrent/issues/2364#issuecomment-336175406
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D_DARWIN_C_SOURCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/paraview/files/patch-icet_case_sensitive.diff b/science/paraview/files/patch-icet_case_sensitive.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..53ae4c8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/paraview/files/patch-icet_case_sensitive.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git ThirdParty/IceT/CMakeLists.txt ThirdParty/IceT/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 383f8abb85..e728660664 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ThirdParty/IceT/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ThirdParty/IceT/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,7 +61,7 @@ set(ICET_INSTALL_NO_DEVELOPMENT ${VTK_INSTALL_NO_DEVELOPMENT})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(ICET_INSTALL_NO_LIBRARIES ${VTK_INSTALL_NO_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(ICET_INSTALL_EXPORT_NAME ${VTK_INSTALL_EXPORT_NAME})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-vtk_module_third_party(icet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++vtk_module_third_party(IceT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE_DIRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/vtkicet/src/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_BINARY_DIR}/vtkicet/src/include
</span></pre><pre style='margin:0'>
</pre>