Attachment 242650 Details for Bug 271878 – Update to 7.0.5

[patch] Update to 7.0.5

kicad-7.0.5.diff.txt (text/plain), 9.65 KB, created by Wen Heping on 2023-06-07 08:03:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wen Heping

Created: 2023-06-07 08:03:25 UTC

Size: 9.65 KB

patch

obsolete

>diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
>index 268e9fa087fe..aa8c1fc3f3fd 100644
>--- a/cad/kicad/Makefile
>+++ b/cad/kicad/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	kicad
>-PORTVERSION=	7.0.2
>-PORTREVISION=	2
>+PORTVERSION=	7.0.5
> PORTEPOCH=	2
> CATEGORIES=	cad
> MASTER_SITES=	https://gitlab.com/${PORTNAME}/code/${PORTNAME}/-/archive/${DISTVERSION}${DISTVERSIONSUFFIX}/
>diff --git a/cad/kicad/distinfo b/cad/kicad/distinfo
>index cda88911f64e..abc6adce3a78 100644
>--- a/cad/kicad/distinfo
>+++ b/cad/kicad/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1681673747
>-SHA256 (kicad-7.0.2.tar.bz2) = 9d7a370ebbd2f7f0603d395d2b3b8c14f5e0ed71441c03895591fb776c4ce38e
>-SIZE (kicad-7.0.2.tar.bz2) = 42844186
>+TIMESTAMP = 1686101175
>+SHA256 (kicad-7.0.5.tar.bz2) = aec38c194c2ee3b18bf8e074a13c3115806aac870df957f0e0146c364f347934
>+SIZE (kicad-7.0.5.tar.bz2) = 43490022
>diff --git a/cad/kicad/files/patch-job_use_dynamic_cast_for_updating b/cad/kicad/files/patch-job_use_dynamic_cast_for_updating
>index 9b6be4f43bcd..b4155e869b8e 100644
>--- a/cad/kicad/files/patch-job_use_dynamic_cast_for_updating
>+++ b/cad/kicad/files/patch-job_use_dynamic_cast_for_updating
>@@ -3,7 +3,7 @@ Author: Christoph Moench-Tegeder <cmt@burggraben.net>
> Date:   Fri Mar 24 21:59:39 2023 +0100
> 
>     do not use dynamic_cast for upcasting to JOB
>-    
>+
>     Based on my understanding of dynamic_cast, the base class needs
>     to be virtual when upcasting a pointer of a derived object to one
>     of it's base classes, and JOB is "not virtual enough", at least not
>@@ -13,15 +13,13 @@ Date:   Fri Mar 24 21:59:39 2023 +0100
>     This changes all obvious cases of the upcast-to-JOB to static_cast,
>     I did not check for other classes (there are just too many for doing
>     that in my spare time).
>-    
>+
>     Credits to Pero Orsolic for reporting the first cases of this in the
>     PDF export in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270273 .
> 
>-diff --git eeschema/eeschema_jobs_handler.cpp eeschema/eeschema_jobs_handler.cpp
>-index 61462793ee..ce312d5100 100644
>---- eeschema/eeschema_jobs_handler.cpp
>+--- eeschema/eeschema_jobs_handler.cpp.orig	2023-06-07 01:10:14 UTC
> +++ eeschema/eeschema_jobs_handler.cpp
>-@@ -111,7 +111,7 @@ REPORTER& EESCHEMA_JOBS_HANDLER::Report( const wxString& aText, SEVERITY aSeveri
>+@@ -111,7 +111,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportPdf( JOB* aJob )
>  
>  int EESCHEMA_JOBS_HANDLER::JobExportPdf( JOB* aJob )
>  {
>@@ -30,7 +28,7 @@ index 61462793ee..ce312d5100 100644
>  
>      if( !aPdfJob )
>          return CLI::EXIT_CODES::ERR_UNKNOWN;
>-@@ -147,7 +147,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportPdf( JOB* aJob )
>+@@ -147,7 +147,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportSvg( JOB* aJob )
>  
>  int EESCHEMA_JOBS_HANDLER::JobExportSvg( JOB* aJob )
>  {
>@@ -39,7 +37,7 @@ index 61462793ee..ce312d5100 100644
>  
>      if( !aSvgJob )
>          return CLI::EXIT_CODES::ERR_UNKNOWN;
>-@@ -183,7 +183,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportSvg( JOB* aJob )
>+@@ -183,7 +183,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportNetlist( JOB* aJob
>  
>  int EESCHEMA_JOBS_HANDLER::JobExportNetlist( JOB* aJob )
>  {
>@@ -48,7 +46,7 @@ index 61462793ee..ce312d5100 100644
>  
>      if( !aNetJob )
>          return CLI::EXIT_CODES::ERR_UNKNOWN;
>-@@ -281,7 +281,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportNetlist( JOB* aJob )
>+@@ -287,7 +287,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportPythonBom( JOB* aJ
>  
>  int EESCHEMA_JOBS_HANDLER::JobExportPythonBom( JOB* aJob )
>  {
>@@ -57,7 +55,7 @@ index 61462793ee..ce312d5100 100644
>  
>      SCHEMATIC* sch = EESCHEMA_HELPERS::LoadSchematic( aNetJob->m_filename, SCH_IO_MGR::SCH_KICAD );
>  
>-@@ -447,7 +447,7 @@ int EESCHEMA_JOBS_HANDLER::doSymExportSvg( JOB_SYM_EXPORT_SVG*         aSvgJob,
>+@@ -464,7 +464,7 @@ int EESCHEMA_JOBS_HANDLER::JobSymExportSvg( JOB* aJob 
>  
>  int EESCHEMA_JOBS_HANDLER::JobSymExportSvg( JOB* aJob )
>  {
>@@ -66,7 +64,7 @@ index 61462793ee..ce312d5100 100644
>  
>      wxFileName fn( svgJob->m_libraryPath );
>      fn.MakeAbsolute();
>-@@ -510,7 +510,7 @@ int EESCHEMA_JOBS_HANDLER::JobSymExportSvg( JOB* aJob )
>+@@ -531,7 +531,7 @@ int EESCHEMA_JOBS_HANDLER::JobSymUpgrade( JOB* aJob )
>  
>  int EESCHEMA_JOBS_HANDLER::JobSymUpgrade( JOB* aJob )
>  {
>@@ -75,11 +73,9 @@ index 61462793ee..ce312d5100 100644
>  
>      wxFileName fn( upgradeJob->m_libraryPath );
>      fn.MakeAbsolute();
>-diff --git pcbnew/pcbnew_jobs_handler.cpp pcbnew/pcbnew_jobs_handler.cpp
>-index be0f806dea..e045f864de 100644
>---- pcbnew/pcbnew_jobs_handler.cpp
>+--- pcbnew/pcbnew_jobs_handler.cpp.orig	2023-06-07 01:12:57 UTC
> +++ pcbnew/pcbnew_jobs_handler.cpp
>-@@ -76,7 +76,7 @@ PCBNEW_JOBS_HANDLER::PCBNEW_JOBS_HANDLER()
>+@@ -76,7 +76,7 @@ int PCBNEW_JOBS_HANDLER::JobExportStep( JOB* aJob )
>  
>  int PCBNEW_JOBS_HANDLER::JobExportStep( JOB* aJob )
>  {
>@@ -88,7 +84,7 @@ index be0f806dea..e045f864de 100644
>  
>      if( aStepJob == nullptr )
>          return CLI::EXIT_CODES::ERR_UNKNOWN;
>-@@ -119,7 +119,7 @@ int PCBNEW_JOBS_HANDLER::JobExportStep( JOB* aJob )
>+@@ -119,7 +119,7 @@ int PCBNEW_JOBS_HANDLER::JobExportSvg( JOB* aJob )
>  
>  int PCBNEW_JOBS_HANDLER::JobExportSvg( JOB* aJob )
>  {
>@@ -97,7 +93,7 @@ index be0f806dea..e045f864de 100644
>  
>      if( aSvgJob == nullptr )
>          return CLI::EXIT_CODES::ERR_UNKNOWN;
>-@@ -152,7 +152,7 @@ int PCBNEW_JOBS_HANDLER::JobExportSvg( JOB* aJob )
>+@@ -152,7 +152,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDxf( JOB* aJob )
>  
>  int PCBNEW_JOBS_HANDLER::JobExportDxf( JOB* aJob )
>  {
>@@ -106,7 +102,7 @@ index be0f806dea..e045f864de 100644
>  
>      if( aDxfJob == nullptr )
>          return CLI::EXIT_CODES::ERR_UNKNOWN;
>-@@ -207,7 +207,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDxf( JOB* aJob )
>+@@ -207,7 +207,7 @@ int PCBNEW_JOBS_HANDLER::JobExportPdf( JOB* aJob )
>  
>  int PCBNEW_JOBS_HANDLER::JobExportPdf( JOB* aJob )
>  {
>@@ -115,25 +111,25 @@ index be0f806dea..e045f864de 100644
>  
>      if( aPdfJob == nullptr )
>          return CLI::EXIT_CODES::ERR_UNKNOWN;
>-@@ -257,7 +257,7 @@ int PCBNEW_JOBS_HANDLER::JobExportPdf( JOB* aJob )
>- 
>+@@ -258,7 +258,7 @@ int PCBNEW_JOBS_HANDLER::JobExportGerbers( JOB* aJob )
>  int PCBNEW_JOBS_HANDLER::JobExportGerbers( JOB* aJob )
>  {
>+     int                     exitCode = CLI::EXIT_CODES::OK;
> -    JOB_EXPORT_PCB_GERBERS* aGerberJob = dynamic_cast<JOB_EXPORT_PCB_GERBERS*>( aJob );
> +    JOB_EXPORT_PCB_GERBERS* aGerberJob = static_cast<JOB_EXPORT_PCB_GERBERS*>( aJob );
>  
>      if( aGerberJob == nullptr )
>          return CLI::EXIT_CODES::ERR_UNKNOWN;
>-@@ -368,7 +368,7 @@ void PCBNEW_JOBS_HANDLER::populateGerberPlotOptionsFromJob( PCB_PLOT_PARAMS&
>- 
>+@@ -375,7 +375,7 @@ int PCBNEW_JOBS_HANDLER::JobExportGerber( JOB* aJob )
>  int PCBNEW_JOBS_HANDLER::JobExportGerber( JOB* aJob )
>  {
>+     int                    exitCode = CLI::EXIT_CODES::OK;
> -    JOB_EXPORT_PCB_GERBER* aGerberJob = dynamic_cast<JOB_EXPORT_PCB_GERBER*>( aJob );
> +    JOB_EXPORT_PCB_GERBER* aGerberJob = static_cast<JOB_EXPORT_PCB_GERBER*>( aJob );
>  
>      if( aGerberJob == nullptr )
>          return CLI::EXIT_CODES::ERR_UNKNOWN;
>-@@ -414,7 +414,7 @@ static DRILL_PRECISION precisionListForMetric( 3, 3 );
>+@@ -426,7 +426,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDrill( JOB* aJob )
>  
>  int PCBNEW_JOBS_HANDLER::JobExportDrill( JOB* aJob )
>  {
>@@ -142,7 +138,25 @@ index be0f806dea..e045f864de 100644
>  
>      if( aDrillJob == nullptr )
>          return CLI::EXIT_CODES::ERR_UNKNOWN;
>-@@ -522,7 +522,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDrill( JOB* aJob )
>+@@ -493,7 +493,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDrill( JOB* aJob )
>+         else
>+             precision = precisionListForMetric;
>+ 
>+-        EXCELLON_WRITER* excellonWriter = dynamic_cast<EXCELLON_WRITER*>( drillWriter.get() );
>++        EXCELLON_WRITER* excellonWriter = static_cast<EXCELLON_WRITER*>( drillWriter.get() );
>+ 
>+         if( excellonWriter == nullptr )
>+             return CLI::EXIT_CODES::ERR_UNKNOWN;
>+@@ -515,7 +515,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDrill( JOB* aJob )
>+     }
>+     else if( aDrillJob->m_format == JOB_EXPORT_PCB_DRILL::DRILL_FORMAT::GERBER )
>+     {
>+-        GERBER_WRITER* gerberWriter = dynamic_cast<GERBER_WRITER*>( drillWriter.get() );
>++        GERBER_WRITER* gerberWriter = static_cast<GERBER_WRITER*>( drillWriter.get() );
>+ 
>+         if( gerberWriter == nullptr )
>+             return CLI::EXIT_CODES::ERR_UNKNOWN;
>+@@ -540,7 +540,7 @@ int PCBNEW_JOBS_HANDLER::JobExportPos( JOB* aJob )
>  
>  int PCBNEW_JOBS_HANDLER::JobExportPos( JOB* aJob )
>  {
>@@ -151,7 +165,7 @@ index be0f806dea..e045f864de 100644
>  
>      if( aPosJob == nullptr )
>          return CLI::EXIT_CODES::ERR_UNKNOWN;
>-@@ -597,7 +597,7 @@ extern FOOTPRINT* try_load_footprint( const wxFileName& aFileName, IO_MGR::PCB_F
>+@@ -615,7 +615,7 @@ int PCBNEW_JOBS_HANDLER::JobExportFpUpgrade( JOB* aJob
>  
>  int PCBNEW_JOBS_HANDLER::JobExportFpUpgrade( JOB* aJob )
>  {
>@@ -160,7 +174,7 @@ index be0f806dea..e045f864de 100644
>  
>      if( upgradeJob == nullptr )
>          return CLI::EXIT_CODES::ERR_UNKNOWN;
>-@@ -668,7 +668,7 @@ int PCBNEW_JOBS_HANDLER::JobExportFpUpgrade( JOB* aJob )
>+@@ -686,7 +686,7 @@ int PCBNEW_JOBS_HANDLER::JobExportFpSvg( JOB* aJob )
>  
>  int PCBNEW_JOBS_HANDLER::JobExportFpSvg( JOB* aJob )
>  {
>@@ -169,3 +183,19 @@ index be0f806dea..e045f864de 100644
>  
>      if( svgJob == nullptr )
>          return CLI::EXIT_CODES::ERR_UNKNOWN;
>+@@ -754,7 +754,7 @@ int PCBNEW_JOBS_HANDLER::doFpExportSvg( JOB_FP_EXPORT_
>+     std::unique_ptr<BOARD> brd;
>+     brd.reset( CreateEmptyBoard() );
>+ 
>+-    FOOTPRINT* fp = dynamic_cast<FOOTPRINT*>( aFootprint->Clone() );
>++    FOOTPRINT* fp = static_cast<FOOTPRINT*>( aFootprint->Clone() );
>+ 
>+     if( fp == nullptr )
>+         return CLI::EXIT_CODES::ERR_UNKNOWN;
>+@@ -808,4 +808,4 @@ REPORTER& PCBNEW_JOBS_HANDLER::Report( const wxString&
>+         wxPrintf( wxS( "%s\n" ), aText );
>+ 
>+     return *this;
>+-}
>+\ No newline at end of file
>++}

Flags:

cmt: maintainer-approval-

Actions: View | Diff

Attachments on bug 271878: 242650