diff options
Diffstat (limited to 'cad/kicad-devel')
| -rw-r--r-- | cad/kicad-devel/Makefile | 2 | ||||
| -rw-r--r-- | cad/kicad-devel/Makefile.git_rev | 6 | ||||
| -rw-r--r-- | cad/kicad-devel/distinfo | 6 | ||||
| -rw-r--r-- | cad/kicad-devel/files/patch-eeschema_sch__base__frame.cpp | 8 | ||||
| -rw-r--r-- | cad/kicad-devel/files/patch-eeschema_sch__base__frame.h | 6 | ||||
| -rw-r--r-- | cad/kicad-devel/files/patch-eeschema_sch__io_easyedapro_sch__io__easyedapro.cpp | 34 | ||||
| -rw-r--r-- | cad/kicad-devel/files/patch-include_pcb__base__frame.h | 4 | ||||
| -rw-r--r-- | cad/kicad-devel/files/patch-pcbnew_pcb__base__frame.cpp | 6 | ||||
| -rw-r--r-- | cad/kicad-devel/pkg-plist | 2 |
9 files changed, 21 insertions, 53 deletions
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile index 00770ccc6003..b23818643cdd 100644 --- a/cad/kicad-devel/Makefile +++ b/cad/kicad-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= kicad DISTVERSION= r${GIT_SRC_DATE} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad PKGNAMESUFFIX= -devel DIST_SUBDIR= ${PORTNAME} diff --git a/cad/kicad-devel/Makefile.git_rev b/cad/kicad-devel/Makefile.git_rev index 5861c948bc4e..627893e8f42c 100644 --- a/cad/kicad-devel/Makefile.git_rev +++ b/cad/kicad-devel/Makefile.git_rev @@ -1,3 +1,3 @@ -GIT_SRC_HASH= 24838129dc1140e5f2796bdd2abae7176d03c28e -GIT_SRC_DATE= 20251120213327 -GIT_SRC_DATE2= 2025.11.20 +GIT_SRC_HASH= 236057ab34bc3bb4e72272f1cee57677e8c78101 +GIT_SRC_DATE= 20251213003514 +GIT_SRC_DATE2= 2025.12.13 diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo index 2f6c5530ffe3..b4e6a83ba5f7 100644 --- a/cad/kicad-devel/distinfo +++ b/cad/kicad-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1763671619 -SHA256 (kicad/kicad/code-kicad-24838129dc1140e5f2796bdd2abae7176d03c28e_GL0.tar.gz) = ed7017b388efacc03b1022bcea6890e1ba3442071601e08c20a1e564d39248a0 -SIZE (kicad/kicad/code-kicad-24838129dc1140e5f2796bdd2abae7176d03c28e_GL0.tar.gz) = 165763917 +TIMESTAMP = 1765620317 +SHA256 (kicad/kicad/code-kicad-236057ab34bc3bb4e72272f1cee57677e8c78101_GL0.tar.gz) = bade3e401f9d36ebf319150feb2d945f697c9af96595b2067133c2bfadde143f +SIZE (kicad/kicad/code-kicad-236057ab34bc3bb4e72272f1cee57677e8c78101_GL0.tar.gz) = 166360931 diff --git a/cad/kicad-devel/files/patch-eeschema_sch__base__frame.cpp b/cad/kicad-devel/files/patch-eeschema_sch__base__frame.cpp index bb12c419d4f9..7e0ca8627568 100644 --- a/cad/kicad-devel/files/patch-eeschema_sch__base__frame.cpp +++ b/cad/kicad-devel/files/patch-eeschema_sch__base__frame.cpp @@ -1,15 +1,15 @@ ---- eeschema/sch_base_frame.cpp.orig 2025-09-14 17:37:19 UTC +--- eeschema/sch_base_frame.cpp.orig 2025-12-12 23:35:14 UTC +++ eeschema/sch_base_frame.cpp -@@ -61,7 +61,7 @@ - #include <wx/log.h> +@@ -65,7 +65,7 @@ #include <wx/msgdlg.h> + #include <trace_helpers.h> -#ifndef __linux__ +#if not defined (__linux__) && not defined (__FreeBSD__) #include <navlib/nl_schematic_plugin.h> #include <wx/fdrepdlg.h> #else -@@ -370,7 +370,7 @@ void SCH_BASE_FRAME::ActivateGalCanvas() +@@ -338,7 +338,7 @@ void SCH_BASE_FRAME::ActivateGalCanvas() { if( !m_spaceMouse ) { diff --git a/cad/kicad-devel/files/patch-eeschema_sch__base__frame.h b/cad/kicad-devel/files/patch-eeschema_sch__base__frame.h index 6b7df3a979fd..bff6ee9051fb 100644 --- a/cad/kicad-devel/files/patch-eeschema_sch__base__frame.h +++ b/cad/kicad-devel/files/patch-eeschema_sch__base__frame.h @@ -1,6 +1,6 @@ ---- eeschema/sch_base_frame.h.orig 2025-09-14 17:37:19 UTC +--- eeschema/sch_base_frame.h.orig 2025-12-12 23:35:14 UTC +++ eeschema/sch_base_frame.h -@@ -57,7 +57,7 @@ struct SCH_SELECTION_FILTER_OPTIONS; +@@ -59,7 +59,7 @@ struct SCH_SELECTION_FILTER_OPTIONS; class SYMBOL_EDITOR_SETTINGS; struct SCH_SELECTION_FILTER_OPTIONS; @@ -9,7 +9,7 @@ class NL_SCHEMATIC_PLUGIN; #else class SPNAV_2D_PLUGIN; -@@ -336,7 +336,7 @@ class SCH_BASE_FRAME : public EDA_DRAW_FRAME, public S +@@ -329,7 +329,7 @@ class SCH_BASE_FRAME : public EDA_DRAW_FRAME, public S wxTimer m_watcherDebounceTimer; bool m_inSymChangeTimerEvent; diff --git a/cad/kicad-devel/files/patch-eeschema_sch__io_easyedapro_sch__io__easyedapro.cpp b/cad/kicad-devel/files/patch-eeschema_sch__io_easyedapro_sch__io__easyedapro.cpp deleted file mode 100644 index 02c96710df87..000000000000 --- a/cad/kicad-devel/files/patch-eeschema_sch__io_easyedapro_sch__io__easyedapro.cpp +++ /dev/null @@ -1,34 +0,0 @@ ---- eeschema/sch_io/easyedapro/sch_io_easyedapro.cpp.orig 2024-10-11 09:03:05 UTC -+++ eeschema/sch_io/easyedapro/sch_io_easyedapro.cpp -@@ -105,6 +105,31 @@ int SCH_IO_EASYEDAPRO::GetModifyHash() const - } - - -+// Explicitly define char traits for wxUniChar since it is not standard -+template<> -+struct nlohmann::detail::char_traits<wxUniChar> : std::char_traits<char32_t> -+{ -+ using char_type = wxUniChar; -+ using int_type = uint32_t; -+ -+ // Redefine to_int_type function -+ static int_type to_int_type(char_type c) noexcept -+ { -+ return static_cast<int_type>(c); -+ } -+ -+ static char_type to_char_type(int_type i) noexcept -+ { -+ return static_cast<char_type>(i); -+ } -+ -+ static constexpr int_type eof() noexcept -+ { -+ return ~0U; -+ } -+}; -+ -+ - static LIB_SYMBOL* loadSymbol( nlohmann::json project, const wxString& aLibraryPath, - const wxString& aAliasName, const std::map<std::string, UTF8>* aProperties ) - { diff --git a/cad/kicad-devel/files/patch-include_pcb__base__frame.h b/cad/kicad-devel/files/patch-include_pcb__base__frame.h index 909801063d01..51fc2276b553 100644 --- a/cad/kicad-devel/files/patch-include_pcb__base__frame.h +++ b/cad/kicad-devel/files/patch-include_pcb__base__frame.h @@ -1,4 +1,4 @@ ---- include/pcb_base_frame.h.orig 2025-09-14 17:37:19 UTC +--- include/pcb_base_frame.h.orig 2025-12-12 23:35:14 UTC +++ include/pcb_base_frame.h @@ -62,7 +62,7 @@ class PCB_LAYER_BOX_SELECTOR; class PROGRESS_REPORTER; @@ -9,7 +9,7 @@ class NL_PCBNEW_PLUGIN; #else class SPNAV_2D_PLUGIN; -@@ -436,7 +436,7 @@ class PCB_BASE_FRAME : public EDA_DRAW_FRAME (private) +@@ -437,7 +437,7 @@ class PCB_BASE_FRAME : public EDA_DRAW_FRAME (private) PCB_ORIGIN_TRANSFORMS m_originTransforms; private: diff --git a/cad/kicad-devel/files/patch-pcbnew_pcb__base__frame.cpp b/cad/kicad-devel/files/patch-pcbnew_pcb__base__frame.cpp index dd98488c35c8..4f3671329644 100644 --- a/cad/kicad-devel/files/patch-pcbnew_pcb__base__frame.cpp +++ b/cad/kicad-devel/files/patch-pcbnew_pcb__base__frame.cpp @@ -1,6 +1,6 @@ ---- pcbnew/pcb_base_frame.cpp.orig 2025-08-26 08:02:49 UTC +--- pcbnew/pcb_base_frame.cpp.orig 2025-12-12 23:35:14 UTC +++ pcbnew/pcb_base_frame.cpp -@@ -67,7 +67,7 @@ +@@ -68,7 +68,7 @@ #include <tool/grid_menu.h> #include <ratsnest/ratsnest_view_item.h> @@ -9,7 +9,7 @@ #include <spacenav/spnav_2d_plugin.h> #else #include <navlib/nl_pcbnew_plugin.h> -@@ -1037,7 +1037,7 @@ void PCB_BASE_FRAME::ActivateGalCanvas() +@@ -1008,7 +1008,7 @@ void PCB_BASE_FRAME::ActivateGalCanvas() { if( !m_spaceMouse ) { diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist index 6794e83c813f..475008d37000 100644 --- a/cad/kicad-devel/pkg-plist +++ b/cad/kicad-devel/pkg-plist @@ -36,6 +36,7 @@ lib/libkigal.so.9.99.0 %%DESKTOPDIR%%/org.kicad.kicad.desktop %%DESKTOPDIR%%/org.kicad.pcbcalculator.desktop %%DESKTOPDIR%%/org.kicad.pcbnew.desktop +share/bash-completion/completions/kicad-cli share/icons/hicolor/128x128/apps/bitmap2component.png share/icons/hicolor/128x128/apps/eeschema.png share/icons/hicolor/128x128/apps/gerbview.png @@ -889,3 +890,4 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-worksheet.svg share/metainfo/org.kicad.kicad.metainfo.xml share/mime/packages/kicad-gerbers.xml share/mime/packages/kicad-kicad.xml +share/zsh/site-functions/_kicad-cli |
