commit: 9161542718b9840ff37f5c27b22b7c3a8e3fd214 Author: Yehoshua Pesach Wallach <yehoshuapw <AT> gmail <DOT> com> AuthorDate: Sun Apr 7 15:51:09 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Tue May 7 12:52:13 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91615427
media-gfx/freecad: adds upstream patch for compiling with VTK-9.3 Closes: https://bugs.gentoo.org/928879 Signed-off-by: Yehoshua Pesach Wallach <yehoshuapw <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/36153 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> .../freecad/files/freecad-0.21.2-vtk9.3-fix.patch | 33 ++++++++++++++++++++++ media-gfx/freecad/freecad-0.21.2-r2.ebuild | 5 ++-- media-gfx/freecad/freecad-9999.ebuild | 4 +-- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch b/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch new file mode 100644 index 000000000000..b41e3618f55f --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch @@ -0,0 +1,33 @@ +# fix for compiling with VTK 9.3 +https://github.com/FreeCAD/FreeCAD/pull/11496/commits/68d380a64e033c40fcb9a6dc322d9e0178de52ee +Bug: https://forum.freecad.org/viewtopic.php?t=82814 +patch by adrianinsaval (commited in 68d380a64e033c40fcb9a6dc322d9e0178de52ee) + +--- 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 +--- 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/media-gfx/freecad/freecad-0.21.2-r2.ebuild b/media-gfx/freecad/freecad-0.21.2-r2.ebuild index 9d461dec5d65..b0f1d3fac470 100644 --- a/media-gfx/freecad/freecad-0.21.2-r2.ebuild +++ b/media-gfx/freecad/freecad-0.21.2-r2.ebuild @@ -73,8 +73,8 @@ RDEPEND=" net-misc/curl ) fem? ( - !qt6? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] ) - qt6? ( <sci-libs/vtk-9.3.0:=[-qt5,qt6,rendering] ) + !qt6? ( sci-libs/vtk:=[qt5,rendering] ) + qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) ) gui? ( >=media-libs/coin-4.0.0 @@ -164,6 +164,7 @@ REQUIRED_USE=" PATCHES=( "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch "${FILESDIR}"/${PN}-0.21.1-Gentoo-specific-don-t-check-vcs.patch + "${FILESDIR}"/${PN}-0.21.2-vtk9.3-fix.patch ) DOCS=( CODE_OF_CONDUCT.md README.md ) diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 76f8dae4592e..ad9a9580164b 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -74,8 +74,8 @@ RDEPEND=" net-misc/curl ) fem? ( - !qt6? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] ) - qt6? ( <sci-libs/vtk-9.3.0:=[-qt5,qt6,rendering] ) + !qt6? ( sci-libs/vtk:=[qt5,rendering] ) + qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) ) gui? ( >=media-libs/coin-4.0.0
