diff options
| author | Robert Clausecker <fuz@FreeBSD.org> | 2026-07-31 16:06:11 +0000 |
|---|---|---|
| committer | Robert Clausecker <fuz@FreeBSD.org> | 2026-08-03 15:02:17 +0000 |
| commit | 1d52f5eb615e39d69e17addd1975e93e121b8ef2 (patch) | |
| tree | 981f76b34268cfdd32f19d883de7945c2cdc9c12 | |
| parent | b700cbd3a83de54d284f95fb5f6db0b241c0b1da (diff) | |
cad/freecad: fix broken patch
This fixes the build on armv7.
Seems like an oversight during patch merging.
Please make sure this stuff is build-tested properly.
The other fix addresses an ambiguous overload on 32-bit platforms
where size_t is unsigned int, not unsigned long.
Approved by: portmgr (build fix blanket)
MFH: 2026Q3
Fixes: 02a0f04f8c5bd62c66bb7618728b1fa247805594
| -rw-r--r-- | cad/freecad/files/patch-src_3rdParty_salomesmesh_inc_SMESH__TryCatch.hxx | 3 | ||||
| -rw-r--r-- | cad/freecad/files/patch-src_Mod_ReverseEngineering_App_ApproxSurface.cpp | 15 |
2 files changed, 16 insertions, 2 deletions
diff --git a/cad/freecad/files/patch-src_3rdParty_salomesmesh_inc_SMESH__TryCatch.hxx b/cad/freecad/files/patch-src_3rdParty_salomesmesh_inc_SMESH__TryCatch.hxx index 6108c1173892..a9b950a9ada1 100644 --- a/cad/freecad/files/patch-src_3rdParty_salomesmesh_inc_SMESH__TryCatch.hxx +++ b/cad/freecad/files/patch-src_3rdParty_salomesmesh_inc_SMESH__TryCatch.hxx @@ -1,6 +1,6 @@ --- src/3rdParty/salomesmesh/inc/SMESH_TryCatch.hxx.orig 2026-04-14 22:09:59 UTC +++ src/3rdParty/salomesmesh/inc/SMESH_TryCatch.hxx -@@ -65,11 +65,46 @@ +@@ -65,11 +65,45 @@ // Two onExceptionFun() are defined here: SMESH::throwSalomeEx() and SMESH::doNothing(). // To add your own catch close, define SMY_OWN_CATCH macro before including this file. @@ -39,7 +39,6 @@ + } +#else +#define SMESH_CATCH( onExceptionFun ) \ -+#define SMESH_CATCH( onExceptionFun ) \ + } \ + catch (Standard_Failure& ex) \ + { \ diff --git a/cad/freecad/files/patch-src_Mod_ReverseEngineering_App_ApproxSurface.cpp b/cad/freecad/files/patch-src_Mod_ReverseEngineering_App_ApproxSurface.cpp index 3803079e226a..9656ce818b18 100644 --- a/cad/freecad/files/patch-src_Mod_ReverseEngineering_App_ApproxSurface.cpp +++ b/cad/freecad/files/patch-src_Mod_ReverseEngineering_App_ApproxSurface.cpp @@ -45,3 +45,18 @@ } // kth derivatives (k> degrees) are zero if (iMax >= _iOrder) { +@@ -649,10 +649,10 @@ ParameterCorrection::ParameterCorrection( + , _usUCtrlpoints(usUCtrlpoints) + , _usVCtrlpoints(usVCtrlpoints) + , _vCtrlPntsOfSurf(0, usUCtrlpoints - 1, 0, usVCtrlpoints - 1) +- , _vUKnots(0, usUCtrlpoints - usUOrder + 1) +- , _vVKnots(0, usVCtrlpoints - usVOrder + 1) +- , _vUMults(0, usUCtrlpoints - usUOrder + 1) +- , _vVMults(0, usVCtrlpoints - usVOrder + 1) ++ , _vUKnots(0, (int)(usUCtrlpoints - usUOrder + 1)) ++ , _vVKnots(0, (int)(usVCtrlpoints - usVOrder + 1)) ++ , _vUMults(0, (int)(usUCtrlpoints - usUOrder + 1)) ++ , _vVMults(0, (int)(usVCtrlpoints - usVOrder + 1)) + { + _bGetUVDir = false; + _bSmoothing = false; |