cad/kicad-devel: Update

Update kicad-devel ports to the latest revisions
Remove two upstreamed patches.

5 files changed, 7 insertions, 38 deletions

diff --git a/cad/kicad-devel/Makefile.git_rev b/cad/kicad-devel/Makefile.git_rev
index bc9fa605ddbe..0a2be58d0a13 100644
--- a/cad/kicad-devel/Makefile.git_rev
+++ b/cad/kicad-devel/Makefile.git_rev
@@ -1,2 +1,2 @@
-GIT_SRC_HASH=  6d0d4e0db97ceda8f46bc37901d3826b85ea5ef6
-GIT_SRC_DATE=  20211211095403
+GIT_SRC_HASH=  a17a58203b33e08b966075833b177dad5740c236
+GIT_SRC_DATE=  20211218003137
diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo
index 14a0d2063f79..4b2f458d718f 100644
--- a/cad/kicad-devel/distinfo
+++ b/cad/kicad-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639228795
-SHA256 (kicad/kicad/code-kicad-6d0d4e0db97ceda8f46bc37901d3826b85ea5ef6_GL0.tar.gz) = 6f36be10586743910911e2a6d18dcd4282fdbd1ade42f576b4402167cfe76e0e
-SIZE (kicad/kicad/code-kicad-6d0d4e0db97ceda8f46bc37901d3826b85ea5ef6_GL0.tar.gz) = 45042393
+TIMESTAMP = 1640015141
+SHA256 (kicad/kicad/code-kicad-a17a58203b33e08b966075833b177dad5740c236_GL0.tar.gz) = ac7da06ede4ea54ba7de27daec23a6f0c2cef0332870d2ffcfc6f2d45a6f8e83
+SIZE (kicad/kicad/code-kicad-a17a58203b33e08b966075833b177dad5740c236_GL0.tar.gz) = 45053171
diff --git a/cad/kicad-devel/files/patch-kicad_pcm_pcm.cpp b/cad/kicad-devel/files/patch-kicad_pcm_pcm.cpp
deleted file mode 100644
index e5d659961c7a..000000000000
--- a/cad/kicad-devel/files/patch-kicad_pcm_pcm.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 298dd891c042..000000000000
--- a/cad/kicad-devel/files/patch-kicad_pcm_pcm__task__manager.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/pkg-plist b/cad/kicad-devel/pkg-plist
index 8ed22a1ec170..ad073e3bb01e 100644
--- a/cad/kicad-devel/pkg-plist
+++ b/cad/kicad-devel/pkg-plist
@@ -20,7 +20,6 @@ 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
@@ -144,7 +143,7 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/interf_u/sym-lib-table
 %%DATADIR%%/demos/interf_u/tux.bmp
 %%DATADIR%%/demos/interf_u/tux.kicad_mod
-%%DATADIR%%/demos/interf_u/tux.lib
+%%DATADIR%%/demos/interf_u/tux.kicad_sym
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/fp-lib-table
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/in_out_conn.kicad_sch
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-coldfire_schlib.kicad_sym
@@ -291,6 +290,7 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/plugins/bom_txt_sorted_by_ref.py
 %%DATADIR%%/plugins/bom_with_title_block_2_csv.xsl
 %%DATADIR%%/plugins/kicad_netlist_reader.py
+%%DATADIR%%/plugins/kicad_utils.py
 %%DATADIR%%/plugins/netlist_form_OrcadPcb2.xsl
 %%DATADIR%%/plugins/netlist_form_cadstar-RINF.xsl
 %%DATADIR%%/plugins/netlist_form_cadstar.xsl