* [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/
@ 2022-09-01 2:24 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-09-01 2:24 UTC (permalink / raw
To: gentoo-commits
commit: f7aa9f54fed8aa3b557e9329b0833060ec76a4a9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 1 02:24:25 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 1 02:24:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7aa9f54
sci-libs/vtk: add more references to patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
...vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sci-libs/vtk/files/vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch b/sci-libs/vtk/files/vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch
index e06c786db9ab..24804ca2dc0a 100644
--- a/sci-libs/vtk/files/vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch
+++ b/sci-libs/vtk/files/vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch
@@ -1,4 +1,8 @@
From https://gitlab.kitware.com/vtk/vtk/-/commit/0322b938968eebee585ad7efb93bbdade7106355
+
+https://bugs.gentoo.org/863038
+https://gitlab.kitware.com/vtk/vtk/-/issues/18638
+
From: Aron Helser <aron.helser@kitware.com>
Date: Mon, 15 Aug 2022 10:06:13 -0400
Subject: [PATCH 16/30] Change or scope struct names to avoid conflicts.
@@ -121,6 +125,3 @@ Subject: [PATCH 16/30] Change or scope struct names to avoid conflicts.
vtkAMRVelodyneReaderInternal();
~vtkAMRVelodyneReaderInternal();
void SetFileName(VTK_FILEPATH VTK_FUTURE_CONST char* fileName);
---
-2.37.2
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/
@ 2024-04-12 12:40 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2024-04-12 12:40 UTC (permalink / raw
To: gentoo-commits
commit: 4b659f52b06f688b2ed2a819b4d6a6be18587030
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Thu Apr 11 16:42:01 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Apr 12 12:40:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b659f52
sci-libs/vtk: update opencascade-7.8 patch
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36214
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch | 13 +++++++++++++
1 file changed, 13 insertions(+)
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
index 6f77fbdea979..4adec4944492 100644
--- 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
@@ -16,3 +16,16 @@
set(opencascade_missing_targets)
foreach (opencascade_req_target IN LISTS opencascade_req_targets)
if (NOT TARGET "${opencascade_req_target}")
+diff --git a/IO/OCCT/vtkOCCTReader.cxx b/IO/OCCT/vtkOCCTReader.cxx
+index 52e76be..7235309 100644
+--- 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;
+ }
+
+ //----------------------------------------------------------------------------
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-12 12:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-12 12:40 [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2022-09-01 2:24 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox