From nobody Sat Nov 13 17:56:57 2021 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 61F1F183BB50; Sat, 13 Nov 2021 17:56:57 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hs37F2Ff3z3ptt; Sat, 13 Nov 2021 17:56:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2D1AF17A73; Sat, 13 Nov 2021 17:56:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1ADHuv8x076528; Sat, 13 Nov 2021 17:56:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ADHuv5r076527; Sat, 13 Nov 2021 17:56:57 GMT (envelope-from git) Date: Sat, 13 Nov 2021 17:56:57 GMT Message-Id: <202111131756.1ADHuv5r076527@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Reifenberger Subject: git: f25bb5dc8133 - main - cad/kicad-devel: Add a patch for compatibility with opencascade 7.6 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f25bb5dc813304822ec6bb9811f4d4165240b065 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mr: URL: https://cgit.FreeBSD.org/ports/commit/?id=f25bb5dc813304822ec6bb9811f4d4165240b065 commit f25bb5dc813304822ec6bb9811f4d4165240b065 Author: Michael Reifenberger AuthorDate: 2021-11-13 17:54:19 +0000 Commit: Michael Reifenberger CommitDate: 2021-11-13 17:56:31 +0000 cad/kicad-devel: Add a patch for compatibility with opencascade 7.6 --- .../files/patch-plugins_3d_oce_loadmodel.cpp | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/cad/kicad-devel/files/patch-plugins_3d_oce_loadmodel.cpp b/cad/kicad-devel/files/patch-plugins_3d_oce_loadmodel.cpp new file mode 100644 index 000000000000..b80f6901bd75 --- /dev/null +++ b/cad/kicad-devel/files/patch-plugins_3d_oce_loadmodel.cpp @@ -0,0 +1,45 @@ +--- plugins/3d/oce/loadmodel.cpp.orig 2021-11-13 17:46:24 UTC ++++ plugins/3d/oce/loadmodel.cpp +@@ -74,6 +74,8 @@ + #include + #include + ++#include ++ + #include "plugins/3dapi/ifsg_all.h" + + // log mask for wxLogTrace +@@ -960,8 +962,10 @@ bool processFace( const TopoDS_Face& face, DATA& data, + else + S3D::AddSGNodeRef( vshape.GetRawPtr(), ocolor ); + ++#if OCC_VERSION_HEX < 0x070600 + const TColgp_Array1OfPnt& arrPolyNodes = triangulation->Nodes(); + const Poly_Array1OfTriangle& arrTriangles = triangulation->Triangles(); ++#endif + + std::vector< SGPOINT > vertices; + std::vector< int > indices; +@@ -970,14 +974,22 @@ bool processFace( const TopoDS_Face& face, DATA& data, + + for( int i = 1; i <= triangulation->NbNodes(); i++ ) + { ++#if OCC_VERSION_HEX < 0x070600 + gp_XYZ v( arrPolyNodes(i).Coord() ); ++#else ++ gp_XYZ v( triangulation->Node(i).Coord() ); ++#endif + vertices.emplace_back( v.X(), v.Y(), v.Z() ); + } + + for( int i = 1; i <= triangulation->NbTriangles(); i++ ) + { + int a, b, c; ++#if OCC_VERSION_HEX < 0x070600 + arrTriangles( i ).Get( a, b, c ); ++#else ++ triangulation->Triangle(i).Get(a, b, c); ++#endif + a--; + + if( reverse )