diff options
Diffstat (limited to '')
16 files changed, 269 insertions, 7 deletions
diff --git a/cad/kicad-devel/files/newVersion.sh b/cad/kicad-devel/files/newVersion.sh index 405b7fd6e1c5..abfd0f434644 100644 --- a/cad/kicad-devel/files/newVersion.sh +++ b/cad/kicad-devel/files/newVersion.sh @@ -15,8 +15,12 @@ cd "${CURDIR}/kicad-repo" GIT_SRC_HASH=`git log -n 1 --pretty=format:"%H"`; GIT_SRC_DATE=`git log -n 1 --date=iso-local -n 1 --pretty=format:"%cd" | \ cut -c '1-19' | sed -e 's,-,,g' -e 's,:,,g' -e 's, ,,g'` +GIT_SRC_DATE2=`git log -n 1 --date=iso-local -n 1 --pretty=format:"%cd" --date=format-local:'%Y.%m.%d' | \ + cut -c '1-19' | sed -e 's,-,,g' -e 's,:,,g' -e 's, ,,g'` + echo "$GIT_SRC_HASH, $GIT_SRC_DATE" echo "GIT_SRC_HASH= ${GIT_SRC_HASH}" > ${CURDIR}/Makefile.git_rev echo "GIT_SRC_DATE= ${GIT_SRC_DATE}" >> ${CURDIR}/Makefile.git_rev +echo "GIT_SRC_DATE2= ${GIT_SRC_DATE2}" >> ${CURDIR}/Makefile.git_rev diff --git a/cad/kicad-devel/files/patch-3d-viewer_3d__viewer_eda__3d__viewer__frame.cpp b/cad/kicad-devel/files/patch-3d-viewer_3d__viewer_eda__3d__viewer__frame.cpp new file mode 100644 index 000000000000..d25ee72edfd6 --- /dev/null +++ b/cad/kicad-devel/files/patch-3d-viewer_3d__viewer_eda__3d__viewer__frame.cpp @@ -0,0 +1,20 @@ +--- 3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp.orig 2025-08-25 16:19:00 UTC ++++ 3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp +@@ -61,7 +61,7 @@ + #include <project_pcb.h> + #include <toolbars_3d.h> + +-#ifdef __linux__ ++#if defined (__linux__) || defined (__FreeBSD__) + #include <spacenav/libspnav_driver.h> + #include <3d_spacenav/spnav_viewer_plugin.h> + #else +@@ -197,7 +197,7 @@ EDA_3D_VIEWER_FRAME::EDA_3D_VIEWER_FRAME( KIWAY* aKiwa + + try + { +-#ifdef __linux__ ++#if defined (__linux__) || defined (__FreeBSD__) + m_spaceMouse = std::make_unique<SPNAV_VIEWER_PLUGIN>( m_canvas ); + #else + m_spaceMouse = std::make_unique<NL_3D_VIEWER_PLUGIN>( m_canvas ); diff --git a/cad/kicad-devel/files/patch-3d-viewer_3d__viewer_eda__3d__viewer__frame.h b/cad/kicad-devel/files/patch-3d-viewer_3d__viewer_eda__3d__viewer__frame.h new file mode 100644 index 000000000000..c8142ea3946f --- /dev/null +++ b/cad/kicad-devel/files/patch-3d-viewer_3d__viewer_eda__3d__viewer__frame.h @@ -0,0 +1,20 @@ +--- 3d-viewer/3d_viewer/eda_3d_viewer_frame.h.orig 2025-08-26 07:56:54 UTC ++++ 3d-viewer/3d_viewer/eda_3d_viewer_frame.h +@@ -44,7 +44,7 @@ + #define KICAD_DEFAULT_3D_DRAWFRAME_STYLE (wxDEFAULT_FRAME_STYLE | wxWANTS_CHARS) + + // Forward declarations +-#ifdef __linux__ ++#if defined (__linux__) || defined (__FreeBSD__) + class SPNAV_VIEWER_PLUGIN; + #else + class NL_3D_VIEWER_PLUGIN; +@@ -280,7 +280,7 @@ class EDA_3D_VIEWER_FRAME : public KIWAY_PLAYER (priva + + bool m_disable_ray_tracing; + +-#ifdef __linux__ ++#if defined (__linux__) || defined (__FreeBSD__) + std::unique_ptr<SPNAV_VIEWER_PLUGIN> m_spaceMouse; + #else + std::unique_ptr<NL_3D_VIEWER_PLUGIN> m_spaceMouse; diff --git a/cad/kicad-devel/files/patch-3d-viewer_dialogs_panel__preview__3d__model.cpp b/cad/kicad-devel/files/patch-3d-viewer_dialogs_panel__preview__3d__model.cpp new file mode 100644 index 000000000000..60c5ef25ddce --- /dev/null +++ b/cad/kicad-devel/files/patch-3d-viewer_dialogs_panel__preview__3d__model.cpp @@ -0,0 +1,20 @@ +--- 3d-viewer/dialogs/panel_preview_3d_model.cpp.orig 2025-08-26 08:03:58 UTC ++++ 3d-viewer/dialogs/panel_preview_3d_model.cpp +@@ -47,7 +47,7 @@ + #include <eda_3d_viewer_settings.h> + #include <board_design_settings.h> + +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + #include <3d_navlib/nl_footprint_properties_plugin.h> + #else + #include <3d_spacenav/spnav_viewer_plugin.h> +@@ -136,7 +136,7 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWind + + try + { +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + m_spaceMouse = std::make_unique<NL_FOOTPRINT_PROPERTIES_PLUGIN>( m_previewPane ); + #else + m_spaceMouse = std::make_unique<SPNAV_VIEWER_PLUGIN>( m_previewPane ); diff --git a/cad/kicad-devel/files/patch-3d-viewer_dialogs_panel__preview__3d__model.h b/cad/kicad-devel/files/patch-3d-viewer_dialogs_panel__preview__3d__model.h new file mode 100644 index 000000000000..6889bd32261d --- /dev/null +++ b/cad/kicad-devel/files/patch-3d-viewer_dialogs_panel__preview__3d__model.h @@ -0,0 +1,20 @@ +--- 3d-viewer/dialogs/panel_preview_3d_model.h.orig 2025-08-26 08:13:34 UTC ++++ 3d-viewer/dialogs/panel_preview_3d_model.h +@@ -63,7 +63,7 @@ class FOOTPRINT; + class BOARD; + class BOARD_ADAPTER; + class FOOTPRINT; +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + class NL_FOOTPRINT_PROPERTIES_PLUGIN; + #else + class SPNAV_VIEWER_PLUGIN; +@@ -233,7 +233,7 @@ class PANEL_PREVIEW_3D_MODEL: public TOOLS_HOLDER, pub + /// The 3d viewer Render initial settings (must be saved and restored) + EDA_3D_VIEWER_SETTINGS::RENDER_SETTINGS m_initialRender; + +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + std::unique_ptr<NL_FOOTPRINT_PROPERTIES_PLUGIN> m_spaceMouse; + #else + std::unique_ptr<SPNAV_VIEWER_PLUGIN> m_spaceMouse; diff --git a/cad/kicad-devel/files/patch-common_spacenav_libspnav__driver.h b/cad/kicad-devel/files/patch-common_spacenav_libspnav__driver.h new file mode 100644 index 000000000000..4ee6d074e77b --- /dev/null +++ b/cad/kicad-devel/files/patch-common_spacenav_libspnav__driver.h @@ -0,0 +1,18 @@ +--- common/spacenav/libspnav_driver.h.orig 2025-08-13 09:54:46 UTC ++++ common/spacenav/libspnav_driver.h +@@ -24,7 +24,7 @@ + #ifndef KICAD_LIBSPNAV_DRIVER_H + #define KICAD_LIBSPNAV_DRIVER_H + +-#ifdef __linux__ ++#if defined (__linux__) || defined (__FreeBSD__) + #include <spnav.h> + #endif + +@@ -52,4 +52,4 @@ class KICOMMON_API LIBSPNAV_DRIVER : public SPACENAV_D + bool m_client_connected = false; + }; + +-#endif // KICAD_LIBSPNAV_DRIVER_H +\ No newline at end of file ++#endif // KICAD_LIBSPNAV_DRIVER_H diff --git a/cad/kicad-devel/files/patch-eeschema_sch__base__frame.cpp b/cad/kicad-devel/files/patch-eeschema_sch__base__frame.cpp new file mode 100644 index 000000000000..80ba85c66c2c --- /dev/null +++ b/cad/kicad-devel/files/patch-eeschema_sch__base__frame.cpp @@ -0,0 +1,20 @@ +--- eeschema/sch_base_frame.cpp.orig 2025-08-26 07:49:43 UTC ++++ eeschema/sch_base_frame.cpp +@@ -60,7 +60,7 @@ + #include <wx/log.h> + #include <wx/msgdlg.h> + +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + #include <navlib/nl_schematic_plugin.h> + #include <wx/fdrepdlg.h> + #else +@@ -369,7 +369,7 @@ void SCH_BASE_FRAME::ActivateGalCanvas() + { + if( !m_spaceMouse ) + { +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + m_spaceMouse = std::make_unique<NL_SCHEMATIC_PLUGIN>(); + #else + m_spaceMouse = std::make_unique<SPNAV_2D_PLUGIN>( GetCanvas() ); diff --git a/cad/kicad-devel/files/patch-eeschema_sch__base__frame.h b/cad/kicad-devel/files/patch-eeschema_sch__base__frame.h new file mode 100644 index 000000000000..7a56f8d5a4d5 --- /dev/null +++ b/cad/kicad-devel/files/patch-eeschema_sch__base__frame.h @@ -0,0 +1,20 @@ +--- eeschema/sch_base_frame.h.orig 2025-08-26 07:58:54 UTC ++++ eeschema/sch_base_frame.h +@@ -56,7 +56,7 @@ class SYMBOL_EDITOR_SETTINGS; + class EESCHEMA_SETTINGS; + class SYMBOL_EDITOR_SETTINGS; + +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + class NL_SCHEMATIC_PLUGIN; + #else + class SPNAV_2D_PLUGIN; +@@ -333,7 +333,7 @@ class SCH_BASE_FRAME : public EDA_DRAW_FRAME, public S + wxTimer m_watcherDebounceTimer; + bool m_inSymChangeTimerEvent; + +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + std::unique_ptr<NL_SCHEMATIC_PLUGIN> m_spaceMouse; + #else + std::unique_ptr<SPNAV_2D_PLUGIN> m_spaceMouse; diff --git a/cad/kicad-devel/files/patch-gerbview_gerbview__frame.cpp b/cad/kicad-devel/files/patch-gerbview_gerbview__frame.cpp new file mode 100644 index 000000000000..686845882980 --- /dev/null +++ b/cad/kicad-devel/files/patch-gerbview_gerbview__frame.cpp @@ -0,0 +1,20 @@ +--- gerbview/gerbview_frame.cpp.orig 2025-08-26 08:02:01 UTC ++++ gerbview/gerbview_frame.cpp +@@ -59,7 +59,7 @@ + #include "widgets/dcode_selection_box.h" + #include <dialog_draw_layers_settings.h> + +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + #include <navlib/nl_gerbview_plugin.h> + #else + #include <spacenav/spnav_2d_plugin.h> +@@ -1045,7 +1045,7 @@ void GERBVIEW_FRAME::ActivateGalCanvas() + { + if( !m_spaceMouse ) + { +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + m_spaceMouse = std::make_unique<NL_GERBVIEW_PLUGIN>(); + #else + m_spaceMouse = std::make_unique<SPNAV_2D_PLUGIN>( galCanvas ); diff --git a/cad/kicad-devel/files/patch-gerbview_gerbview__frame.h b/cad/kicad-devel/files/patch-gerbview_gerbview__frame.h new file mode 100644 index 000000000000..090f1f915f8f --- /dev/null +++ b/cad/kicad-devel/files/patch-gerbview_gerbview__frame.h @@ -0,0 +1,20 @@ +--- gerbview/gerbview_frame.h.orig 2025-08-26 08:11:04 UTC ++++ gerbview/gerbview_frame.h +@@ -46,7 +46,7 @@ class wxStaticText; + class SELECTION; + class wxStaticText; + +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + class NL_GERBVIEW_PLUGIN; + #else + class SPNAV_2D_PLUGIN; +@@ -526,7 +526,7 @@ class GERBVIEW_FRAME : public EDA_DRAW_FRAME (private) + wxStaticText* m_dcodeText; // a message on the auxiliary toolbar, + // relative to the m_DCodeSelector + +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + std::unique_ptr<NL_GERBVIEW_PLUGIN> m_spaceMouse; + #else + std::unique_ptr<SPNAV_2D_PLUGIN> m_spaceMouse; diff --git a/cad/kicad-devel/files/patch-include_pcb__base__frame.h b/cad/kicad-devel/files/patch-include_pcb__base__frame.h new file mode 100644 index 000000000000..792286c34462 --- /dev/null +++ b/cad/kicad-devel/files/patch-include_pcb__base__frame.h @@ -0,0 +1,20 @@ +--- include/pcb_base_frame.h.orig 2025-08-26 08:09:08 UTC ++++ include/pcb_base_frame.h +@@ -62,7 +62,7 @@ class PCB_LAYER_BOX_SELECTOR; + class PROGRESS_REPORTER; + class PCB_LAYER_BOX_SELECTOR; + +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + class NL_PCBNEW_PLUGIN; + #else + class SPNAV_2D_PLUGIN; +@@ -435,7 +435,7 @@ class PCB_BASE_FRAME : public EDA_DRAW_FRAME (private) + PCB_ORIGIN_TRANSFORMS m_originTransforms; + + private: +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + std::unique_ptr<NL_PCBNEW_PLUGIN> m_spaceMouse; + #else + std::unique_ptr<SPNAV_2D_PLUGIN> m_spaceMouse; diff --git a/cad/kicad-devel/files/patch-pagelayout__editor_pl__editor__frame.cpp b/cad/kicad-devel/files/patch-pagelayout__editor_pl__editor__frame.cpp new file mode 100644 index 000000000000..8e43d946c95a --- /dev/null +++ b/cad/kicad-devel/files/patch-pagelayout__editor_pl__editor__frame.cpp @@ -0,0 +1,20 @@ +--- pagelayout_editor/pl_editor_frame.cpp.orig 2025-08-26 08:01:02 UTC ++++ pagelayout_editor/pl_editor_frame.cpp +@@ -65,7 +65,7 @@ + #include <wx/msgdlg.h> + #include <wx/log.h> + +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + #include <navlib/nl_pl_editor_plugin.h> + #else + #include <spacenav/spnav_2d_plugin.h> +@@ -240,7 +240,7 @@ PL_EDITOR_FRAME::PL_EDITOR_FRAME( KIWAY* aKiway, wxWin + { + if( !m_spaceMouse ) + { +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + m_spaceMouse = std::make_unique<NL_PL_EDITOR_PLUGIN>(); + #else + m_spaceMouse = std::make_unique<SPNAV_2D_PLUGIN>( GetCanvas() ); diff --git a/cad/kicad-devel/files/patch-pagelayout__editor_pl__editor__frame.h b/cad/kicad-devel/files/patch-pagelayout__editor_pl__editor__frame.h new file mode 100644 index 000000000000..d8397f508440 --- /dev/null +++ b/cad/kicad-devel/files/patch-pagelayout__editor_pl__editor__frame.h @@ -0,0 +1,20 @@ +--- pagelayout_editor/pl_editor_frame.h.orig 2025-08-26 08:10:05 UTC ++++ pagelayout_editor/pl_editor_frame.h +@@ -39,7 +39,7 @@ class wxChoice; + class DS_DATA_ITEM; + class wxChoice; + +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + class NL_PL_EDITOR_PLUGIN; + #else + class SPNAV_2D_PLUGIN; +@@ -274,7 +274,7 @@ class PL_EDITOR_FRAME : public EDA_DRAW_FRAME (private + // only on page 1, not on page 1 + VECTOR2I m_grid_origin; + +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + std::unique_ptr<NL_PL_EDITOR_PLUGIN> m_spaceMouse; + #else + std::unique_ptr<SPNAV_2D_PLUGIN> m_spaceMouse; diff --git a/cad/kicad-devel/files/patch-pcbnew_pcb__base__frame.cpp b/cad/kicad-devel/files/patch-pcbnew_pcb__base__frame.cpp new file mode 100644 index 000000000000..dd98488c35c8 --- /dev/null +++ b/cad/kicad-devel/files/patch-pcbnew_pcb__base__frame.cpp @@ -0,0 +1,20 @@ +--- pcbnew/pcb_base_frame.cpp.orig 2025-08-26 08:02:49 UTC ++++ pcbnew/pcb_base_frame.cpp +@@ -67,7 +67,7 @@ + #include <tool/grid_menu.h> + #include <ratsnest/ratsnest_view_item.h> + +-#ifdef __linux__ ++#if defined (__linux__) || defined (__FreeBSD__) + #include <spacenav/spnav_2d_plugin.h> + #else + #include <navlib/nl_pcbnew_plugin.h> +@@ -1037,7 +1037,7 @@ void PCB_BASE_FRAME::ActivateGalCanvas() + { + if( !m_spaceMouse ) + { +-#ifndef __linux__ ++#if not defined (__linux__) && not defined (__FreeBSD__) + m_spaceMouse = std::make_unique<NL_PCBNEW_PLUGIN>( GetCanvas() ); + #else + m_spaceMouse = std::make_unique<SPNAV_2D_PLUGIN>( GetCanvas() ); diff --git a/cad/kicad-devel/files/patch-thirdparty_compoundfilereader_compoundfilereader.h b/cad/kicad-devel/files/patch-thirdparty_compoundfilereader_compoundfilereader.h index be30bfbdd7da..e597e5a50073 100644 --- a/cad/kicad-devel/files/patch-thirdparty_compoundfilereader_compoundfilereader.h +++ b/cad/kicad-devel/files/patch-thirdparty_compoundfilereader_compoundfilereader.h @@ -1,6 +1,6 @@ ---- thirdparty/compoundfilereader/compoundfilereader.h.orig 2024-10-11 09:03:05 UTC +--- thirdparty/compoundfilereader/compoundfilereader.h.orig 2025-08-13 00:57:26 UTC +++ thirdparty/compoundfilereader/compoundfilereader.h -@@ -131,7 +131,7 @@ struct helper +@@ -261,7 +261,7 @@ struct helper } }; @@ -9,7 +9,7 @@ typedef std::function<int(const COMPOUND_FILE_ENTRY*, const utf16string& dir, int level)> EnumFilesCallback; -@@ -249,7 +249,7 @@ class CompoundFileReader (private) +@@ -379,7 +379,7 @@ class CompoundFileReader (private) utf16string newDir = dir; if (dir.length() != 0) newDir.append(1, '\n'); diff --git a/cad/kicad-devel/files/patch-thirdparty_nanodbc_nanodbc_nanodbc.cpp b/cad/kicad-devel/files/patch-thirdparty_nanodbc_nanodbc_nanodbc.cpp index 6cfdd8b1abbc..bd9cf5d061ee 100644 --- a/cad/kicad-devel/files/patch-thirdparty_nanodbc_nanodbc_nanodbc.cpp +++ b/cad/kicad-devel/files/patch-thirdparty_nanodbc_nanodbc_nanodbc.cpp @@ -1,6 +1,6 @@ ---- thirdparty/nanodbc/nanodbc/nanodbc.cpp.orig 2024-10-11 09:03:05 UTC +--- thirdparty/nanodbc/nanodbc/nanodbc.cpp.orig 2025-08-13 00:57:26 UTC +++ thirdparty/nanodbc/nanodbc/nanodbc.cpp -@@ -255,10 +255,19 @@ constexpr std::size_t size(const T (&array)[N]) noexce +@@ -386,10 +386,19 @@ constexpr std::size_t size(const T (&array)[N]) noexce } #endif @@ -21,7 +21,7 @@ NANODBC_ASSERT(n < N); return n < N ? n : N - 1; } -@@ -3589,9 +3598,9 @@ std::list<datasource> list_datasources() +@@ -3720,9 +3729,9 @@ std::list<datasource> list_datasources() "incompatible SQLCHAR and string::value_type"); datasource dsn; @@ -33,7 +33,7 @@ dsns.push_back(std::move(dsn)); direction = SQL_FETCH_NEXT; -@@ -3642,7 +3651,7 @@ std::list<driver> list_drivers() +@@ -3773,7 +3782,7 @@ std::list<driver> list_drivers() "incompatible SQLCHAR and string::value_type"); driver drv; |