Skip to content

Commit e483945

Browse files
MehdiChinouneMehdiChinoune
committed
freecad: update to 1.0.1
1 parent 95795b8 commit e483945

2 files changed

Lines changed: 106 additions & 8 deletions

File tree

‎mingw-w64-freecad/002-fix-build-with-vtk-9.5.patch‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
--- a/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx
2+
+++ b/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx
3+
@@ -96,7 +96,7 @@
4+
vtkCellLinks* GetLinks()
5+
{
6+
#ifdef VTK_CELL_ARRAY_V2
7+
- return static_cast<vtkCellLinks*>(GetCellLinks());
8+
+ return static_cast<vtkCellLinks*>(GetLinks());
9+
#else
10+
return Links;
11+
#endif
12+
--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
13+
+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
14+
@@ -4713,7 +4713,7 @@
15+
}
16+
ficcon << "-------------------------------- connectivity " << nbPoints << endl;
17+
#ifdef VTK_CELL_ARRAY_V2
18+
- vtkCellLinks *links = static_cast<vtkCellLinks*>(myGrid->GetCellLinks());
19+
+ vtkCellLinks *links = static_cast<vtkCellLinks*>(myGrid->GetLinks());
20+
#else
21+
vtkCellLinks *links = myGrid->GetCellLinks();
22+
#endif
23+
--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp
24+
+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp
25+
@@ -69,7 +69,7 @@
26+
SMDS_UnstructuredGrid * grid = mesh->getGrid();
27+
vtkPoints *points = grid->GetPoints();
28+
points->InsertPoint(myVtkID, x, y, z);
29+
- SMDS_CellLinks *cellLinks = dynamic_cast<SMDS_CellLinks*>(grid->GetCellLinks());
30+
+ SMDS_CellLinks *cellLinks = dynamic_cast<SMDS_CellLinks*>(grid->GetLinks());
31+
assert(cellLinks);
32+
cellLinks->ResizeForPoint( myVtkID );
33+
}
34+
@@ -191,7 +191,7 @@
35+
SMDS_ElemIteratorPtr SMDS_MeshNode::
36+
GetInverseElementIterator(SMDSAbs_ElementType type) const
37+
{
38+
- vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
39+
+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetLinks())->GetLink(myVtkID);
40+
//MESSAGE("myID " << myID << " ncells " << l.ncells);
41+
return SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyInvIterator(SMDS_Mesh::_meshList[myMeshId], l.cells, l.ncells, type));
42+
}
43+
@@ -251,7 +251,7 @@
44+
return SMDS_MeshElement::elementsIterator(SMDSAbs_Node);
45+
else
46+
{
47+
- vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
48+
+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetLinks())->GetLink(myVtkID);
49+
return SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyIterator(SMDS_Mesh::_meshList[myMeshId], l.cells, l.ncells, type));
50+
}
51+
}
52+
@@ -350,7 +350,7 @@
53+
const SMDS_MeshCell *cell = dynamic_cast<const SMDS_MeshCell*> (ME);
54+
assert(cell);
55+
SMDS_UnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
56+
- vtkCellLinks *Links = static_cast<vtkCellLinks*>(grid->GetCellLinks());
57+
+ vtkCellLinks *Links = static_cast<vtkCellLinks*>(grid->GetLinks());
58+
Links->ResizeCellList(myVtkID, 1);
59+
Links->AddCellReference(cell->getVtkId(), myVtkID);
60+
}
61+
@@ -366,7 +366,7 @@
62+
63+
bool SMDS_MeshNode::emptyInverseElements()
64+
{
65+
- vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
66+
+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetLinks())->GetLink(myVtkID);
67+
return (l.ncells == 0);
68+
}
69+
70+
@@ -378,7 +378,7 @@
71+
72+
int SMDS_MeshNode::NbInverseElements(SMDSAbs_ElementType type) const
73+
{
74+
- vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
75+
+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetLinks())->GetLink(myVtkID);
76+
77+
if ( type == SMDSAbs_All )
78+
return l.ncells;
79+
--- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp
80+
+++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp
81+
@@ -11348,7 +11348,7 @@
82+
{
83+
int oldId = *itn;
84+
//MESSAGE(" node " << oldId);
85+
- vtkCellLinks::Link l = static_cast<vtkCellLinks*>(grid->GetCellLinks())->GetLink(oldId);
86+
+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(grid->GetLinks())->GetLink(oldId);
87+
for (int i=0; i<l.ncells; i++)
88+
{
89+
int vtkId = l.cells[i];
90+
@@ -11708,7 +11708,7 @@
91+
{
92+
int oldId = itnod->first;
93+
//MESSAGE(" node " << oldId);
94+
- vtkCellLinks::Link l = static_cast<vtkCellLinks*>(grid->GetCellLinks())->GetLink(oldId);
95+
+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(grid->GetLinks())->GetLink(oldId);
96+
for (int i = 0; i < l.ncells; i++)
97+
{
98+
int vtkId = l.cells[i];

‎mingw-w64-freecad/PKGBUILD‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
_realname=freecad
44
pkgbase=mingw-w64-${_realname}
55
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
6-
pkgver=1.0.0
7-
pkgrel=4
8-
_OS_commit=91f70382
6+
pkgver=1.0.1
7+
pkgrel=1
8+
_OS_commit=09d6175a
99
pkgdesc="Free and Opensource multiplatform 3D parametric modeler (mingw-w64)"
1010
arch=('any')
1111
mingw_arch=('ucrt64' 'clang64' 'clangarm64')
@@ -50,11 +50,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
5050
source=("https://github.com/FreeCAD/FreeCAD/archive/${pkgver}/${_realname}-${pkgver}.tar.gz"
5151
"https://github.com/Ondsel-Development/OndselSolver/archive/${_OS_commit}/OndselSolver-${_OS_commit}.tar.gz"
5252
"001-clang19-char-traits.patch"
53-
"002-vtk-9.4.patch::https://github.com/FreeCAD/FreeCAD/pull/18543.patch")
54-
sha256sums=('51115afd8e3b89f4bac343b986b0800d8e1c68fc1e322c3cd179cfe1033ef937'
55-
'061f651f503f1ec5a9814e174cdb8a9ba84d511a3b8be3d94852e84976c6b158'
53+
"002-fix-build-with-vtk-9.5.patch")
54+
sha256sums=('f62bc07c477544eff62b6ab0fc3bb63fa7f1e6f94763c51b0049507842d444f3'
55+
'890fb6ddeb1b42face95854689ff7b96c926c368b7d616d9e31e4b35f79ddde8'
5656
'0dcc9a5ce20f080913f2bff71f5e2eb7d166e789f1012cea2009f94c9f30e5f2'
57-
'aaf53617dff2119805b2f4d415181d7685e43b80e18905d0f64e2b909afc8510')
57+
'36f8124ff7f2061afae313a5e96be0504086ecc4edf0c905512e96b93ee243d9')
5858

5959
apply_patch_with_msg() {
6060
for _patch in "$@"
@@ -71,7 +71,7 @@ prepare() {
7171

7272
apply_patch_with_msg \
7373
001-clang19-char-traits.patch \
74-
002-vtk-9.4.patch
74+
002-fix-build-with-vtk-9.5.patch
7575
}
7676

7777
build() {

0 commit comments

Comments
 (0)