Date: Mon, 03 Aug 2026 15:07:35 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1d52f5eb615e - main - cad/freecad: fix broken patch Message-ID: <6a70aeb7.3875c.1825d9d6@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d52f5eb615e39d69e17addd1975e93e121b8ef2 commit 1d52f5eb615e39d69e17addd1975e93e121b8ef2 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2026-07-31 16:06:11 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2026-08-03 15:02:17 +0000 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 --- ...patch-src_3rdParty_salomesmesh_inc_SMESH__TryCatch.hxx | 3 +-- ...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;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a70aeb7.3875c.1825d9d6>