diff --git a/srcpkgs/paraview/patches/cmake-py39.patch b/srcpkgs/paraview/patches/cmake-py39.patch deleted file mode 100644 index 5e15a6ffac1..00000000000 --- a/srcpkgs/paraview/patches/cmake-py39.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/VTK/CMake/patches/99/FindPython/Support.cmake 2020-10-08 00:54:51.788984364 -0400 -+++ b/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/patches/fix-page_size-macro.patch b/srcpkgs/paraview/patches/fix-page_size-macro.patch deleted file mode 100644 index 62240a02014..00000000000 --- a/srcpkgs/paraview/patches/fix-page_size-macro.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Plugins/Datamine/Readers/dmfile.cxx 2020-08-04 22:12:01.000000000 +0200 -+++ b/Plugins/Datamine/Readers/dmfile.cxx 2020-08-30 13:22:12.387889301 +0200 -@@ -421,8 +421,8 @@ - - // number of records per page - // There is only 508 bytes per page ( table is 512 with 4 reserved ) -- const int PAGE_SIZE = 508; -- int numRecsPerPage = PAGE_SIZE / recordLength; -+ const int DM_PAGE_SIZE = 508; -+ int numRecsPerPage = DM_PAGE_SIZE / recordLength; - - // number of record on last page - int numRecsLastPage = GetNLastPageRecs(); diff --git a/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch b/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch deleted file mode 100644 index f01cce9b7e8..00000000000 --- a/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/VTK/Utilities/KWSys/vtksys/CMakeLists.txt 2020-08-30 14:24:27.200081977 +0200 -+++ b/VTK/Utilities/KWSys/vtksys/CMakeLists.txt 2020-08-30 14:26:38.533088752 +0200 -@@ -592,7 +592,8 @@ - # check for simple stack trace - # usually it's in libc but on FreeBSD - # it's in libexecinfo -- FIND_LIBRARY(EXECINFO_LIB "execinfo") -+ FIND_PACKAGE(PkgConfig REQUIRED) -+ PKG_CHECK_MODULES(EXECINFO IMPORTED_TARGET libexecinfo) - MARK_AS_ADVANCED(EXECINFO_LIB) - IF (NOT EXECINFO_LIB) - SET(EXECINFO_LIB "") diff --git a/srcpkgs/paraview/patches/vtk-isnan.patch b/srcpkgs/paraview/patches/vtk-isnan.patch deleted file mode 100644 index 8bf0ec27033..00000000000 --- a/srcpkgs/paraview/patches/vtk-isnan.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h 2020-08-04 22:12:01.000000000 +0200 -+++ b/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h 2020-08-29 22:33:06.824012475 +0200 -@@ -36,20 +36,20 @@ - template - struct has_NaN - { -- static bool isnan(T x) { return std::isnan(x); } -+ static bool vtkisnan(T x) { return std::isnan(x); } - }; - - template - struct has_NaN - { -- static bool isnan(T) { return false; } -+ static bool vtkisnan(T) { return false; } - }; - - template --bool isnan(T x) -+bool vtkisnan(T x) - { - // Select the correct partially specialized type. -- return has_NaN::has_quiet_NaN>::isnan(x); -+ return has_NaN::has_quiet_NaN>::vtkisnan(x); - } - } // namespace detail - -@@ -127,7 +127,7 @@ - for (vtkIdType i = 0; i < num; ++i) - { - auto value = this->AssociatedArray->GetValue(i); -- if (::detail::isnan(value)) -+ if (::detail::vtkisnan(value)) - { - NanIndices.push_back(i); - } -@@ -140,7 +140,7 @@ - std::vector* FindIndexVec(ValueType value) - { - std::vector* indices{ nullptr }; -- if (::detail::isnan(value) && !this->NanIndices.empty()) -+ if (::detail::vtkisnan(value) && !this->NanIndices.empty()) - { - indices = &this->NanIndices; - } diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template deleted file mode 100644 index 20a7f558967..00000000000 --- a/srcpkgs/paraview/template +++ /dev/null @@ -1,75 +0,0 @@ -# Template file for 'paraview' -pkgname=paraview -version=5.8.1 -revision=3 -wrksrc=ParaView-v${version} -build_style=cmake -configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr - -DPARAVIEW_ENABLE_FFMPEG=ON - -DPARAVIEW_ENABLE_GDAL=ON - -DPARAVIEW_USE_PYTHON=ON - -DPARAVIEW_USE_MPI=ON - -DVTK_PYTHON_FULL_THREADSAFE=ON - -DVTK_PYTHON_VERSION=3 - -DVTK_SMP_IMPLEMENTATION_TYPE=TBB - -DVTKm_ENABLE_MPI=ON - -DVTKm_ENABLE_RENDERING=ON - -DVTKm_USE_DOUBLE_PRECISION=ON" -#make_build_args="VERBOSE=1" -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 - qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds - qt5-svg-devel qt5-xmlpatterns python3-devel double-conversion-devel eigen - expat-devel freetype-devel glew-devel hdf5-devel libjpeg-turbo-devel - jsoncpp-devel proj-devel libxml2-devel liblzma-devel liblz4-devel netcdf-devel - libogg-devel libpng-devel pugixml-devel libtheora-devel tiff-devel zlib-devel - protobuf-devel protobuf python3-Pygments ffmpeg-devel tbb-devel boost-devel - libgdal-devel python3-mpi4py" -depends="openmpi" -short_desc="Application for interactive, scientific visualization" -maintainer="Anders Damsgaard " -license="BSD-3-Clause" -homepage="https://www.paraview.org" -distfiles="https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${version:0:3}&type=source&os=Sources&downloadFile=ParaView-v${version}.tar.xz>paraview-${version}.tar.xz" -checksum=7653950392a0d7c0287c26f1d3a25cdbaa11baa7524b0af0e6a1a0d7d487d034 - -CFLAGS="-DYYERROR_VERBOSE -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DGNU_SOURCE -fcommon" -CXXFLAGS="${CFLAGS}" - -# qhelpgenerator: could not find a Qt installation of '' -export QT_SELECT="5" - -if [ "$XBPS_TARGET_LIBC" = musl ]; then - makedepends+=" libexecinfo-devel" - configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo" -fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - -post_extract() { - if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - echo "vtk_module_link(VTK::CommonDataModel PRIVATE atomic)" >> \ - VTK/Common/DataModel/CMakeLists.txt - echo "target_link_libraries(protobuf PRIVATE atomic)" >> \ - ThirdParty/protobuf/vtkprotobuf/src/CMakeLists.txt - fi -} - -pre_configure() { - # use smaller debug info for 32-bit targets - if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then - export CFLAGS="${CFLAGS/-g/-g1}" - export CXXFLAGS="${CXXFLAGS/-g/-g1}" - fi - # conserve linker memory on 32-bit hosts - if [ "$XBPS_WORDSIZE" = "32" ]; then - export LDFLAGS+=" -Wl,--no-keep-memory" - fi -} - -post_install() { - vlicense Copyright.txt -}