<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6018a769e6a000d9ceb56fea57f79bbb349ff55b">https://github.com/macports/macports-ports/commit/6018a769e6a000d9ceb56fea57f79bbb349ff55b</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 6018a769e6a kicad: Fix build with opencascade 7.8.x
</span>6018a769e6a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6018a769e6a000d9ceb56fea57f79bbb349ff55b
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Mon Apr 1 19:10:08 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> kicad: Fix build with opencascade 7.8.x
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> And use path:-based dependencies and refresh patches.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/69584
</span>---
science/kicad/Portfile | 7 +-
...ake-adding-KICAD_MACOSX_APP_BUNDLE-option.patch | 160 ++++++++-------------
science/kicad/files/0002-disable-codesigning.patch | 6 +-
science/kicad/files/macports_prefix.patch | 6 +-
science/kicad/files/opencascade-7.8.patch | 37 +++++
5 files changed, 101 insertions(+), 115 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 a86ff9babf0..304e659c68b 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;'>@@ -37,12 +37,13 @@ if {${name} eq ${subport}} {
</span>
patchfiles-append \
macports_prefix.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ opencascade-7.8.patch \
</span> 0001-cmake-adding-KICAD_MACOSX_APP_BUNDLE-option.patch \
0002-disable-codesigning.patch
depends_build-append \
path:bin/doxygen:doxygen \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig \
</span> port:swig \
port:swig-python
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +60,7 @@ if {${name} eq ${subport}} {
</span> port:py${py_ver_no_dot}-pybind11 \
path:lib/pkgconfig/pixman-1.pc:libpixman \
port:unixODBC \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:harfbuzz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
</span> port:kicad-docs \
port:kicad-symbols \
port:kicad-footprints \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,7 +127,7 @@ subport kicad-docs {
</span> description KiCad documentation
long_description {*}${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # we use pre-compiled binary since it is very long to compile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we use a pre-compiled binary since it takes a very long time to compile
</span> # and requires many big dependencies
master_sites https://kicad-downloads.s3.cern.ch/docs
distname ${name}-doc-${version}
<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 4c455b75075..af5178b3e4d 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,18 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git 3d-viewer/3d_cache/3d_plugin_manager.cpp 3d-viewer/3d_cache/3d_plugin_manager.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 09f4f557a1..5fc0b08566 100644
</span> --- 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;'>-@@ -124,7 +124,7 @@ void S3D_PLUGIN_MANAGER::loadPlugins( void )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::list< wxString > pluginlist;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxFileName fn;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -124,7 +124,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::list<wxString> pluginlist;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxFileName fn;
</span>
-#ifndef __WXMAC__
+#ifndef __MACOSX_APP__
if( wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- // set up to work from the build directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git 3d-viewer/3d_cache/sg/CMakeLists.txt 3d-viewer/3d_cache/sg/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0899a1925b..13d1e6a688 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // set up to work from the build directory
</span> --- 3d-viewer/3d_cache/sg/CMakeLists.txt
+++ 3d-viewer/3d_cache/sg/CMakeLists.txt
@@ -35,7 +35,7 @@ endif( MINGW )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,13 +20,11 @@ index 0899a1925b..13d1e6a688 100644
</span> # puts library into the main kicad.app bundle in build tree
set_target_properties( kicad_3dsg PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${OSX_BUNDLE_BUILD_LIB_DIR}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1cd76e8db5..fd76b6bb86 100644
</span> --- CMakeLists.txt
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -161,6 +161,11 @@ option( KICAD_STEP_EXPORT_LIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OFF "WIN32"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OFF )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -207,6 +207,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span>
+cmake_dependent_option( KICAD_MACOSX_APP_BUNDLE
+ "Create macOS Application bundle"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +34,7 @@ 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;'>-@@ -186,6 +191,10 @@ if( KICAD_GAL_PROFILE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -232,6 +237,10 @@
</span> add_definitions( -DKICAD_WIN32_VERIFY_CODESIGN )
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,16 +45,16 @@ 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;'>-@@ -518,7 +527,7 @@ set( KIFACE_PREFIX "_" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -566,7 +575,7 @@
</span> #================================================
# Locations for install targets.
#================================================
-if( NOT APPLE )
+if( NOT KICAD_MACOSX_APP_BUNDLE )
# Everything without leading / is relative to CMAKE_INSTALL_PREFIX.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set( KICAD_BIN bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CACHE PATH "Location of KiCad binaries." )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -799,7 +808,7 @@ if( NOT PYTHON_SITE_PACKAGE_PATH )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( KICAD_BIN bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -864,7 +873,7 @@
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +63,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;'>-@@ -900,7 +909,7 @@ if( MINGW )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -975,7 +984,7 @@
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,8 +72,6 @@ index 1cd76e8db5..fd76b6bb86 100644
</span> # Remove app bundles in ${KICAD_BIN} before installing anything new.
# Must be defined before all includes so that it is executed first.
install( CODE "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git bitmap2component/CMakeLists.txt bitmap2component/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3b45e9d348..61d0acab02 100644
</span> --- bitmap2component/CMakeLists.txt
+++ bitmap2component/CMakeLists.txt
@@ -35,7 +35,7 @@ if( WIN32 )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,11 +104,9 @@ index 3b45e9d348..61d0acab02 100644
</span> )
# put individual bundle outside of main bundle as a first step
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git common/gestfich.cpp common/gestfich.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7ad46c0a2f..cd2d727474 100644
</span> --- common/gestfich.cpp
+++ common/gestfich.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,7 +53,7 @@ wxString FindKicadFile( const wxString& shortname )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,7 +54,7 @@
</span> {
// Test the presence of the file in the directory shortname of
// the KiCad binary path.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,7 +115,7 @@ index 7ad46c0a2f..cd2d727474 100644
</span> wxString fullFileName = Pgm().GetExecutablePath() + shortname;
#else
wxString fullFileName = Pgm().GetExecutablePath() + wxT( "Contents/MacOS/" ) + shortname;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,7 +79,7 @@ wxString FindKicadFile( const wxString& shortname )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,7 +80,7 @@
</span>
// Path list for KiCad binary files
const static wxChar* possibilities[] = {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,7 +124,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;'>-@@ -98,7 +98,7 @@ wxString FindKicadFile( const wxString& shortname )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,7 +99,7 @@
</span> // find binary file from possibilities list:
for( unsigned i=0; i<arrayDim(possibilities); ++i )
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,11 +133,9 @@ index 7ad46c0a2f..cd2d727474 100644
</span> fullFileName = possibilities[i] + shortname;
#else
// make relative paths absolute
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git common/kiway.cpp common/kiway.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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;'>+@@ -127,7 +127,7 @@
</span> return wxEmptyString;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,7 +144,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;'>-@@ -148,7 +148,7 @@ const wxString KIWAY::dso_search_path( FACE_T aFaceId )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -153,7 +153,7 @@
</span>
if( wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,8 +153,6 @@ index ab84801f1d..04ba3a6800 100644
</span> // On Mac, all of the kifaces are placed in the kicad.app bundle, even though the individual
// 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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git common/paths.cpp common/paths.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 462a3d0846..da0ce126bf 100644
</span> --- common/paths.cpp
+++ common/paths.cpp
@@ -29,7 +29,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,8 +163,8 @@ index 462a3d0846..da0ce126bf 100644
</span> +#if defined( __MACOSX_APP__ ) || defined( __WXMSW__ )
#define KICAD_PATH_STR wxT( "KiCad" )
#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #define KICAD_PATH_STR wxT( "kicad" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,7 +154,7 @@ wxString PATHS::GetStockDataPath( bool aRespectRunFromBuildDir )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define KICAD_PATH_STR wxT( "kicad" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,7 +154,7 @@
</span> if( aRespectRunFromBuildDir && wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
{
// Allow debugging from build dir by placing relevant files/folders in the build root
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,7 +173,7 @@ index 462a3d0846..da0ce126bf 100644
</span> wxFileName fn = wxStandardPaths::Get().GetExecutablePath();
fn.RemoveLastDir();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -170,7 +170,7 @@ wxString PATHS::GetStockDataPath( bool aRespectRunFromBuildDir )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -170,7 +170,7 @@
</span> }
else
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -196,7 +182,7 @@ index 462a3d0846..da0ce126bf 100644
</span> path = GetOSXKicadDataDir();
#elif defined( __WXMSW__ )
path = getWindowsKiCadRoot() + wxT( "share/kicad" );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -187,7 +187,7 @@ wxString PATHS::GetStockEDALibraryPath()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -187,7 +187,7 @@
</span> {
wxString path;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,16 +191,16 @@ index 462a3d0846..da0ce126bf 100644
</span> path = GetOSXKicadMachineDataDir();
#elif defined( __WXMSW__ )
path = GetStockDataPath( false );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -286,7 +286,7 @@ wxString PATHS::GetStockPlugins3DPath()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fn.Assign( tfname, wxEmptyString );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -286,7 +286,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fn.Assign( tfname, "" );
</span> fn.AppendDir( wxT( "kicad" ) );
fn.AppendDir( wxT( "plugins" ) );
-#elif defined( __WXMAC__ )
+#elif defined( __MACOSX_APP__ )
fn.Assign( wxStandardPaths::Get().GetPluginsDir(), wxEmptyString );
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fn.AssignDir( Pgm().GetExecutablePath() );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -326,7 +326,7 @@ wxString PATHS::GetDocumentationPath()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This must be mapped to main bundle for everything but kicad.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -352,7 +352,7 @@
</span> {
wxString path;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -223,11 +209,9 @@ index 462a3d0846..da0ce126bf 100644
</span> path = GetOSXKicadDataDir();
#elif defined( __WXMSW__ )
path = getWindowsKiCadRoot() + wxT( "share/doc/kicad" );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git common/systemdirsappend.cpp common/systemdirsappend.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d322fab161..8997c0268a 100644
</span> --- common/systemdirsappend.cpp
+++ common/systemdirsappend.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,7 +52,7 @@ void SystemDirsAppend( SEARCH_STACK* aSearchStack )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,7 +53,7 @@
</span> // Otherwise don't set it.
maybe.AddPaths( wxGetenv( wxT( "KICAD" ) ) );
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,7 +220,7 @@ index d322fab161..8997c0268a 100644
</span> // Add the directory for the user-dependent, program specific data files.
maybe.AddPaths( PATHS::GetOSXKicadUserDataDir() );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,7 +137,7 @@ void SystemDirsAppend( SEARCH_STACK* aSearchStack )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,7 +138,7 @@
</span> {
wxFileName fn( maybe[i], wxEmptyString );
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -245,7 +229,7 @@ index d322fab161..8997c0268a 100644
</span> if( fn.GetPath().AfterLast( fn.GetPathSeparator() ) == wxT( "bin" ) )
{
fn.RemoveLastDir();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -149,7 +149,7 @@ void SystemDirsAppend( SEARCH_STACK* aSearchStack )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -150,7 +150,7 @@
</span>
aSearchStack->AddPaths( fn.GetPath() );
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -254,11 +238,9 @@ index d322fab161..8997c0268a 100644
</span> fn.AppendDir( wxT( "kicad" ) );
aSearchStack->AddPaths( fn.GetPath() ); // add maybe[i]/kicad
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git cvpcb/CMakeLists.txt cvpcb/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index eb68a4f6a4..e81167954f 100644
</span> --- cvpcb/CMakeLists.txt
+++ cvpcb/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,7 +99,7 @@ if( MAKE_LINK_MAPS )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,7 +100,7 @@
</span> endif()
# these 2 binaries are a matched set, keep them together:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -267,11 +249,9 @@ index eb68a4f6a4..e81167954f 100644
</span> # puts binaries into the *.app bundle while linking
set_target_properties( cvpcb_kiface PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git eeschema/CMakeLists.txt eeschema/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 52a11230ba..49e82646c6 100644
</span> --- eeschema/CMakeLists.txt
+++ eeschema/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -342,7 +342,7 @@ set_source_files_properties( sch_text.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -410,7 +410,7 @@
</span> OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/sch_text_help_md.h
)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -280,7 +260,7 @@ index 52a11230ba..49e82646c6 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;'>-@@ -357,7 +357,7 @@ if( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -425,7 +425,7 @@
</span> endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -289,7 +269,7 @@ index 52a11230ba..49e82646c6 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;'>-@@ -441,9 +441,10 @@ if( MAKE_LINK_MAPS )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -529,9 +529,10 @@
</span> endif()
# these 2 binaries are a matched set, keep them together:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -301,8 +281,6 @@ index 52a11230ba..49e82646c6 100644
</span> )
# puts binaries into the *.app bundle while linking
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git eeschema/sim/ngspice.cpp eeschema/sim/ngspice.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e31449c98b..d9cdd0bc81 100644
</span> --- eeschema/sim/ngspice.cpp
+++ eeschema/sim/ngspice.cpp
@@ -443,7 +443,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -314,11 +292,9 @@ index e31449c98b..d9cdd0bc81 100644
</span> const std::vector<std::string> dllPaths = {
PATHS::GetOSXKicadUserDataDir().ToStdString() + "/PlugIns/ngspice",
PATHS::GetOSXKicadMachineDataDir().ToStdString() + "/PlugIns/ngspice",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git gerbview/CMakeLists.txt gerbview/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d1fd2cd401..9f9f843a5e 100644
</span> --- gerbview/CMakeLists.txt
+++ gerbview/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,7 +91,7 @@ if( WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,7 +85,7 @@
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -327,7 +303,7 @@ index d1fd2cd401..9f9f843a5e 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;'>-@@ -105,7 +105,7 @@ if( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,7 +99,7 @@
</span> set( MACOSX_BUNDLE_NAME gerbview )
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -336,7 +312,7 @@ index d1fd2cd401..9f9f843a5e 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;'>-@@ -179,9 +179,10 @@ target_include_directories( gerbview_kiface PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,9 +173,10 @@
</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;'>@@ -348,11 +324,9 @@ index d1fd2cd401..9f9f843a5e 100644
</span> )
# puts binaries into the *.app bundle while linking
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git kicad/CMakeLists.txt kicad/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 04edf80fb3..16ba177d45 100644
</span> --- kicad/CMakeLists.txt
+++ kicad/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,7 +64,7 @@ if( WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,7 +63,7 @@
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -361,7 +335,7 @@ index 04edf80fb3..16ba177d45 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;'>-@@ -77,7 +77,7 @@ if( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,7 +76,7 @@
</span> set( MACOSX_BUNDLE_NAME kicad )
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -370,7 +344,7 @@ index 04edf80fb3..16ba177d45 100644
</span> kicad.cpp
${KICAD_SRCS}
${KICAD_EXTRA_SRCS}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -111,9 +111,10 @@ if( UNIX )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,9 +110,10 @@
</span> )
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -381,8 +355,8 @@ index 04edf80fb3..16ba177d45 100644
</span> + MACOSX_BUNDLE TRUE
)
target_link_libraries( kicad
<span style='display:block; white-space:pre;background:#ffe0e0;'>- common
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,7 +176,7 @@ if( KICAD_WIN32_INSTALL_PDBS )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nlohmann_json
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,7 +176,7 @@
</span> install(FILES $<TARGET_PDB_FILE:kicad> DESTINATION ${KICAD_BIN})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -391,8 +365,6 @@ index 04edf80fb3..16ba177d45 100644
</span> # "install( CODE ... )" will launch its own CMake, so no variables from
# this CMake instance are accessible... use helper to transfer
set( SCRIPTING_HELPER "1" )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git kicad/tools/kicad_manager_control.cpp kicad/tools/kicad_manager_control.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 383c41c701..36e56f66f1 100644
</span> --- kicad/tools/kicad_manager_control.cpp
+++ kicad/tools/kicad_manager_control.cpp
@@ -866,7 +866,7 @@ int KICAD_MANAGER_CONTROL::Execute( const TOOL_EVENT& aEvent )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -404,8 +376,6 @@ index 383c41c701..36e56f66f1 100644
</span> // This non-parameterized use of wxExecute is fine because execFile is not derived
// from user input.
wxExecute( "osascript -e 'activate application \"" + execFile + "\"'" );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git pagelayout_editor/CMakeLists.txt pagelayout_editor/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fb621b5aa7..bb10e3ea29 100644
</span> --- pagelayout_editor/CMakeLists.txt
+++ pagelayout_editor/CMakeLists.txt
@@ -57,7 +57,7 @@ if( WIN32 )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -438,11 +408,9 @@ index fb621b5aa7..bb10e3ea29 100644
</span> )
# puts binaries into the *.app bundle while linking
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git pcb_calculator/CMakeLists.txt pcb_calculator/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2069c9e835..4ebf9ca75f 100644
</span> --- pcb_calculator/CMakeLists.txt
+++ pcb_calculator/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +58,7 @@ if( WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,7 @@
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -451,7 +419,7 @@ index 2069c9e835..4ebf9ca75f 100644
</span> # setup bundle
set( PCB_CALCULATOR_RESOURCES pcb_calculator.icns )
set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/pcb_calculator.icns" PROPERTIES
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,7 +69,7 @@ if( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,7 @@
</span> set( MACOSX_BUNDLE_NAME pcb_calculator )
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -460,7 +428,7 @@ index 2069c9e835..4ebf9ca75f 100644
</span> ${CMAKE_SOURCE_DIR}/common/single_top.cpp
${CMAKE_SOURCE_DIR}/common/pgm_base.cpp
${PCB_CALCULATOR_RESOURCES}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -119,9 +119,10 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,9 +127,10 @@
</span> add_dependencies( pcb_calculator pcb_calculator_kiface )
# these 2 binaries are a matched set, keep them together
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -472,11 +440,9 @@ index 2069c9e835..4ebf9ca75f 100644
</span> )
# puts binaries into the *.app bundle while linking
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git pcbnew/CMakeLists.txt pcbnew/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 58a3b0e13f..49065b6886 100644
</span> --- pcbnew/CMakeLists.txt
+++ pcbnew/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -582,7 +582,7 @@ set_source_files_properties( dialogs/panel_setup_rules.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -571,7 +571,7 @@
</span> OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/panel_setup_rules_help_md.h
)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -485,7 +451,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;'>-@@ -605,7 +605,7 @@ add_subdirectory( plugins/fabmaster )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -594,7 +594,7 @@
</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;'>@@ -494,7 +460,7 @@ index 58a3b0e13f..49065b6886 100644
</span> ${CMAKE_SOURCE_DIR}/common/single_top.cpp
${PCBNEW_RESOURCES}
)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -747,9 +747,10 @@ if( WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -727,9 +727,10 @@
</span> endif()
# these 2 binaries are a matched set, keep them together:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -506,8 +472,8 @@ index 58a3b0e13f..49065b6886 100644
</span> )
# puts binaries into the *.app bundle while linking
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -795,7 +796,7 @@ if( KICAD_WIN32_INSTALL_PDBS )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(FILES $<TARGET_PDB_FILE:pcbnew_kiface> DESTINATION ${KICAD_BIN})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -775,7 +776,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES $<TARGET_PDB_FILE:pcbnew_kiface> DESTINATION ${KICAD_KIFACE})
</span> endif()
-if( NOT APPLE )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -515,7 +481,7 @@ 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;'>-@@ -820,7 +821,7 @@ install( DIRECTORY ${PROJECT_SOURCE_DIR}/pcbnew/python/plugins/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -800,7 +801,7 @@
</span> if( WIN32 )
install( FILES ${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.pyd DESTINATION ${PYTHON_DEST} )
set( PYMOD_EXT "pyd" )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -524,8 +490,8 @@ 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;'>-@@ -834,7 +835,7 @@ else() # only linux remains among supported platforms
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( PYMOD_EXT "so" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -816,7 +817,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/python/_pcbnew.${PYMOD_EXT} DESTINATION ${PYTHON_DEST} )
</span> endif()
-if( APPLE )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -533,8 +499,8 @@ 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;'>-@@ -858,7 +859,7 @@ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -870,7 +871,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span>
-if( APPLE )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -542,8 +508,6 @@ index 58a3b0e13f..49065b6886 100644
</span> # If we don't have wxPython, then we must create the site-packages directory
add_custom_target( ScriptingPythonDirectoryCreation ALL
COMMAND ${CMAKE_COMMAND} -E make_directory "${PYTHON_DEST}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git plugins/3d/idf/CMakeLists.txt plugins/3d/idf/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7bcc7656dd..a417d38f88 100644
</span> --- plugins/3d/idf/CMakeLists.txt
+++ plugins/3d/idf/CMakeLists.txt
@@ -29,7 +29,7 @@ target_link_libraries( s3d_plugin_idf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -555,8 +519,6 @@ index 7bcc7656dd..a417d38f88 100644
</span> # puts library into the main kicad.app bundle in build tree
set_target_properties( s3d_plugin_idf PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${OSX_BUNDLE_BUILD_PLUGIN_DIR}/3d"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git plugins/3d/oce/CMakeLists.txt plugins/3d/oce/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 074df30a67..5998fb7c15 100644
</span> --- plugins/3d/oce/CMakeLists.txt
+++ plugins/3d/oce/CMakeLists.txt
@@ -23,7 +23,7 @@ target_include_directories( s3d_plugin_oce PRIVATE
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -568,8 +530,6 @@ index 074df30a67..5998fb7c15 100644
</span> # puts library into the main kicad.app bundle in build tree
set_target_properties( s3d_plugin_oce PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${OSX_BUNDLE_BUILD_PLUGIN_DIR}/3d"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git plugins/3d/vrml/CMakeLists.txt plugins/3d/vrml/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b651598842..ebe3a7f7c7 100644
</span> --- plugins/3d/vrml/CMakeLists.txt
+++ plugins/3d/vrml/CMakeLists.txt
@@ -71,7 +71,7 @@ target_include_directories( s3d_plugin_vrml PRIVATE
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -581,8 +541,6 @@ index b651598842..ebe3a7f7c7 100644
</span> # puts library into the main kicad.app bundle in build tree
set_target_properties( s3d_plugin_vrml PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${OSX_BUNDLE_BUILD_PLUGIN_DIR}/3d"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git scripting/CMakeLists.txt scripting/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 07e7e33d9a..851afbeaf5 100644
</span> --- scripting/CMakeLists.txt
+++ scripting/CMakeLists.txt
@@ -66,7 +66,7 @@ if( MAKE_LINK_MAPS )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -594,11 +552,9 @@ 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;'>-diff --git scripting/python_scripting.cpp scripting/python_scripting.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e292887ff0..b2531e8891 100644
</span> --- scripting/python_scripting.cpp
+++ scripting/python_scripting.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -164,7 +164,7 @@ bool SCRIPTING::scriptingSetup()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -253,7 +253,7 @@
</span> wxSetEnv( wxT( "PATH" ), kipython );
}
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -607,8 +563,6 @@ index e292887ff0..b2531e8891 100644
</span>
// Prevent Mac builds from generating JIT versions as this will break
// the package signing
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git translation/CMakeLists.txt translation/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6a71974fb0..9dd622f018 100644
</span> --- translation/CMakeLists.txt
+++ translation/CMakeLists.txt
@@ -1,7 +1,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -620,8 +574,6 @@ index 6a71974fb0..9dd622f018 100644
</span> set( KICAD_I18N_PATH ${KICAD_DATA}/internat
CACHE PATH "Location of KiCad i18n files." )
else()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git utils/idftools/CMakeLists.txt utils/idftools/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c6dbff6dfa..2cfc6bed06 100644
</span> --- utils/idftools/CMakeLists.txt
+++ utils/idftools/CMakeLists.txt
@@ -42,7 +42,7 @@ target_link_libraries( idf2vrml
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/kicad/files/0002-disable-codesigning.patch b/science/kicad/files/0002-disable-codesigning.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 728f526b3ac..bd30ded211b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/kicad/files/0002-disable-codesigning.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/kicad/files/0002-disable-codesigning.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt 2023-07-24 17:41:09.037114375 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2023-07-25 08:53:09.659283252 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1071,7 +1071,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1089,7 +1089,7 @@
</span> add_subdirectory( translation )
endif()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/kicad/files/macports_prefix.patch b/science/kicad/files/macports_prefix.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 646a4d13073..9a56b32f17c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/kicad/files/macports_prefix.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/kicad/files/macports_prefix.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git common/gestfich.cpp common/gestfich.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cd2d727474..e114b44042 100644
</span> --- common/gestfich.cpp
+++ common/gestfich.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,6 +91,7 @@ wxString FindKicadFile( const wxString& shortname )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,6 +92,7 @@
</span> wxT( "/usr/bin/" ),
wxT( "/usr/local/bin/" ),
wxT( "/usr/local/kicad/bin/" ),
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,8 +8,6 @@ index cd2d727474..e114b44042 100644
</span> #endif
};
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git eeschema/sim/ngspice.cpp eeschema/sim/ngspice.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0a3a07ed4b..fe566c9e81 100644
</span> --- eeschema/sim/ngspice.cpp
+++ eeschema/sim/ngspice.cpp
@@ -456,7 +456,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/kicad/files/opencascade-7.8.patch b/science/kicad/files/opencascade-7.8.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..88d2f025f96
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/kicad/files/opencascade-7.8.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with Open Cascade 7.8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.com/kicad/code/kicad/-/issues/17654
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bz-attachments.freebsd.org/attachment.cgi?id=248764
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/FindOCC.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/FindOCC.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,7 +45,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKGeomAlgo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKGeomBase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKHLR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TKIGES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TKDEIGES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKLCAF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKMath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKMesh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,18 +55,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKPrim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKService
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKShHealing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TKSTEP209
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TKSTEPAttr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TKSTEPBase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TKSTEP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TKSTL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TKDESTEP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TKDESTL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKTObj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKTopAlgo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKV3d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TKVRML
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TKDEVRML
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKXCAF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TKXDEIGES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TKXDESTEP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKXMesh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKXmlL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKXml
</span></pre><pre style='margin:0'>
</pre>