Attachment 248826 Details for Bug 277392 – Update to 7.0.11

[patch] Update to 7.0.11

kicad-7.0.11.diff.txt (text/plain), 12.62 KB, created by Wen Heping on 2024-02-29 12:32:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wen Heping

Created: 2024-02-29 12:32:07 UTC

Size: 12.62 KB

patch

obsolete

>diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
>index cb7500771af8..48a30235977e 100644
>--- a/cad/kicad/Makefile
>+++ b/cad/kicad/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	kicad
>-PORTVERSION=	7.0.2
>-PORTREVISION=	5
>+PORTVERSION=	7.0.11
> 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..990248647a6f 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 = 1709033701
>+SHA256 (kicad-7.0.11.tar.bz2) = 24feb0747ee8d767c903fac5254c314a5012f4aee7016e961da845765764cf73
>+SIZE (kicad-7.0.11.tar.bz2) = 44083805
>diff --git a/cad/kicad/files/patch-CMakeModules_KiCadFullVersion.cmake b/cad/kicad/files/patch-CMakeModules_KiCadFullVersion.cmake
>deleted file mode 100644
>index 654deae40d10..000000000000
>--- a/cad/kicad/files/patch-CMakeModules_KiCadFullVersion.cmake
>+++ /dev/null
>@@ -1,13 +0,0 @@
>---- ./cmake/KiCadFullVersion.cmake.orig	2023-01-25 21:49:08.004539000 +0100
>-+++ ./cmake/KiCadFullVersion.cmake	2023-01-25 21:49:50.772285000 +0100
>-@@ -27,10 +27,6 @@
>- # repository), or the version from KiCadVersion.cmake. The user-provided
>- # KICAD_VERSION_EXTRA is then appended to the base version string.
>- 
>--# Use git to determine the version string if it's available.
>--include( ${KICAD_CMAKE_MODULE_PATH}/CreateGitVersionHeader.cmake )
>--create_git_version_header( ${SRC_PATH} )
>--
>- # $KICAD_VERSION is set in KiCadVersion.cmake or by git (if it is available).
>- set( KICAD_VERSION_FULL "${KICAD_VERSION}" )
>- 
>diff --git a/cad/kicad/files/patch-eeschema_sim_sim__plot__frame.cpp b/cad/kicad/files/patch-eeschema_sim_sim__plot__frame.cpp
>index ba2c5ec1a4dd..b41224f758fe 100644
>--- a/cad/kicad/files/patch-eeschema_sim_sim__plot__frame.cpp
>+++ b/cad/kicad/files/patch-eeschema_sim_sim__plot__frame.cpp
>@@ -1,5 +1,5 @@
>---- eeschema/sim/sim_plot_frame.cpp.orig	2023-01-25 22:50:55.894239000 +0100
>-+++ eeschema/sim/sim_plot_frame.cpp	2023-01-27 00:25:46.086158000 +0100
>+--- eeschema/sim/sim_plot_frame.cpp.orig	2024-02-29 11:45:35 UTC
>++++ eeschema/sim/sim_plot_frame.cpp
> @@ -27,6 +27,8 @@
>  #include <wx/debug.h>
>  #include <wx/stc/stc.h>
>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..39b97f333d00 100644
>--- a/cad/kicad/files/patch-job_use_dynamic_cast_for_updating
>+++ b/cad/kicad/files/patch-job_use_dynamic_cast_for_updating
>@@ -17,29 +17,18 @@ Date:   Fri Mar 24 21:59:39 2023 +0100
>     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	2024-02-29 11:55:32 UTC
> +++ eeschema/eeschema_jobs_handler.cpp
>-@@ -111,7 +111,7 @@ REPORTER& EESCHEMA_JOBS_HANDLER::Report( const wxString& aText, SEVERITY aSeveri
>+@@ -108,7 +108,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportPlot( JOB* aJob )
>  
>- int EESCHEMA_JOBS_HANDLER::JobExportPdf( JOB* aJob )
>+ int EESCHEMA_JOBS_HANDLER::JobExportPlot( JOB* aJob )
>  {
>--    JOB_EXPORT_SCH_PDF* aPdfJob = dynamic_cast<JOB_EXPORT_SCH_PDF*>( aJob );
>-+    JOB_EXPORT_SCH_PDF* aPdfJob = static_cast<JOB_EXPORT_SCH_PDF*>( aJob );
>+-    JOB_EXPORT_SCH_PLOT* aPlotJob = dynamic_cast<JOB_EXPORT_SCH_PLOT*>( aJob );
>++    JOB_EXPORT_SCH_PLOT* aPlotJob = static_cast<JOB_EXPORT_SCH_PLOT*>( aJob );
>  
>-     if( !aPdfJob )
>+     if( !aPlotJob )
>          return CLI::EXIT_CODES::ERR_UNKNOWN;
>-@@ -147,7 +147,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportPdf( JOB* aJob )
>- 
>- int EESCHEMA_JOBS_HANDLER::JobExportSvg( JOB* aJob )
>- {
>--    JOB_EXPORT_SCH_SVG* aSvgJob = dynamic_cast<JOB_EXPORT_SCH_SVG*>( aJob );
>-+    JOB_EXPORT_SCH_SVG* aSvgJob = static_cast<JOB_EXPORT_SCH_SVG*>( aJob );
>- 
>-     if( !aSvgJob )
>-         return CLI::EXIT_CODES::ERR_UNKNOWN;
>-@@ -183,7 +183,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportSvg( JOB* aJob )
>+@@ -134,7 +134,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportNetlist( JOB* aJob
>  
>  int EESCHEMA_JOBS_HANDLER::JobExportNetlist( JOB* aJob )
>  {
>@@ -48,7 +37,7 @@ index 61462793ee..ce312d5100 100644
>  
>      if( !aNetJob )
>          return CLI::EXIT_CODES::ERR_UNKNOWN;
>-@@ -281,7 +281,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportNetlist( JOB* aJob )
>+@@ -238,7 +238,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportPythonBom( JOB* aJ
>  
>  int EESCHEMA_JOBS_HANDLER::JobExportPythonBom( JOB* aJob )
>  {
>@@ -57,7 +46,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,
>+@@ -416,7 +416,7 @@ int EESCHEMA_JOBS_HANDLER::JobSymExportSvg( JOB* aJob 
>  
>  int EESCHEMA_JOBS_HANDLER::JobSymExportSvg( JOB* aJob )
>  {
>@@ -66,7 +55,7 @@ index 61462793ee..ce312d5100 100644
>  
>      wxFileName fn( svgJob->m_libraryPath );
>      fn.MakeAbsolute();
>-@@ -510,7 +510,7 @@ int EESCHEMA_JOBS_HANDLER::JobSymExportSvg( JOB* aJob )
>+@@ -483,7 +483,7 @@ int EESCHEMA_JOBS_HANDLER::JobSymUpgrade( JOB* aJob )
>  
>  int EESCHEMA_JOBS_HANDLER::JobSymUpgrade( JOB* aJob )
>  {
>@@ -75,11 +64,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	2024-02-29 11:57:46 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 +75,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 +84,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 )
>+@@ -154,7 +154,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDxf( JOB* aJob )
>  
>  int PCBNEW_JOBS_HANDLER::JobExportDxf( JOB* aJob )
>  {
>@@ -106,7 +93,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 )
>+@@ -209,7 +209,7 @@ int PCBNEW_JOBS_HANDLER::JobExportPdf( JOB* aJob )
>  
>  int PCBNEW_JOBS_HANDLER::JobExportPdf( JOB* aJob )
>  {
>@@ -115,25 +102,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 )
>- 
>+@@ -278,7 +278,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&
>- 
>+@@ -400,7 +400,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 );
>+@@ -451,7 +451,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDrill( JOB* aJob )
>  
>  int PCBNEW_JOBS_HANDLER::JobExportDrill( JOB* aJob )
>  {
>@@ -142,7 +129,7 @@ index be0f806dea..e045f864de 100644
>  
>      if( aDrillJob == nullptr )
>          return CLI::EXIT_CODES::ERR_UNKNOWN;
>-@@ -522,7 +522,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDrill( JOB* aJob )
>+@@ -574,7 +574,7 @@ int PCBNEW_JOBS_HANDLER::JobExportPos( JOB* aJob )
>  
>  int PCBNEW_JOBS_HANDLER::JobExportPos( JOB* aJob )
>  {
>@@ -151,7 +138,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
>+@@ -649,7 +649,7 @@ int PCBNEW_JOBS_HANDLER::JobExportFpUpgrade( JOB* aJob
>  
>  int PCBNEW_JOBS_HANDLER::JobExportFpUpgrade( JOB* aJob )
>  {
>@@ -160,7 +147,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 )
>+@@ -720,7 +720,7 @@ int PCBNEW_JOBS_HANDLER::JobExportFpSvg( JOB* aJob )
>  
>  int PCBNEW_JOBS_HANDLER::JobExportFpSvg( JOB* aJob )
>  {
>diff --git a/cad/kicad/files/patch-pcbnew_import__gfx_dxf__import__plugin.cpp b/cad/kicad/files/patch-pcbnew_import__gfx_dxf__import__plugin.cpp
>index aee69e61ffff..1af70b4aa259 100644
>--- a/cad/kicad/files/patch-pcbnew_import__gfx_dxf__import__plugin.cpp
>+++ b/cad/kicad/files/patch-pcbnew_import__gfx_dxf__import__plugin.cpp
>@@ -1,16 +1,6 @@
>---- pcbnew/import_gfx/dxf_import_plugin.cpp.orig	2023-01-25 22:16:35.742131000 +0100
>-+++ pcbnew/import_gfx/dxf_import_plugin.cpp	2023-01-25 23:02:52.939723000 +0100
>-@@ -28,6 +28,9 @@
>- // like void DXF_IMPORT_PLUGIN::addLine( const DL_LineData& data ) when a line is read.
>- // this function just add the BOARD entity from dxf parameters (start and end point ...)
>- 
>-+#ifdef __BSD_VISIBLE
>-+#undef __BSD_VISIBLE
>-+#endif
>- 
>- #include "dxf_import_plugin.h"
>- #include <wx/arrstr.h>
>-@@ -580,7 +583,7 @@
>+--- pcbnew/import_gfx/dxf_import_plugin.cpp.orig	2024-02-29 09:20:16 UTC
>++++ pcbnew/import_gfx/dxf_import_plugin.cpp
>+@@ -587,7 +587,7 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseDa
>      // For now, we assume ellipses in the XY plane.
>  
>      VECTOR2D center( mapX( centerCoords.x ), mapY( centerCoords.y ) );
>@@ -19,7 +9,14 @@
>  
>      // DXF elliptical arcs store their angles in radians (unlike circular arcs which use degrees)
>      // The arcs wind CCW as in KiCad.  The end angle must be greater than the start angle, and if
>-@@ -598,7 +601,7 @@
>+@@ -602,12 +602,12 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseDa
>+         endAngle += ANGLE_360;
>+ 
>+     // Angles are relative to major axis
>+-    startAngle -= EDA_ANGLE( major );
>+-    endAngle -= EDA_ANGLE( major );
>++    startAngle -= EDA_ANGLE( vmajor );
>++    endAngle -= EDA_ANGLE( vmajor );
>  
>      if( aData.ratio == 1.0 )
>      {
>@@ -28,8 +25,8 @@
>  
>          if( startAngle == endAngle )
>          {
>-@@ -616,7 +619,7 @@
>-     }
>+@@ -627,7 +627,7 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseDa
>+     // TODO: testcases for negative extrusion vector; handle it here
>  
>      std::vector<BEZIER<double>> splines;
> -    ELLIPSE<double> ellipse( center, major, aData.ratio, startAngle, endAngle );
>@@ -37,7 +34,7 @@
>  
>      TransformEllipseToBeziers( ellipse, splines );
>  
>-@@ -630,8 +633,8 @@
>+@@ -641,8 +641,8 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseDa
>          bufferToUse->AddSpline( b.Start, b.C1, b.C2, b.End, lineWidth );
>  
>      // Naive bounding
>diff --git a/cad/kicad/files/patch-cmake_KiCadFullVersion.cmake b/cad/kicad/files/patch-cmake_KiCadFullVersion.cmake
>new file mode 100644
>index 000000000000..536f411b1fe3
>--- /dev/null
>+++ b/cad/kicad/files/patch-cmake_KiCadFullVersion.cmake
>@@ -0,0 +1,13 @@
>+--- cmake/KiCadFullVersion.cmake.orig	2024-02-29 11:47:07 UTC
>++++ cmake/KiCadFullVersion.cmake
>+@@ -27,10 +27,6 @@
>+ # repository), or the version from KiCadVersion.cmake. The user-provided
>+ # KICAD_VERSION_EXTRA is then appended to the base version string.
>+ 
>+-# Use git to determine the version string if it's available.
>+-include( ${KICAD_CMAKE_MODULE_PATH}/CreateGitVersionHeader.cmake )
>+-create_git_version_header( ${SRC_PATH} )
>+-
>+ # $KICAD_VERSION is set in KiCadVersion.cmake or by git (if it is available).
>+ set( KICAD_VERSION_FULL "${KICAD_VERSION}" )
>+

Actions: View | Diff

Attachments on bug 277392: 248826