Attachment 236569 Details for Bug 266426 – cad/kicad-devel: update and prepare to wxgtk32

[patch] cad/kicad-devel: update and prepare to wxgtk32

kicad-devel.diff (text/plain), 10.86 KB, created by Loïc Bartoletti on 2022-09-15 15:54:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2022-09-15 15:54:04 UTC

Size: 10.86 KB

patch

obsolete

>diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
>index 1026ffcebe9d..994d01f1b59c 100644
>--- a/cad/kicad-devel/Makefile
>+++ b/cad/kicad-devel/Makefile
>@@ -21,7 +21,8 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
> 		libpixman-1.so:x11/pixman \
> 		libpng.so:graphics/png \
> 		libcurl.so:ftp/curl \
>-		libGLEW-wayland.so:graphics/glew-wayland
>+		libGLEW-wayland.so:graphics/glew-wayland \
>+		libodbc.so:databases/unixODBC
> 
> CONFLICTS_INSTALL=	kicad # bin/_cvpcb.kiface
> 
>@@ -39,7 +40,7 @@ GL_ACCOUNT=	kicad/code
> GL_PROJECT=	kicad
> GL_COMMIT=	${GIT_SRC_HASH}
> USE_GL=		gl glew glu glut
>-USE_WX=		3.1
>+USE_WX=		3.2
> WX_COMPS=	wx python:lib
> USE_GNOME=	atk cairo	# Required by libwx_gtk2_aui-2.8.so
> USE_XORG+=	ice pixman x11 xext
>diff --git a/cad/kicad-devel/Makefile.git_rev b/cad/kicad-devel/Makefile.git_rev
>index f0368f825a3d..0a1c5201147b 100644
>--- a/cad/kicad-devel/Makefile.git_rev
>+++ b/cad/kicad-devel/Makefile.git_rev
>@@ -1,2 +1,2 @@
>-GIT_SRC_HASH=  5edc03e85bf36b928876d398c20f964eea49d947
>-GIT_SRC_DATE=  20220517060049
>+GIT_SRC_HASH=  e4c5bc6c669af546ff311c9104eed7585a236b0b
>+GIT_SRC_DATE=  20220914071949
>diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo
>index c5fb9303390a..d5bed0c97fb9 100644
>--- a/cad/kicad-devel/distinfo
>+++ b/cad/kicad-devel/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1652887177
>-SHA256 (kicad/kicad/code-kicad-5edc03e85bf36b928876d398c20f964eea49d947_GL0.tar.gz) = 78bcdaa1bc9bd626b7d4e5e445099794d415d9e4167d41f08ecc81ff052bfc82
>-SIZE (kicad/kicad/code-kicad-5edc03e85bf36b928876d398c20f964eea49d947_GL0.tar.gz) = 51727068
>+TIMESTAMP = 1663149330
>+SHA256 (kicad/kicad/code-kicad-e4c5bc6c669af546ff311c9104eed7585a236b0b_GL0.tar.gz) = 78fb7bb3cb5e14e20ddf5acf29320a09194f2ff4605c2de7cbb64973bee436b5
>+SIZE (kicad/kicad/code-kicad-e4c5bc6c669af546ff311c9104eed7585a236b0b_GL0.tar.gz) = 53433751
>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
>new file mode 100644
>index 000000000000..a7b40f4b3256
>--- /dev/null
>+++ b/cad/kicad-devel/files/patch-eeschema_sim_sim__plot__frame.cpp
>@@ -0,0 +1,23 @@
>+--- eeschema/sim/sim_plot_frame.cpp.orig	2022-09-14 16:35:24 UTC
>++++ eeschema/sim/sim_plot_frame.cpp
>+@@ -167,15 +167,15 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindo
>+     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 Parameters" ),
>++    m_toolSettings = m_toolBar->AddTool( wxID_ANY, wxEmptyString,
>+             KiBitmap( BITMAPS::config ), _( "Simulation parameters and settings" ), wxITEM_NORMAL );
>+ 
>+     // Start all toolbar buttons except settings as disabled
>diff --git a/cad/kicad-devel/files/patch-thirdparty_nanodbc_CMakeLists.txt b/cad/kicad-devel/files/patch-thirdparty_nanodbc_CMakeLists.txt
>new file mode 100644
>index 000000000000..a4b434935ab1
>--- /dev/null
>+++ b/cad/kicad-devel/files/patch-thirdparty_nanodbc_CMakeLists.txt
>@@ -0,0 +1,30 @@
>+--- thirdparty/nanodbc/CMakeLists.txt.orig	2022-09-14 12:06:32 UTC
>++++ thirdparty/nanodbc/CMakeLists.txt
>+@@ -165,16 +165,11 @@ elseif(MINGW)
>+ endif()
>+ 
>+ ########################################
>+-## Mac OS X specifics for targets
>++## FreeBSD specifics for targets
>+ ########################################
>+-if(APPLE)
>+-  set(CMAKE_MACOSX_RPATH ON)
>+-  message(STATUS "Use rpaths on Mac OS X - ${CMAKE_MACOSX_RPATH}")
>+-
>+-  # AppleClang complains of unused `-I/path/` arguments.
>+-  # These are harmless and can be safely ignored.
>+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-command-line-argument")
>+-endif()
>++# Clang complains of unused `-I/path/` arguments.
>++# These are harmless and can be safely ignored.
>++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-command-line-argument")
>+ 
>+ ########################################
>+ ## library target
>+@@ -202,4 +197,4 @@ endif()
>+ if(NANODBC_ENABLE_UNICODE)
>+   add_compile_definitions(NANODBC_ENABLE_UNICODE)
>+   target_compile_definitions(nanodbc PUBLIC NANODBC_ENABLE_UNICODE)
>+-endif()
>+\ No newline at end of file
>++endif()
>diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist
>index 4ff0efeb54cc..7ceee4feccc5 100644
>--- a/cad/kicad-devel/pkg-plist
>+++ b/cad/kicad-devel/pkg-plist
>@@ -30,9 +30,6 @@ lib/libkicad_3dsg.so.2.0.0
> %%DESKTOPDIR%%/org.kicad.kicad.desktop
> %%DESKTOPDIR%%/org.kicad.pcbcalculator.desktop
> %%DESKTOPDIR%%/org.kicad.pcbnew.desktop
>-%%PORTDOCS%%%%DOCSDIR%%/scripts/lib_convert.py
>-%%PORTDOCS%%%%DOCSDIR%%/scripts/test_kicad_plugin.py
>-%%PORTDOCS%%%%DOCSDIR%%/scripts/test_plugin.py
> share/icons/hicolor/128x128/apps/bitmap2component.png
> share/icons/hicolor/128x128/apps/eeschema.png
> share/icons/hicolor/128x128/apps/gerbview.png
>@@ -116,6 +113,9 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
> %%DATADIR%%/demos/ecc83/ecc83-pp_v2.kicad_pro
> %%DATADIR%%/demos/ecc83/ecc83-pp_v2.kicad_sch
> %%DATADIR%%/demos/ecc83/ecc83_schlib.kicad_sym
>+%%DATADIR%%/demos/ecc83/footprints.pretty/MountingHole_3.2mm_M3_DIN965_Pad.kicad_mod
>+%%DATADIR%%/demos/ecc83/footprints.pretty/Valve_ECC-83-1.kicad_mod
>+%%DATADIR%%/demos/ecc83/footprints.pretty/Valve_ECC-83-2.kicad_mod
> %%DATADIR%%/demos/ecc83/fp-lib-table
> %%DATADIR%%/demos/ecc83/sym-lib-table
> %%DATADIR%%/demos/electric/elec-unifil.kicad_sym
>@@ -128,7 +128,12 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
> %%DATADIR%%/demos/flat_hierarchy/fp-lib-table
> %%DATADIR%%/demos/flat_hierarchy/libs/3d_shapes/adjustable_rx2v4.wrl
> %%DATADIR%%/demos/flat_hierarchy/libs/flat_hierarchy_schlib.kicad_sym
>+%%DATADIR%%/demos/flat_hierarchy/libs/pic_programmer_fp.pretty/D_DO-35_SOD27_P7.62mm_Horizontal.kicad_mod
>+%%DATADIR%%/demos/flat_hierarchy/libs/pic_programmer_fp.pretty/MountingHole_4.3mm_M4_DIN965.kicad_mod
> %%DATADIR%%/demos/flat_hierarchy/libs/pic_programmer_fp.pretty/RV2X4.kicad_mod
>+%%DATADIR%%/demos/flat_hierarchy/libs/pic_programmer_fp.pretty/R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal.kicad_mod
>+%%DATADIR%%/demos/flat_hierarchy/libs/pic_programmer_fp.pretty/TO-220-3_Horizontal_TabDown.kicad_mod
>+%%DATADIR%%/demos/flat_hierarchy/libs/pic_programmer_fp.pretty/TO-92.kicad_mod
> %%DATADIR%%/demos/flat_hierarchy/pic_programmer.kicad_sch
> %%DATADIR%%/demos/flat_hierarchy/pic_sockets.kicad_sch
> %%DATADIR%%/demos/flat_hierarchy/sym-lib-table
>@@ -208,7 +213,6 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
> %%DATADIR%%/demos/simulation/sallen_key/sym-lib-table
> %%DATADIR%%/demos/simulation/subsheets/subsheet1.kicad_sch
> %%DATADIR%%/demos/simulation/subsheets/subsheet2.kicad_sch
>-%%DATADIR%%/demos/simulation/subsheets/subsheets.kicad_pro
> %%DATADIR%%/demos/simulation/subsheets/subsheets.kicad_sch
> %%DATADIR%%/demos/simulation/v_i_sources/sym-lib-table
> %%DATADIR%%/demos/simulation/v_i_sources/v_i_sources.kicad_pro
>@@ -250,6 +254,9 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
> %%DATADIR%%/demos/stickhub/footprints.pretty/USB_A_PCB_traces_small.kicad_mod
> %%DATADIR%%/demos/stickhub/fp-lib-table
> %%DATADIR%%/demos/stickhub/sym-lib-table
>+%%DATADIR%%/demos/test_pads_inside_pads/connect.pretty/1pin.kicad_mod
>+%%DATADIR%%/demos/test_pads_inside_pads/connect.pretty/1pin_thermal.kicad_mod
>+%%DATADIR%%/demos/test_pads_inside_pads/fp-lib-table
> %%DATADIR%%/demos/test_pads_inside_pads/sym-lib-table
> %%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pcb
> %%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pro
>@@ -259,17 +266,23 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
> %%DATADIR%%/demos/test_xil_95108/carte_test.kicad_pro
> %%DATADIR%%/demos/test_xil_95108/carte_test.kicad_sch
> %%DATADIR%%/demos/test_xil_95108/carte_test_schlib.kicad_sym
>+%%DATADIR%%/demos/test_xil_95108/footprints.pretty/DIP-28__300__600_ELL.kicad_mod
>+%%DATADIR%%/demos/test_xil_95108/footprints.pretty/PLCC84.kicad_mod
> %%DATADIR%%/demos/test_xil_95108/fp-lib-table
> %%DATADIR%%/demos/test_xil_95108/sym-lib-table
> %%DATADIR%%/demos/video/bus_pci.kicad_sch
> %%DATADIR%%/demos/video/esvideo.kicad_sch
> %%DATADIR%%/demos/video/fp-lib-table
> %%DATADIR%%/demos/video/graphic.kicad_sch
>+%%DATADIR%%/demos/video/libs/footprints.pretty/BUSPCI.kicad_mod
> %%DATADIR%%/demos/video/libs/footprints.pretty/CV3-30PF.kicad_mod
>+%%DATADIR%%/demos/video/libs/footprints.pretty/D_DO-34_SOD68_P7.62mm_Horizontal.kicad_mod
> %%DATADIR%%/demos/video/libs/footprints.pretty/LED_D3.0mm.kicad_mod
> %%DATADIR%%/demos/video/libs/footprints.pretty/LRTDK.kicad_mod
> %%DATADIR%%/demos/video/libs/footprints.pretty/PLCC68.kicad_mod
> %%DATADIR%%/demos/video/libs/footprints.pretty/PLCC84.kicad_mod
>+%%DATADIR%%/demos/video/libs/footprints.pretty/SOT23EBC.kicad_mod
>+%%DATADIR%%/demos/video/libs/footprints.pretty/SolderJumper-2_P1.3mm_Open_Pad1.0x1.5mm.kicad_mod
> %%DATADIR%%/demos/video/libs/footprints.pretty/sim72.kicad_mod
> %%DATADIR%%/demos/video/libs/footprints.pretty/subclick.kicad_mod
> %%DATADIR%%/demos/video/libs/fp.3dshapes/subclick_horiz.wings
>@@ -284,21 +297,14 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
> %%DATADIR%%/demos/video/video.kicad_pro
> %%DATADIR%%/demos/video/video.kicad_sch
> %%DATADIR%%/plugins/README-bom.txt
>-%%DATADIR%%/plugins/bom2csv.xsl
>-%%DATADIR%%/plugins/bom2grouped_csv.xsl
> %%DATADIR%%/plugins/bom_csv_grouped_by_value.py
> %%DATADIR%%/plugins/bom_csv_grouped_by_value_with_fp.py
> %%DATADIR%%/plugins/bom_csv_sorted_by_ref.py
> %%DATADIR%%/plugins/bom_html_grouped_by_value.py
> %%DATADIR%%/plugins/bom_html_with_advanced_grouping.py
> %%DATADIR%%/plugins/bom_txt_sorted_by_ref.py
>-%%DATADIR%%/plugins/bom_with_title_block_2_csv.xsl
> %%DATADIR%%/plugins/kicad_netlist_reader.py
> %%DATADIR%%/plugins/kicad_utils.py
>-%%DATADIR%%/plugins/netlist_form_OrcadPcb2.xsl
>-%%DATADIR%%/plugins/netlist_form_cadstar-RINF.xsl
>-%%DATADIR%%/plugins/netlist_form_cadstar.xsl
>-%%DATADIR%%/plugins/netlist_form_pads-pcb.asc.xsl
> %%DATADIR%%/resources/images.tar.gz
> %%DATADIR%%/schemas/pcm.v1.schema.json
> %%DATADIR%%/scripting/kicad_pyshell/__init__.py

Actions: View | Diff

Attachments on bug 266426: 236568 | 236569