commit: 886e7fcf03045dfc57a90ae4896b3644fa3724b1 Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Tue Oct 7 16:35:39 2025 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Tue Oct 7 16:35:39 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=886e7fcf
sci-libs/vtk: remove unused patches Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> .../vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch | 47 --------------- sci-libs/vtk/files/vtk-9.3.0-ThrustPatches.patch | 51 ---------------- .../vtk/files/vtk-9.3.0-core-octree_node.txx.patch | 18 ------ .../vtk/files/vtk-9.3.0-opencascade-7.8.0.patch | 29 --------- sci-libs/vtk/files/vtk-9.3.1-fix-fmt-11.patch | 70 ---------------------- 5 files changed, 215 deletions(-) diff --git a/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch b/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch deleted file mode 100644 index b69d399f3c2a..000000000000 --- a/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d00b98bd8ef02f854f1068e8ab8fd2fb28244c3b Mon Sep 17 00:00:00 2001 -From: Ted Rodgers <[email protected]> -Date: Sat, 10 Aug 2024 16:13:09 -0400 -Subject: [PATCH] include cstdint + correct case/words - ---- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h -+++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h -@@ -11402,7 +11402,7 @@ public: - - VTKM_EXEC vtkm::UInt8 GetPoint(vtkm::Id pointIndex) const - { -- return this->CellFacePortal.Get(pointIndex); -+ return this->CellEdgesPortal.Get(pointIndex); - } - - private: ---- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h -+++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h -@@ -663,7 +663,7 @@ std::string HierarchicalContourTree<FieldType>::PrintDotSuperStructure(const cha - auto hyperarcsPortal = this->Hyperarcs.ReadPortal(); - auto regularNodeGlobalIdsPortal = this->RegularNodeGlobalIds.ReadPortal(); - auto whichIterationPortal = this->WhichIteration.ReadPortal(); -- auto whichRoundPortal = this->whichRound.ReadPortal(); -+ auto whichRoundPortal = this->WhichRound.ReadPortal(); - auto superarcsPortal = this->Superarcs.ReadPortal(); - auto superparentsPortal = this->Superparents.ReadPortal(); - for (vtkm::Id supernode = 0; supernode < this->Supernodes.GetNumberOfValues(); supernode++) -@@ -708,7 +708,7 @@ std::string HierarchicalContourTree<FieldType>::PrintDotSuperStructure(const cha - if (contourtree_augmented::NoSuchElement(superarcTo)) - { // no superarc - // if it occurred on the final round, it's the global root and is shown as the NULL node -- if (whichRoundPortal.Get(superarcFrom) == this->NRounds) -+ if (whichRoundPortal.Get(superarcFrom) == this->NumRounds) - { // root node - outstream << "\tSN" << std::setw(1) << superarcFrom << " -> SA" << std::setw(1) << superarc - << " [label=\"S" << std::setw(1) << superarc << "\",style=dotted]\n"; ---- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp -+++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp -@@ -136,6 +136,7 @@ - // - #pragma once - -+#include <cstdint> - #include <type_traits> - #include <cstddef> - #include <memory> - diff --git a/sci-libs/vtk/files/vtk-9.3.0-ThrustPatches.patch b/sci-libs/vtk/files/vtk-9.3.0-ThrustPatches.patch deleted file mode 100644 index 82525e75d914..000000000000 --- a/sci-libs/vtk/files/vtk-9.3.0-ThrustPatches.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 4a4466e7c8cd44d2be2bd3fe6f359faa8e9547aa Mon Sep 17 00:00:00 2001 -From: Kenneth Moreland <[email protected]> -Date: Tue, 4 Jun 2024 10:04:42 -0400 -Subject: [PATCH] Disable Thrust patch that is no longer needed in modern - Thrust - -There is a Thrust patch that works around an issue in Thrust 1.9.4 -(https://github.com/NVIDIa/ThirdParty/vtkm/vtkvtkm/vtk-m/thrust/issues/972). The underlying issue -should be fixed in recent versions. In recent versions of CUDA, the patch -breaks (https://gitlab.kitware.com/vtk/vtk-m/-/issues/818). - -This change fixes the problem by disabling the patch where it is not -needed. ---- /dev/null -+++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/docs/changelog/obsolete-thrust-patch.md -@@ -0,0 +1,9 @@ -+# Disable Thrust patch that is no longer needed in modern Thrust -+ -+There is a Thrust patch that works around an issue in Thrust 1.9.4 -+(https://github.com/NVIDIa/ThirdParty/vtkm/vtkvtkm/vtk-m/thrust/issues/972). The underlying issue -+should be fixed in recent versions. In recent versions of CUDA, the patch -+breaks (https://gitlab.kitware.com/vtk/vtk-m/-/issues/818). -+ -+This change fixes the problem by disabling the patch where it is not -+needed. ---- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/ThrustPatches.h -+++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/ThrustPatches.h -@@ -170,9 +170,9 @@ ALIGN_RE_PAIR(vtkm::Int64, vtkm::Float64); - #undef ALIGN_RE_PAIR - } - } --#endif //THRUST_VERSION >= 100900 -+#endif //THRUST_VERSION >= 100900 && THRUST_VERSION < 100906 - --#if THRUST_VERSION >= 100904 -+#if (THRUST_VERSION >= 100904) && (THRUST_VERSION < 100909) - //So for thrust 1.9.4+ (CUDA 10.1+) the stateless_resource_allocator has a bug - //where it is not marked as __host__ __device__ && __thrust_exec_check_disable__. - //To fix this we add a new partial specialization on cuda::memory_resource -@@ -236,7 +236,7 @@ public: - }; - } - } --#endif //THRUST_VERSION >= 100903 -+#endif //(THRUST_VERSION >= 100904) && (THRUST_VERSION < 100909) - - - #if THRUST_VERSION < 100900 --- -GitLab - diff --git a/sci-libs/vtk/files/vtk-9.3.0-core-octree_node.txx.patch b/sci-libs/vtk/files/vtk-9.3.0-core-octree_node.txx.patch deleted file mode 100644 index 7c4d4544a490..000000000000 --- a/sci-libs/vtk/files/vtk-9.3.0-core-octree_node.txx.patch +++ /dev/null @@ -1,18 +0,0 @@ -From b5f466a66771621a3aaa15434910f413ab7168f7 Mon Sep 17 00:00:00 2001 -From: Ted Rodgers <[email protected]> -Date: Sat, 10 Aug 2024 16:10:13 -0400 -Subject: [PATCH] octree_node.txx fix chilren typo - -Signed-off-by: Paul Zander <[email protected]> - ---- a/Utilities/octree/octree/octree_node.txx -+++ b/Utilities/octree/octree/octree_node.txx -@@ -210,7 +210,7 @@ const octree_node<T_, d_, A_>& octree_node<T_, d_, A_>::operator[](int child) co - { - throw std::domain_error("Attempt to access children of an octree leaf node."); - } -- return this->_M_chilren[child]; -+ return this->m_children[child]; - } - - /**\brief Return a reference to a child node. diff --git a/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch b/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch deleted file mode 100644 index 0e6410c18ea0..000000000000 --- a/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/IO/OCCT/CMakeLists.txt -+++ b/IO/OCCT/CMakeLists.txt -@@ -5,11 +5,11 @@ vtk_module_find_package( - ) - - set(opencascade_req_targets -- TKSTEP -- TKIGES -+ TKDESTEP -+ TKDEIGES - TKMesh -- TKXDESTEP -- TKXDEIGES) -+ TKXSDRAWSTEP -+ TKXSDRAWIGES) - set(opencascade_missing_targets) - foreach (opencascade_req_target IN LISTS opencascade_req_targets) - if (NOT TARGET "${opencascade_req_target}") ---- a/IO/OCCT/vtkOCCTReader.cxx -+++ b/IO/OCCT/vtkOCCTReader.cxx -@@ -348,7 +348,7 @@ public: - int GetHash(const TDF_Label& label) - { - TopoDS_Shape aShape; -- return this->ShapeTool->GetShape(label, aShape) ? aShape.HashCode(INT_MAX) : 0; -+ return this->ShapeTool->GetShape(label, aShape) ? opencascade::hash(aShape) : 0; - } - - //---------------------------------------------------------------------------- diff --git a/sci-libs/vtk/files/vtk-9.3.1-fix-fmt-11.patch b/sci-libs/vtk/files/vtk-9.3.1-fix-fmt-11.patch deleted file mode 100644 index 64643c82723f..000000000000 --- a/sci-libs/vtk/files/vtk-9.3.1-fix-fmt-11.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a811c0c4aca246a89f85a1eecc805e388a645178 Mon Sep 17 00:00:00 2001 -From: Paul Zander <[email protected]> -Date: Tue, 17 Sep 2024 18:45:03 +0200 -Subject: [PATCH] fix fmt-11 - -Signed-off-by: Paul Zander <[email protected]> - -diff --git a/ThirdParty/ioss/vtkioss/Ioss_Decomposition.C b/ThirdParty/ioss/vtkioss/Ioss_Decomposition.C -index 388d524..a94afc6 100644 ---- a/ThirdParty/ioss/vtkioss/Ioss_Decomposition.C -+++ b/ThirdParty/ioss/vtkioss/Ioss_Decomposition.C -@@ -15,6 +15,7 @@ - #include <cassert> - #include "vtk_fmt.h" - #include VTK_FMT(fmt/ostream.h) -+#include VTK_FMT(fmt/ranges.h) - #include <numeric> - - #if !defined(NO_ZOLTAN_SUPPORT) -diff --git a/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C b/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C -index 440f352..ca71a90 100644 ---- a/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C -+++ b/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C -@@ -12,6 +12,7 @@ - #include <cstddef> // for nullptr - #include "vtk_fmt.h" - #include VTK_FMT(fmt/ostream.h) -+#include VTK_FMT(fmt/ranges.h) - #include <map> // for _Rb_tree_iterator, etc - #include <ostream> // for basic_ostream, etc - #include <set> -diff --git a/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C b/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C -index 1609c31..85b67e2 100644 ---- a/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C -+++ b/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C -@@ -15,6 +15,7 @@ - #include <Ioss_StructuredBlock.h> - #include "vtk_fmt.h" - #include VTK_FMT(fmt/ostream.h) -+#include VTK_FMT(fmt/ranges.h) - - #include <cstddef> // for size_t - #include <numeric> -diff --git a/ThirdParty/ioss/vtkioss/Ioss_Utils.C b/ThirdParty/ioss/vtkioss/Ioss_Utils.C -index 57021ab..cc5b8a4 100644 ---- a/ThirdParty/ioss/vtkioss/Ioss_Utils.C -+++ b/ThirdParty/ioss/vtkioss/Ioss_Utils.C -@@ -21,6 +21,7 @@ - #include VTK_FMT(fmt/chrono.h) - #include VTK_FMT(fmt/format.h) - #include VTK_FMT(fmt/ostream.h) -+#include VTK_FMT(fmt/ranges.h) - #include <fstream> - #include <sstream> - #include <string> -diff --git a/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C b/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C -index 5d32481..5cb3c02 100644 ---- a/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C -+++ b/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C -@@ -9,6 +9,7 @@ - #include <cstddef> // for size_t - #include "vtk_fmt.h" - #include VTK_FMT(fmt/ostream.h) -+#include VTK_FMT(fmt/ranges.h) - #include <string> // for string - #include <vector> // for vector - --- -2.46.0 -
