commit: 1a1324aa105beed8878503f55dd6783255127de0 Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> AuthorDate: Thu Jan 20 16:55:55 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Feb 21 23:23:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1324aa
sci-libs/vtk: drop 8.2.0 Only one package, sci-libs/oce, which is masked for last-riting, depends on this version. Won't build with ffmpeg-5. Bug: https://bugs.gentoo.org/831595 Bug: https://bugs.gentoo.org/832625 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> Closes: https://github.com/gentoo/gentoo/pull/23886 Signed-off-by: Sam James <sam <AT> gentoo.org> sci-libs/vtk/Manifest | 4 - .../files/vtk-8.1.0-openmpi-4-compatibility.patch | 14 - ...01-fix-library-installation-dir-for-xdmf3.patch | 57 ---- sci-libs/vtk/files/vtk-8.2.0-fno-common.patch | 40 --- sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch | 16 - sci-libs/vtk/files/vtk-8.2.0-pugixml.patch | 12 - sci-libs/vtk/files/vtk-8.2.0-py38.patch | 175 ---------- sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch | 37 -- sci-libs/vtk/metadata.xml | 1 - sci-libs/vtk/vtk-8.2.0-r6.ebuild | 375 --------------------- 10 files changed, 731 deletions(-) diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index d345d4831ee0..52b37377441f 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -1,14 +1,10 @@ -DIST VTK-8.2.0.tar.gz 35511819 BLAKE2B 908ed9377d75da6d0bd84de0078ba90a1e9396fcc906ca2981102e2c79d9d3ba4b1297f98682cd2802c7c04f9dbec32ee70740e645c44180befd765f7cda34a6 SHA512 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286 DIST VTK-9.0.3.tar.gz 34684378 BLAKE2B 6862ab2df95bbefe9d3970757af6521cfa874476f6ee8e64c4e6e279f2e0cbb8a8299bc3b0b8bb9b7254d01a169644e7927b67b11b2ce934ddc87bce0a9e4c26 SHA512 00528011f9206444d09fc6cea05c46930745bb70ea02be6244ab3eb510ae82af772157c025157b1761dc4c6a9ab538b57f814c03a708f30aa3598a421fdc6ae2 DIST VTK-9.1.0.tar.gz 47871165 BLAKE2B 68cebc0879737a519b53e73f198356208b047c301d38ee2d62b9a14539cdb9aa76bd7174baa29592c7b1cfd1cc9700d01e98519a207d67a232d16ad37295ac31 SHA512 b2c4be8795fa082e0776e6ffdb9a3fd88dbb235841a8369a34ebe26cf4c5fcb1610fcca987be314510629da3edc74ee76c0ce2cc88d5ef4b099ac550ac892b0a -DIST VTKData-8.2.0.tar.gz 304287875 BLAKE2B 0292d84be40e11203326dcb1bf45f4a6ad2a785968130d4868a230f1cfbdcb600d0c03d4dae3519e2737dc7a964f29c51500c91b3da4291069608dd80a2bce45 SHA512 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b DIST VTKData-9.0.3.tar.gz 413854066 BLAKE2B 84c2fa0ae5df8567cc06022262fe3ea1202c553168757c94aa4a0a258360deccdf349d474c2f6585fc2054ee8e0468df4c80ec835cecf6b2391efa639f479eaa SHA512 28ab2ecb32860d820f736e9ceb4345bcd03471f0a35b90f8c9ccbe05454f7a95a4de3c99bae2f4b9db87a27ef8fe50159cd283f5e921f4e6e69b06a50a0570c6 DIST VTKData-9.1.0.tar.gz 590185633 BLAKE2B 7451d57bc507571afa8a8f9ba541010e1924849759f228318b6390aabb07a68341b84b38b82cd504844194544c569b040c9fad1858e6e35e172e4e18000d338e SHA512 134a8dd2b029d3a4959b601987e68a0caa5d050532655b6786b5b67dfc77d3639628b2b957511f8998e63864c247c501a11a6aed248c762f13e860d878778e1a DIST VTKDataFiles-9.1.0.tar.gz 605163184 BLAKE2B 968e2fed1e17bb57da4f8dd38e17e128779e50dfce81fc31c6ef75a2f3fe46675dd77ab7343b609998b8ddd3927e256d1ea4117c2719ad76f61db435b5f1c34f SHA512 f56ebd087753e2d2805e2f5954197de4e9933ec90648956780525d83149277a7bca42ce376c4355a53fca71ec78510fed155955af71b70e1b26de27851252e36 -DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d26599b48208b4104f41eaa90f99483689cd928cb00e3a7def396d65db2f03c9294d132854a27af74f66eb118c8319c4ce SHA512 8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588 DIST VTKLargeData-9.0.3.tar.gz 247523270 BLAKE2B f4011292957454da5d8c9e515bcd0972af4299cef3928098d745be96559a1e0080297871c6e11fdd98498c8786a30a6674bc650368adcbcdbc6260e0938d21a1 SHA512 ebd6cb5f2935b77961dd68d0c0da2ea5ab900cec8c2eb641c785a604c65702e40a3e44d32bf3f2acfce9ec28dd89f41bf29f93a4f89d5b36c713f3743d7125b1 DIST VTKLargeData-9.1.0.tar.gz 247517666 BLAKE2B 1b47829ad51f246ff26c8b6d16c9fa431e53ca33fec99e8aa78ee156a82e4b3351e32ee36674d9d345f346efad085ae1e2d3186a144911d2210a31a259e69f1f SHA512 0760dfd4e92bbfec10fec9d783f548a8ca5464b1a1744dfa575d4ed4592756335dbfcf28249d2da964aa6b41933ff1ac98458e4a32484ee4bb91b5e7cfaa78c9 DIST VTKLargeDataFiles-9.1.0.tar.gz 247504557 BLAKE2B a05892347a1a5cf5cb0df3f1c1d94efcdb68c28bcd0391617602565fddc4277ac44accec6f1b3ae2822a860f3d5f5642a56e36171b5d81bef137561182051d08 SHA512 10abc287256c7ec5fb7114f4054eda5cde1b75a8d2bbe70375fb96d31b7c4164be936489ce2fc9b5c33225f494d9b7f5f7bed648828661b17d6f66acb70eeddc -DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317 DIST vtkDocHtml-9.0.3.tar.gz 132650096 BLAKE2B 45fc1a6942df3e79e500a552c3b3cda2099b9451191559d471e3a2e785a8c52b2c6273cfd2cc4a3f3f65582e607d9414475f58d243fde96a4f985bed479e53db SHA512 9b5fef43f3c2b92aa1fe6a9ba9458d6677874b09b167654db7f26df6feffdc34ed1a8fb4e59d64b75625063a774af77fe57f275903602a5f7daa74e1a2e71800 DIST vtkDocHtml-9.1.0.tar.gz 152767166 BLAKE2B 9163b6b1bf55810a310ca8bc211e067827b1f9907efd2a378363d8e6296d4bf07b25371b66c00cab3576fb06f0cb63fdf2ffea044033e2c42e9087819a3736ba SHA512 036daba5eb6503b5eb3e9323a4ab3ea0f27c09d8fef411dd2ed154c24d5a37d9f19d57db07576c8af404bfdb7178e95b137a3c27bfedb3f9cb72c04f717da80a diff --git a/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch b/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch deleted file mode 100644 index 267c1d91b0cb..000000000000 --- a/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h b/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h -index 3173831..e8ee74b 100644 ---- a/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h -+++ b/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h -@@ -141,4 +141,9 @@ - - #endif - -+ #if OMPI_NUMVERSION >= 40000 -+ #undef PyMPI_HAVE_MPI_LB -+ #undef PyMPI_HAVE_MPI_UB -+ #endif /* OMPI >= 4.0.0 */ -+ - #endif /* !PyMPI_CONFIG_OPENMPI_H */ diff --git a/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch b/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch deleted file mode 100644 index d03cab326f4f..000000000000 --- a/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 3aad9ec6004b7e3a82817f2f1e2840fc5f07c050 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <[email protected]> -Date: Thu, 3 Jun 2021 13:13:38 +0200 -Subject: [PATCH] fix library installation dir for xdmf3 - -Signed-off-by: Bernd Waibel <[email protected]> ---- - ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt -index 86d688f8..7d009dfe 100644 ---- a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt -+++ b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt -@@ -269,10 +269,10 @@ endif() - - if(UNIX) - if (BUILD_SHARED_LIBS) -- set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/libXdmfCore.so -+ set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/libXdmfCore.so - PARENT_SCOPE) - else() -- set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/libXdmfCore.a -+ set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/libXdmfCore.a - PARENT_SCOPE) - endif() - endif() -@@ -297,13 +297,13 @@ if (NOT XDMF_INSTALL_NO_DEVELOPMENT) - endif() - install(TARGETS XdmfCore - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) - if (XDMF_STATIC_AND_SHARED AND BUILD_SHARED_LIBS) - install(TARGETS XdmfCore_Static - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) - endif () - - if (Boost_FOUND) -@@ -329,7 +329,7 @@ set(XdmfCore_INCLUDE_DIRS - CACHE INTERNAL "") - - set(XDMF_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include PARENT_SCOPE) --set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib) -+set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) - set(XDMF_DIR ${CMAKE_INSTALL_PREFIX} PARENT_SCOPE) - set(XDMF_BINARIES ${XDMF_BINARIES} ${CMAKE_INSTALL_PREFIX}/bin) - --- -2.31.1 - diff --git a/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch b/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch deleted file mode 100644 index d7268ef7566b..000000000000 --- a/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a9079bdccbb2165583d6773a5ed848427e2a38a8 Mon Sep 17 00:00:00 2001 -From: Seacas Upstream <[email protected]> -Date: Tue, 28 Jan 2020 09:13:38 -0500 -Subject: [PATCH] exodusII 2020-01-28 (d97eb08d) - -Code extracted from: - - https://gitlab.kitware.com/third-party/seacas.git - -at commit d97eb08d79e87c82facfae39bc75deb60c0a2d83 (for/vtk-20200128-7.24f-v2019-12-18). ---- - ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c | 2 +- - ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c -index 8d5d6734f0..ef439618da 100644 ---- a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c -+++ b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c -@@ -216,5 +216,5 @@ int ex_create_par_int(const char *path, int cmode, int *comp_ws, int *io_ws, MPI - * Prevent warning in some versions of ranlib(1) because the object - * file has no symbols. - */ --const char exodus_unused_symbol_dummy_1; -+const char exodus_unused_symbol_dummy_ex_create_par; - #endif -diff --git a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c -index b2faa22c29..9df4818767 100644 ---- a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c -+++ b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c -@@ -459,5 +459,5 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float - * Prevent warning in some versions of ranlib(1) because the object - * file has no symbols. - */ --const char exodus_unused_symbol_dummy_1; -+const char exodus_unused_symbol_dummy_ex_open_par; - #endif --- -2.26.2 - diff --git a/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch b/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch deleted file mode 100644 index a903b0375304..000000000000 --- a/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/CMake/VTKGenerateExportHeader.cmake 2020-05-24 14:33:12.154603698 -0600 -+++ b/CMake/VTKGenerateExportHeader.cmake 2020-05-24 14:33:34.864603776 -0600 -@@ -174,8 +174,12 @@ - execute_process(COMMAND ${CMAKE_C_COMPILER} --version - OUTPUT_VARIABLE _gcc_version_info - ERROR_VARIABLE _gcc_version_info) -- string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*" -+ string(REGEX MATCH "[1-9][0-9]\\.[0-9]\\.[0-9]*" - _gcc_version "${_gcc_version_info}") -+ if(NOT _gcc_version) -+ string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*" -+ _gcc_version "${_gcc_version_info}") -+ endif() - # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the - # patch level, handle this here: - if(NOT _gcc_version) \ No newline at end of file diff --git a/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch b/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch deleted file mode 100644 index d890f696388d..000000000000 --- a/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/758611 ---- a/IO/CityGML/CMakeLists.txt -+++ b/IO/CityGML/CMakeLists.txt -@@ -5,7 +5,4 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS}) - if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS) - find_package(pugixml REQUIRED) -- get_target_property(pugixml_INCLUDE_DIRS pugixml INTERFACE_INCLUDE_DIRECTORIES) -- get_target_property(pugixml_LIBRARIES pugixml LOCATION) -- include_directories(${pugixml_INCLUDE_DIRS}) -- vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES}) -+ vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE pugixml::pugixml) - endif() diff --git a/sci-libs/vtk/files/vtk-8.2.0-py38.patch b/sci-libs/vtk/files/vtk-8.2.0-py38.patch deleted file mode 100644 index c4c235dafd3f..000000000000 --- a/sci-libs/vtk/files/vtk-8.2.0-py38.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 257b9d7b18d5f3db3fe099dc18f230e23f7dfbab Mon Sep 17 00:00:00 2001 -From: David Gobbi <[email protected]> -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/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h -index b1c12c83de..14ccfbe928 100644 ---- a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h -+++ b/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/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx -index 2b0d443537..3840038498 100644 ---- a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx -+++ b/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/Wrapping/PythonCore/PyVTKNamespace.cxx b/Wrapping/PythonCore/PyVTKNamespace.cxx -index 71ee2a3516..5cf5bfbe6b 100644 ---- a/Wrapping/PythonCore/PyVTKNamespace.cxx -+++ b/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/Wrapping/PythonCore/PyVTKReference.cxx b/Wrapping/PythonCore/PyVTKReference.cxx -index 943ac71080..b7104091c0 100644 ---- a/Wrapping/PythonCore/PyVTKReference.cxx -+++ b/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/Wrapping/PythonCore/PyVTKTemplate.cxx b/Wrapping/PythonCore/PyVTKTemplate.cxx -index be200985b3..340fe7953b 100644 ---- a/Wrapping/PythonCore/PyVTKTemplate.cxx -+++ b/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/Wrapping/PythonCore/vtkPythonCompatibility.h b/Wrapping/PythonCore/vtkPythonCompatibility.h -index 4a767844a6..be208faeef 100644 ---- a/Wrapping/PythonCore/vtkPythonCompatibility.h -+++ b/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/Wrapping/Tools/vtkWrapPythonClass.c b/Wrapping/Tools/vtkWrapPythonClass.c -index b1e45f8e80..4d558ea081 100644 ---- a/Wrapping/Tools/vtkWrapPythonClass.c -+++ b/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/Wrapping/Tools/vtkWrapPythonEnum.c b/Wrapping/Tools/vtkWrapPythonEnum.c -index b933702242..1249362854 100644 ---- a/Wrapping/Tools/vtkWrapPythonEnum.c -+++ b/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/Wrapping/Tools/vtkWrapPythonType.c b/Wrapping/Tools/vtkWrapPythonType.c -index 744cb1b9d3..0a1375e541 100644 ---- a/Wrapping/Tools/vtkWrapPythonType.c -+++ b/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/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch b/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch deleted file mode 100644 index d5a02ca75929..000000000000 --- a/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 797f28697d5ba50c1fa2bc5596af626a3c277826 Mon Sep 17 00:00:00 2001 -From: "Andrew J. P. Maclean" <[email protected]> -Date: Wed, 27 May 2020 15:27:15 +1000 -Subject: [PATCH] Qt 5.15 needs the include file QPainterPath - ---- - Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 1 + - Rendering/Qt/vtkQtStringToImage.cxx | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx -index afda585cca..eca65c64cd 100644 ---- a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx -+++ b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx -@@ -41,6 +41,7 @@ - #include <QImage> - #include <QMap> - #include <QPainter> -+#include <QPainterPath> - #include <QPair> - #include <QPixmap> - #include <QTextDocument> -diff --git a/Rendering/Qt/vtkQtStringToImage.cxx b/Rendering/Qt/vtkQtStringToImage.cxx -index 659c71570e..fbb9b78f05 100644 ---- a/Rendering/Qt/vtkQtStringToImage.cxx -+++ b/Rendering/Qt/vtkQtStringToImage.cxx -@@ -30,6 +30,7 @@ - #include <QFontMetrics> - #include <QImage> - #include <QPainter> -+#include <QPainterPath> - #include <QPixmap> - #include <QString> - #include <QTextDocument> --- -2.26.2 - diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml index 78fb93f57d22..50a77432780d 100644 --- a/sci-libs/vtk/metadata.xml +++ b/sci-libs/vtk/metadata.xml @@ -27,6 +27,5 @@ <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> to handle smp support</flag> <flag name="views">Building Views modules</flag> <flag name="web">Install web component</flag> - <flag name="R">Enable support for dev-lang/R</flag> </use> </pkgmetadata> diff --git a/sci-libs/vtk/vtk-8.2.0-r6.ebuild b/sci-libs/vtk/vtk-8.2.0-r6.ebuild deleted file mode 100644 index 6cbd67167e03..000000000000 --- a/sci-libs/vtk/vtk-8.2.0-r6.ebuild +++ /dev/null @@ -1,375 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) -WEBAPP_OPTIONAL=yes -WEBAPP_MANUAL_SLOT=yes - -# Short package version -MY_PV="$(ver_cut 1-2)" -inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils toolchain-funcs cmake virtualx webapp - -DESCRIPTION="The Visualization Toolkit" -HOMEPAGE="https://www.vtk.org/"; -SRC_URI=" - https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz - doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz ) - examples? ( - https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz - )" - -LICENSE="BSD LGPL-2" -SLOT="0/${MY_PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" -IUSE="all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi - mysql odbc offscreen postgres python qt5 R rendering tbb tcl theora tk - video_cards_nvidia views web +X" - -REQUIRED_USE=" - all-modules? ( boost ffmpeg gdal mpi mysql odbc postgres python qt5 ) - java? ( qt5 ) - python? ( ${PYTHON_REQUIRED_USE} ) - tcl? ( rendering ) - examples? ( python ) - tk? ( tcl ) - web? ( python ) - ^^ ( X aqua offscreen )" - -RDEPEND=" - app-arch/lz4 - dev-cpp/eigen - dev-db/sqlite - dev-libs/double-conversion:0= - dev-libs/expat - dev-libs/jsoncpp:= - dev-libs/libxml2:2 - >=dev-libs/pugixml-1.11 - >=media-libs/freetype-2.5.4 - media-libs/glew:0= - >=media-libs/libharu-2.3.0-r2 - media-libs/libpng:0= - media-libs/libtheora - media-libs/mesa - media-libs/tiff:0 - sci-libs/exodusii - sci-libs/hdf5:= - sci-libs/netcdf:0= - sci-libs/netcdf-cxx:3 - sys-libs/zlib - virtual/jpeg:0 - virtual/opengl - x11-libs/libX11 - x11-libs/libXmu - x11-libs/libXt - all-modules? ( - !sci-libs/xdmf2 - <dev-libs/pegtl-3 - sci-libs/kissfft - ) - boost? ( dev-libs/boost:=[mpi?] ) - examples? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - ) - ffmpeg? ( media-video/ffmpeg ) - gdal? ( sci-libs/gdal ) - java? ( >=virtual/jdk-1.8:* ) - mpi? ( - virtual/mpi[cxx,romio] - $(python_gen_cond_dep ' - python? ( dev-python/mpi4py[${PYTHON_USEDEP}] ) - ') - ) - mysql? ( dev-db/mysql-connector-c ) - odbc? ( dev-db/unixODBC ) - offscreen? ( media-libs/mesa[osmesa] ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/sip:5[${PYTHON_USEDEP}] - ') - ) - qt5? ( - dev-qt/designer:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtsql:5 - dev-qt/qtx11extras:5 - $(python_gen_cond_dep ' - python? ( dev-python/PyQt5[${PYTHON_USEDEP}] ) - ') - ) - R? ( dev-lang/R ) - tbb? ( <dev-cpp/tbb-2021:= ) - tcl? ( dev-lang/tcl:0= ) - tk? ( dev-lang/tk:0= ) - video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) - web? ( - ${WEBAPP_DEPEND} - $(python_gen_cond_dep ' - dev-python/autobahn[${PYTHON_USEDEP}] - dev-python/constantly[${PYTHON_USEDEP}] - dev-python/hyperlink[${PYTHON_USEDEP}] - dev-python/incremental[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/twisted[${PYTHON_USEDEP}] - dev-python/txaio[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - ') - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( app-doc/doxygen ) - mpi? ( app-admin/chrpath ) -" - -S="${WORKDIR}"/VTK-${PV} - -PATCHES=( - "${FILESDIR}"/${PN}-8.1.0-openmpi-4-compatibility.patch - "${FILESDIR}"/${P}-qt-5.15.patch # bug 726960 - "${FILESDIR}"/${P}-gcc-10.patch # bug 723374 - "${FILESDIR}"/${P}-fno-common.patch # bug 721048 - "${FILESDIR}"/${P}-py38.patch - "${FILESDIR}"/${P}-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch # bug #751088 - "${FILESDIR}"/${P}-pugixml.patch - "${FILESDIR}"/${P}-0001-fix-library-installation-dir-for-xdmf3.patch -) - -RESTRICT="test" - -pkg_setup() { - use java && java-pkg-opt-2_pkg_setup - use python && python-single-r1_pkg_setup - use web && webapp_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - local x - # missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3 zfp - for x in expat freetype hdf5 jpeg jsoncpp kissfft libharu libxml2 lz4 netcdf pugixml png tiff zlib; do - ebegin "Dropping bundled ${x}" - rm -r ThirdParty/${x}/vtk${x} || die - eend $? - done - - sed -i -e '/add_subdirectory(vtkpugixml)/d' ThirdParty/pugixml/CMakeLists.txt || die - sed -i -e '/vtk_target_export(vtkpugixml)/d' ThirdParty/pugixml/CMakeLists.txt || die - - # my_bool is no longer used in MySQL and MariaDB isn't supported in vtk-8 - sed -e 's/my_bool/bool/' -i IO/MySQL/vtkMySQL{Database,Query}.cxx || die - - if use doc; then - einfo "Removing .md5 files from documents." - rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes" - sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \ - -i Utilities/Doxygen/CMakeLists.txt || die - fi -} - -src_configure() { - # general configuration - local mycmakeargs=( - -Wno-dev - -DVTK_DIR="${S}" - -DVTK_INSTALL_LIBRARY_DIR=$(get_libdir) - -DVTK_INSTALL_PACKAGE_DIR="$(get_libdir)/cmake/${PN}-${MY_PV}" - -DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" - -DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data" - -DVTK_CUSTOM_LIBRARY_SUFFIX="" - -DBUILD_SHARED_LIBS=ON - -DVTK_USE_SYSTEM_AUTOBAHN=ON - -DVTK_USE_SYSTEM_EXPAT=ON - -DVTK_USE_SYSTEM_FREETYPE=ON - -DVTK_USE_SYSTEM_FreeType=ON - # Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible) - -DVTK_USE_SYSTEM_GL2PS=OFF - -DVTK_USE_SYSTEM_HDF5=ON - -DVTK_USE_SYSTEM_JPEG=ON - -DVTK_USE_SYSTEM_LIBPROJ=OFF - -DVTK_USE_SYSTEM_LIBXML2=ON - -DVTK_USE_SYSTEM_LibXml2=ON - -DVTK_USE_SYSTEM_NETCDF=ON - -DVTK_USE_SYSTEM_OGGTHEORA=ON - -DVTK_USE_SYSTEM_PUGIXML=ON - -DVTK_USE_SYSTEM_PNG=ON - -DVTK_USE_SYSTEM_TIFF=ON - -DVTK_USE_SYSTEM_TWISTED=ON - -DVTK_USE_SYSTEM_XDMF2=OFF - -DVTK_USE_SYSTEM_XDMF3=OFF - -DVTK_USE_SYSTEM_ZLIB=ON - -DVTK_USE_SYSTEM_ZOPE=ON - -DVTK_USE_SYSTEM_LIBRARIES=ON - # Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake) - -DVTK_USE_SYSTEM_DIY2=OFF - -DVTK_USE_GL2PS=ON - -DVTK_USE_LARGE_DATA=ON - -DVTK_USE_PARALLEL=ON - -DVTK_EXTRA_COMPILER_WARNINGS=ON - -DVTK_Group_StandAlone=ON - -DBUILD_DOCUMENTATION=$(usex doc) - -DBUILD_EXAMPLES=$(usex examples) - -DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off - -DVTK_BUILD_ALL_MODULES=$(usex all-modules) - -DUSE_DOCUMENTATION_HTML_HELP=$(usex doc) - -DVTK_Group_Imaging=$(usex imaging) - -DVTK_Group_MPI=$(usex mpi) - -DVTK_Group_Rendering=$(usex rendering) - -DVTK_Group_Tk=$(usex tk) - -DVTK_Group_Views=$(usex views) - -DVTK_Group_Web=$(usex web) - -DVTK_SMP_IMPLEMENTATION_TYPE="$(usex tbb TBB Sequential)" - -DVTK_WWW_DIR="${EPREFIX}/${MY_HTDOCSDIR}" - -DVTK_WRAP_JAVA=$(usex java) - -DVTK_WRAP_PYTHON=$(usex python) - -DVTK_WRAP_PYTHON_SIP=$(usex python) - -DVTK_WRAP_TCL=$(usex tcl) - -DVTK_USE_BOOST=$(usex boost) - -DUSE_VTK_USE_BOOST=$(usex boost) - -DModule_vtkInfovisBoost=$(usex boost) - -DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost) - -DVTK_USE_ODBC=$(usex odbc) - -DModule_vtkIOODBC=$(usex odbc) - -DVTK_USE_OFFSCREEN=$(usex offscreen) - -DVTK_OPENGL_HAS_OSMESA=$(usex offscreen) - -DVTK_USE_OGGTHEORA_ENCODER=$(usex theora) - -DVTK_USE_NVCONTROL=$(usex video_cards_nvidia) - -DModule_vtkFiltersStatisticsGnuR=$(usex R) - -DVTK_USE_X=$(usex X) - # IO - -DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg) - -DModule_vtkIOGDAL=$(usex gdal) - -DModule_vtkIOGeoJSON=$(usex json) - -DModule_vtkIOXdmf2=$(usex all-modules) - -DBUILD_TESTING=$(usex examples) - # Apple stuff, does it really work? - -DVTK_USE_COCOA=$(usex aqua) - ) - - if use all-modules; then - mycmakeargs+=( - -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=ON - # we don't have a package for zfp yet - -DVTK_USE_SYSTEM_ZFP=OFF - ) - fi - - if use java; then - local javacargs=$(java-pkg_javac-args) - mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} ) - fi - - if use mpi; then - mycmakeargs+=( -DVTK_USE_SYSTEM_MPI4PY=ON ) - fi - - if use python; then - mycmakeargs+=( - -DVTK_INSTALL_PYTHON_MODULES_DIR="$(python_get_sitedir)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip" - -DSIP_INCLUDE_DIR="$(python_get_includedir)" - -DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DVTK_PYTHON_LIBRARY="$(python_get_library_path)" - -DVTK_USE_SYSTEM_SIX=ON - ) - fi - - if use qt5; then - mycmakeargs+=( - -DVTK_USE_QVTK=ON - -DVTK_USE_QVTK_OPENGL=ON - -DVTK_USE_QVTK_QTOPENGL=ON - -DQT_WRAP_CPP=ON - -DQT_WRAP_UI=ON - -DVTK_INSTALL_QT_DIR="$(basename $(qt5_get_libdir))/qt5/plugins/designer" - -DDESIRED_QT_VERSION=5 - -DVTK_QT_VERSION=5 - -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" - -DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic" - -DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5" - -DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake" - -DVTK_Group_Qt:BOOL=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON - ) - fi - - if use R; then - mycmakeargs+=( - -DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so - -DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so - ) - fi - - append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE - - use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm" - - if use mpi; then - export CC=mpicc - export CXX=mpicxx - export FC=mpif90 - export F90=mpif90 - export F77=mpif77 - fi - - cmake_src_configure -} - -src_install() { - use web && webapp_src_preinst - - cmake_src_install - - use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar - - # Stop web page images from being compressed - use doc && docompress -x /usr/share/doc/${PF}/doxygen - - # install examples - if use examples; then - einfo "Installing examples" - mv -v {E,e}xamples || die - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - - # with MPI, rpaths are not deleted properly - if use mpi; then - chrpath -d "${ED}"/usr/$(get_libdir)/*.so* || die - chrpath -d "${ED}"/usr/bin/* || die - if use python; then - chrpath -d "${ED}"/$(python_get_sitedir)/vtkmodules/*.so || die - fi - fi - - use python && python_optimize - - # environment - cat >> "${T}"/40${PN} <<- EOF || die - VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data - VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${MY_PV} - VTKHOME=${EPREFIX}/usr - EOF - doenvd "${T}"/40${PN} - - use web && webapp_src_install -} - -# webapp.eclass exports these but we want it optional #534036 -pkg_postinst() { - use web && webapp_pkg_postinst -} - -pkg_prerm() { - use web && webapp_pkg_prerm -}
