commit: 499a3568ad3d38514a25fbbd851ee1419a1956f4 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Thu Jul 31 17:19:18 2025 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Thu Jul 31 18:23:32 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=499a3568
sci-visualization/paraview: fix compilation Closes: https://bugs.gentoo.org/939533 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> .../files/paraview-5.13.0-fix_compilation-2.patch | 22 ++++++++++++++++++++++ .../files/paraview-5.13.0-fix_compilation.patch | 19 +++++++++++++++++++ .../paraview/paraview-5.13.2-r2.ebuild | 2 ++ .../paraview/paraview-5.13.3-r2.ebuild | 2 ++ 4 files changed, 45 insertions(+) diff --git a/sci-visualization/paraview/files/paraview-5.13.0-fix_compilation-2.patch b/sci-visualization/paraview/files/paraview-5.13.0-fix_compilation-2.patch new file mode 100644 index 000000000000..7bbb7885dc4b --- /dev/null +++ b/sci-visualization/paraview/files/paraview-5.13.0-fix_compilation-2.patch @@ -0,0 +1,22 @@ +diff --git a/VTK/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h b/VTK/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h +index acd5eca2..5a23705d 100644 +--- a/VTK/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h ++++ b/VTK/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"; diff --git a/sci-visualization/paraview/files/paraview-5.13.0-fix_compilation.patch b/sci-visualization/paraview/files/paraview-5.13.0-fix_compilation.patch new file mode 100644 index 000000000000..4a8be529ce23 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-5.13.0-fix_compilation.patch @@ -0,0 +1,19 @@ +Upstream: https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/3272 +Gentoo Bug: https://bugs.gentoo.org/939533 + +diff --git a/vtkm/filter/contour/worklet/mir/MIRTables.h b/vtkm/filter/contour/worklet/mir/MIRTables.h +index 3dff3329eb4d129a6dd7929be63eb8bf061fb0c3..a6f4d4f1fdb9f9b35e7c6157619caf59cb6e8a77 100644 +--- a/VTK/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h ++++ b/VTK/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h +@@ -11400,11 +11400,6 @@ public: + return FacesLookup[shape]; + } + +- VTKM_EXEC vtkm::UInt8 GetPoint(vtkm::Id pointIndex) const +- { +- return this->CellFacePortal.Get(pointIndex); +- } +- + private: + typename vtkm::cont::ArrayHandle<vtkm::UInt8>::ReadPortalType MIRTablesDataPortal; + typename vtkm::cont::ArrayHandle<vtkm::UInt16>::ReadPortalType MIRTablesIndicesPortal; diff --git a/sci-visualization/paraview/paraview-5.13.2-r2.ebuild b/sci-visualization/paraview/paraview-5.13.2-r2.ebuild index 6393202d7b53..60199c194f26 100644 --- a/sci-visualization/paraview/paraview-5.13.2-r2.ebuild +++ b/sci-visualization/paraview/paraview-5.13.2-r2.ebuild @@ -99,6 +99,8 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch "${FILESDIR}"/${PN}-5.13.0-cmake-3.31-compat.patch + "${FILESDIR}"/${PN}-5.13.0-fix_compilation.patch + "${FILESDIR}"/${PN}-5.13.0-fix_compilation-2.patch ) # false positive when checking for available HDF5 interface, bug #904731 diff --git a/sci-visualization/paraview/paraview-5.13.3-r2.ebuild b/sci-visualization/paraview/paraview-5.13.3-r2.ebuild index 6393202d7b53..60199c194f26 100644 --- a/sci-visualization/paraview/paraview-5.13.3-r2.ebuild +++ b/sci-visualization/paraview/paraview-5.13.3-r2.ebuild @@ -99,6 +99,8 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch "${FILESDIR}"/${PN}-5.13.0-cmake-3.31-compat.patch + "${FILESDIR}"/${PN}-5.13.0-fix_compilation.patch + "${FILESDIR}"/${PN}-5.13.0-fix_compilation-2.patch ) # false positive when checking for available HDF5 interface, bug #904731
