mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-27 10:03:20 +00:00
Code Issues Releases Activity

science/paraview: upgrade to 5.11.1

Browse Source 
This allows the removing of the ExprTk patches.
This commit is contained in:
Thierry Thomas 2023-04-03 21:49:40 +02:00
parent f86688ca43
commit 7db91bae5c
4 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
science/paraview/Makefile
View File

@ -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|' \

6
science/paraview/distinfo
View File

@ -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

15
science/paraview/files/patch-VTK_CMake_FindExprTk.cmake
View File

@ -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)

12
science/paraview/files/patch-VTK_Common_Misc_vtkExprTkFunctionParser.cxx
View File

@ -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