diff --git a/srcpkgs/paraview/patches/cmake-py39.patch b/srcpkgs/paraview/patches/cmake-py39.patch new file mode 100644 index 00000000000..b309d596c81 --- /dev/null +++ b/srcpkgs/paraview/patches/cmake-py39.patch @@ -0,0 +1,11 @@ +--- VTK/CMake/patches/99/FindPython/Support.cmake.orig 2020-10-08 00:54:51.788984364 -0400 ++++ VTK/CMake/patches/99/FindPython/Support.cmake 2020-10-08 00:54:56.640977251 -0400 +@@ -46,7 +46,7 @@ + message (FATAL_ERROR "FindPython: INTERNAL ERROR") + endif() + if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3) +- set(_${_PYTHON_PREFIX}_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) ++ set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) + elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2) + set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) + else() diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template index d5155e81827..20a7f558967 100644 --- a/srcpkgs/paraview/template +++ b/srcpkgs/paraview/template @@ -1,7 +1,7 @@ # Template file for 'paraview' pkgname=paraview version=5.8.1 -revision=2 +revision=3 wrksrc=ParaView-v${version} build_style=cmake configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr @@ -16,7 +16,7 @@ configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr -DVTKm_ENABLE_RENDERING=ON -DVTKm_USE_DOUBLE_PRECISION=ON" #make_build_args="VERBOSE=1" -hostmakedepends="pkg-config which" +hostmakedepends="pkg-config which python3" # TODO: find some way of making this work with system vtk makedepends="MesaLib-devel libfreeglut-devel glu-devel libXt-devel openmpi-devel qt5-devel qt5-x11extras-devel qt5-tools-devel qt5-plugin-mysql @@ -43,7 +43,7 @@ export QT_SELECT="5" if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" libexecinfo-devel" - LDFLAGS="-lexecinfo" + configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo" fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" @@ -70,25 +70,6 @@ pre_configure() { fi } -_add_execinfo() { - # contents of link.txt files need to be in a single line - local content="$(cat $1) -lexecinfo " - echo "$content" > $1 -} - -pre_build() { - if [ "$XBPS_TARGET_LIBC" = musl ]; then - # TODO: -lexecinfo in LDFLAGS adds it to the start of the file, so linking still fails. - # there's probably some configure_arg that actually makes it work cleanly, I hope. - # this list of files hasn't been extensively tested. It's possible not all of them are required. - _add_execinfo build/VTK/Rendering/LICOpenGL2/CMakeFiles/RenderingLICOpenGL2.dir/link.txt - _add_execinfo build/VTK/Rendering/OpenGL2/CMakeFiles/vtkProbeOpenGLVersion.dir/link.txt - _add_execinfo build/VTK/ThirdParty/loguru/vtkloguru/CMakeFiles/loguru.dir/link.txt - _add_execinfo build/VTK/Common/Core/CMakeFiles/CommonCore.dir/link.txt - _add_execinfo build/VTKExtensions/Core/CMakeFiles/VTKExtensionsCore.dir/link.txt - fi -} - post_install() { vlicense Copyright.txt }