| 1 |
commit: 34251046e57f6eefc3576839fb1c333c8420a604 |
| 2 |
Author: switch87 <gert <AT> pellin <DOT> be> |
| 3 |
AuthorDate: Thu Mar 15 21:05:46 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 5 12:24:22 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34251046 |
| 7 |
|
| 8 |
sci-libs/opencascade: Fix build with >=vtk-8.1.0 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/650596 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/7470 |
| 12 |
|
| 13 |
.../files/opencascade-6.9.1-vtk-8.1.patch | 48 ++++++++++++++++++++++ |
| 14 |
sci-libs/opencascade/opencascade-6.9.1-r2.ebuild | 4 +- |
| 15 |
2 files changed, 50 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..d1f560320c6 |
| 20 |
--- /dev/null |
| 21 |
+++ b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch |
| 22 |
@@ -0,0 +1,48 @@ |
| 23 |
+--- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx |
| 24 |
++++ b/src/IVtkVTK/IVtkVTK_ShapeData.cxx |
| 25 |
+@@ -80,9 +80,9 @@ void IVtkVTK_ShapeData::InsertVertex (const IVtk_IdType theShapeID, |
| 26 |
+ vtkIdType aPointIdVTK = thePointId; |
| 27 |
+ myPolyData->InsertNextCell (VTK_VERTEX, 1, &aPointIdVTK); |
| 28 |
+ const vtkIdType aShapeIDVTK = theShapeID; |
| 29 |
+- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK); |
| 30 |
++ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK); |
| 31 |
+ const vtkIdType aType = theMeshType; |
| 32 |
+- myMeshTypes->InsertNextTupleValue (&aType); |
| 33 |
++ myMeshTypes->InsertNextTypedTuple (&aType); |
| 34 |
+ } |
| 35 |
+ |
| 36 |
+ //================================================================ |
| 37 |
+@@ -97,9 +97,9 @@ void IVtkVTK_ShapeData::InsertLine (const IVtk_IdType theShapeID, |
| 38 |
+ vtkIdType aPoints[2] = { thePointId1, thePointId2 }; |
| 39 |
+ myPolyData->InsertNextCell (VTK_LINE, 2, aPoints); |
| 40 |
+ const vtkIdType aShapeIDVTK = theShapeID; |
| 41 |
+- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK); |
| 42 |
++ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK); |
| 43 |
+ const vtkIdType aType = theMeshType; |
| 44 |
+- myMeshTypes->InsertNextTupleValue (&aType); |
| 45 |
++ myMeshTypes->InsertNextTypedTuple (&aType); |
| 46 |
+ } |
| 47 |
+ |
| 48 |
+ //================================================================ |
| 49 |
+@@ -124,9 +124,9 @@ void IVtkVTK_ShapeData::InsertLine (const IVtk_IdType theShapeID, |
| 50 |
+ |
| 51 |
+ myPolyData->InsertNextCell (VTK_POLY_LINE, anIdList); |
| 52 |
+ const vtkIdType aShapeIDVTK = theShapeID; |
| 53 |
+- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK); |
| 54 |
++ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK); |
| 55 |
+ const vtkIdType aType = theMeshType; |
| 56 |
+- myMeshTypes->InsertNextTupleValue (&aType); |
| 57 |
++ myMeshTypes->InsertNextTypedTuple (&aType); |
| 58 |
+ anIdList->Delete(); |
| 59 |
+ } |
| 60 |
+ } |
| 61 |
+@@ -144,7 +144,7 @@ void IVtkVTK_ShapeData::InsertTriangle (const IVtk_IdType theShapeID, |
| 62 |
+ vtkIdType aPoints[3] = { thePointId1, thePointId2, thePointId3 }; |
| 63 |
+ myPolyData->InsertNextCell (VTK_TRIANGLE, 3, aPoints); |
| 64 |
+ const vtkIdType aShapeIDVTK = theShapeID; |
| 65 |
+- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK); |
| 66 |
++ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK); |
| 67 |
+ const vtkIdType aType = theMeshType; |
| 68 |
+- myMeshTypes->InsertNextTupleValue (&aType); |
| 69 |
++ myMeshTypes->InsertNextTypedTuple (&aType); |
| 70 |
+ } |
| 71 |
|
| 72 |
diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild |
| 73 |
index 8eff7a5ab1a..bf868ce0ef5 100644 |
| 74 |
--- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild |
| 75 |
+++ b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild |
| 76 |
@@ -1,4 +1,4 @@ |
| 77 |
-# Copyright 1999-2017 Gentoo Foundation |
| 78 |
+# Copyright 1999-2018 Gentoo Foundation |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
|
| 81 |
EAPI=6 |
| 82 |
@@ -31,13 +31,13 @@ DEPEND=" |
| 83 |
tbb? ( dev-cpp/tbb ) |
| 84 |
vtk? ( || ( sci-libs/vtk[imaging] sci-libs/vtk[rendering] sci-libs/vtk[views] sci-libs/vtk[all-modules] ) )" |
| 85 |
RDEPEND="${DEPEND}" |
| 86 |
- |
| 87 |
CHECKREQS_MEMORY="256M" |
| 88 |
CHECKREQS_DISK_BUILD="3584M" |
| 89 |
|
| 90 |
PATCHES=( |
| 91 |
"${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch |
| 92 |
"${FILESDIR}"/${PN}-6.9.1-vtk-configure.patch |
| 93 |
+ "${FILESDIR}"/${PN}-6.9.1-vtk-8.1.patch |
| 94 |
) |
| 95 |
|
| 96 |
pkg_setup() { |
Archives