From nobody Mon Aug 3 15:07:35 2026 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hDKm763zNz6mKHh for ; Mon, 03 Aug 2026 15:07:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hDKm73F1hz473Y for ; Mon, 03 Aug 2026 15:07:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785769655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ua94+92DZ+OOH0UZ4DpDAr1zvJL/BrjK5tX7DzGF+p0=; b=oGAbNMIDeDdwStUUtieKBijOnkamM/ZjkmRkFiMrdU4zA8WpiLfVvHt44fCMHIJDE0rma1 JLC4hMwPuVqhvc30qaislUI5sCl+wvSHiaLIIt/eNy1kJcuTMLA5FKw9/fbJD8dVt8EUJW f2cJs5he/BHyxzNJS8uJgKKWbp8/3AklVLc7p8qOPZxEgAxgypNgtNvBg6pQdA5olzvG0K B9WRroIDVY1UWePB8DjlXaMQ6DZ0Yt12u+T+Su0ZSo+qfzAuCwtKsLT1a9lAh0hgKcN1Bm 5foGuAWbH92OLpKRXzB/1kWUDUrJogN7LW7oZL2HUkQoPD6t8AKaxZMTg5I/sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785769655; a=rsa-sha256; cv=none; b=og8EhGLDVGiv5htDXdfE/7rNlnQzZBBMvZDBtmQ0UdhutGgww5+C4jTplqCO9/u6gIA7ww QpRgRz60jfWPDk4ygPEc8Cm8e+ULOukIV2/WAQDYn7+MQcsIC9A6kg6/jmgmF1ZmysmEaR 7nUKjNMxnOKXNTAw/kZpAyDXWGlM499OMTCK3yV1USoL++aQIcdApWbm5yXXyNFHNWsPp9 ZqxK6o/4a6XfCI0mreLzOBUCyGCpt6XSWPXyO32GS7RprTuV6QCK4KoCFsUaAFhZuB+dzE 8hwzfZMjphKg3buIAwUqBj34dMo9MO/W88gPKckG7ZovlCdl2lCrJzLX1XLZ2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785769655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ua94+92DZ+OOH0UZ4DpDAr1zvJL/BrjK5tX7DzGF+p0=; b=fB/Rq0pXhUmwrx84gNEJG034uDcbEdNrO1bIuVUiCtVO5Vf547Sd5uHO1NLnNTBSLoIB7X v0yjYdfYjMUUOKY1iLMNxjCnum9dj8hNMWuYKzIUNpyJRHmU/8e5QS2R8cxv79zp+Cg9rf kK+opPBnHn0SdZKf+Rn4dIIp5hJxwN3kCFt73klV0d22yub8bFDwdH9Juznr5DdhqNK0es N8srWiFMNHeBQGuJXmI85ghJcOc8a4xpp4NfuIRqQ2yyG2UWi2y/IDHWTPLyXyAPKFi9OE XMl51dnr2P1GO1rbe8E4eblX4B94YCxzKYyqUoVgSUmlwRZ15b4/BRd1uaPYKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDKm724CCz15QK for ; Mon, 03 Aug 2026 15:07:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3875c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 15:07:35 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 1d52f5eb615e - main - cad/freecad: fix broken patch List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d52f5eb615e39d69e17addd1975e93e121b8ef2 Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 15:07:35 +0000 Message-Id: <6a70aeb7.3875c.1825d9d6@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d52f5eb615e39d69e17addd1975e93e121b8ef2 commit 1d52f5eb615e39d69e17addd1975e93e121b8ef2 Author: Robert Clausecker AuthorDate: 2026-07-31 16:06:11 +0000 Commit: Robert Clausecker 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;