<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/25531f632ddd82c4996ce23f32605708633859f4">https://github.com/macports/macports-ports/commit/25531f632ddd82c4996ce23f32605708633859f4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 25531f632ddd82c4996ce23f32605708633859f4
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Mon Feb 14 14:14:36 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> kicad: update version to 6.0.2
</span>---
science/kicad/Portfile | 39 +++---
...ake-adding-KICAD_MACOSX_APP_BUNDLE-option.patch | 132 +++++++--------------
2 files changed, 64 insertions(+), 107 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/kicad/Portfile b/science/kicad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8f4009601f9..f1a3009ef0b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/kicad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/kicad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup gitlab 1.0
</span> PortGroup boost 1.0
name kicad
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.0.2
</span> description KiCad is an electronic design automation software suite
long_description KiCad is an EDA software suite for the creation of professional schematics \
and printed circuit boards up to 32 copper layers with additional technical layers.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,9 @@ compiler.cxx_standard 2014
</span> if {${name} eq ${subport}} {
gitlab.setup kicad/code kicad ${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 33751495a79b0a376f22f01f00506c0a2b28b70d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 49996d77768d2e337dad768daa7dd6f4f22a7147b77dafc63287858d2ba33ab4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 33856728
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 b502f0e8360bf9e3d5b6b71b972332308c8e8661 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5d5f73c61224ae7ca71f1c5bc7d7b4b7594b8415a8a6f87341a39448154240cb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 33866213
</span> revision 0
patchfiles-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,10 +123,9 @@ subport kicad-docs {
</span> master_sites https://kicad-downloads.s3.cern.ch/docs
distname ${name}-doc-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 3c3a4dec15eff4de328fe45e47dfef164c3b3bba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6093c99cfde827fb42fc351ef301f0dcad805f0c256ef02a0e82d9daafc238d3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 258546012
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 9cb347de9ecf97f8a986cdbd15713e52cc7e8d65 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a8be2b4fec78783be1c4653f6571ff431f659fd58daf6f74a0427c4472d56b29 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 258354072
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,9 +144,9 @@ subport kicad-symbols {
</span>
gitlab.setup kicad/libraries kicad-symbols ${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 73b730aee67e1b4cc1b99bfa6d1832e4ac861589 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 868829e8c7fe82ebfb304ded3115b9c77dafcd4a73bc8ab1029b91d5a7a1c327 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2248886
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 5108b710a35c428350dad6d125f1faea383e631c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b0f8d184884e6eb1f1f31d4b5e271a0650d0d297e46609f5f55a0e4ac4ede21b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2255368
</span>
patchfiles-append kicad_libraries_cmakelists.txt.patch
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,9 +158,9 @@ subport kicad-footprints {
</span>
gitlab.setup kicad/libraries kicad-footprints ${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 bbb715a5475b7c2b8d6e56f3badbb6ca6897aaa2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a344442fdb95d3661e4e0e2681f475dd9281ede334eb41ac350118c83c26fa7c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 23374811
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c32c49eabf9a62ae8f71b9db049b7605b62268ae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c5d4795c84dbfccad4ea53fecbaf8a0cd51111b942fd01126cbf91e61d841d78 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23530876
</span>
patchfiles-append kicad_libraries_cmakelists.txt.patch
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,9 +172,9 @@ subport kicad-packages3D {
</span>
gitlab.setup kicad/libraries kicad-packages3D ${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 7e1613650858b12d955353a9d462ec448cb78311 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 caf3359cf474b4f71fa2b62a5128d594f92285a92817adbcd6be99f199ac36da \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 727835459
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 75edc43c84b3b0f8338beb10fa9f577783efbd61 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dfabf094b60ae8fde0c7ce832ec201ea98dfca231a5b6eaafb7de66c1db3cb63 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 730431238
</span>
patchfiles-append kicad_libraries_cmakelists.txt.patch
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,9 +186,9 @@ subport kicad-templates {
</span>
gitlab.setup kicad/libraries kicad-templates ${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 e882173af935f3b3bf8ef1ddc30db19afd561b15 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 67300769de41cea7f28e6529358b7c80a5507827acee5253e3b8952af51dfb5b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2057874
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 99f13dbfd5ec899b990babf0ba389999a6749b73 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 87b74d3dbcf6e2ca6f12839d273590707a4e9ecd822087cc7c58e099624079d5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2057786
</span>
patchfiles-append kicad_libraries_cmakelists.txt.patch
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/kicad/files/0001-cmake-adding-KICAD_MACOSX_APP_BUNDLE-option.patch b/science/kicad/files/0001-cmake-adding-KICAD_MACOSX_APP_BUNDLE-option.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index cc8b6475e92..9425fb9b706 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/kicad/files/0001-cmake-adding-KICAD_MACOSX_APP_BUNDLE-option.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/kicad/files/0001-cmake-adding-KICAD_MACOSX_APP_BUNDLE-option.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b3da43cdc932b6b59783608f4aab1c51b7c6db9d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Davide Gerhard <rainbow@irh.it>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 22 Jan 2022 20:35:32 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] cmake: adding KICAD_MACOSX_APP_BUNDLE option
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ADDED: with cmake KICAD_MACOSX_APP_BUNDLE option the user can disable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the macOS app bundle creation when compiling on macOS. This permit to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use/install KiCad like any other *nix platform (/usr/bin, /usr/share,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ecc.). By default, cmake build the app bundle.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3d-viewer/3d_cache/3d_plugin_manager.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3d-viewer/3d_cache/sg/CMakeLists.txt | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMakeLists.txt | 15 ++++++++++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bitmap2component/CMakeLists.txt | 7 ++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- common/gestfich.cpp | 6 +++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- common/kiway.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- common/paths.cpp | 12 ++++++------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- common/systemdirsappend.cpp | 6 +++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cvpcb/CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eeschema/CMakeLists.txt | 7 ++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eeschema/bom_plugins.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eeschema/dialogs/dialog_netlist.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eeschema/sim/ngspice.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gerbview/CMakeLists.txt | 7 ++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kicad/CMakeLists.txt | 9 +++++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kicad/tools/kicad_manager_control.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pagelayout_editor/CMakeLists.txt | 9 +++++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pcb_calculator/CMakeLists.txt | 7 ++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pcbnew/CMakeLists.txt | 15 ++++++++-------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- plugins/3d/idf/CMakeLists.txt | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- plugins/3d/oce/CMakeLists.txt | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- plugins/3d/vrml/CMakeLists.txt | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripting/CMakeLists.txt | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripting/python_scripting.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- translation/CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- utils/idftools/CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- utils/kicad2step/CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 27 files changed, 80 insertions(+), 64 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> diff --git 3d-viewer/3d_cache/3d_plugin_manager.cpp 3d-viewer/3d_cache/3d_plugin_manager.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index cf9def2a29..b47e438420 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 09f4f557a1..5fc0b08566 100644
</span> --- 3d-viewer/3d_cache/3d_plugin_manager.cpp
+++ 3d-viewer/3d_cache/3d_plugin_manager.cpp
@@ -124,7 +124,7 @@ void S3D_PLUGIN_MANAGER::loadPlugins( void )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,12 +32,12 @@ index 0899a1925b..13d1e6a688 100644
</span> \ No newline at end of file
+endif()
diff --git CMakeLists.txt CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 16e60f8ca1..1b08d05a4c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1cd76e8db5..fd76b6bb86 100644
</span> --- CMakeLists.txt
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -166,6 +166,11 @@ if( KICAD_USE_3DCONNEXION )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -156,6 +156,11 @@ option( KICAD_STEP_EXPORT_LIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Build and use kicad2step as a library, meant for debugging"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OFF )
</span>
+cmake_dependent_option( KICAD_MACOSX_APP_BUNDLE
+ "Create macOS Application bundle"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +47,7 @@ index 16e60f8ca1..1b08d05a4c 100644
</span> # Global setting: exports are explicit
set( CMAKE_CXX_VISIBILITY_PRESET "hidden" )
set( CMAKE_VISIBILITY_INLINES_HIDDEN ON )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -187,6 +192,10 @@ if( KICAD_GAL_PROFILE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -177,6 +182,10 @@ if( KICAD_GAL_PROFILE )
</span> add_definitions( -DKICAD_GAL_PROFILE )
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +58,7 @@ index 16e60f8ca1..1b08d05a4c 100644
</span> # Ensure DEBUG is defined for all platforms in Debug builds
# change to add_compile_definitions() after minimum required CMake version is 3.12
set_property( DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:DEBUG> )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -518,7 +527,7 @@ set( KIFACE_PREFIX "_" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -508,7 +517,7 @@ set( KIFACE_PREFIX "_" )
</span> #================================================
# Locations for install targets.
#================================================
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +67,7 @@ index 16e60f8ca1..1b08d05a4c 100644
</span> # Everything without leading / is relative to CMAKE_INSTALL_PREFIX.
set( KICAD_BIN bin
CACHE PATH "Location of KiCad binaries." )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -814,7 +823,7 @@ if( NOT PYTHON_SITE_PACKAGE_PATH )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -795,7 +804,7 @@ if( NOT PYTHON_SITE_PACKAGE_PATH )
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,7 +76,7 @@ index 16e60f8ca1..1b08d05a4c 100644
</span> set( OSX_BUNDLE_PYTHON_SITE_PACKAGES_DIR ${OSX_BUNDLE_LIB_DIR}/Python.framework/Versions/${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
set( OSX_BUNDLE_INSTALL_PYTHON_SITE_PACKAGES_DIR "${OSX_BUNDLE_INSTALL_DIR}/${OSX_BUNDLE_PYTHON_SITE_PACKAGES_DIR}")
set( PYTHON_DEST "${OSX_BUNDLE_BUILD_DIR}/${OSX_BUNDLE_PYTHON_SITE_PACKAGES_DIR}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -907,7 +916,7 @@ if( MINGW )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -888,7 +897,7 @@ if( MINGW )
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,10 +151,10 @@ index 7ad46c0a2f..cd2d727474 100644
</span> #else
// make relative paths absolute
diff --git common/kiway.cpp common/kiway.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 069acc2add..fadca00458 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ab84801f1d..04ba3a6800 100644
</span> --- common/kiway.cpp
+++ common/kiway.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -122,7 +122,7 @@ const wxString KIWAY::dso_search_path( FACE_T aFaceId )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -121,7 +121,7 @@ const wxString KIWAY::dso_search_path( FACE_T aFaceId )
</span> return wxEmptyString;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -202,7 +163,7 @@ index 069acc2add..fadca00458 100644
</span> wxString path;
if( m_ctl & (KFCTL_STANDALONE | KFCTL_CPP_PROJECT_SUITE) )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -148,7 +148,7 @@ const wxString KIWAY::dso_search_path( FACE_T aFaceId )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -147,7 +147,7 @@ const wxString KIWAY::dso_search_path( FACE_T aFaceId )
</span>
if( wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -212,7 +173,7 @@ index 069acc2add..fadca00458 100644
</span> // standalone binaries are placed in separate bundles before the make install step runs.
// So, we have to jump up to the kicad directory, then the PlugIns section of the kicad
diff --git common/paths.cpp common/paths.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index c2e37a557e..eba49ca995 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 462a3d0846..da0ce126bf 100644
</span> --- common/paths.cpp
+++ common/paths.cpp
@@ -29,7 +29,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,9 +182,9 @@ index c2e37a557e..eba49ca995 100644
</span> // lowercase or pretty case depending on platform
-#if defined( __WXMAC__ ) || defined( __WXMSW__ )
+#if defined( __MACOSX_APP__ ) || defined( __WXMSW__ )
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #define KICAD_PATH_STR "KiCad"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define KICAD_PATH_STR wxT( "KiCad" )
</span> #else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #define KICAD_PATH_STR "kicad"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define KICAD_PATH_STR wxT( "kicad" )
</span> @@ -154,7 +154,7 @@ wxString PATHS::GetStockDataPath( bool aRespectRunFromBuildDir )
if( aRespectRunFromBuildDir && wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -252,7 +213,7 @@ index c2e37a557e..eba49ca995 100644
</span> #elif defined( __WXMSW__ )
path = GetStockDataPath( false );
@@ -266,7 +266,7 @@ wxString PATHS::GetStockPlugins3DPath()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fn.Assign( tfname, "" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fn.Assign( tfname, wxEmptyString );
</span> fn.AppendDir( wxT( "kicad" ) );
fn.AppendDir( wxT( "plugins" ) );
-#elif defined( __WXMAC__ )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,7 +229,7 @@ index c2e37a557e..eba49ca995 100644
</span> +#if defined( __MACOSX_APP__ )
path = GetOSXKicadDataDir();
#elif defined( __WXMSW__ )
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path = getWindowsKiCadRoot() + "share/doc/kicad";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path = getWindowsKiCadRoot() + wxT( "share/doc/kicad" );
</span> diff --git common/systemdirsappend.cpp common/systemdirsappend.cpp
index d322fab161..8997c0268a 100644
--- common/systemdirsappend.cpp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -314,10 +275,10 @@ index eb68a4f6a4..e81167954f 100644
</span> set_target_properties( cvpcb_kiface PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR}
diff --git eeschema/CMakeLists.txt eeschema/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d42bd4fe53..abfcad83b6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 52a11230ba..49e82646c6 100644
</span> --- eeschema/CMakeLists.txt
+++ eeschema/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -358,7 +358,7 @@ set_source_files_properties( sch_text.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -342,7 +342,7 @@ set_source_files_properties( sch_text.cpp
</span> OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/sch_text_help_md.h
)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -326,7 +287,7 @@ index d42bd4fe53..abfcad83b6 100644
</span> # setup bundle
set( EESCHEMA_RESOURCES eeschema.icns eeschema_doc.icns )
set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/eeschema.icns" PROPERTIES
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -373,7 +373,7 @@ if( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -357,7 +357,7 @@ if( APPLE )
</span> endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -335,7 +296,7 @@ index d42bd4fe53..abfcad83b6 100644
</span> ${CMAKE_SOURCE_DIR}/common/single_top.cpp
${CMAKE_SOURCE_DIR}/common/pgm_base.cpp
${EESCHEMA_RESOURCES}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -457,9 +457,10 @@ if( MAKE_LINK_MAPS )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -441,9 +441,10 @@ if( MAKE_LINK_MAPS )
</span> endif()
# these 2 binaries are a matched set, keep them together:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -348,7 +309,7 @@ index d42bd4fe53..abfcad83b6 100644
</span>
# puts binaries into the *.app bundle while linking
diff --git eeschema/bom_plugins.cpp eeschema/bom_plugins.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index b18c680123..9f4715f7b9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 84b6762504..efb8436beb 100644
</span> --- eeschema/bom_plugins.cpp
+++ eeschema/bom_plugins.cpp
@@ -75,7 +75,7 @@ BOM_GENERATOR_HANDLER::BOM_GENERATOR_HANDLER( const wxString& aFile )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -361,10 +322,10 @@ index b18c680123..9f4715f7b9 100644
</span>
// Of course, for macOS, it's not quite that simple, since the relative path
diff --git eeschema/dialogs/dialog_netlist.cpp eeschema/dialogs/dialog_netlist.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7ed6153fe0..45dfa0da6a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ee62d2a6ff..b3a42b4356 100644
</span> --- eeschema/dialogs/dialog_netlist.cpp
+++ eeschema/dialogs/dialog_netlist.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -673,7 +673,7 @@ void NETLIST_DIALOG_ADD_GENERATOR::OnBrowseGenerators( wxCommandEvent& event )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -677,7 +677,7 @@ void NETLIST_DIALOG_ADD_GENERATOR::OnBrowseGenerators( wxCommandEvent& event )
</span> {
wxString FullFileName, Path;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -374,7 +335,7 @@ index 7ed6153fe0..45dfa0da6a 100644
</span> #else
Path = PATHS::GetOSXKicadDataDir() + wxT( "/plugins" );
diff --git eeschema/sim/ngspice.cpp eeschema/sim/ngspice.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4d2c0a6f2c..7690f7f937 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e31449c98b..d9cdd0bc81 100644
</span> --- eeschema/sim/ngspice.cpp
+++ eeschema/sim/ngspice.cpp
@@ -431,7 +431,7 @@ void NGSPICE::init_dll()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -387,10 +348,10 @@ index 4d2c0a6f2c..7690f7f937 100644
</span> PATHS::GetOSXKicadUserDataDir().ToStdString() + "/PlugIns/ngspice",
PATHS::GetOSXKicadMachineDataDir().ToStdString() + "/PlugIns/ngspice",
diff --git gerbview/CMakeLists.txt gerbview/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index e41408813f..363306fac0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d1fd2cd401..9f9f843a5e 100644
</span> --- gerbview/CMakeLists.txt
+++ gerbview/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -89,7 +89,7 @@ if( WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,7 +91,7 @@ if( WIN32 )
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -399,7 +360,7 @@ index e41408813f..363306fac0 100644
</span> # setup bundle
set( GERBVIEW_RESOURCES gerbview.icns gerbview_doc.icns )
set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/gerbview.icns" PROPERTIES
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -103,7 +103,7 @@ if( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,7 +105,7 @@ if( APPLE )
</span> set( MACOSX_BUNDLE_NAME gerbview )
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -408,7 +369,7 @@ index e41408813f..363306fac0 100644
</span> ${CMAKE_SOURCE_DIR}/common/single_top.cpp
${CMAKE_SOURCE_DIR}/common/pgm_base.cpp
${GERBVIEW_RESOURCES}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -168,9 +168,10 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -179,9 +179,10 @@ target_include_directories( gerbview_kiface PRIVATE
</span> add_dependencies( gerbview gerbview_kiface )
# these 2 binaries are a matched set, keep them together
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -421,10 +382,10 @@ index e41408813f..363306fac0 100644
</span>
# puts binaries into the *.app bundle while linking
diff --git kicad/CMakeLists.txt kicad/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index a90c37d2ab..7831ff82f5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 04edf80fb3..16ba177d45 100644
</span> --- kicad/CMakeLists.txt
+++ kicad/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,7 +43,7 @@ if( WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,7 +47,7 @@ if( WIN32 )
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -433,7 +394,7 @@ index a90c37d2ab..7831ff82f5 100644
</span> set( KICAD_RESOURCES kicad.icns kicad_doc.icns )
set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/kicad.icns" PROPERTIES
MACOSX_PACKAGE_LOCATION Resources
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,7 @@ if( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,7 @@ if( APPLE )
</span> set( MACOSX_BUNDLE_NAME kicad )
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -442,7 +403,7 @@ index a90c37d2ab..7831ff82f5 100644
</span> ${KICAD_SRCS}
${KICAD_EXTRA_SRCS}
${KICAD_RESOURCES}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,9 +72,10 @@ if( UNIX )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,9 +80,10 @@ if( UNIX )
</span> )
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -453,8 +414,8 @@ index a90c37d2ab..7831ff82f5 100644
</span> + MACOSX_BUNDLE TRUE
)
target_link_libraries( kicad
<span style='display:block; white-space:pre;background:#ffe0e0;'>- nlohmann_json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,7 +105,7 @@ if( KICAD_WIN32_INSTALL_PDBS )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ common
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,7 +113,7 @@ if( KICAD_WIN32_INSTALL_PDBS )
</span> install(FILES $<TARGET_PDB_FILE:kicad> DESTINATION ${KICAD_BIN})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -464,10 +425,10 @@ index a90c37d2ab..7831ff82f5 100644
</span> # this CMake instance are accessible... use helper to transfer
set( SCRIPTING_HELPER "1" )
diff --git kicad/tools/kicad_manager_control.cpp kicad/tools/kicad_manager_control.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index a44ebefacf..887128e03d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 383c41c701..36e56f66f1 100644
</span> --- kicad/tools/kicad_manager_control.cpp
+++ kicad/tools/kicad_manager_control.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -799,7 +799,7 @@ int KICAD_MANAGER_CONTROL::Execute( const TOOL_EVENT& aEvent )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -801,7 +801,7 @@ int KICAD_MANAGER_CONTROL::Execute( const TOOL_EVENT& aEvent )
</span> wxString msg = wxString::Format( _( "%s %s opened [pid=%ld]\n" ), execFile, param, pid );
m_frame->PrintMsg( msg );
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -477,10 +438,10 @@ index a44ebefacf..887128e03d 100644
</span> // from user input.
wxExecute( "osascript -e 'activate application \"" + execFile + "\"'" );
diff --git pagelayout_editor/CMakeLists.txt pagelayout_editor/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index b3c940aabb..4013e4a869 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fb621b5aa7..bb10e3ea29 100644
</span> --- pagelayout_editor/CMakeLists.txt
+++ pagelayout_editor/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,7 +62,7 @@ if( WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,7 +61,7 @@ if( WIN32 )
</span> endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -489,7 +450,7 @@ index b3c940aabb..4013e4a869 100644
</span> # setup bundle
set( PL_EDITOR_RESOURCES pagelayout_editor.icns pagelayout_editor_doc.icns )
set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/pagelayout_editor.icns" PROPERTIES
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,7 +77,7 @@ if( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,7 +76,7 @@ if( APPLE )
</span> endif()
# a very small program launcher for pl_editor_kiface
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -498,7 +459,7 @@ index b3c940aabb..4013e4a869 100644
</span> ${CMAKE_SOURCE_DIR}/common/single_top.cpp
${CMAKE_SOURCE_DIR}/common/pgm_base.cpp
${PL_EDITOR_RESOURCES}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -130,9 +130,10 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -129,9 +129,10 @@ endif()
</span> add_dependencies( pl_editor pl_editor_kiface )
# these 2 binaries are a matched set, keep them together:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -510,7 +471,7 @@ index b3c940aabb..4013e4a869 100644
</span> )
# puts binaries into the *.app bundle while linking
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -177,4 +178,4 @@ if( KICAD_WIN32_INSTALL_PDBS )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,4 +177,4 @@ if( KICAD_WIN32_INSTALL_PDBS )
</span> # Get the PDBs to copy over for MSVC
install(FILES $<TARGET_PDB_FILE:pl_editor> DESTINATION ${KICAD_BIN})
install(FILES $<TARGET_PDB_FILE:pl_editor_kiface> DESTINATION ${KICAD_BIN})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -552,10 +513,10 @@ index 2069c9e835..4ebf9ca75f 100644
</span>
# puts binaries into the *.app bundle while linking
diff --git pcbnew/CMakeLists.txt pcbnew/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index fe2ba0dbea..edd888854d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 58a3b0e13f..49065b6886 100644
</span> --- pcbnew/CMakeLists.txt
+++ pcbnew/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -588,7 +588,7 @@ set_source_files_properties( dialogs/panel_setup_rules.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -576,7 +576,7 @@ set_source_files_properties( dialogs/panel_setup_rules.cpp
</span> OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/panel_setup_rules_help_md.h
)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -564,7 +525,7 @@ index fe2ba0dbea..edd888854d 100644
</span> # setup bundle
set( PCBNEW_RESOURCES pcbnew.icns pcbnew_doc.icns )
set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/pcbnew.icns" PROPERTIES
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -611,7 +611,7 @@ add_subdirectory( plugins/fabmaster )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -599,7 +599,7 @@ add_subdirectory( plugins/fabmaster )
</span> set( PCBNEW_IO_LIBRARIES pcad2kicadpcb altium2pcbnew cadstar2pcbnew fabmaster CACHE INTERNAL "")
# a very small program launcher for pcbnew_kiface
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -753,6 +714,3 @@ index 2bc9c94e29..5eb4bb177b 100644
</span> # puts binaries into the *.app bundle while linking
set_target_properties( kicad2step_bin PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_BIN_DIR}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.35.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>