cad/kicad-devel: Update to the latest version

5 files changed, 6 insertions, 39 deletions

diff --git a/cad/kicad-devel/Makefile.git_rev b/cad/kicad-devel/Makefile.git_rev
index b8b3fd764303..d47f5d059067 100644
--- a/cad/kicad-devel/Makefile.git_rev
+++ b/cad/kicad-devel/Makefile.git_rev
@@ -1,2 +1,2 @@
-GIT_SRC_HASH=  063478b3dc2257641a43fa9830902fcdd89976d5
-GIT_SRC_DATE=  20230108153438
+GIT_SRC_HASH=  206f66aee213a70a76f5b7dacd2ad205a83d3f90
+GIT_SRC_DATE=  20230622153548
diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo
index 6dc0f0717071..f8bdd3b3eb1c 100644
--- a/cad/kicad-devel/distinfo
+++ b/cad/kicad-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1673190180
-SHA256 (kicad/kicad/code-kicad-063478b3dc2257641a43fa9830902fcdd89976d5_GL0.tar.gz) = cc4f560965f6b4001ac825e4d3a0e4a3dfa472a413a948d50aa6a7ecafb78576
-SIZE (kicad/kicad/code-kicad-063478b3dc2257641a43fa9830902fcdd89976d5_GL0.tar.gz) = 55179322
+TIMESTAMP = 1687443075
+SHA256 (kicad/kicad/code-kicad-206f66aee213a70a76f5b7dacd2ad205a83d3f90_GL0.tar.gz) = 8af629a771a0d3b53fa8c2a87eb79665a5c18191821b696f7e7f8b1e0d17bcb2
+SIZE (kicad/kicad/code-kicad-206f66aee213a70a76f5b7dacd2ad205a83d3f90_GL0.tar.gz) = 62029878
diff --git a/cad/kicad-devel/files/patch-eeschema_sim_sim__plot__frame.cpp b/cad/kicad-devel/files/patch-eeschema_sim_sim__plot__frame.cpp
deleted file mode 100644
index ed9e2c51bd83..000000000000
--- a/cad/kicad-devel/files/patch-eeschema_sim_sim__plot__frame.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- eeschema/sim/sim_plot_frame.cpp.orig	2023-01-06 17:32:00.707624000 +0100
-+++ eeschema/sim/sim_plot_frame.cpp	2023-01-06 17:35:04.237427000 +0100
-@@ -156,15 +156,15 @@
-     Bind( EVT_SIM_CURSOR_UPDATE, &SIM_PLOT_FRAME::onCursorUpdate, this );
- 
-     // Toolbar buttons
--    m_toolSimulate = m_toolBar->AddTool( ID_SIM_RUN, _( "Run/Stop Simulation" ),
-+    m_toolSimulate = m_toolBar->AddTool( ID_SIM_RUN, wxEmptyString,
-             KiBitmap( BITMAPS::sim_run ), _( "Run Simulation" ), wxITEM_NORMAL );
--    m_toolAddSignals = m_toolBar->AddTool( ID_SIM_ADD_SIGNALS, _( "Add Signals" ),
-+    m_toolAddSignals = m_toolBar->AddTool( ID_SIM_ADD_SIGNALS, wxEmptyString,
-             KiBitmap( BITMAPS::sim_add_signal ), _( "Add signals to plot" ), wxITEM_NORMAL );
--    m_toolProbe = m_toolBar->AddTool( ID_SIM_PROBE,  _( "Probe" ),
-+    m_toolProbe = m_toolBar->AddTool( ID_SIM_PROBE,  wxEmptyString,
-             KiBitmap( BITMAPS::sim_probe ), _( "Probe signals on the schematic" ), wxITEM_NORMAL );
--    m_toolTune = m_toolBar->AddTool( ID_SIM_TUNE, _( "Tune" ),
-+    m_toolTune = m_toolBar->AddTool( ID_SIM_TUNE, wxEmptyString,
-             KiBitmap( BITMAPS::sim_tune ), _( "Tune component values" ), wxITEM_NORMAL );
--    m_toolSettings = m_toolBar->AddTool( wxID_ANY, _( "Sim Command" ),
-+    m_toolSettings = m_toolBar->AddTool( wxID_ANY, wxEmptyString,
-             KiBitmap( BITMAPS::config ), _( "Simulation command and settings" ), wxITEM_NORMAL );
- 
-     // Start all toolbar buttons except settings as disabled
diff --git a/cad/kicad-devel/files/patch-pcbnew_dialogs_dialog__board__reannotate.cpp b/cad/kicad-devel/files/patch-pcbnew_dialogs_dialog__board__reannotate.cpp
deleted file mode 100644
index 531346308fac..000000000000
--- a/cad/kicad-devel/files/patch-pcbnew_dialogs_dialog__board__reannotate.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- pcbnew/dialogs/dialog_board_reannotate.cpp.orig	2022-03-03 17:16:00 UTC
-+++ pcbnew/dialogs/dialog_board_reannotate.cpp
-@@ -522,7 +522,7 @@ void DIALOG_BOARD_REANNOTATE::LogChangePlan()
-                     (int) m_refDesTypes.size() );
- 
-     for( RefDesTypeStr Type : m_refDesTypes ) // Show all the types of refdes
--        message += Type.RefDesType + ( 0 == ( i++ % 16 ) ? wxT( "\n" ) : wxS( " " ) );
-+        message += Type.RefDesType + ( 0 == ( i++ % 16 ) ? wxT( "\n" ) : wxT( " " ) );
- 
-     if( !m_excludeArray.empty() )
-     {
diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist
index fa6f49dbdade..05d35cd75f8b 100644
--- a/cad/kicad-devel/pkg-plist
+++ b/cad/kicad-devel/pkg-plist
@@ -197,6 +197,7 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/simulation/laser_driver/laser_driver.kicad_sch
 %%DATADIR%%/demos/simulation/laser_driver/laser_driver_schlib.kicad_sym
 %%DATADIR%%/demos/simulation/laser_driver/sym-lib-table
+%%DATADIR%%/demos/simulation/pspice/2n2222.model
 %%DATADIR%%/demos/simulation/pspice/pspice.kicad_pro
 %%DATADIR%%/demos/simulation/pspice/pspice.kicad_sch
 %%DATADIR%%/demos/simulation/pspice/schematic_libspice.kicad_sym