diff options
| author |   Bernd Waibel <waebbl-gentoo@posteo.net> | 2021-06-20 14:09:03 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2021-06-21 23:25:56 +0100 |
| commit | 7b5a3b73f36cafd3274ad495028bfae3c573d049 (patch) | |
| tree | 5499d692421ff86ec54c4235d46ab0293f70be5b /media-gfx/freecad/files | |
| parent | profiles: mask pcl USE flag on non-live freecad (diff) | |
| download | gentoo-7b5a3b73f36cafd3274ad495028bfae3c573d049.tar.gz gentoo-7b5a3b73f36cafd3274ad495028bfae3c573d049.tar.bz2 gentoo-7b5a3b73f36cafd3274ad495028bfae3c573d049.zip | |
media-gfx/freecad: update dependencies
support >=sci-libs/opencascade-7.5.2
support >=sci-libs/vtk-9
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-gfx/freecad/files')
2 files changed, 83 insertions, 0 deletions
diff --git a/media-gfx/freecad/files/freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch b/media-gfx/freecad/files/freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch new file mode 100644 index 000000000000..f9120e051919 --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch @@ -0,0 +1,53 @@ +From fc4ae2ff217c67eae39947ed6b655b8afaa83859 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Sun, 20 Jun 2021 15:38:45 +0200 +Subject: [PATCH] add boost::serialization to find_package + +Swaps SetupBoost() after SetupSalomeSMESH() has been called. +SetupSalomeSMESH() looks for vtk, which searches for boost::serialization +overriding the default libraries detected by SetupBoost(). + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + CMakeLists.txt | 4 +++- + cMake/FreeCAD_Helpers/SetupBoost.cmake | 2 +- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5b17736..c241ebe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -45,7 +45,6 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER) + SetupPython() + SetupPCL() + SetupPybind11() +- SetupBoost() + SetupXercesC() + find_package(ZLIB REQUIRED) + find_package(PyCXX REQUIRED) +@@ -57,6 +56,9 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER) + SetupOpenGL() + endif(BUILD_GUI) + SetupSalomeSMESH() ++ # needs to be called after SMESH which pulls in VTK, which only add boost::serialization ++ # overriding the values of SetupBoost() ++ SetupBoost() + if (BUILD_FEM_NETGEN) + find_package(NETGEN) + endif(BUILD_FEM_NETGEN) +diff --git a/cMake/FreeCAD_Helpers/SetupBoost.cmake b/cMake/FreeCAD_Helpers/SetupBoost.cmake +index 76c6d64..77c415b 100644 +--- a/cMake/FreeCAD_Helpers/SetupBoost.cmake ++++ b/cMake/FreeCAD_Helpers/SetupBoost.cmake +@@ -3,7 +3,7 @@ macro(SetupBoost) + + set(_boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS}) + +- set (BOOST_COMPONENTS filesystem program_options regex system thread) ++ set (BOOST_COMPONENTS filesystem program_options regex serialization system thread) + find_package(Boost ${BOOST_MIN_VERSION} + COMPONENTS ${BOOST_COMPONENTS} REQUIRED) + +-- +2.32.0 + diff --git a/media-gfx/freecad/files/freecad-0.19.2-0007-fix-build-failure-with-opencascade-7.5.2.patch b/media-gfx/freecad/files/freecad-0.19.2-0007-fix-build-failure-with-opencascade-7.5.2.patch new file mode 100644 index 000000000000..46c69326129a --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.19.2-0007-fix-build-failure-with-opencascade-7.5.2.patch @@ -0,0 +1,30 @@ +From bbbaf3e27d39767ba0b3de998b9d8d5fd42a681f Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Sun, 20 Jun 2021 16:24:04 +0200 +Subject: [PATCH] fix build failure with opencascade-7.5.2 + +For patch, see +https://forum.freecadweb.org/viewtopic.php?f=4&t=58090&sid=07aca55f0513162234c40bc4bd6e4044#p503286 + +Upstream issue at https://tracker.dev.opencascade.org/view.php?id=32328 + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + src/Mod/Part/App/ShapeUpgrade/UnifySameDomainPyImp.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Mod/Part/App/ShapeUpgrade/UnifySameDomainPyImp.cpp b/src/Mod/Part/App/ShapeUpgrade/UnifySameDomainPyImp.cpp +index a268fce..3def142 100644 +--- a/src/Mod/Part/App/ShapeUpgrade/UnifySameDomainPyImp.cpp ++++ b/src/Mod/Part/App/ShapeUpgrade/UnifySameDomainPyImp.cpp +@@ -27,6 +27,7 @@ + # include <Standard_Failure.hxx> + #endif + ++#include <TopoDS_Edge.hxx> + #include "ShapeUpgrade/UnifySameDomainPy.h" + #include "ShapeUpgrade/UnifySameDomainPy.cpp" + #include "TopoShapePy.h" +-- +2.32.0 + |