diff options
| author | Vincent Legoll <vincent.legoll@gmail.com> | 2024-11-25 23:00:14 +0100 |
|---|---|---|
| committer | Guillaume Le Vaillant <glv@posteo.net> | 2024-11-26 15:21:44 +0100 |
| commit | f8979b4bcc8772d02640f6f665b4195380d57df9 (patch) | |
| tree | b05d6918a0828587609fb8287547ff25c80b43aa /gnu/packages/patches/freecad-vtk-9.3.patch | |
| parent | e11ab2a6e9628af6c37d4ae5e0faabde79bcea34 (diff) | |
| download | guix-f8979b4bcc8772d02640f6f665b4195380d57df9.tar.gz guix-f8979b4bcc8772d02640f6f665b4195380d57df9.zip | |
gnu: freecad: Update to 1.0.0.
* gnu/packages/patches/freecad-vtk-9.3.patch: Has been upstreamed, remove.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/engineering (freecad)[source]: Update to 1.0.0,
remove patches, add snippet to unbundle some 3rdparty code.
[native-inputs]: Add c++-gsl.
[inputs]: Add onsdel-solver, yaml-cpp.
[configure-flags]: Add some flags.
Change-Id: I3005a3b5cccc8aae4129a49e123fd5ab8293b3f2
Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
Diffstat (limited to 'gnu/packages/patches/freecad-vtk-9.3.patch')
| -rw-r--r-- | gnu/packages/patches/freecad-vtk-9.3.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/gnu/packages/patches/freecad-vtk-9.3.patch b/gnu/packages/patches/freecad-vtk-9.3.patch deleted file mode 100644 index af9d654046..0000000000 --- a/gnu/packages/patches/freecad-vtk-9.3.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d0fb2b8b29fe0428d9dd8aa790b0d6e45c8a9516 Mon Sep 17 00:00:00 2001 -From: Adrian Insaurralde Avalos <adrianinsaval@gmail.com> -Date: Wed, 22 Nov 2023 16:42:06 -0300 -Subject: [PATCH] 3rdPart/salomesmesh - fix for vtk 9.3 compatibility - -minimum required version is 7.1 ---- - src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx | 4 ---- - src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp | 5 +++++ - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx -index 7f89573efd0d..47a52fe585fe 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 7e3de0070a02..e9895d615717 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();
\ No newline at end of file |