rpm/FreeCAD
SHA256
1
0
Fork 0
forked from pool/FreeCAD
Code Pull Requests Activity

Accepting request 995251 from home:StefanBruens:branches:science

Browse Source 
- Fix build with Netgen 6.2.2201 and later, add
  0001-Fix-build-with-NG-6.2.2201-include-BRepMesh_Incremen.patch

OBS-URL: https://build.opensuse.org/request/show/995251
OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=151
This commit is contained in:
Stefan Brüns 2022-08-16 00:30:56 +00:00 committed by Git OBS Bridge
parent c43d052fbd
commit 789ddfe9ae
3 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
0001-Fix-build-with-NG-6.2.2201-include-BRepMesh_Incremen.patch Normal file
View File

@ -0,0 +1,53 @@
From d334b435006d81b31fd6a78651d2dbb11f4167e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Tue, 16 Aug 2022 00:05:17 +0200
Subject: [PATCH] Fix build with NG 6.2.2201+, include
BRepMesh_IncrementalMesh.hxx
Netgen commit 16b88e8e67a0 "OCC Mesher Cleanup" removed many OCC includes
from occgeom.hpp, e.g. BRepMesh_IncrementalMesh.hxx.
The missing headers and class definitions cause a compilation failure.
---
.../salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp | 3 +++
.../src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp | 2 ++
2 files changed, 5 insertions(+)
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
index 4dd8ed274e..95e7e4c04e 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
@@ -50,7 +50,9 @@
#include <utilities.h>
+#include <BRepBndLib.hxx>
#include <BRepBuilderAPI_Copy.hxx>
+#include <BRepMesh_IncrementalMesh.hxx>
#include <BRep_Tool.hxx>
#include <Bnd_B3d.hxx>
#include <NCollection_Map.hxx>
@@ -66,6 +68,7 @@
#include <TopTools_DataMapOfShapeShape.hxx>
#include <TopTools_MapOfShape.hxx>
#include <TopoDS.hxx>
+#include <TopoDS_Solid.hxx>
#ifdef _MSC_VER
#pragma warning(disable : 4067)
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
index 2ebe4f87ac..72269e84db 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
@@ -39,6 +39,8 @@
#include <StdMeshers_MaxElementArea.hxx>
#include <StdMeshers_QuadranglePreference.hxx>
#include <StdMeshers_ViscousLayers2D.hxx>
+#include <TopExp.hxx>
+#include <TopExp_Explorer.hxx>
#include <Precision.hxx>
#include <Standard_ErrorHandler.hxx>
--
2.37.1

6
FreeCAD.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Aug 15 22:06:33 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Fix build with Netgen 6.2.2201 and later, add
0001-Fix-build-with-NG-6.2.2201-include-BRepMesh_Incremen.patch
-------------------------------------------------------------------
Tue Jun 14 17:12:11 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

2
FreeCAD.spec
View File

@ -38,6 +38,8 @@ Source0: https://github.com/FreeCAD/FreeCAD/archive/refs/tags/%{version}.
Patch0: 0001-Gui-Quarter-Add-missing-OpenGL-includes.patch
# PATCH-FIX-OPENSUSE
Patch1: 0001-Avoid-catching-SIGSEGV-defer-to-system-services.patch
# PATCH-FIX-UPSTREAM
Patch2: 0001-Fix-build-with-NG-6.2.2201-include-BRepMesh_Incremen.patch
# Test suite fails on 32bit and I don't want to debug that anymore
ExcludeArch: %ix86 %arm ppc s390 s390x