freecad: update to 1.0.2 (#25149)

- 002-fix-build-with-vtk-9.5.patch: remove, fixed upstream

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

@@ -1,98 +0,0 @@
---- a/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx
-+++ b/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx
-@@ -96,7 +96,7 @@
-   vtkCellLinks* GetLinks()
-   {
- #ifdef VTK_CELL_ARRAY_V2
--    return static_cast<vtkCellLinks*>(GetCellLinks());
-+    return static_cast<vtkCellLinks*>(GetLinks());
- #else
-     return Links;
- #endif
---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
-+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
-@@ -4713,7 +4713,7 @@
-   }
-   ficcon << "-------------------------------- connectivity " <<  nbPoints << endl;
- #ifdef VTK_CELL_ARRAY_V2
--  vtkCellLinks *links = static_cast<vtkCellLinks*>(myGrid->GetCellLinks());
-+  vtkCellLinks *links = static_cast<vtkCellLinks*>(myGrid->GetLinks());
- #else
-   vtkCellLinks *links = myGrid->GetCellLinks();
- #endif
---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp
-+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp
-@@ -69,7 +69,7 @@
-   SMDS_UnstructuredGrid * grid = mesh->getGrid();
-   vtkPoints *points = grid->GetPoints();
-   points->InsertPoint(myVtkID, x, y, z);
--  SMDS_CellLinks *cellLinks = dynamic_cast<SMDS_CellLinks*>(grid->GetCellLinks());
-+  SMDS_CellLinks *cellLinks = dynamic_cast<SMDS_CellLinks*>(grid->GetLinks());
-   assert(cellLinks);
-   cellLinks->ResizeForPoint( myVtkID );
- }
-@@ -191,7 +191,7 @@
- SMDS_ElemIteratorPtr SMDS_MeshNode::
- GetInverseElementIterator(SMDSAbs_ElementType type) const
- {
--  vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
-+  vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetLinks())->GetLink(myVtkID);
-   //MESSAGE("myID " << myID << " ncells " << l.ncells);
-   return SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyInvIterator(SMDS_Mesh::_meshList[myMeshId], l.cells, l.ncells, type));
- }
-@@ -251,7 +251,7 @@
-     return SMDS_MeshElement::elementsIterator(SMDSAbs_Node);
-   else
-   {
--    vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
-+    vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetLinks())->GetLink(myVtkID);
-     return SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyIterator(SMDS_Mesh::_meshList[myMeshId], l.cells, l.ncells, type));
-   }
- }
-@@ -350,7 +350,7 @@
-   const SMDS_MeshCell *cell = dynamic_cast<const SMDS_MeshCell*> (ME);
-   assert(cell);
-   SMDS_UnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
--  vtkCellLinks *Links = static_cast<vtkCellLinks*>(grid->GetCellLinks());
-+  vtkCellLinks *Links = static_cast<vtkCellLinks*>(grid->GetLinks());
-   Links->ResizeCellList(myVtkID, 1);
-   Links->AddCellReference(cell->getVtkId(), myVtkID);
- }
-@@ -366,7 +366,7 @@
- 
- bool SMDS_MeshNode::emptyInverseElements()
- {
--  vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
-+  vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetLinks())->GetLink(myVtkID);
-   return (l.ncells == 0);
- }
- 
-@@ -378,7 +378,7 @@
- 
- int SMDS_MeshNode::NbInverseElements(SMDSAbs_ElementType type) const
- {
--  vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
-+  vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetLinks())->GetLink(myVtkID);
- 
-   if ( type == SMDSAbs_All )
-     return l.ncells;
---- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp
-+++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp
-@@ -11348,7 +11348,7 @@
-             {
-               int oldId = *itn;
-               //MESSAGE("     node " << oldId);
--              vtkCellLinks::Link l = static_cast<vtkCellLinks*>(grid->GetCellLinks())->GetLink(oldId);
-+              vtkCellLinks::Link l = static_cast<vtkCellLinks*>(grid->GetLinks())->GetLink(oldId);
-               for (int i=0; i<l.ncells; i++)
-                 {
-                   int vtkId = l.cells[i];
-@@ -11708,7 +11708,7 @@
-         {
-           int oldId = itnod->first;
-           //MESSAGE("     node " << oldId);
--          vtkCellLinks::Link l = static_cast<vtkCellLinks*>(grid->GetCellLinks())->GetLink(oldId);
-+          vtkCellLinks::Link l = static_cast<vtkCellLinks*>(grid->GetLinks())->GetLink(oldId);
-           for (int i = 0; i < l.ncells; i++)
-             {
-               int vtkId = l.cells[i];

mingw-w64-freecad/PKGBUILD

@@ -3,8 +3,8 @@
 _realname=freecad
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=1.0.1
+pkgver=1.0.2
-pkgrel=2
+pkgrel=1
 _OS_commit=09d6175a
 pkgdesc="Free and Opensource multiplatform 3D parametric modeler (mingw-w64)"
 arch=('any')
@@ -49,12 +49,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-utf8cpp")
 source=("https://github.com/FreeCAD/FreeCAD/archive/${pkgver}/${_realname}-${pkgver}.tar.gz"
         "https://github.com/Ondsel-Development/OndselSolver/archive/${_OS_commit}/OndselSolver-${_OS_commit}.tar.gz"
-        "001-clang19-char-traits.patch"
+        "001-clang19-char-traits.patch")
-        "002-fix-build-with-vtk-9.5.patch")
+sha256sums=('228ee52f00627c7d8fa61998179deb01865ece69390829feb1300228d24f7e9e'
-sha256sums=('f62bc07c477544eff62b6ab0fc3bb63fa7f1e6f94763c51b0049507842d444f3'
             '890fb6ddeb1b42face95854689ff7b96c926c368b7d616d9e31e4b35f79ddde8'
-            '0dcc9a5ce20f080913f2bff71f5e2eb7d166e789f1012cea2009f94c9f30e5f2'
+            '0dcc9a5ce20f080913f2bff71f5e2eb7d166e789f1012cea2009f94c9f30e5f2')
-            '36f8124ff7f2061afae313a5e96be0504086ecc4edf0c905512e96b93ee243d9')
 
 apply_patch_with_msg() {
   for _patch in "$@"
@@ -65,18 +63,15 @@ apply_patch_with_msg() {
 }
 
 prepare() {
-  mv OndselSolver-*/* ${_realname}-${pkgver}/src/3rdParty/OndselSolver/
+  mv OndselSolver-*/* FreeCAD-${pkgver}/src/3rdParty/OndselSolver/
 
-  cd ${_realname}-${pkgver}
+  cd FreeCAD-${pkgver}
 
   apply_patch_with_msg \
-    001-clang19-char-traits.patch \
+    001-clang19-char-traits.patch
-    002-fix-build-with-vtk-9.5.patch
 }
 
 build() {
-  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
-
   declare -a _extra_config
   if check_option "debug" "n"; then
     _extra_config+=("-DCMAKE_BUILD_TYPE=Release")
@@ -92,7 +87,7 @@ build() {
 
   CXXFLAGS+=" -Wno-deprecated-declarations -Wno-unknown-pragmas" \
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;" \
-    "${MINGW_PREFIX}"/bin/cmake.exe -Wno-dev \
+    cmake -Wno-dev \
       -GNinja \
       -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
       -DFREECAD_QT_VERSION="6" \
@@ -103,19 +98,17 @@ build() {
       -DINSTALL_TO_SITEPACKAGES=OFF \
       -DPython_EXECUTABLE=${MINGW_PREFIX}/bin/python \
       -DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python \
-      -DPYTHON_EXECUTABLE=${MINGW_PREFIX}/bin/python \
       "${_extra_config[@]}" \
-      ../${_realname}-${pkgver}
+      -S "FreeCAD-${pkgver}" \
+      -B "build-${MSYSTEM}"
 
-  "${MINGW_PREFIX}"/bin/cmake.exe --build .
+  cmake --build "build-${MSYSTEM}"
 }
 
 package() {
-  cd "${srcdir}/build-${MSYSTEM}"
+  DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install "build-${MSYSTEM}"
 
-  DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install .
+  install -Dm644 FreeCAD-${pkgver}/LICENSE \
-
-  install -Dm644 "${srcdir}"/${_realname}-${pkgver}/LICENSE \
     "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
 
   MSYS2_ARG_CONV_EXCL="-d" \