diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2023-04-03 19:49:40 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2023-04-03 20:16:10 +0000 |
| commit | 7db91bae5c8bf161a661ae5a92b855b2eea65c55 (patch) | |
| tree | 9fee4e12abc0477c721ff1e7e63c246fa99eb2d4 /science/paraview | |
| parent | f86688ca4320aca20b40db087b8ab4671ae5e724 (diff) | |
| download | ports-7db91bae5c8bf161a661ae5a92b855b2eea65c55.tar.gz ports-7db91bae5c8bf161a661ae5a92b855b2eea65c55.zip | |
science/paraview: upgrade to 5.11.1
This allows the removing of the ExprTk patches.
Diffstat (limited to 'science/paraview')
| -rw-r--r-- | science/paraview/Makefile | 6 | ||||
| -rw-r--r-- | science/paraview/distinfo | 6 | ||||
| -rw-r--r-- | science/paraview/files/patch-VTK_CMake_FindExprTk.cmake | 15 | ||||
| -rw-r--r-- | science/paraview/files/patch-VTK_Common_Misc_vtkExprTkFunctionParser.cxx | 12 |
4 files changed, 6 insertions, 33 deletions
diff --git a/science/paraview/Makefile b/science/paraview/Makefile index da46d51bac6c..b1f6aa2ea906 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -1,6 +1,5 @@ PORTNAME= paraview -DISTVERSION= ${PARAVIEW_VER}.0 -PORTREVISION= 3 +DISTVERSION= ${PARAVIEW_VER}.1 CATEGORIES= science graphics MASTER_SITES= http://www.paraview.org/files/v${PARAVIEW_VER}/ DISTNAME= ParaView-v${PORTVERSION} @@ -145,7 +144,8 @@ PLIST_SUB+= VERMAJORMINOR=${PARAVIEW_VER} VTK9_CONFLICTS= vtk.py vtkmodules/__init__.py vtkmodules/all.py \ vtkmodules/gtk vtkmodules/numpy_interface \ vtkmodules/qt vtkmodules/test vtkmodules/tk \ - vtkmodules/util vtkmodules/wx vtkmodules/generate_pyi.py + vtkmodules/util vtkmodules/wx vtkmodules/generate_pyi.py \ + vtkmodules/web/errors.py pre-configure: ${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ diff --git a/science/paraview/distinfo b/science/paraview/distinfo index fcd6eada6df4..4401e886e1f0 100644 --- a/science/paraview/distinfo +++ b/science/paraview/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668610241 -SHA256 (ParaView-v5.11.0.tar.xz) = 9a0b8fe8b1a2cdfd0ace9a87fa87e0ec21ee0f6f0bcb1fdde050f4f585a25165 -SIZE (ParaView-v5.11.0.tar.xz) = 70212180 +TIMESTAMP = 1680368317 +SHA256 (ParaView-v5.11.1.tar.xz) = 5cc2209f7fa37cd3155d199ff6c3590620c12ca4da732ef7698dec37fa8dbb34 +SIZE (ParaView-v5.11.1.tar.xz) = 79847556 diff --git a/science/paraview/files/patch-VTK_CMake_FindExprTk.cmake b/science/paraview/files/patch-VTK_CMake_FindExprTk.cmake deleted file mode 100644 index 215a8fb90f6f..000000000000 --- a/science/paraview/files/patch-VTK_CMake_FindExprTk.cmake +++ /dev/null @@ -1,15 +0,0 @@ -- workaround for https://gitlab.kitware.com/paraview/paraview/-/issues/21817 - ---- VTK/CMake/FindExprTk.cmake.orig 2023-03-11 22:27:31 UTC -+++ VTK/CMake/FindExprTk.cmake -@@ -21,8 +21,8 @@ mark_as_advanced(ExprTk_INCLUDE_DIR) - - if (ExprTk_INCLUDE_DIR) - file(STRINGS "${ExprTk_INCLUDE_DIR}/exprtk.hpp" _exprtk_version_header -- REGEX "static const char\\* version") -- string(REGEX MATCH "static const char\\* version = \"([0-9.]+)\"" _exprtk_version_match "${_exprtk_version_header}") -+ REGEX "static char_cptr *version") -+ string(REGEX MATCH "static char_cptr *version = \"([0-9.]+)\"" _exprtk_version_match "${_exprtk_version_header}") - set(ExprTk_VERSION "${CMAKE_MATCH_1}") - unset(_exprtk_version_header) - unset(_exprtk_version_match) diff --git a/science/paraview/files/patch-VTK_Common_Misc_vtkExprTkFunctionParser.cxx b/science/paraview/files/patch-VTK_Common_Misc_vtkExprTkFunctionParser.cxx deleted file mode 100644 index 3507e242e481..000000000000 --- a/science/paraview/files/patch-VTK_Common_Misc_vtkExprTkFunctionParser.cxx +++ /dev/null @@ -1,12 +0,0 @@ -- unbreak bundled VTK after math/exprtk update to 0.0.2 - ---- VTK/Common/Misc/vtkExprTkFunctionParser.cxx.orig 2023-03-20 04:03:14 UTC -+++ VTK/Common/Misc/vtkExprTkFunctionParser.cxx -@@ -19,6 +19,7 @@ - #include <cctype> - #include <random> - #include <regex> -+#include <sstream> - - // exprtk macros - #define exprtk_disable_string_capabilities |