From 4e84a85f6b08a96bbfc31a6ac8d0de69eeab40cb Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Mon, 30 Sep 2024 21:27:52 -0400 Subject: [PATCH] freecad: rebuild for vtk-9.3.1. --- srcpkgs/freecad/patches/vtk.patch | 32 +++++++++++++++++++++++++++++++ srcpkgs/freecad/template | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/freecad/patches/vtk.patch diff --git a/srcpkgs/freecad/patches/vtk.patch b/srcpkgs/freecad/patches/vtk.patch new file mode 100644 index 00000000000..bcaf68d0855 --- /dev/null +++ b/srcpkgs/freecad/patches/vtk.patch @@ -0,0 +1,32 @@ +diff --git a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx +index 7f89573efd..47a52fe585 100644 +--- a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx ++++ b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx +@@ -39,10 +39,6 @@ + #define SMDS_EXPORT + #endif + +-#ifdef VTK_HAS_MTIME_TYPE + #define VTK_MTIME_TYPE vtkMTimeType +-#else +-#define VTK_MTIME_TYPE unsigned long +-#endif + + #endif +diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp +index 7e3de0070a..e9895d6157 100644 +--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp ++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp +@@ -1026,7 +1026,12 @@ void SMDS_UnstructuredGrid::BuildLinks() + GetLinks()->Allocate(this->GetNumberOfPoints()); + GetLinks()->Register(this); + //FIXME: vtk9 ++ #if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9,3,0) + GetLinks()->BuildLinks(this); ++ #else ++ GetLinks()->SetDataSet(this); ++ GetLinks()->BuildLinks(); ++ #endif + GetLinks()->Delete(); + #else + this->Links = SMDS_CellLinks::New(); diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index 2c0e8031511..3d5e31790bb 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -1,7 +1,7 @@ # Template file for 'freecad' pkgname=freecad version=0.21.2 -revision=1 +revision=2 build_wrksrc="FreeCAD-${version}" build_style=cmake pycompile_dirs="usr/lib/${pkgname}/Mod"