kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cad/kicad-devel: Update kicad-devel

Browse source 
Update kicad-devel ports to the latest revisions
This commit is contained in:
Michael Reifenberger 2021-12-12 14:01:48 +01:00
parent 9b80b66999
commit 6e09776ab5
7 changed files with 41 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cad/kicad-devel/Makefile.git_rev
View file

@ -1,2 +1,2 @@
GIT_SRC_HASH= ff9612b6dad97ec8820a506956f1fdcc652b1d52
GIT_SRC_DATE= 20210826200350
GIT_SRC_HASH= 6d0d4e0db97ceda8f46bc37901d3826b85ea5ef6
GIT_SRC_DATE= 20211211095403

6
cad/kicad-devel/distinfo
View file

@ -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

4
cad/kicad-devel/files/patch-include-kiway.h
View file

@ -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

11
cad/kicad-devel/files/patch-kicad_pcm_pcm.cpp Normal file
View file

@ -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;

20
cad/kicad-devel/files/patch-kicad_pcm_pcm__task__manager.cpp Normal file
View file

@ -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 );

45
cad/kicad-devel/files/patch-plugins_3d_oce_loadmodel.cpp
View file

@ -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 <TDF_LabelSequence.hxx>
#include <TDF_ChildIterator.hxx>
+#include <Standard_Version.hxx>
+
#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 )

5
cad/kicad-devel/pkg-plist
View file

@ -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