diff --git a/srcpkgs/paraview/patches/python3.8.patch b/srcpkgs/paraview/patches/python3.8.patch deleted file mode 100644 index f7489ce1637..00000000000 --- a/srcpkgs/paraview/patches/python3.8.patch +++ /dev/null @@ -1,176 +0,0 @@ -From 257b9d7b18d5f3db3fe099dc18f230e23f7dfbab Mon Sep 17 00:00:00 2001 -From: David Gobbi -Date: Tue, 20 Aug 2019 17:02:24 -0600 -Subject: [PATCH] Compatibility for Python 3.8 - -The PyTypeObject struct was modified in Python 3.8, this change is -required to avoid compile errors. ---- - .../PythonInterpreter/vtkPythonStdStreamCaptureHelper.h | 6 ++++++ - Wrapping/PythonCore/PyVTKMethodDescriptor.cxx | 2 +- - Wrapping/PythonCore/PyVTKNamespace.cxx | 2 +- - Wrapping/PythonCore/PyVTKReference.cxx | 8 ++++---- - Wrapping/PythonCore/PyVTKTemplate.cxx | 2 +- - Wrapping/PythonCore/vtkPythonCompatibility.h | 8 +++++++- - Wrapping/Tools/vtkWrapPythonClass.c | 2 +- - Wrapping/Tools/vtkWrapPythonEnum.c | 2 +- - Wrapping/Tools/vtkWrapPythonType.c | 2 +- - 9 files changed, 23 insertions(+), 11 deletions(-) - -diff --git a/VTK/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h b/VTK/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h -index b1c12c83de..14ccfbe928 100644 ---- a/VTK/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h -+++ b/VTK/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h -@@ -140,6 +140,12 @@ static PyTypeObject vtkPythonStdStreamCaptureHelperType = { - #if PY_VERSION_HEX >= 0x03040000 - 0, // tp_finalize - #endif -+#if PY_VERSION_HEX >= 0x03080000 -+ 0, // tp_vectorcall -+#if PY_VERSION_HEX < 0x03090000 -+ 0, // tp_print -+#endif -+#endif - }; - - static PyObject* vtkWrite(PyObject* self, PyObject* args) -diff --git a/VTK/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx b/VTK/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx -index 2b0d443537..3840038498 100644 ---- a/VTK/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx -+++ b/VTK/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx -@@ -186,7 +186,7 @@ PyTypeObject PyVTKMethodDescriptor_Type = { - sizeof(PyMethodDescrObject), // tp_basicsize - 0, // tp_itemsize - PyVTKMethodDescriptor_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -diff --git a/VTK/Wrapping/PythonCore/PyVTKNamespace.cxx b/VTK/Wrapping/PythonCore/PyVTKNamespace.cxx -index 71ee2a3516..5cf5bfbe6b 100644 ---- a/VTK/Wrapping/PythonCore/PyVTKNamespace.cxx -+++ b/VTK/Wrapping/PythonCore/PyVTKNamespace.cxx -@@ -49,7 +49,7 @@ PyTypeObject PyVTKNamespace_Type = { - 0, // tp_basicsize - 0, // tp_itemsize - PyVTKNamespace_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -diff --git a/VTK/Wrapping/PythonCore/PyVTKReference.cxx b/VTK/Wrapping/PythonCore/PyVTKReference.cxx -index 943ac71080..b7104091c0 100644 ---- a/VTK/Wrapping/PythonCore/PyVTKReference.cxx -+++ b/VTK/Wrapping/PythonCore/PyVTKReference.cxx -@@ -1010,7 +1010,7 @@ PyTypeObject PyVTKReference_Type = { - sizeof(PyVTKReference), // tp_basicsize - 0, // tp_itemsize - PyVTKReference_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -@@ -1067,7 +1067,7 @@ PyTypeObject PyVTKNumberReference_Type = { - sizeof(PyVTKReference), // tp_basicsize - 0, // tp_itemsize - PyVTKReference_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -@@ -1124,7 +1124,7 @@ PyTypeObject PyVTKStringReference_Type = { - sizeof(PyVTKReference), // tp_basicsize - 0, // tp_itemsize - PyVTKReference_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -@@ -1181,7 +1181,7 @@ PyTypeObject PyVTKTupleReference_Type = { - sizeof(PyVTKReference), // tp_basicsize - 0, // tp_itemsize - PyVTKReference_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -diff --git a/VTK/Wrapping/PythonCore/PyVTKTemplate.cxx b/VTK/Wrapping/PythonCore/PyVTKTemplate.cxx -index be200985b3..340fe7953b 100644 ---- a/VTK/Wrapping/PythonCore/PyVTKTemplate.cxx -+++ b/VTK/Wrapping/PythonCore/PyVTKTemplate.cxx -@@ -268,7 +268,7 @@ PyTypeObject PyVTKTemplate_Type = { - 0, // tp_basicsize - 0, // tp_itemsize - nullptr, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -diff --git a/VTK/Wrapping/PythonCore/vtkPythonCompatibility.h b/VTK/Wrapping/PythonCore/vtkPythonCompatibility.h -index 4a767844a6..be208faeef 100644 ---- a/VTK/Wrapping/PythonCore/vtkPythonCompatibility.h -+++ b/VTK/Wrapping/PythonCore/vtkPythonCompatibility.h -@@ -64,7 +64,13 @@ - #endif - - // PyTypeObject compatibility --#if PY_VERSION_HEX >= 0x03040000 -+#if PY_VERSION_HEX >= 0x03090000 -+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \ -+ 0, 0, 0, 0, -+#elif PY_VERSION_HEX >= 0x03080000 -+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \ -+ 0, 0, 0, 0, 0, -+#elif PY_VERSION_HEX >= 0x03040000 - #define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \ - 0, 0, 0, - #else -diff --git a/VTK/Wrapping/Tools/vtkWrapPythonClass.c b/VTK/Wrapping/Tools/vtkWrapPythonClass.c -index b1e45f8e80..4d558ea081 100644 ---- a/VTK/Wrapping/Tools/vtkWrapPythonClass.c -+++ b/VTK/Wrapping/Tools/vtkWrapPythonClass.c -@@ -521,7 +521,7 @@ void vtkWrapPython_GenerateObjectType( - " sizeof(PyVTKObject), // tp_basicsize\n" - " 0, // tp_itemsize\n" - " PyVTKObject_Delete, // tp_dealloc\n" -- " nullptr, // tp_print\n" -+ " 0, // tp_vectorcall_offset\n" - " nullptr, // tp_getattr\n" - " nullptr, // tp_setattr\n" - " nullptr, // tp_compare\n" -diff --git a/VTK/Wrapping/Tools/vtkWrapPythonEnum.c b/VTK/Wrapping/Tools/vtkWrapPythonEnum.c -index b933702242..1249362854 100644 ---- a/VTK/Wrapping/Tools/vtkWrapPythonEnum.c -+++ b/VTK/Wrapping/Tools/vtkWrapPythonEnum.c -@@ -145,7 +145,7 @@ void vtkWrapPython_GenerateEnumType( - " sizeof(PyIntObject), // tp_basicsize\n" - " 0, // tp_itemsize\n" - " nullptr, // tp_dealloc\n" -- " nullptr, // tp_print\n" -+ " 0, // tp_vectorcall_offset\n" - " nullptr, // tp_getattr\n" - " nullptr, // tp_setattr\n" - " nullptr, // tp_compare\n" -diff --git a/VTK/Wrapping/Tools/vtkWrapPythonType.c b/VTK/Wrapping/Tools/vtkWrapPythonType.c -index 744cb1b9d3..0a1375e541 100644 ---- a/VTK/Wrapping/Tools/vtkWrapPythonType.c -+++ b/VTK/Wrapping/Tools/vtkWrapPythonType.c -@@ -709,7 +709,7 @@ void vtkWrapPython_GenerateSpecialType( - " sizeof(PyVTKSpecialObject), // tp_basicsize\n" - " 0, // tp_itemsize\n" - " Py%s_Delete, // tp_dealloc\n" -- " nullptr, // tp_print\n" -+ " 0, // tp_vectorcall_offset\n" - " nullptr, // tp_getattr\n" - " nullptr, // tp_setattr\n" - " nullptr, // tp_compare\n" --- -2.21.0 - diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template index 5a3f92cb8c9..646b85b4ece 100644 --- a/srcpkgs/paraview/template +++ b/srcpkgs/paraview/template @@ -1,51 +1,26 @@ # Template file for 'paraview' pkgname=paraview -version=5.6.1 -revision=6 +version=5.8.1 +revision=1 wrksrc=ParaView-v${version} build_style=cmake configure_args="-DPARAVIEW_ENABLE_FFMPEG=ON -DPARAVIEW_ENABLE_GDAL=ON - -DPARAVIEW_ENABLE_MATPLOTLIB=ON - -DPARAVIEW_ENABLE_PYTHON=ON + -DPARAVIEW_USE_PYTHON=ON -DPARAVIEW_USE_MPI=ON - -DPARAVIEW_USE_VISITBRIDGE=OFF - -DPARAVIEW_USE_OSPRAY=OFF -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 - -DVTK_USE_SYSTEM_LIBRARIES=OFF - -DVTK_USE_SYSTEM_DOUBLECONVERSION=ON - -DVTK_USE_SYSTEM_EIGEN=ON - -DVTK_USE_SYSTEM_EXPAT=ON - -DVTK_USE_SYSTEM_FREETYPE=ON - -DVTK_USE_SYSTEM_GLEW=ON - -DVTK_USE_SYSTEM_HDF5=ON - -DVTK_USE_SYSTEM_JPEG=ON - -DVTK_USE_SYSTEM_JSONCPP=ON - -DVTK_USE_SYSTEM_LIBPROJ=ON - -DVTK_USE_SYSTEM_LIBXML2=ON - -DVTK_USE_SYSTEM_LZMA=ON - -DVTK_USE_SYSTEM_MPI4PY=ON - -DVTK_USE_SYSTEM_NETCDF=ON - -DVTK_USE_SYSTEM_OGG=ON - -DVTK_USE_SYSTEM_PEGTL=OFF - -DVTK_USE_SYSTEM_PNG=ON - -DVTK_USE_SYSTEM_PUGIXML=ON - -DVTK_USE_SYSTEM_THEORA=ON - -DVTK_USE_SYSTEM_TIFF=ON - -DVTK_USE_SYSTEM_ZLIB=ON - -DVTK_USE_SYSTEM_PROTOBUF=ON" + -DVTKm_USE_DOUBLE_PRECISION=ON" 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-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 + 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" @@ -54,10 +29,10 @@ 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=50ef01f54db6358b402e50d1460ef47c04d675bf26f250c6937737169f1e6612 +checksum=7653950392a0d7c0287c26f1d3a25cdbaa11baa7524b0af0e6a1a0d7d487d034 patch_args="-Np1" -CFLAGS="-D_GNU_SOURCE" -CXXFLAGS="-D_GNU_SOURCE" +CFLAGS="-D_GNU_SOURCE -fcommon" +CXXFLAGS="-D_GNU_SOURCE -fcommon" # qhelpgenerator: could not find a Qt installation of '' export QT_SELECT="5" @@ -67,13 +42,10 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then fi post_extract() { - case "$XBPS_TARGET_MACHINE" in - ppc64*) ;; - ppc*) - echo "target_link_libraries(vtkCommonDataModel PRIVATE atomic)" >> \ - VTK/Common/DataModel/CMakeLists.txt - ;; - esac + if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + echo "target_link_libraries(vtkCommonDataModel PRIVATE atomic)" >> \ + VTK/Common/DataModel/CMakeLists.txt + fi } post_install() {