backports/freecad: disable due to missing py3-pyside2 depend #483
6 changed files with 1012 additions and 7 deletions
|
@ -1,12 +1,13 @@
|
||||||
# Contributor: Aiden Grossman <agrossman154@yahoo.com>
|
# Contributor: Aiden Grossman <agrossman154@yahoo.com>
|
||||||
# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
|
# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
|
||||||
pkgname=freecad
|
pkgname=freecad
|
||||||
pkgver=0.21.0
|
pkgver=0.20.2
|
||||||
pkgrel=0
|
pkgrel=5
|
||||||
pkgdesc="Free and open source 3D parametric modeler"
|
pkgdesc="Free and open source 3D parametric modeler"
|
||||||
url="https://freecadweb.org/"
|
url="https://freecadweb.org/"
|
||||||
license="LGPL-2.0-or-later"
|
license="LGPL-2.0-or-later"
|
||||||
arch="x86_64" # dependency OpenCascade is only x86_64
|
arch="" # removed dependency py3-pyside2
|
||||||
|
#arch="x86_64" # dependency OpenCascade is only x86_64
|
||||||
depends="
|
depends="
|
||||||
graphviz
|
graphviz
|
||||||
hdf5
|
hdf5
|
||||||
|
@ -44,11 +45,16 @@ makedepends="
|
||||||
vtk-dev
|
vtk-dev
|
||||||
xerces-c-dev
|
xerces-c-dev
|
||||||
"
|
"
|
||||||
options="!check" # Failing test units upstream as well
|
|
||||||
checkdepends="xvfb-run mesa mesa-dri-gallium font-opensans"
|
checkdepends="xvfb-run mesa mesa-dri-gallium font-opensans"
|
||||||
source="https://github.com/FreeCAD/FreeCAD/archive/$pkgver/freecad-$pkgver.tar.gz
|
source="https://github.com/FreeCAD/FreeCAD/archive/$pkgver/freecad-$pkgver.tar.gz
|
||||||
$pkgname-cstdint.patch::https://github.com/FreeCAD/FreeCAD/commit/f8f02f089537497a1bf46bc1057f01659b6636c1.patch
|
$pkgname-python3.11-1.patch::https://github.com/FreeCAD/FreeCAD/commit/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
|
||||||
|
numpy-1.20.patch
|
||||||
no-execinfo.patch
|
no-execinfo.patch
|
||||||
|
no-workaround-spnav.patch
|
||||||
|
resourceDirectory.patch
|
||||||
|
tests.patch
|
||||||
|
opencascade-7.8.0.patch
|
||||||
|
missing-include-cstdint.patch
|
||||||
"
|
"
|
||||||
builddir="$srcdir/FreeCAD-$pkgver"
|
builddir="$srcdir/FreeCAD-$pkgver"
|
||||||
|
|
||||||
|
@ -90,7 +96,13 @@ package() {
|
||||||
}
|
}
|
||||||
|
|
||||||
sha512sums="
|
sha512sums="
|
||||||
f5b4428217d9abd18aed1dcd8a5c77132b90173d07627ff9164919a87f04d242f9d616e9655751ec06ff57fc3e242090cc4d7e1d7045fdae9bc2e281e7855281 freecad-0.21.0.tar.gz
|
c3acd77dd2bb9a2a23ac354da3b6102effb89c95d675e91421d65486414dfe8cc0188a7212245e0deb63f17b9c5df76133017be09e4cd14b833be8cbec52a08d freecad-0.20.2.tar.gz
|
||||||
27dffdbb124096e7fcbec3589cdcfc587ea09bf039c1c1108edb68a9a4fd1278f66a39642636f98b8759a44da92485fd748f8b3d615b0625bc37fc717130e237 freecad-cstdint.patch
|
75a237f7ed7a89a98c0e5bdb3d3f0788749602daf718089aa0814e05f93ced1e15ad5867c7c87f170b48c5984f9ace1bbc95c4f386ce72bfb8d616323b47f1e5 freecad-python3.11-1.patch
|
||||||
|
80b08b031810fce7b6d698c662f64fa4f8a904f283f46b478b1d718529164c0ee61ce190f633abf04e03212720480f3f0603b0c1e160af79d7b6bb82da3bd0e4 numpy-1.20.patch
|
||||||
73aaba7015dce7048eb7d2456131b5b5ba4673cc980503331987be54d99daed5f61db015ca33d7d2ef0f02bd3192da8ce122c103c3b93f9959927deb4f0b933e no-execinfo.patch
|
73aaba7015dce7048eb7d2456131b5b5ba4673cc980503331987be54d99daed5f61db015ca33d7d2ef0f02bd3192da8ce122c103c3b93f9959927deb4f0b933e no-execinfo.patch
|
||||||
|
15696bdaaf77482f1b5d3806535a8004c8cec7d598d62092d9f0394b4ca9e2ad6cedd77c4b86a83a06324d16678c1c6bbf3a390b807729717a2f513e858afd50 no-workaround-spnav.patch
|
||||||
|
8ba13b17bad66316757d180c1b9e9e72a24382627eac7c43a2264b3b5101e6e8f701775f2b805ed733f500fbcd8b0e8e422ec58a9ab3d948d613b666157d4c52 resourceDirectory.patch
|
||||||
|
5db19e0aa2ca1fd21f4c56afc9db54390a799262aaa0a741704c2c304b0068fd6ca1dcc086465e12e9c0cfe06aac750aaf9b8f5f4db324539af4dd3394803ff9 tests.patch
|
||||||
|
f933680dea8744e147f38abce389cb7fd0ec3fb3566454fdd5e6ea07b2faaac5fe61aabe1df3bda9f0d7b4fca16055aa2ad700e9cce10d2604ae37b761b68ade opencascade-7.8.0.patch
|
||||||
|
fec515cc63830f0e715527c7890173705b24e7d99d225821ec4300104cf3affdee49243bbd4d0a331a902cf04db756a1b8f18f0a17cc71f5757f8b5c73c78ede missing-include-cstdint.patch
|
||||||
"
|
"
|
||||||
|
|
11
backports/freecad/missing-include-cstdint.patch
Normal file
11
backports/freecad/missing-include-cstdint.patch
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
diff --color -rupN a/src/3rdParty/libE57Format/include/E57Format.h b/src/3rdParty/libE57Format/include/E57Format.h
|
||||||
|
--- a/src/3rdParty/libE57Format/include/E57Format.h 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/3rdParty/libE57Format/include/E57Format.h 2024-02-27 14:06:29.308892531 +0100
|
||||||
|
@@ -32,6 +32,7 @@
|
||||||
|
//! @file E57Format.h header file for the E57 API
|
||||||
|
|
||||||
|
#include <cfloat>
|
||||||
|
+#include <cstdint>
|
||||||
|
#include <memory>
|
||||||
|
#include <vector>
|
||||||
|
|
69
backports/freecad/no-workaround-spnav.patch
Normal file
69
backports/freecad/no-workaround-spnav.patch
Normal file
|
@ -0,0 +1,69 @@
|
||||||
|
Patch-Source: https://github.com/FreeCAD/FreeCAD/commit/7b377a216b9185960e4cee980a6504dc1a755f50
|
||||||
|
fixes stderr reassignment
|
||||||
|
--
|
||||||
|
From 7b377a216b9185960e4cee980a6504dc1a755f50 Mon Sep 17 00:00:00 2001
|
||||||
|
From: wmayer <wmayer@users.sourceforge.net>
|
||||||
|
Date: Wed, 29 Jun 2022 15:19:18 +0200
|
||||||
|
Subject: [PATCH] Gui: remove workaround for spnav 0.23 due to build failure
|
||||||
|
with musl libc
|
||||||
|
|
||||||
|
---
|
||||||
|
src/Gui/3Dconnexion/GuiNativeEventLinux.cpp | 27 ---------------------
|
||||||
|
1 file changed, 27 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
|
||||||
|
index 7f0ddd75d262..455ece0b36bd 100644
|
||||||
|
--- a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
|
||||||
|
+++ b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
|
||||||
|
@@ -21,42 +21,17 @@
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
#include <FCConfig.h>
|
||||||
|
-#include <cstdio>
|
||||||
|
|
||||||
|
#include "GuiNativeEventLinux.h"
|
||||||
|
|
||||||
|
#include "GuiApplicationNativeEventAware.h"
|
||||||
|
#include <Base/Console.h>
|
||||||
|
-#include <Base/FileInfo.h>
|
||||||
|
#include <QMainWindow>
|
||||||
|
|
||||||
|
#include <QSocketNotifier>
|
||||||
|
|
||||||
|
#include <spnav.h>
|
||||||
|
|
||||||
|
-namespace {
|
||||||
|
-class RedirectStdErr
|
||||||
|
-{
|
||||||
|
-public:
|
||||||
|
- RedirectStdErr()
|
||||||
|
- : fi(Base::FileInfo::getTempFileName())
|
||||||
|
- , file(stderr)
|
||||||
|
- {
|
||||||
|
- stderr = fopen(fi.filePath().c_str(), "w");
|
||||||
|
- }
|
||||||
|
- ~RedirectStdErr()
|
||||||
|
- {
|
||||||
|
- fclose(stderr);
|
||||||
|
- fi.deleteFile();
|
||||||
|
- stderr = file;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
-private:
|
||||||
|
- Base::FileInfo fi;
|
||||||
|
- FILE* file;
|
||||||
|
-};
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
Gui::GuiNativeEvent::GuiNativeEvent(Gui::GUIApplicationNativeEventAware *app)
|
||||||
|
: GuiAbstractNativeEvent(app)
|
||||||
|
{
|
||||||
|
@@ -72,8 +47,6 @@ Gui::GuiNativeEvent::~GuiNativeEvent()
|
||||||
|
|
||||||
|
void Gui::GuiNativeEvent::initSpaceball(QMainWindow *window)
|
||||||
|
{
|
||||||
|
- // tmp. redirect stderr to a file to suppress an error message from spnav_open()
|
||||||
|
- RedirectStdErr err;
|
||||||
|
Q_UNUSED(window)
|
||||||
|
if (spnav_open() == -1) {
|
||||||
|
Base::Console().Log("Couldn't connect to spacenav daemon. Please ignore if you don't have a spacemouse.\n");
|
25
backports/freecad/numpy-1.20.patch
Normal file
25
backports/freecad/numpy-1.20.patch
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
Patch-Source: https://github.com/FreeCAD/FreeCAD/commit/8b0df1dc936b544091f6a2d68df1c1a14ae3de5b
|
||||||
|
--
|
||||||
|
From 8b0df1dc936b544091f6a2d68df1c1a14ae3de5b Mon Sep 17 00:00:00 2001
|
||||||
|
From: lorenz <looooo@users.noreply.github.com>
|
||||||
|
Date: Tue, 27 Dec 2022 04:59:35 +0100
|
||||||
|
Subject: [PATCH] FEM: femmesh: fix AttributeError: module 'numpy' has no
|
||||||
|
attribute 'int'
|
||||||
|
|
||||||
|
---
|
||||||
|
src/Mod/Fem/femmesh/meshtools.py | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/Mod/Fem/femmesh/meshtools.py b/src/Mod/Fem/femmesh/meshtools.py
|
||||||
|
index dd8671b..d2e2b0a 100644
|
||||||
|
--- a/src/Mod/Fem/femmesh/meshtools.py
|
||||||
|
+++ b/src/Mod/Fem/femmesh/meshtools.py
|
||||||
|
@@ -485,7 +485,7 @@ def get_femelement_sets(
|
||||||
|
# fem_objects = FreeCAD FEM document objects
|
||||||
|
# get femelements for reference shapes of each obj.References
|
||||||
|
count_femelements = 0
|
||||||
|
- referenced_femelements = np.zeros((max(femelement_table.keys())+1,),dtype=np.int)
|
||||||
|
+ referenced_femelements = np.zeros((max(femelement_table.keys())+1,),dtype=int)
|
||||||
|
has_remaining_femelements = None
|
||||||
|
for fem_object_i, fem_object in enumerate(fem_objects):
|
||||||
|
obj = fem_object["Object"]
|
877
backports/freecad/opencascade-7.8.0.patch
Normal file
877
backports/freecad/opencascade-7.8.0.patch
Normal file
|
@ -0,0 +1,877 @@
|
||||||
|
Fix compilation with opencascase 7.8.0
|
||||||
|
|
||||||
|
Base on https://github.com/FreeCAD/FreeCAD/pull/11909
|
||||||
|
|
||||||
|
diff --color -rupN a/cMake/FindOCC.cmake b/cMake/FindOCC.cmake
|
||||||
|
--- a/cMake/FindOCC.cmake 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/cMake/FindOCC.cmake 2024-02-27 15:00:48.248873883 +0100
|
||||||
|
@@ -127,8 +127,6 @@ if(OCC_FOUND)
|
||||||
|
TKG2d
|
||||||
|
TKG3d
|
||||||
|
TKMath
|
||||||
|
- TKIGES
|
||||||
|
- TKSTL
|
||||||
|
TKShHealing
|
||||||
|
TKXSBase
|
||||||
|
TKBool
|
||||||
|
@@ -139,10 +137,6 @@ if(OCC_FOUND)
|
||||||
|
TKGeomBase
|
||||||
|
TKOffset
|
||||||
|
TKPrim
|
||||||
|
- TKSTEPBase
|
||||||
|
- TKSTEPAttr
|
||||||
|
- TKSTEP209
|
||||||
|
- TKSTEP
|
||||||
|
TKHLR
|
||||||
|
TKFeat
|
||||||
|
)
|
||||||
|
@@ -154,17 +148,19 @@ if(OCC_FOUND)
|
||||||
|
TKLCAF
|
||||||
|
TKVCAF
|
||||||
|
TKCDF
|
||||||
|
- TKXDESTEP
|
||||||
|
- TKXDEIGES
|
||||||
|
TKMeshVS
|
||||||
|
TKService
|
||||||
|
TKV3d
|
||||||
|
)
|
||||||
|
- if(OCC_VERSION_STRING VERSION_LESS 6.7.3)
|
||||||
|
- list(APPEND OCC_OCAF_LIBRARIES TKAdvTools)
|
||||||
|
- elseif(NOT OCC_VERSION_STRING VERSION_LESS 7.5.0)
|
||||||
|
+ if(NOT OCC_VERSION_STRING VERSION_LESS 7.5.0)
|
||||||
|
list(APPEND OCC_OCAF_LIBRARIES TKRWMesh)
|
||||||
|
- endif(OCC_VERSION_STRING VERSION_LESS 6.7.3)
|
||||||
|
+ endif(NOT OCC_VERSION_STRING VERSION_LESS 7.5.0)
|
||||||
|
+ if(OCC_VERSION_STRING VERSION_LESS 7.8.0)
|
||||||
|
+ list(APPEND OCC_LIBRARIES TKIGES TKSTL TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP)
|
||||||
|
+ list(APPEND OCC_OCAF_LIBRARIES TKXDESTEP TKXDEIGES)
|
||||||
|
+ else(OCC_VERSION_STRING VERSION_LESS 7.8.0)
|
||||||
|
+ list(APPEND OCC_LIBRARIES TKDESTEP TKDEIGES TKDEGLTF TKDESTL)
|
||||||
|
+ endif(OCC_VERSION_STRING VERSION_LESS 7.8.0)
|
||||||
|
message(STATUS "-- Found OCE/OpenCASCADE version: ${OCC_VERSION_STRING}")
|
||||||
|
message(STATUS "-- OCE/OpenCASCADE include directory: ${OCC_INCLUDE_DIR}")
|
||||||
|
message(STATUS "-- OCE/OpenCASCADE shared libraries directory: ${OCC_LIBRARY_DIR}")
|
||||||
|
diff --color -rupN a/src/3rdParty/salomesmesh/inc/SMESHDS_DataMapOfShape.hxx b/src/3rdParty/salomesmesh/inc/SMESHDS_DataMapOfShape.hxx
|
||||||
|
--- a/src/3rdParty/salomesmesh/inc/SMESHDS_DataMapOfShape.hxx 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/3rdParty/salomesmesh/inc/SMESHDS_DataMapOfShape.hxx 2024-02-27 15:00:48.248873883 +0100
|
||||||
|
@@ -29,22 +29,35 @@
|
||||||
|
|
||||||
|
#include <TopoDS_Shape.hxx>
|
||||||
|
|
||||||
|
+#include <Standard_Version.hxx>
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* This method needed for instance NCollection_DataMap with TopoDS_Shape as key
|
||||||
|
*/
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
struct SMESHDS_Hasher
|
||||||
|
{
|
||||||
|
- static inline Standard_Boolean IsEqual(const TopoDS_Shape& S1,
|
||||||
|
- const TopoDS_Shape& S2)
|
||||||
|
- {
|
||||||
|
- return S1.IsSame(S2);
|
||||||
|
+ size_t operator()(const TopoDS_Shape& S) const noexcept {
|
||||||
|
+ return std::hash<TopoDS_Shape>{}(S);
|
||||||
|
}
|
||||||
|
- static inline Standard_Integer HashCode(const TopoDS_Shape& S,
|
||||||
|
- const Standard_Integer Upper)
|
||||||
|
- {
|
||||||
|
- return ::HashCode( S, Upper);
|
||||||
|
+ size_t operator()(const TopoDS_Shape& S1, const TopoDS_Shape& S2) const noexcept {
|
||||||
|
+ return S1.IsSame(S2);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
-
|
||||||
|
+#else
|
||||||
|
+struct SMESHDS_Hasher
|
||||||
|
+{
|
||||||
|
+static inline Standard_Boolean IsEqual(const TopoDS_Shape& S1,
|
||||||
|
+ const TopoDS_Shape& S2)
|
||||||
|
+{
|
||||||
|
+ return S1.IsSame(S2);
|
||||||
|
+}
|
||||||
|
+static inline Standard_Integer HashCode(const TopoDS_Shape& S,
|
||||||
|
+ const Standard_Integer Upper)
|
||||||
|
+{
|
||||||
|
+ return ::HashCode( S, Upper);
|
||||||
|
+}
|
||||||
|
+};
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
diff --color -rupN a/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx b/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx
|
||||||
|
--- a/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx 2024-02-27 15:00:48.248873883 +0100
|
||||||
|
@@ -57,9 +57,6 @@
|
||||||
|
#ifndef _MeshVS_EntityType_HeaderFile
|
||||||
|
#include <MeshVS_EntityType.hxx>
|
||||||
|
#endif
|
||||||
|
-#ifndef _Standard_Address_HeaderFile
|
||||||
|
-#include <Standard_Address.hxx>
|
||||||
|
-#endif
|
||||||
|
#ifndef _TColStd_HArray1OfInteger_HeaderFile
|
||||||
|
#include <TColStd_HArray1OfInteger.hxx>
|
||||||
|
#endif
|
||||||
|
diff --color -rupN a/src/3rdParty/salomesmesh/inc/SMESH_SMESH.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SMESH.hxx
|
||||||
|
--- a/src/3rdParty/salomesmesh/inc/SMESH_SMESH.hxx 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/3rdParty/salomesmesh/inc/SMESH_SMESH.hxx 2024-02-27 15:00:48.248873883 +0100
|
||||||
|
@@ -37,4 +37,5 @@
|
||||||
|
#define SMESH_EXPORT
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#include <Standard_Version.hxx>
|
||||||
|
#endif
|
||||||
|
diff --color -rupN a/src/3rdParty/salomesmesh/inc/SMESH_SequenceOfNode.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SequenceOfNode.hxx
|
||||||
|
--- a/src/3rdParty/salomesmesh/inc/SMESH_SequenceOfNode.hxx 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/3rdParty/salomesmesh/inc/SMESH_SequenceOfNode.hxx 2024-02-27 15:00:48.252207183 +0100
|
||||||
|
@@ -28,10 +28,11 @@
|
||||||
|
|
||||||
|
#include "SMESH_SMESH.hxx"
|
||||||
|
|
||||||
|
-#include <NCollection_DefineSequence.hxx>
|
||||||
|
#if OCC_VERSION_HEX >= 0x060703
|
||||||
|
#include <NCollection_IncAllocator.hxx>
|
||||||
|
#include <NCollection_Sequence.hxx>
|
||||||
|
+#else
|
||||||
|
+#include <NCollection_DefineSequence.hxx>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef const SMDS_MeshNode* SMDS_MeshNodePtr;
|
||||||
|
diff --color -rupN a/src/3rdParty/salomesmesh/inc/SMESH_TypeDefs.hxx b/src/3rdParty/salomesmesh/inc/SMESH_TypeDefs.hxx
|
||||||
|
--- a/src/3rdParty/salomesmesh/inc/SMESH_TypeDefs.hxx 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/3rdParty/salomesmesh/inc/SMESH_TypeDefs.hxx 2024-02-27 15:00:48.252207183 +0100
|
||||||
|
@@ -185,11 +185,18 @@ typedef std::vector< UVPtStruct > UVPtSt
|
||||||
|
|
||||||
|
// --------------------------------------------------------------------------------
|
||||||
|
// class SMESH_SequenceOfElemPtr
|
||||||
|
+#include <Standard_Version.hxx>
|
||||||
|
+#if OCC_VERSION_HEX >= 0x060703
|
||||||
|
+#include <NCollection_Sequence.hxx>
|
||||||
|
+#else
|
||||||
|
#include <NCollection_DefineSequence.hxx>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
class SMDS_MeshElement;
|
||||||
|
|
||||||
|
typedef const SMDS_MeshElement* SMDS_MeshElementPtr;
|
||||||
|
+#define DEFINE_SEQUENCE(_ClassName_, _BaseCollection_, TheItemType) \
|
||||||
|
+typedef NCollection_Sequence<TheItemType > _ClassName_;
|
||||||
|
|
||||||
|
DEFINE_SEQUENCE (SMESH_SequenceOfElemPtr, SMESH_BaseCollectionElemPtr, SMDS_MeshElementPtr)
|
||||||
|
|
||||||
|
diff --color -rupN a/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp b/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp
|
||||||
|
--- a/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp 2024-02-27 15:00:48.252207183 +0100
|
||||||
|
@@ -33,10 +33,33 @@
|
||||||
|
#include "SMDS_MeshNode.hxx"
|
||||||
|
#include "SMESH_File.hxx"
|
||||||
|
|
||||||
|
+#include <Standard_Version.hxx>
|
||||||
|
+
|
||||||
|
namespace
|
||||||
|
{
|
||||||
|
struct Hasher
|
||||||
|
{
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ size_t operator()(const gp_Pnt& point) const noexcept
|
||||||
|
+ {
|
||||||
|
+ union
|
||||||
|
+ {
|
||||||
|
+ Standard_Real R[3];
|
||||||
|
+ Standard_Integer I[6];
|
||||||
|
+ } U;
|
||||||
|
+
|
||||||
|
+ point.Coord( U.R[0], U.R[1], U.R[2] );
|
||||||
|
+ return std::hash<Standard_Integer>{}(U.I[0]/23+U.I[1]/19+U.I[2]/17+U.I[3]/13+U.I[4]/11+U.I[5]/7);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ size_t operator()(const gp_Pnt& point1, const gp_Pnt& point2) const noexcept
|
||||||
|
+ {
|
||||||
|
+ static Standard_Real tab1[3], tab2[3];
|
||||||
|
+ point1.Coord(tab1[0],tab1[1],tab1[2]);
|
||||||
|
+ point2.Coord(tab2[0],tab2[1],tab2[2]);
|
||||||
|
+ return (memcmp(tab1,tab2,sizeof(tab1)) == 0);
|
||||||
|
+ }
|
||||||
|
+#else
|
||||||
|
//=======================================================================
|
||||||
|
//function : HashCode
|
||||||
|
//purpose :
|
||||||
|
@@ -51,9 +74,9 @@ namespace
|
||||||
|
} U;
|
||||||
|
|
||||||
|
point.Coord( U.R[0], U.R[1], U.R[2] );
|
||||||
|
-
|
||||||
|
- return ::HashCode(U.I[0]/23+U.I[1]/19+U.I[2]/17+U.I[3]/13+U.I[4]/11+U.I[5]/7,Upper);
|
||||||
|
+ return std::hash<Standard_Integer>{}(U.I[0]/23+U.I[1]/19+U.I[2]/17+U.I[3]/13+U.I[4]/11+U.I[5]/7);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
//=======================================================================
|
||||||
|
//function : IsEqual
|
||||||
|
//purpose :
|
||||||
|
@@ -66,7 +89,9 @@ namespace
|
||||||
|
point2.Coord(tab2[0],tab2[1],tab2[2]);
|
||||||
|
return (memcmp(tab1,tab2,sizeof(tab1)) == 0);
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
};
|
||||||
|
+
|
||||||
|
typedef NCollection_DataMap<gp_Pnt,SMDS_MeshNode*,Hasher> TDataMapOfPntNodePtr;
|
||||||
|
|
||||||
|
const int HEADER_SIZE = 84;
|
||||||
|
diff --color -rupN a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp
|
||||||
|
--- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp 2024-02-27 15:00:48.252207183 +0100
|
||||||
|
@@ -48,7 +48,6 @@
|
||||||
|
#include <Bnd_Box.hxx>
|
||||||
|
#include <GeomAPI_ProjectPointOnSurf.hxx>
|
||||||
|
#include <Geom_Surface.hxx>
|
||||||
|
-#include <NCollection_DefineArray2.hxx>
|
||||||
|
#include <Precision.hxx>
|
||||||
|
#include <Standard_Real.hxx>
|
||||||
|
#include <TColStd_SequenceOfInteger.hxx>
|
||||||
|
diff --color -rupN a/src/Mod/Drawing/App/PreCompiled.h b/src/Mod/Drawing/App/PreCompiled.h
|
||||||
|
--- a/src/Mod/Drawing/App/PreCompiled.h 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Drawing/App/PreCompiled.h 2024-02-27 15:00:48.252207183 +0100
|
||||||
|
@@ -70,7 +70,6 @@
|
||||||
|
#include <Standard_LicenseError.hxx>
|
||||||
|
#include <Standard_LicenseNotFound.hxx>
|
||||||
|
#include <Standard_Macro.hxx>
|
||||||
|
-#include <Standard_math.hxx>
|
||||||
|
#include <Standard_MultiplyDefined.hxx>
|
||||||
|
#include <Standard_NegativeValue.hxx>
|
||||||
|
#include <Standard_NoMoreObject.hxx>
|
||||||
|
diff --color -rupN a/src/Mod/Drawing/Gui/TaskDialog.cpp b/src/Mod/Drawing/Gui/TaskDialog.cpp
|
||||||
|
--- a/src/Mod/Drawing/Gui/TaskDialog.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Drawing/Gui/TaskDialog.cpp 2024-02-27 15:00:48.252207183 +0100
|
||||||
|
@@ -29,7 +29,6 @@
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
-#include <Standard_math.hxx>
|
||||||
|
#include "TaskDialog.h"
|
||||||
|
#include <Gui/Application.h>
|
||||||
|
#include <Gui/Command.h>
|
||||||
|
diff --color -rupN a/src/Mod/Fem/Gui/PreCompiled.h b/src/Mod/Fem/Gui/PreCompiled.h
|
||||||
|
--- a/src/Mod/Fem/Gui/PreCompiled.h 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Fem/Gui/PreCompiled.h 2024-02-27 15:00:48.252207183 +0100
|
||||||
|
@@ -63,7 +63,6 @@
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// OCC
|
||||||
|
-#include <Standard_math.hxx>
|
||||||
|
#include <Precision.hxx>
|
||||||
|
#include <TopoDS.hxx>
|
||||||
|
#include <BRepAdaptor_Surface.hxx>
|
||||||
|
diff --color -rupN a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
|
||||||
|
--- a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp 2024-02-27 15:00:48.252207183 +0100
|
||||||
|
@@ -28,7 +28,6 @@
|
||||||
|
|
||||||
|
# include <SMESH_Mesh.hxx>
|
||||||
|
# include <SMESHDS_Mesh.hxx>
|
||||||
|
-# include <Standard_math.hxx>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <Base/Console.h>
|
||||||
|
diff --color -rupN a/src/Mod/Import/App/ImportOCAF.cpp b/src/Mod/Import/App/ImportOCAF.cpp
|
||||||
|
--- a/src/Mod/Import/App/ImportOCAF.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Import/App/ImportOCAF.cpp 2024-02-27 15:00:48.252207183 +0100
|
||||||
|
@@ -165,7 +165,11 @@ void ImportOCAF::loadShapes(const TDF_La
|
||||||
|
std::vector<App::DocumentObject *> localValue;
|
||||||
|
|
||||||
|
if (aShapeTool->GetShape(label,aShape)) {
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ hash = std::hash<TopoDS_Shape>{}(aShape);
|
||||||
|
+#else
|
||||||
|
hash = aShape.HashCode(HashUpper);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
Handle(TDataStd_Name) name;
|
||||||
|
@@ -235,7 +239,11 @@ void ImportOCAF::loadShapes(const TDF_La
|
||||||
|
if (isRef || myRefShapes.find(hash) == myRefShapes.end()) {
|
||||||
|
TopoDS_Shape aShape;
|
||||||
|
if (isRef && aShapeTool->GetShape(label, aShape))
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ myRefShapes.insert(std::hash<TopoDS_Shape>{}(aShape));
|
||||||
|
+#else
|
||||||
|
myRefShapes.insert(aShape.HashCode(HashUpper));
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
if (aShapeTool->IsSimpleShape(label) && (isRef || aShapeTool->IsFree(label))) {
|
||||||
|
if (!asm_name.empty())
|
||||||
|
@@ -565,7 +573,11 @@ void ImportXCAF::createShape(const TopoD
|
||||||
|
part->Label.setValue(default_name);
|
||||||
|
part->Shape.setValue(shape);
|
||||||
|
std::map<Standard_Integer, Quantity_ColorRGBA>::const_iterator jt;
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ jt = myColorMap.find(std::hash<TopoDS_Shape>{}(shape));
|
||||||
|
+#else
|
||||||
|
jt = myColorMap.find(shape.HashCode(INT_MAX));
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
App::Color partColor(0.8f,0.8f,0.8f);
|
||||||
|
#if 0//TODO
|
||||||
|
@@ -586,7 +598,11 @@ void ImportXCAF::createShape(const TopoD
|
||||||
|
// set label name if defined
|
||||||
|
if (setname && !myNameMap.empty()) {
|
||||||
|
std::map<Standard_Integer, std::string>::const_iterator jt;
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ jt = myNameMap.find(std::hash<TopoDS_Shape>{}(shape));
|
||||||
|
+#else
|
||||||
|
jt = myNameMap.find(shape.HashCode(INT_MAX));
|
||||||
|
+#endif
|
||||||
|
if (jt != myNameMap.end()) {
|
||||||
|
part->Label.setValue(jt->second);
|
||||||
|
}
|
||||||
|
@@ -606,7 +622,11 @@ void ImportXCAF::createShape(const TopoD
|
||||||
|
faceColors.resize(faces.Extent(), partColor);
|
||||||
|
xp.Init(shape,TopAbs_FACE);
|
||||||
|
while (xp.More()) {
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ jt = myColorMap.find(std::hash<TopoDS_Shape>{}(xp.Current()));
|
||||||
|
+#else
|
||||||
|
jt = myColorMap.find(xp.Current().HashCode(INT_MAX));
|
||||||
|
+#endif
|
||||||
|
if (jt != myColorMap.end()) {
|
||||||
|
int index = faces.FindIndex(xp.Current());
|
||||||
|
faceColors[index-1] = convertColor(jt->second);
|
||||||
|
@@ -641,23 +661,51 @@ void ImportXCAF::loadShapes(const TDF_La
|
||||||
|
// add the shapes
|
||||||
|
TopExp_Explorer xp;
|
||||||
|
for (xp.Init(aShape, TopAbs_SOLID); xp.More(); xp.Next(), ctSolids++)
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ this->mySolids[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
|
||||||
|
+#else
|
||||||
|
this->mySolids[xp.Current().HashCode(INT_MAX)] = (xp.Current());
|
||||||
|
+#endif
|
||||||
|
for (xp.Init(aShape, TopAbs_SHELL, TopAbs_SOLID); xp.More(); xp.Next(), ctShells++)
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ this->myShells[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
|
||||||
|
+#else
|
||||||
|
this->myShells[xp.Current().HashCode(INT_MAX)] = (xp.Current());
|
||||||
|
+#endif
|
||||||
|
// if no solids and no shells were found then go for compounds
|
||||||
|
if (ctSolids == 0 && ctShells == 0) {
|
||||||
|
for (xp.Init(aShape, TopAbs_COMPOUND); xp.More(); xp.Next(), ctComps++)
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ this->myCompds[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
|
||||||
|
+#else
|
||||||
|
this->myCompds[xp.Current().HashCode(INT_MAX)] = (xp.Current());
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
if (ctComps == 0) {
|
||||||
|
for (xp.Init(aShape, TopAbs_FACE, TopAbs_SHELL); xp.More(); xp.Next())
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ this->myShapes[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
|
||||||
|
+#else
|
||||||
|
this->myShapes[xp.Current().HashCode(INT_MAX)] = (xp.Current());
|
||||||
|
+#endif
|
||||||
|
for (xp.Init(aShape, TopAbs_WIRE, TopAbs_FACE); xp.More(); xp.Next())
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ this->myShapes[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
|
||||||
|
+#else
|
||||||
|
this->myShapes[xp.Current().HashCode(INT_MAX)] = (xp.Current());
|
||||||
|
+#endif
|
||||||
|
for (xp.Init(aShape, TopAbs_EDGE, TopAbs_WIRE); xp.More(); xp.Next())
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ this->myShapes[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
|
||||||
|
+#else
|
||||||
|
this->myShapes[xp.Current().HashCode(INT_MAX)] = (xp.Current());
|
||||||
|
+#endif
|
||||||
|
for (xp.Init(aShape, TopAbs_VERTEX, TopAbs_EDGE); xp.More(); xp.Next())
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ this->myShapes[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
|
||||||
|
+#else
|
||||||
|
this->myShapes[xp.Current().HashCode(INT_MAX)] = (xp.Current());
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -667,7 +715,11 @@ void ImportXCAF::loadShapes(const TDF_La
|
||||||
|
hColors->GetColor(label, XCAFDoc_ColorSurf, col) ||
|
||||||
|
hColors->GetColor(label, XCAFDoc_ColorCurv, col)) {
|
||||||
|
// add defined color
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ myColorMap[std::hash<TopoDS_Shape>{}(aShape)] = col;
|
||||||
|
+#else
|
||||||
|
myColorMap[aShape.HashCode(INT_MAX)] = col;
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// http://www.opencascade.org/org/forum/thread_17107/
|
||||||
|
@@ -677,7 +729,11 @@ void ImportXCAF::loadShapes(const TDF_La
|
||||||
|
hColors->GetColor(it.Value(), XCAFDoc_ColorSurf, col) ||
|
||||||
|
hColors->GetColor(it.Value(), XCAFDoc_ColorCurv, col)) {
|
||||||
|
// add defined color
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ myColorMap[std::hash<TopoDS_Shape>{}(it.Value())] = col;
|
||||||
|
+#else
|
||||||
|
myColorMap[it.Value().HashCode(INT_MAX)] = col;
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -690,7 +746,11 @@ void ImportXCAF::loadShapes(const TDF_La
|
||||||
|
extstr.ToUTF8CString(str);
|
||||||
|
std::string labelName(str);
|
||||||
|
if (!labelName.empty())
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ myNameMap[std::hash<TopoDS_Shape>{}(aShape)] = labelName;
|
||||||
|
+#else
|
||||||
|
myNameMap[aShape.HashCode(INT_MAX)] = labelName;
|
||||||
|
+#endif
|
||||||
|
delete [] str;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --color -rupN a/src/Mod/Import/App/ImportOCAF.h b/src/Mod/Import/App/ImportOCAF.h
|
||||||
|
--- a/src/Mod/Import/App/ImportOCAF.h 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Import/App/ImportOCAF.h 2024-02-27 15:00:48.252207183 +0100
|
||||||
|
@@ -29,7 +29,6 @@
|
||||||
|
#include <XCAFDoc_ShapeTool.hxx>
|
||||||
|
#include <Quantity_ColorRGBA.hxx>
|
||||||
|
#include <TopoDS_Shape.hxx>
|
||||||
|
-#include <TDF_LabelMapHasher.hxx>
|
||||||
|
#include <climits>
|
||||||
|
#include <string>
|
||||||
|
#include <set>
|
||||||
|
diff --color -rupN a/src/Mod/Import/App/ImportOCAF2.h b/src/Mod/Import/App/ImportOCAF2.h
|
||||||
|
--- a/src/Mod/Import/App/ImportOCAF2.h 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Import/App/ImportOCAF2.h 2024-02-27 15:06:12.358890276 +0100
|
||||||
|
@@ -27,7 +27,6 @@
|
||||||
|
#include <XCAFDoc_ColorTool.hxx>
|
||||||
|
#include <XCAFDoc_ShapeTool.hxx>
|
||||||
|
#include <TopoDS_Shape.hxx>
|
||||||
|
-#include <TDF_LabelMapHasher.hxx>
|
||||||
|
#include <climits>
|
||||||
|
#include <string>
|
||||||
|
#include <set>
|
||||||
|
@@ -57,13 +56,21 @@ namespace Import {
|
||||||
|
|
||||||
|
struct ShapeHasher {
|
||||||
|
std::size_t operator()(const TopoDS_Shape &s) const {
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ return std::hash<TopoDS_Shape>{}(s);
|
||||||
|
+#else
|
||||||
|
return s.HashCode(INT_MAX);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
struct LabelHasher {
|
||||||
|
std::size_t operator()(const TDF_Label &l) const {
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ return std::hash<TDF_Label> {}(l);
|
||||||
|
+#else
|
||||||
|
return TDF_LabelMapHasher::HashCode(l,INT_MAX);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
diff --color -rupN a/src/Mod/MeshPart/App/CurveProjector.h b/src/Mod/MeshPart/App/CurveProjector.h
|
||||||
|
--- a/src/Mod/MeshPart/App/CurveProjector.h 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/MeshPart/App/CurveProjector.h 2024-02-27 15:00:48.252207183 +0100
|
||||||
|
@@ -20,6 +20,7 @@
|
||||||
|
* *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
+#include <Standard_Version.hxx>
|
||||||
|
|
||||||
|
#ifndef _CurveProjector_h_
|
||||||
|
#define _CurveProjector_h_
|
||||||
|
@@ -64,8 +65,13 @@ public:
|
||||||
|
|
||||||
|
template<class T>
|
||||||
|
struct TopoDSLess {
|
||||||
|
- bool operator()(const T& x, const T& y) const {
|
||||||
|
- return x.HashCode(INT_MAX-1) < y.HashCode(INT_MAX-1);
|
||||||
|
+ bool operator()(const T& x, const T& y) const {
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ std::hash<T> hasher;
|
||||||
|
+ return hasher(x) < hasher(y);
|
||||||
|
+#else
|
||||||
|
+ return x.HashCode(INT_MAX-1) < y.HashCode(INT_MAX-1);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
diff --color -rupN a/src/Mod/MeshPart/App/PreCompiled.h b/src/Mod/MeshPart/App/PreCompiled.h
|
||||||
|
--- a/src/Mod/MeshPart/App/PreCompiled.h 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/MeshPart/App/PreCompiled.h 2024-02-27 15:00:48.252207183 +0100
|
||||||
|
@@ -76,7 +76,6 @@
|
||||||
|
#include <Standard_LicenseError.hxx>
|
||||||
|
#include <Standard_LicenseNotFound.hxx>
|
||||||
|
#include <Standard_Macro.hxx>
|
||||||
|
-#include <Standard_math.hxx>
|
||||||
|
#include <Standard_MultiplyDefined.hxx>
|
||||||
|
#include <Standard_NegativeValue.hxx>
|
||||||
|
#include <Standard_NoMoreObject.hxx>
|
||||||
|
diff --color -rupN a/src/Mod/MeshPart/Gui/CrossSections.cpp b/src/Mod/MeshPart/Gui/CrossSections.cpp
|
||||||
|
--- a/src/Mod/MeshPart/Gui/CrossSections.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/MeshPart/Gui/CrossSections.cpp 2024-02-27 15:00:48.252207183 +0100
|
||||||
|
@@ -24,7 +24,6 @@
|
||||||
|
#include "PreCompiled.h"
|
||||||
|
#ifndef _PreComp_
|
||||||
|
# include <sstream>
|
||||||
|
-# include <Standard_math.hxx>
|
||||||
|
# include <BRep_Builder.hxx>
|
||||||
|
# include <BRepBuilderAPI_MakePolygon.hxx>
|
||||||
|
# include <TopoDS.hxx>
|
||||||
|
diff --color -rupN a/src/Mod/Part/App/ImportStep.cpp b/src/Mod/Part/App/ImportStep.cpp
|
||||||
|
--- a/src/Mod/Part/App/ImportStep.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Part/App/ImportStep.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||||
|
@@ -167,7 +167,12 @@ int Part::ImportStepParts(App::Document
|
||||||
|
// This is a trick to access the GUI via Python and set the color property
|
||||||
|
// of the associated view provider. If no GUI is up an exception is thrown
|
||||||
|
// and cleared immediately
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ std::hash<TopoDS_Solid> hasher;
|
||||||
|
+ std::map<int, Quantity_Color>::iterator it = hash_col.find(hasher(aSolid));
|
||||||
|
+#else
|
||||||
|
std::map<int, Quantity_Color>::iterator it = hash_col.find(aSolid.HashCode(INT_MAX));
|
||||||
|
+#endif
|
||||||
|
if (it != hash_col.end()) {
|
||||||
|
try {
|
||||||
|
Py::Object obj(pcFeature->getPyObject(), true);
|
||||||
|
diff --color -rupN a/src/Mod/Part/App/OCCError.h b/src/Mod/Part/App/OCCError.h
|
||||||
|
--- a/src/Mod/Part/App/OCCError.h 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Part/App/OCCError.h 2024-02-27 15:00:48.255540482 +0100
|
||||||
|
@@ -50,7 +50,6 @@
|
||||||
|
# include <Standard_Overflow.hxx>
|
||||||
|
# include <Standard_ProgramError.hxx>
|
||||||
|
# include <Standard_RangeError.hxx>
|
||||||
|
-# include <Standard_TooManyUsers.hxx>
|
||||||
|
# include <Standard_TypeMismatch.hxx>
|
||||||
|
# include <Standard_Underflow.hxx>
|
||||||
|
|
||||||
|
diff --color -rupN a/src/Mod/Part/App/OpenCascadeAll.h b/src/Mod/Part/App/OpenCascadeAll.h
|
||||||
|
--- a/src/Mod/Part/App/OpenCascadeAll.h 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Part/App/OpenCascadeAll.h 2024-02-27 15:00:48.255540482 +0100
|
||||||
|
@@ -49,7 +49,6 @@
|
||||||
|
#include <Standard_LicenseError.hxx>
|
||||||
|
#include <Standard_LicenseNotFound.hxx>
|
||||||
|
#include <Standard_Macro.hxx>
|
||||||
|
-#include <Standard_math.hxx>
|
||||||
|
#include <Standard_MultiplyDefined.hxx>
|
||||||
|
#include <Standard_NegativeValue.hxx>
|
||||||
|
#include <Standard_NoMoreObject.hxx>
|
||||||
|
diff --color -rupN a/src/Mod/Part/App/TopoShapePyImp.cpp b/src/Mod/Part/App/TopoShapePyImp.cpp
|
||||||
|
--- a/src/Mod/Part/App/TopoShapePyImp.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Part/App/TopoShapePyImp.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||||
|
@@ -1321,7 +1321,11 @@ PyObject* TopoShapePy::ancestorsOfType(
|
||||||
|
TopTools_ListIteratorOfListOfShape it(ancestors);
|
||||||
|
for (; it.More(); it.Next()) {
|
||||||
|
// make sure to avoid duplicates
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ const size_t code = std::hash<TopoDS_Shape>{}(static_cast<TopoDS_Shape>(it.Value()));
|
||||||
|
+#else
|
||||||
|
Standard_Integer code = it.Value().HashCode(INT_MAX);
|
||||||
|
+#endif
|
||||||
|
if (hashes.find(code) == hashes.end()) {
|
||||||
|
list.append(shape2pyshape(it.Value()));
|
||||||
|
hashes.insert(code);
|
||||||
|
@@ -1943,7 +1947,11 @@ PyObject* TopoShapePy::hashCode(PyObject
|
||||||
|
if (!PyArg_ParseTuple(args, "|i",&upper))
|
||||||
|
return nullptr;
|
||||||
|
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ int hc = std::hash<TopoDS_Shape>{}(getTopoShapePtr()->getShape());
|
||||||
|
+#else
|
||||||
|
int hc = getTopoShapePtr()->getShape().HashCode(upper);
|
||||||
|
+#endif
|
||||||
|
return Py_BuildValue("i", hc);
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --color -rupN a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp
|
||||||
|
--- a/src/Mod/Part/Gui/AppPartGui.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Part/Gui/AppPartGui.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||||
|
@@ -11,9 +11,6 @@
|
||||||
|
|
||||||
|
|
||||||
|
#include "PreCompiled.h"
|
||||||
|
-#ifndef _PreComp_
|
||||||
|
-# include <Standard_math.hxx>
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
#include <Base/Console.h>
|
||||||
|
#include <Base/Interpreter.h>
|
||||||
|
diff --color -rupN a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp
|
||||||
|
--- a/src/Mod/Part/Gui/Command.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Part/Gui/Command.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||||
|
@@ -26,7 +26,6 @@
|
||||||
|
# include <QFileInfo>
|
||||||
|
# include <QPointer>
|
||||||
|
# include <QString>
|
||||||
|
-# include <Standard_math.hxx>
|
||||||
|
# include <Standard_Version.hxx>
|
||||||
|
# include <TopExp_Explorer.hxx>
|
||||||
|
# include <TopoDS_Shape.hxx>
|
||||||
|
diff --color -rupN a/src/Mod/Part/Gui/CommandSimple.cpp b/src/Mod/Part/Gui/CommandSimple.cpp
|
||||||
|
--- a/src/Mod/Part/Gui/CommandSimple.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Part/Gui/CommandSimple.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||||
|
@@ -22,9 +22,6 @@
|
||||||
|
|
||||||
|
|
||||||
|
#include "PreCompiled.h"
|
||||||
|
-#ifndef _PreComp_
|
||||||
|
-# include <Standard_math.hxx>
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
#include <App/Document.h>
|
||||||
|
#include <App/DocumentObject.h>
|
||||||
|
diff --color -rupN a/src/Mod/Part/Gui/CrossSections.cpp b/src/Mod/Part/Gui/CrossSections.cpp
|
||||||
|
--- a/src/Mod/Part/Gui/CrossSections.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Part/Gui/CrossSections.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||||
|
@@ -23,7 +23,6 @@
|
||||||
|
|
||||||
|
#include "PreCompiled.h"
|
||||||
|
#ifndef _PreComp_
|
||||||
|
-# include <Standard_math.hxx>
|
||||||
|
# include <BRep_Builder.hxx>
|
||||||
|
# include <BRepAlgoAPI_Section.hxx>
|
||||||
|
# include <BRepBuilderAPI_MakeWire.hxx>
|
||||||
|
diff --color -rupN a/src/Mod/Part/Gui/ViewProvider2DObject.cpp b/src/Mod/Part/Gui/ViewProvider2DObject.cpp
|
||||||
|
--- a/src/Mod/Part/Gui/ViewProvider2DObject.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Part/Gui/ViewProvider2DObject.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||||
|
@@ -26,8 +26,6 @@
|
||||||
|
#ifndef _PreComp_
|
||||||
|
# include <cfloat>
|
||||||
|
|
||||||
|
-# include <Standard_math.hxx>
|
||||||
|
-
|
||||||
|
# include <Inventor/nodes/SoAnnotation.h>
|
||||||
|
# include <Inventor/nodes/SoBaseColor.h>
|
||||||
|
# include <Inventor/nodes/SoDepthBuffer.h>
|
||||||
|
diff --color -rupN a/src/Mod/Part/Gui/ViewProviderExt.cpp b/src/Mod/Part/Gui/ViewProviderExt.cpp
|
||||||
|
--- a/src/Mod/Part/Gui/ViewProviderExt.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Part/Gui/ViewProviderExt.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||||
|
@@ -978,7 +978,11 @@ void ViewProviderPartExt::updateVisual()
|
||||||
|
|
||||||
|
TopExp_Explorer xp;
|
||||||
|
for (xp.Init(faceMap(i),TopAbs_EDGE);xp.More();xp.Next())
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ faceEdges.insert(std::hash<TopoDS_Shape>{}(xp.Current()));
|
||||||
|
+#else
|
||||||
|
faceEdges.insert(xp.Current().HashCode(INT_MAX));
|
||||||
|
+#endif
|
||||||
|
numFaces++;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1006,7 +1010,11 @@ void ViewProviderPartExt::updateVisual()
|
||||||
|
// So, we have to store the hashes of the edges associated to a face.
|
||||||
|
// If the hash of a given edge is not in this list we know it's really
|
||||||
|
// a free edge.
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ int hash = std::hash<TopoDS_Shape>{}(aEdge);
|
||||||
|
+#else
|
||||||
|
int hash = aEdge.HashCode(INT_MAX);
|
||||||
|
+#endif
|
||||||
|
if (faceEdges.find(hash) == faceEdges.end()) {
|
||||||
|
Handle(Poly_Polygon3D) aPoly = Part::Tools::polygonOfEdge(aEdge, aLoc);
|
||||||
|
if (!aPoly.IsNull()) {
|
||||||
|
@@ -1205,7 +1213,11 @@ void ViewProviderPartExt::updateVisual()
|
||||||
|
TopLoc_Location aLoc;
|
||||||
|
|
||||||
|
// handling of the free edge that are not associated to a face
|
||||||
|
+#if OCC_VERSION_HEX >= 0x070800
|
||||||
|
+ int hash = std::hash<TopoDS_Shape>{}(aEdge);
|
||||||
|
+#else
|
||||||
|
int hash = aEdge.HashCode(INT_MAX);
|
||||||
|
+#endif
|
||||||
|
if (faceEdges.find(hash) == faceEdges.end()) {
|
||||||
|
Handle(Poly_Polygon3D) aPoly = Part::Tools::polygonOfEdge(aEdge, aLoc);
|
||||||
|
if (!aPoly.IsNull()) {
|
||||||
|
diff --color -rupN a/src/Mod/Part/Gui/ViewProviderExt.h b/src/Mod/Part/Gui/ViewProviderExt.h
|
||||||
|
--- a/src/Mod/Part/Gui/ViewProviderExt.h 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Part/Gui/ViewProviderExt.h 2024-02-27 15:00:48.255540482 +0100
|
||||||
|
@@ -24,7 +24,6 @@
|
||||||
|
#ifndef PARTGUI_VIEWPROVIDERPARTEXT_H
|
||||||
|
#define PARTGUI_VIEWPROVIDERPARTEXT_H
|
||||||
|
|
||||||
|
-#include <Standard_math.hxx>
|
||||||
|
#include <Standard_Boolean.hxx>
|
||||||
|
#include <TopoDS_Shape.hxx>
|
||||||
|
#include <TopoDS_Face.hxx>
|
||||||
|
diff --color -rupN a/src/Mod/Part/Gui/ViewProviderMirror.cpp b/src/Mod/Part/Gui/ViewProviderMirror.cpp
|
||||||
|
--- a/src/Mod/Part/Gui/ViewProviderMirror.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Part/Gui/ViewProviderMirror.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||||
|
@@ -27,7 +27,6 @@
|
||||||
|
# include <QAction>
|
||||||
|
# include <QMenu>
|
||||||
|
# include <QTimer>
|
||||||
|
-# include <Standard_math.hxx>
|
||||||
|
# include <TopExp.hxx>
|
||||||
|
# include <TopTools_IndexedMapOfShape.hxx>
|
||||||
|
# include <TopTools_ListOfShape.hxx>
|
||||||
|
diff --color -rupN a/src/Mod/Part/Gui/ViewProviderPython.cpp b/src/Mod/Part/Gui/ViewProviderPython.cpp
|
||||||
|
--- a/src/Mod/Part/Gui/ViewProviderPython.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Part/Gui/ViewProviderPython.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||||
|
@@ -23,7 +23,6 @@
|
||||||
|
|
||||||
|
#include "PreCompiled.h"
|
||||||
|
|
||||||
|
-#include <Standard_math.hxx>
|
||||||
|
#ifndef _PreComp_
|
||||||
|
# include <Inventor/nodes/SoSeparator.h>
|
||||||
|
#endif
|
||||||
|
diff --color -rupN a/src/Mod/Part/Gui/ViewProviderReference.h b/src/Mod/Part/Gui/ViewProviderReference.h
|
||||||
|
--- a/src/Mod/Part/Gui/ViewProviderReference.h 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Part/Gui/ViewProviderReference.h 2024-02-27 15:00:48.255540482 +0100
|
||||||
|
@@ -24,7 +24,6 @@
|
||||||
|
#ifndef PARTGUI_ViewProviderPartReference_H
|
||||||
|
#define PARTGUI_ViewProviderPartReference_H
|
||||||
|
|
||||||
|
-#include <Standard_math.hxx>
|
||||||
|
#include <Standard_Boolean.hxx>
|
||||||
|
#include <TopoDS_Shape.hxx>
|
||||||
|
#include <Gui/ViewProviderGeometryObject.h>
|
||||||
|
diff --color -rupN a/src/Mod/PartDesign/Gui/PreCompiled.h b/src/Mod/PartDesign/Gui/PreCompiled.h
|
||||||
|
--- a/src/Mod/PartDesign/Gui/PreCompiled.h 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/PartDesign/Gui/PreCompiled.h 2024-02-27 15:00:48.255540482 +0100
|
||||||
|
@@ -44,7 +44,6 @@
|
||||||
|
#include <boost/bind/bind.hpp>
|
||||||
|
|
||||||
|
// OCC
|
||||||
|
-#include <Standard_math.hxx>
|
||||||
|
#include <Standard_Version.hxx>
|
||||||
|
#include <Bnd_Box.hxx>
|
||||||
|
#include <BRepBndLib.hxx>
|
||||||
|
diff --color -rupN a/src/Mod/Path/App/Voronoi.cpp b/src/Mod/Path/App/Voronoi.cpp
|
||||||
|
--- a/src/Mod/Path/App/Voronoi.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Path/App/Voronoi.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||||
|
@@ -23,10 +23,6 @@
|
||||||
|
|
||||||
|
#include "PreCompiled.h"
|
||||||
|
|
||||||
|
-#ifndef _PreComp_
|
||||||
|
-# include <Standard_math.hxx>
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
#include <Base/Vector3D.h>
|
||||||
|
|
||||||
|
#include "Voronoi.h"
|
||||||
|
diff --color -rupN a/src/Mod/Path/Gui/PreCompiled.h b/src/Mod/Path/Gui/PreCompiled.h
|
||||||
|
--- a/src/Mod/Path/Gui/PreCompiled.h 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Path/Gui/PreCompiled.h 2024-02-27 15:00:48.258873781 +0100
|
||||||
|
@@ -38,8 +38,6 @@
|
||||||
|
# define PathGuiExport
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#include <Standard_math.hxx>
|
||||||
|
-
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
# pragma warning( disable : 4273 )
|
||||||
|
#endif
|
||||||
|
diff --color -rupN a/src/Mod/Robot/Gui/PreCompiled.h b/src/Mod/Robot/Gui/PreCompiled.h
|
||||||
|
--- a/src/Mod/Robot/Gui/PreCompiled.h 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Robot/Gui/PreCompiled.h 2024-02-27 15:00:48.258873781 +0100
|
||||||
|
@@ -39,8 +39,6 @@
|
||||||
|
# define RobotGuiExport
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#include <Standard_math.hxx>
|
||||||
|
-
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
# pragma warning(disable : 4005)
|
||||||
|
# pragma warning(disable : 4273)
|
||||||
|
diff --color -rupN a/src/Mod/Sandbox/Gui/AppSandboxGui.cpp b/src/Mod/Sandbox/Gui/AppSandboxGui.cpp
|
||||||
|
--- a/src/Mod/Sandbox/Gui/AppSandboxGui.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Sandbox/Gui/AppSandboxGui.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||||
|
@@ -24,7 +24,6 @@
|
||||||
|
#include "PreCompiled.h"
|
||||||
|
#ifndef _PreComp_
|
||||||
|
# include <Python.h>
|
||||||
|
-# include <Standard_math.hxx>
|
||||||
|
# include <Inventor/nodes/SoLineSet.h>
|
||||||
|
# include <Inventor/nodes/SoBaseColor.h>
|
||||||
|
# include <Inventor/nodes/SoSeparator.h>
|
||||||
|
diff --color -rupN a/src/Mod/Sketcher/App/SketchAnalysis.cpp b/src/Mod/Sketcher/App/SketchAnalysis.cpp
|
||||||
|
--- a/src/Mod/Sketcher/App/SketchAnalysis.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Sketcher/App/SketchAnalysis.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||||
|
@@ -25,7 +25,6 @@
|
||||||
|
#include "PreCompiled.h"
|
||||||
|
|
||||||
|
#ifndef _PreComp_
|
||||||
|
-# include <Standard_math.hxx>
|
||||||
|
# include <BRep_Tool.hxx>
|
||||||
|
# include <gp_Pnt.hxx>
|
||||||
|
# include <Precision.hxx>
|
||||||
|
diff --color -rupN a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp
|
||||||
|
--- a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||||
|
@@ -24,7 +24,6 @@
|
||||||
|
#include "PreCompiled.h"
|
||||||
|
|
||||||
|
#ifndef _PreComp_
|
||||||
|
-# include <Standard_math.hxx>
|
||||||
|
# include <Inventor/nodes/SoTranslation.h>
|
||||||
|
# include <Inventor/nodes/SoText2.h>
|
||||||
|
# include <Inventor/nodes/SoFont.h>
|
||||||
|
diff --color -rupN a/src/Mod/Sketcher/Gui/EditDatumDialog.cpp b/src/Mod/Sketcher/Gui/EditDatumDialog.cpp
|
||||||
|
--- a/src/Mod/Sketcher/Gui/EditDatumDialog.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Sketcher/Gui/EditDatumDialog.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||||
|
@@ -23,7 +23,6 @@
|
||||||
|
#include "PreCompiled.h"
|
||||||
|
|
||||||
|
#ifndef _PreComp_
|
||||||
|
-# include <Standard_math.hxx>
|
||||||
|
/// Qt Include Files
|
||||||
|
# include <QApplication>
|
||||||
|
# include <QDialog>
|
||||||
|
diff --color -rupN a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
|
||||||
|
--- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||||
|
@@ -24,7 +24,6 @@
|
||||||
|
#include "PreCompiled.h"
|
||||||
|
|
||||||
|
#ifndef _PreComp_
|
||||||
|
-# include <Standard_math.hxx>
|
||||||
|
# include <QDoubleValidator>
|
||||||
|
# include <QLocale>
|
||||||
|
# include <QMessageBox>
|
||||||
|
diff --color -rupN a/src/Mod/Sketcher/Gui/ViewProviderPython.cpp b/src/Mod/Sketcher/Gui/ViewProviderPython.cpp
|
||||||
|
--- a/src/Mod/Sketcher/Gui/ViewProviderPython.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Sketcher/Gui/ViewProviderPython.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||||
|
@@ -23,7 +23,6 @@
|
||||||
|
|
||||||
|
#include "PreCompiled.h"
|
||||||
|
|
||||||
|
-#include <Standard_math.hxx>
|
||||||
|
#ifndef _PreComp_
|
||||||
|
# include <Inventor/nodes/SoSeparator.h>
|
||||||
|
#endif
|
||||||
|
diff --color -rupN a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
|
||||||
|
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||||
|
@@ -24,7 +24,6 @@
|
||||||
|
#include "PreCompiled.h"
|
||||||
|
|
||||||
|
#ifndef _PreComp_
|
||||||
|
-# include <Standard_math.hxx>
|
||||||
|
|
||||||
|
# include <Inventor/actions/SoGetBoundingBoxAction.h>
|
||||||
|
# include <Inventor/SbBox3f.h>
|
||||||
|
diff --color -rupN a/src/Mod/Surface/Gui/Command.cpp b/src/Mod/Surface/Gui/Command.cpp
|
||||||
|
--- a/src/Mod/Surface/Gui/Command.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/Surface/Gui/Command.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||||
|
@@ -31,7 +31,6 @@
|
||||||
|
#include <QLineEdit>
|
||||||
|
#include <QMessageBox>
|
||||||
|
#include <QPointer>
|
||||||
|
-#include <Standard_math.hxx>
|
||||||
|
#include <TopoDS_Shape.hxx>
|
||||||
|
#include <TopoDS_Edge.hxx>
|
||||||
|
#include <Geom_BezierCurve.hxx>
|
||||||
|
diff --color -rupN a/src/Mod/TechDraw/Gui/TaskProjection.cpp b/src/Mod/TechDraw/Gui/TaskProjection.cpp
|
||||||
|
--- a/src/Mod/TechDraw/Gui/TaskProjection.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||||
|
+++ b/src/Mod/TechDraw/Gui/TaskProjection.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||||
|
@@ -29,9 +29,6 @@
|
||||||
|
# include <QMessageBox>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-
|
||||||
|
-#include <Standard_math.hxx>
|
||||||
|
-
|
||||||
|
#include <Gui/Application.h>
|
||||||
|
#include <Gui/BitmapFactory.h>
|
||||||
|
#include <Gui/Command.h>
|
11
backports/freecad/resourceDirectory.patch
Normal file
11
backports/freecad/resourceDirectory.patch
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
--- ./cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake.orig
|
||||||
|
+++ ./cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake
|
||||||
|
@@ -23,7 +23,7 @@
|
||||||
|
"Path to the directory containing PyCXX's cxxextensions.c source file")
|
||||||
|
|
||||||
|
# used as compiler defines
|
||||||
|
- set(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
|
||||||
|
+ set(RESOURCEDIR "../../share/freecad")
|
||||||
|
set(LIBRARYDIR "${CMAKE_INSTALL_LIBDIR}")
|
||||||
|
set(DOCDIR "${CMAKE_INSTALL_DOCDIR}")
|
||||||
|
|
Loading…
Reference in a new issue