From nobody Sun Dec 12 13:02:45 2021 X-Original-To: dev-commits-ports-main@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 83D0C18DB922; Sun, 12 Dec 2021 13:02:45 +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 4JBlDP1vwbz4fQJ; Sun, 12 Dec 2021 13:02:45 +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 21513217D6; Sun, 12 Dec 2021 13:02:45 +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 1BCD2jwj051302; Sun, 12 Dec 2021 13:02:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BCD2jCs051301; Sun, 12 Dec 2021 13:02:45 GMT (envelope-from git) Date: Sun, 12 Dec 2021 13:02:45 GMT Message-Id: <202112121302.1BCD2jCs051301@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: 6e09776ab591 - main - cad/kicad-devel: Update kicad-devel List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 6e09776ab591709c10f23a4f835954f02c815b82 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639314165; 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=50TDz9kOQB3+iyOZYL6zwU2ooX1HPeUBgyRgqyrmJgA=; b=HTzr41jilzWEbzvWRfUm1jArHHGCgltwz7qSXWU/QIXunaYQCC6nkNmevp63ACkfZtxqYm NWg1zYcDEO/Gn+JnU4B03+7O6sq6LcF7cAA53idWAqgaI0aWHlj+HtBDLuYidh8youxwPy w8FA1lmnUor+Luc8mPIi0eP3DSRmMKPG2Nq7CuWIaBwy42Q2eLF90FFeDrjBEchVUV3Rix 8zAzBXxbIc2WOkkfCzDfYvrhKNBK/PP0GpGTU9bygm9OjI1P8QE+wziqdBxXZy0W6MzGqa J3ohesqOQlxTpoGHJ2n1LFMzkdF6g0m9h8UY+6+NbtsMPGLVf697Fbma6+em2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639314165; a=rsa-sha256; cv=none; b=a9ApE42sP8oAAY4GPbNvMi3d1MSQ/sbI9cO4CePiVt9MV/Hq8detNfzNAAZwuSL3tAWr6c /K7WdqDLC6V3EtUQEtBVzNcfLgT4K2KmMShIkNI13uyc3t/13TbnQIlchDlhFtutfbec3z LMJsSoHvQBkFuHenpIqdKesfCLqpvVOrfYtQLE8ZxItkB4QeoxeaLGE+znBtBiLvJw3BHO XkhiYOzFB1u4G0faLQ6la+8huq4EOLS9eLq5Ue2Ql5k+873SNDNfvCybxtNiM37KYhulIF JqtG3AV/DO/PRwMUUYrimCeJwFqbmTx2Qz8mdeuuhp6LFdeCQcO/mXZBguzQQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mr: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e09776ab591709c10f23a4f835954f02c815b82 commit 6e09776ab591709c10f23a4f835954f02c815b82 Author: Michael Reifenberger AuthorDate: 2021-12-12 13:01:48 +0000 Commit: Michael Reifenberger CommitDate: 2021-12-12 13:01:48 +0000 cad/kicad-devel: Update kicad-devel Update kicad-devel ports to the latest revisions --- cad/kicad-devel/Makefile.git_rev | 4 +- cad/kicad-devel/distinfo | 6 +-- cad/kicad-devel/files/patch-include-kiway.h | 4 +- cad/kicad-devel/files/patch-kicad_pcm_pcm.cpp | 11 ++++++ .../files/patch-kicad_pcm_pcm__task__manager.cpp | 20 ++++++++++ .../files/patch-plugins_3d_oce_loadmodel.cpp | 45 ---------------------- cad/kicad-devel/pkg-plist | 5 ++- 7 files changed, 41 insertions(+), 54 deletions(-) diff --git a/cad/kicad-devel/Makefile.git_rev b/cad/kicad-devel/Makefile.git_rev index ea728386e85d..bc9fa605ddbe 100644 --- a/cad/kicad-devel/Makefile.git_rev +++ b/cad/kicad-devel/Makefile.git_rev @@ -1,2 +1,2 @@ -GIT_SRC_HASH= ff9612b6dad97ec8820a506956f1fdcc652b1d52 -GIT_SRC_DATE= 20210826200350 +GIT_SRC_HASH= 6d0d4e0db97ceda8f46bc37901d3826b85ea5ef6 +GIT_SRC_DATE= 20211211095403 diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo index d0a3d43653a8..14a0d2063f79 100644 --- a/cad/kicad-devel/distinfo +++ b/cad/kicad-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1630006379 -SHA256 (kicad/kicad/code-kicad-ff9612b6dad97ec8820a506956f1fdcc652b1d52_GL0.tar.gz) = bb7a132336d6866bb4e4c3ee3fc52791f9507316ec45c67fbdfd3cdaf01e734e -SIZE (kicad/kicad/code-kicad-ff9612b6dad97ec8820a506956f1fdcc652b1d52_GL0.tar.gz) = 43388656 +TIMESTAMP = 1639228795 +SHA256 (kicad/kicad/code-kicad-6d0d4e0db97ceda8f46bc37901d3826b85ea5ef6_GL0.tar.gz) = 6f36be10586743910911e2a6d18dcd4282fdbd1ade42f576b4402167cfe76e0e +SIZE (kicad/kicad/code-kicad-6d0d4e0db97ceda8f46bc37901d3826b85ea5ef6_GL0.tar.gz) = 45042393 diff --git a/cad/kicad-devel/files/patch-include-kiway.h b/cad/kicad-devel/files/patch-include-kiway.h index 07ebc8158a9d..dda125f679c6 100644 --- a/cad/kicad-devel/files/patch-include-kiway.h +++ b/cad/kicad-devel/files/patch-include-kiway.h @@ -1,6 +1,6 @@ ---- include/kiway.h.orig 2021-06-08 00:34:09 UTC +--- include/kiway.h.orig 2021-12-11 08:54:03 UTC +++ include/kiway.h -@@ -113,7 +113,7 @@ +@@ -114,7 +114,7 @@ #define KIFACE_INSTANCE_NAME_AND_VERSION "KIFACE_1" #ifndef SWIG diff --git a/cad/kicad-devel/files/patch-kicad_pcm_pcm.cpp b/cad/kicad-devel/files/patch-kicad_pcm_pcm.cpp new file mode 100644 index 000000000000..e5d659961c7a --- /dev/null +++ b/cad/kicad-devel/files/patch-kicad_pcm_pcm.cpp @@ -0,0 +1,11 @@ +--- kicad/pcm/pcm.cpp.orig 2021-12-11 16:21:09 UTC ++++ kicad/pcm/pcm.cpp +@@ -798,7 +798,7 @@ PLUGIN_CONTENT_MANAGER::GetRepositoryPackageBitmaps( c + for( wxArchiveEntry* entry = zip.GetNextEntry(); entry; entry = zip.GetNextEntry() ) + { + wxArrayString path_parts = +- wxSplit( entry->GetName(), wxFileName::GetPathSeparator(), (wxChar) NULL ); ++ wxSplit( entry->GetName(), wxFileName::GetPathSeparator(), 0 ); + + if( path_parts.size() != 2 || path_parts[1] != "icon.png" ) + continue; diff --git a/cad/kicad-devel/files/patch-kicad_pcm_pcm__task__manager.cpp b/cad/kicad-devel/files/patch-kicad_pcm_pcm__task__manager.cpp new file mode 100644 index 000000000000..298dd891c042 --- /dev/null +++ b/cad/kicad-devel/files/patch-kicad_pcm_pcm__task__manager.cpp @@ -0,0 +1,20 @@ +--- kicad/pcm/pcm_task_manager.cpp.orig 2021-12-12 12:45:08 UTC ++++ kicad/pcm/pcm_task_manager.cpp +@@ -195,7 +195,7 @@ bool PCM_TASK_MANAGER::extract( const wxString& aFileP + for( ; entry; entry = zip.GetNextEntry() ) + { + wxArrayString path_parts = +- wxSplit( entry->GetName(), wxFileName::GetPathSeparator(), (wxChar) NULL ); ++ wxSplit( entry->GetName(), wxFileName::GetPathSeparator(), 0 ); + + if( path_parts.size() < 2 + || PCM_PACKAGE_DIRECTORIES.find( path_parts[0] ) == PCM_PACKAGE_DIRECTORIES.end() +@@ -215,7 +215,7 @@ bool PCM_TASK_MANAGER::extract( const wxString& aFileP + path_parts.Insert( clean_package_id, 1 ); + path_parts.Insert( m_pcm->Get3rdPartyPath(), 0 ); + +- wxString fullname = wxJoin( path_parts, wxFileName::GetPathSeparator(), (wxChar) NULL ); ++ wxString fullname = wxJoin( path_parts, wxFileName::GetPathSeparator(), 0 ); + + // Ensure the target directory exists and create it if not. + wxString t_path = wxPathOnly( fullname ); diff --git a/cad/kicad-devel/files/patch-plugins_3d_oce_loadmodel.cpp b/cad/kicad-devel/files/patch-plugins_3d_oce_loadmodel.cpp deleted file mode 100644 index b80f6901bd75..000000000000 --- a/cad/kicad-devel/files/patch-plugins_3d_oce_loadmodel.cpp +++ /dev/null @@ -1,45 +0,0 @@ ---- 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 ) diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist index 968372dfe2d6..8ed22a1ec170 100644 --- a/cad/kicad-devel/pkg-plist +++ b/cad/kicad-devel/pkg-plist @@ -20,6 +20,7 @@ bin/pl_editor lib/kicad/plugins/3d/libs3d_plugin_idf.so lib/kicad/plugins/3d/libs3d_plugin_oce.so lib/kicad/plugins/3d/libs3d_plugin_vrml.so +lib/libkicad2step_lib.a lib/libkicad_3dsg.so lib/libkicad_3dsg.so.2.0.0 %%PYTHON_SITELIBDIR%%/_pcbnew.so @@ -104,11 +105,9 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg %%DATADIR%%/demos/complex_hierarchy/fp-lib-table %%DATADIR%%/demos/complex_hierarchy/sym-lib-table %%DATADIR%%/demos/custom_pads_test/custom_pads_schlib.kicad_sym -%%DATADIR%%/demos/custom_pads_test/custom_pads_schlib.lib %%DATADIR%%/demos/custom_pads_test/custom_pads_test.kicad_pcb %%DATADIR%%/demos/custom_pads_test/custom_pads_test.kicad_pro %%DATADIR%%/demos/custom_pads_test/custom_pads_test.kicad_sch -%%DATADIR%%/demos/custom_pads_test/custom_pads_test.lib %%DATADIR%%/demos/custom_pads_test/sym-lib-table %%DATADIR%%/demos/ecc83/3d_shapes/ecc83.wrl %%DATADIR%%/demos/ecc83/ecc83-pp.kicad_pcb @@ -297,12 +296,14 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg %%DATADIR%%/plugins/netlist_form_cadstar.xsl %%DATADIR%%/plugins/netlist_form_pads-pcb.asc.xsl %%DATADIR%%/resources/images.tar.gz +%%DATADIR%%/schemas/pcm.v1.schema.json %%DATADIR%%/scripting/kicad_pyshell/__init__.py %%DATADIR%%/scripting/kicad_pyshell/kicad_pyeditor.py %%DATADIR%%/scripting/plugins/FPC_wizard.py %%DATADIR%%/scripting/plugins/FootprintWizardBase.py %%DATADIR%%/scripting/plugins/PadArray.py %%DATADIR%%/scripting/plugins/__init__.py +%%DATADIR%%/scripting/plugins/arc_test.py %%DATADIR%%/scripting/plugins/bga_wizard.py %%DATADIR%%/scripting/plugins/circular_pad_array_wizard.py %%DATADIR%%/scripting/plugins/kicad_qrcode.py