<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/1926d4e78bda31ea9c62260b012a0cb792e37bda">https://github.com/macports/macports-ports/commit/1926d4e78bda31ea9c62260b012a0cb792e37bda</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1926d4e78bd kicad: update to 6.0.9
</span>1926d4e78bd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1926d4e78bda31ea9c62260b012a0cb792e37bda
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sat Nov 5 14:29:12 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> kicad: update to 6.0.9
</span>---
science/kicad/Portfile | 40 ++++++++--------
...ake-adding-KICAD_MACOSX_APP_BUNDLE-option.patch | 54 +++++++++++-----------
2 files changed, 47 insertions(+), 47 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 ced5814267b..57c4bf41f4e 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.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.0.9
</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,10 @@ 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 e4bc107611289876f0c74e832cb1e0bf2515b706 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 306ec52e383d0fb46ccfac45ff250d749288324d102aa38d44eb061e1378d86f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 33999510
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 3603cc21857468ed0edb8fe941c92776004237eb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 808063f728a8c3ed42af2126b465c9a4aa3e6df8e025387b9b11c6a15710d9ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 34045371
</span> revision 0
patchfiles-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,9 +124,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 74ccba15bae9eef0c8b19539447ab6dd0403b95b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 aa73e3ca67d806a127fdf3ec4220593cc7eaa19157af024d641ab5233bf786de \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 262579901
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 4904567c9b6e6800f315ca5f74e4a2a96abddc10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b3764df3c0f9ad3da43011597b0eb97e4cd69663207aec3e131d96495314c653 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 255617528
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,10 +144,9 @@ subport kicad-symbols {
</span> long_description ${description}
gitlab.setup kicad/libraries kicad-symbols ${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 0d965fe64e013624a93908ee87a11bdda7250ef8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 67506ba4b3039f320b4222b96a91148600e984f5bbcc63ba86f7a632e75534e6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2268509
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 1fd29f2eecc56df98d24fc50a84a466885fb6c2d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 83cf3b1c8b56282dcc05798a32a2c640831b5be07170bbe5b7d2958c2e0ddd04 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2271982
</span>
patchfiles-append kicad_libraries_cmakelists.txt.patch
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,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 6758198057d7fcfc4c6b6031d1b9388ae2634ba5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 aac685d8bf908e1a4f33931d1073d9405ea8daf340b63dbf290a6a1e92ea85ae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 23649523
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 ff418c0da29d3c0cbdd242c9de3b118cc12bfd63 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2032a80ad7086ad3237598190094973baa918070f7c9204b7cc64daa0bd8b72a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23657739
</span>
patchfiles-append kicad_libraries_cmakelists.txt.patch
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,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 c874d73cf9a09e588191057843a842038842db1d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ee2cebb3eb331bc062b299ab124fa66ab058106326c4a576f937f0bf772729c8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 736764600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 79135b40950775ccf6a3c5aad5a58e0cb57111f9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 355a80ea60b2ea8bfed0a9984f7f899c1059be6a8c72680d7c6f078e50ac5e96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 736776816
</span>
patchfiles-append kicad_libraries_cmakelists.txt.patch
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,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 5f7cd6c156acc7974ae3bc94df0ff95a531defcb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5df5d9e62f28fdeb1a4aa6b7b5237c1349f13294f1c5a91abe15dd42de28dee8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 934424
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 47230c9c08a52b3125bc86904458df3da2534e31 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3306eec26cba2f7d6fb6630d0cda3858c364ccc931513f2cf8e387193be580ba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 934744
</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 9425fb9b706..f5d690290e9 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;'>@@ -35,8 +35,8 @@ diff --git CMakeLists.txt CMakeLists.txt
</span> index 1cd76e8db5..fd76b6bb86 100644
--- CMakeLists.txt
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -156,6 +156,11 @@ option( KICAD_STEP_EXPORT_LIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Build and use kicad2step as a library, meant for debugging"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,6 +161,11 @@ option( KICAD_STEP_EXPORT_LIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OFF "WIN32"
</span> OFF )
+cmake_dependent_option( KICAD_MACOSX_APP_BUNDLE
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,8 +47,8 @@ index 1cd76e8db5..fd76b6bb86 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;'>-@@ -177,6 +182,10 @@ if( KICAD_GAL_PROFILE )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_definitions( -DKICAD_GAL_PROFILE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,6 +191,10 @@ if( KICAD_GAL_PROFILE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions( -DKICAD_WIN32_VERIFY_CODESIGN )
</span> endif()
+if ( KICAD_MACOSX_APP_BUNDLE )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@ index 1cd76e8db5..fd76b6bb86 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;'>-@@ -508,7 +517,7 @@ set( KIFACE_PREFIX "_" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -518,7 +527,7 @@ set( KIFACE_PREFIX "_" )
</span> #================================================
# Locations for install targets.
#================================================
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ index 1cd76e8db5..fd76b6bb86 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;'>-@@ -795,7 +804,7 @@ if( NOT PYTHON_SITE_PACKAGE_PATH )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -799,7 +808,7 @@ if( NOT PYTHON_SITE_PACKAGE_PATH )
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +76,7 @@ index 1cd76e8db5..fd76b6bb86 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;'>-@@ -888,7 +897,7 @@ if( MINGW )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -900,7 +909,7 @@ if( MINGW )
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,7 +141,7 @@ index 7ad46c0a2f..cd2d727474 100644
</span> // all internal paths are relative to main bundle kicad.app
wxT( "Contents/Applications/pcbnew.app/Contents/MacOS/" ),
wxT( "Contents/Applications/eeschema.app/Contents/MacOS/" ),
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,7 +97,7 @@ wxString FindKicadFile( const wxString& shortname )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -98,7 +98,7 @@ wxString FindKicadFile( const wxString& shortname )
</span> // find binary file from possibilities list:
for( unsigned i=0; i<arrayDim(possibilities); ++i )
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,7 +154,7 @@ diff --git common/kiway.cpp common/kiway.cpp
</span> index ab84801f1d..04ba3a6800 100644
--- common/kiway.cpp
+++ common/kiway.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -121,7 +121,7 @@ const wxString KIWAY::dso_search_path( FACE_T aFaceId )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,7 +122,7 @@ const wxString KIWAY::dso_search_path( FACE_T aFaceId )
</span> return wxEmptyString;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,7 +163,7 @@ index ab84801f1d..04ba3a6800 100644
</span> wxString path;
if( m_ctl & (KFCTL_STANDALONE | KFCTL_CPP_PROJECT_SUITE) )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -147,7 +147,7 @@ const wxString KIWAY::dso_search_path( FACE_T aFaceId )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,7 +148,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 +212,7 @@ index 462a3d0846..da0ce126bf 100644
</span> path = GetOSXKicadMachineDataDir();
#elif defined( __WXMSW__ )
path = GetStockDataPath( false );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -266,7 +266,7 @@ wxString PATHS::GetStockPlugins3DPath()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -286,7 +286,7 @@ wxString PATHS::GetStockPlugins3DPath()
</span> fn.Assign( tfname, wxEmptyString );
fn.AppendDir( wxT( "kicad" ) );
fn.AppendDir( wxT( "plugins" ) );
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,7 +221,7 @@ index 462a3d0846..da0ce126bf 100644
</span> fn.Assign( wxStandardPaths::Get().GetPluginsDir(), wxEmptyString );
#else
fn.AssignDir( Pgm().GetExecutablePath() );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -306,7 +306,7 @@ wxString PATHS::GetDocumentationPath()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -326,7 +326,7 @@ wxString PATHS::GetDocumentationPath()
</span> {
wxString path;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -325,7 +325,7 @@ diff --git eeschema/dialogs/dialog_netlist.cpp eeschema/dialogs/dialog_netlist.c
</span> index ee62d2a6ff..b3a42b4356 100644
--- eeschema/dialogs/dialog_netlist.cpp
+++ eeschema/dialogs/dialog_netlist.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -677,7 +677,7 @@ void NETLIST_DIALOG_ADD_GENERATOR::OnBrowseGenerators( wxCommandEvent& event )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -682,7 +682,7 @@ void NETLIST_DIALOG_ADD_GENERATOR::OnBrowseGenerators( wxCommandEvent& event )
</span> {
wxString FullFileName, Path;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -428,7 +428,7 @@ diff --git kicad/tools/kicad_manager_control.cpp kicad/tools/kicad_manager_contr
</span> index 383c41c701..36e56f66f1 100644
--- kicad/tools/kicad_manager_control.cpp
+++ kicad/tools/kicad_manager_control.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -801,7 +801,7 @@ int KICAD_MANAGER_CONTROL::Execute( const TOOL_EVENT& aEvent )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -799,7 +799,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;'>@@ -516,7 +516,7 @@ diff --git pcbnew/CMakeLists.txt pcbnew/CMakeLists.txt
</span> index 58a3b0e13f..49065b6886 100644
--- pcbnew/CMakeLists.txt
+++ pcbnew/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -576,7 +576,7 @@ set_source_files_properties( dialogs/panel_setup_rules.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -582,7 +582,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;'>@@ -525,7 +525,7 @@ index 58a3b0e13f..49065b6886 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;'>-@@ -599,7 +599,7 @@ add_subdirectory( plugins/fabmaster )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -605,7 +605,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;'>@@ -534,7 +534,7 @@ index 58a3b0e13f..49065b6886 100644
</span> ${CMAKE_SOURCE_DIR}/common/single_top.cpp
${PCBNEW_RESOURCES}
)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -741,9 +741,10 @@ if( WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -747,9 +747,10 @@ if( WIN32 )
</span> endif()
# these 2 binaries are a matched set, keep them together:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -546,7 +546,7 @@ index 58a3b0e13f..49065b6886 100644
</span> )
# puts binaries into the *.app bundle while linking
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -789,7 +790,7 @@ if( KICAD_WIN32_INSTALL_PDBS )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -795,7 +796,7 @@ if( KICAD_WIN32_INSTALL_PDBS )
</span> install(FILES $<TARGET_PDB_FILE:pcbnew_kiface> DESTINATION ${KICAD_BIN})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -555,8 +555,8 @@ index 58a3b0e13f..49065b6886 100644
</span> install( FILES ${CMAKE_BINARY_DIR}/pcbnew/pcbnew.py DESTINATION ${PYTHON_DEST} )
else()
# put into bundle at build time, it is relocated at install
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -814,7 +815,7 @@ install( DIRECTORY ${PROJECT_SOURCE_DIR}/pcbnew/python/plugins/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( MINGW OR VCPKG_TOOLCHAIN )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -820,7 +821,7 @@ install( DIRECTORY ${PROJECT_SOURCE_DIR}/pcbnew/python/plugins/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( WIN32 )
</span> install( FILES ${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.pyd DESTINATION ${PYTHON_DEST} )
set( PYMOD_EXT "pyd" )
-elseif( APPLE )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -564,7 +564,7 @@ index 58a3b0e13f..49065b6886 100644
</span> # put everything into bundle at build time, it is relocated at install
add_custom_target( ScriptingModulesPcbnewSoCopy ALL
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.so" "${PYTHON_DEST}/"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -828,7 +829,7 @@ else() # only linux remains among supported platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -834,7 +835,7 @@ else() # only linux remains among supported platforms
</span> set( PYMOD_EXT "so" )
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -573,7 +573,7 @@ index 58a3b0e13f..49065b6886 100644
</span> add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
DEPENDS pcbnew_kiface
COMMAND ${CMAKE_COMMAND} -E copy ${OSX_BUNDLE_BUILD_KIFACE_DIR}/_pcbnew.kiface _pcbnew.${PYMOD_EXT}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -852,7 +853,7 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -858,7 +859,7 @@ else()
</span> endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -646,7 +646,7 @@ diff --git scripting/CMakeLists.txt scripting/CMakeLists.txt
</span> index 07e7e33d9a..851afbeaf5 100644
--- scripting/CMakeLists.txt
+++ scripting/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,7 +62,7 @@ if( MAKE_LINK_MAPS )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,7 @@ if( MAKE_LINK_MAPS )
</span> LINK_FLAGS "-Wl,-cref,-Map=_scripting.kiface.map" )
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -655,7 +655,7 @@ index 07e7e33d9a..851afbeaf5 100644
</span> set_target_properties( scripting_kiface PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR}
)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,4 +82,4 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,4 +86,4 @@ endif()
</span> install( DIRECTORY ${PROJECT_SOURCE_DIR}/scripting/kicad_pyshell/
DESTINATION ${KICAD_DATA}/scripting/kicad_pyshell
FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -666,15 +666,15 @@ diff --git scripting/python_scripting.cpp scripting/python_scripting.cpp
</span> index e292887ff0..b2531e8891 100644
--- scripting/python_scripting.cpp
+++ scripting/python_scripting.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,7 +154,7 @@ bool SCRIPTING::scriptingSetup()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -164,7 +164,7 @@ bool SCRIPTING::scriptingSetup()
</span> wxSetEnv( wxT( "PATH" ), kipython );
}
#endif
-#elif defined( __WXMAC__ )
+#elif defined( __MACOSX_APP__ )
<span style='display:block; white-space:pre;background:#ffe0e0;'>- // Add default paths to PYTHONPATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxString pypath;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Prevent Mac builds from generating JIT versions as this will break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // the package signing
</span> diff --git translation/CMakeLists.txt translation/CMakeLists.txt
index 6a71974fb0..9dd622f018 100644
--- translation/CMakeLists.txt
</pre><pre style='margin:0'>
</pre>