<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/3285d6880ae08678da8ef517cffe50a506e08291">https://github.com/macports/macports-ports/commit/3285d6880ae08678da8ef517cffe50a506e08291</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 3285d6880ae science/kicad: update to 7.0.9, python 3.11
</span>3285d6880ae is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3285d6880ae08678da8ef517cffe50a506e08291
</span>Author: Aljaž "g5pw" Srebrnič <g5pw@macports.org>
AuthorDate: Thu Jul 27 14:27:08 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> science/kicad: update to 7.0.9, python 3.11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also adds missing dependencies.
</span>---
science/kicad/Portfile | 49 ++++-----
...ake-adding-KICAD_MACOSX_APP_BUNDLE-option.patch | 113 +++------------------
science/kicad/files/0002-disable-codesigning.patch | 11 ++
science/kicad/files/macports_prefix.patch | 8 +-
4 files changed, 57 insertions(+), 124 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 2a6e392e80d..2640ce863f2 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.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.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;'>@@ -15,7 +15,7 @@ license GPL-3
</span> maintainers {ra1nb0w @ra1nb0w} openmaintainer
homepage https://www.kicad.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_version 3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version 3.11
</span> set py_ver_no_dot [join [split ${python_version} "."] ""]
set python_framework_dir ${frameworks_dir}/Python.framework/Versions/${python_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,15 +25,15 @@ if {${name} eq ${subport}} {
</span>
gitlab.setup kicad/code kicad ${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 b13a0b899f0548ed8ff76c0c78d33f80c1ab7473 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f2b7ad72942c7e154bebb06d4e6d9fd7ea765f679edafb25b059b387860fbe5d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 34083016
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 e52fee69a2d158a8be220880c7789560356c8860 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 45322e7495cbf0b6bba70b8fb8b58fdafa408d4d8473209fd1c5e8bad5a818f7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 43964032
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- wxwidgets-4.1-deprecated.patch \
</span> macports_prefix.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-cmake-adding-KICAD_MACOSX_APP_BUNDLE-option.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0001-cmake-adding-KICAD_MACOSX_APP_BUNDLE-option.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-disable-codesigning.patch
</span>
depends_build-append \
path:bin/doxygen:doxygen \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +53,8 @@ if {${name} eq ${subport}} {
</span> path:lib/pkgconfig/cairo.pc:cairo \
port:py${py_ver_no_dot}-pybind11 \
path:lib/pkgconfig/pixman-1.pc:libpixman \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:unixODBC \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:harfbuzz \
</span> port:kicad-docs \
port:kicad-symbols \
port:kicad-footprints \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,9 +126,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 206f25bc6d82b55e265625606664e92123226331 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 141ef958e8cfd8daf489c8e61b245df64e971bd0b30b2a32857b3210c22f3f4a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 278043986
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 e8020d677cd9bf1f58bab6d53fe50b19d1b63029 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3e276fd4d5ca1a2cc11cb35770c3ef6a33e02ec4a20243b28d110b647abef00b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 694923369
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,9 +148,10 @@ subport kicad-symbols {
</span>
gitlab.setup kicad/libraries kicad-symbols ${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 585801627bf07bf9ce514835c6d8208c38470e77 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b4b28ef9449ebce2cbab0555173994b2af6c0157e546ba1308d680ad6fa4a0ca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2291352
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 a4e17bdcfda2283a934e667f910d1fcc7ed35e15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c1be547ab435cccf9c98d21c9a816ab3051ae8e306bcbcb4ac46a896c88210ab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3054537
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
patchfiles-append kicad_libraries_cmakelists.txt.patch
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,9 +164,9 @@ subport kicad-footprints {
</span>
gitlab.setup kicad/libraries kicad-footprints ${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 f063a0ae6b02d0cc95d5fad77cb1e7ddc30c2faa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6229296fb1f7fcd64424230128abcee008eb92c2590da6b40718f0a66810b614 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 23763091
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 1f8f14d49dc64342a080d78350e4f11fd0859996 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1307f37613c1971794940ee78ad49146ae10eb3525a0c9f427adb8900ddbee0e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24450969
</span>
patchfiles-append kicad_libraries_cmakelists.txt.patch
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,9 +179,9 @@ subport kicad-packages3D {
</span>
gitlab.setup kicad/libraries kicad-packages3D ${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 a41b961ff98d9f24488feb21b20f985009adeff0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ca3291bcf54dc79b37bc8c0e15c3eb6d1a9eea0e391d0e34202bd26b451c6fcb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 737065465
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 681a3188e25acc46fc86af91cead540e8ed76f4c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cf9dd300e4020f25e17835c7f930af1974d5953694d103b65bb0a41eb80bf19a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 773284884
</span>
patchfiles-append kicad_libraries_cmakelists.txt.patch
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,9 +194,9 @@ subport kicad-templates {
</span>
gitlab.setup kicad/libraries kicad-templates ${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 a58993f2d9044a8ba8e7079ef75166cf37eb0f37 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a8de6c4653ad7ba711a21d4b081797202e4f4e9954dc6d9fdca3ce2f392448d9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 934873
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 0b32a8fd3aab53794190b52c3902f610d6ffa8f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3f87dfe352cf12e73cf7769202101935fba547da5f04e1029bdd786ad0f9f0a4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1247499
</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 f5d690290e9..4c455b75075 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;'>@@ -8,8 +8,8 @@ index 09f4f557a1..5fc0b08566 100644
</span>
-#ifndef __WXMAC__
+#ifndef __MACOSX_APP__
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span> // set up to work from the build directory
diff --git 3d-viewer/3d_cache/sg/CMakeLists.txt 3d-viewer/3d_cache/sg/CMakeLists.txt
index 0899a1925b..13d1e6a688 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,13 +24,6 @@ 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;'>-@@ -108,4 +108,4 @@ install( TARGETS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( KICAD_WIN32_INSTALL_PDBS )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Get the PDBs to copy over for MSVC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(FILES $<TARGET_PDB_FILE:kicad_3dsg> DESTINATION ${KICAD_BIN})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span> diff --git CMakeLists.txt CMakeLists.txt
index 1cd76e8db5..fd76b6bb86 100644
--- CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -308,43 +301,17 @@ 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/bom_plugins.cpp eeschema/bom_plugins.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 84b6762504..efb8436beb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- eeschema/bom_plugins.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ eeschema/bom_plugins.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -75,7 +75,7 @@ BOM_GENERATOR_HANDLER::BOM_GENERATOR_HANDLER( const wxString& aFile )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // For macOS, we want to use the Python we bundle along, rather than just PYTHON_EXECUTABLE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // For non-Windows, non-macOS, we can call out to PYTHON_EXECUTABLE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __MACOSX_APP__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // python is at Contents/Frameworks/Python.framework/Versions/Current/bin/python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Of course, for macOS, it's not quite that simple, since the relative path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git eeschema/dialogs/dialog_netlist.cpp eeschema/dialogs/dialog_netlist.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ee62d2a6ff..b3a42b4356 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- eeschema/dialogs/dialog_netlist.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ eeschema/dialogs/dialog_netlist.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -682,7 +682,7 @@ void NETLIST_DIALOG_ADD_GENERATOR::OnBrowseGenerators( wxCommandEvent& event )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxString FullFileName, Path;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __WXMAC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __MACOSX_APP__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Path = Pgm().GetExecutablePath();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Path = PATHS::GetOSXKicadDataDir() + wxT( "/plugins" );
</span> diff --git eeschema/sim/ngspice.cpp eeschema/sim/ngspice.cpp
index e31449c98b..d9cdd0bc81 100644
--- eeschema/sim/ngspice.cpp
+++ eeschema/sim/ngspice.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -431,7 +431,7 @@ void NGSPICE::init_dll()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -443,7 +443,7 @@
</span> #else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- const vector<string> dllPaths = { "", "/mingw64/bin", "/mingw32/bin" };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const std::vector<std::string> dllPaths = { "", "/mingw64/bin", "/mingw32/bin" };
</span> #endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__WXMAC__)
</span> +#elif defined(__MACOSX_APP__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- const vector<string> dllPaths = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__WXMAC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const std::vector<std::string> dllPaths = {
</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:#e0e0e0;'>@@ -385,7 +352,7 @@ diff --git kicad/CMakeLists.txt kicad/CMakeLists.txt
</span> index 04edf80fb3..16ba177d45 100644
--- kicad/CMakeLists.txt
+++ kicad/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,7 +47,7 @@ if( WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,7 +64,7 @@ if( WIN32 )
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -394,16 +361,16 @@ 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;'>-@@ -60,7 +60,7 @@ if( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,7 @@ if( APPLE )
</span> set( MACOSX_BUNDLE_NAME kicad )
endif()
-add_executable( kicad WIN32 MACOSX_BUNDLE
+add_executable( kicad WIN32
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ kicad.cpp
</span> ${KICAD_SRCS}
${KICAD_EXTRA_SRCS}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${KICAD_RESOURCES}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -80,9 +80,10 @@ if( UNIX )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,9 +111,10 @@ if( UNIX )
</span> )
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -415,7 +382,7 @@ index 04edf80fb3..16ba177d45 100644
</span> )
target_link_libraries( kicad
common
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -112,7 +113,7 @@ if( KICAD_WIN32_INSTALL_PDBS )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,7 +176,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;'>@@ -428,10 +395,10 @@ 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;'>-@@ -799,7 +799,7 @@ int KICAD_MANAGER_CONTROL::Execute( const TOOL_EVENT& aEvent )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxString msg = wxString::Format( _( "%s %s opened [pid=%ld]\n" ), execFile, param, pid );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_frame->PrintMsg( msg );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -866,7 +866,7 @@ int KICAD_MANAGER_CONTROL::Execute( const TOOL_EVENT& aEvent )
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( pid > 0 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span> -#ifdef __WXMAC__
+#ifdef __MACOSX_APP__
// This non-parameterized use of wxExecute is fine because execFile is not derived
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -441,7 +408,7 @@ diff --git pagelayout_editor/CMakeLists.txt pagelayout_editor/CMakeLists.txt
</span> index fb621b5aa7..bb10e3ea29 100644
--- pagelayout_editor/CMakeLists.txt
+++ pagelayout_editor/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,7 +61,7 @@ if( WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +57,7 @@ if( WIN32 )
</span> endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -450,7 +417,7 @@ index fb621b5aa7..bb10e3ea29 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;'>-@@ -76,7 +76,7 @@ if( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,7 +72,7 @@ if( APPLE )
</span> endif()
# a very small program launcher for pl_editor_kiface
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -471,13 +438,6 @@ index fb621b5aa7..bb10e3ea29 100644
</span> )
# puts binaries into the *.app bundle while linking
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,4 +177,4 @@ if( KICAD_WIN32_INSTALL_PDBS )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Get the PDBs to copy over for MSVC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(FILES $<TARGET_PDB_FILE:pl_editor> DESTINATION ${KICAD_BIN})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(FILES $<TARGET_PDB_FILE:pl_editor_kiface> DESTINATION ${KICAD_BIN})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span> diff --git pcb_calculator/CMakeLists.txt pcb_calculator/CMakeLists.txt
index 2069c9e835..4ebf9ca75f 100644
--- pcb_calculator/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -595,13 +555,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;'>-@@ -45,4 +45,4 @@ install( TARGETS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( KICAD_WIN32_INSTALL_PDBS )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Get the PDBs to copy over for MSVC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(FILES $<TARGET_PDB_FILE:s3d_plugin_idf> DESTINATION ${KICAD_USER_PLUGIN}/3d)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span> diff --git plugins/3d/oce/CMakeLists.txt plugins/3d/oce/CMakeLists.txt
index 074df30a67..5998fb7c15 100644
--- plugins/3d/oce/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -615,13 +568,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;'>-@@ -39,4 +39,4 @@ install( TARGETS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( KICAD_WIN32_INSTALL_PDBS )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Get the PDBs to copy over for MSVC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(FILES $<TARGET_PDB_FILE:s3d_plugin_oce> DESTINATION ${KICAD_USER_PLUGIN}/3d)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span> diff --git plugins/3d/vrml/CMakeLists.txt plugins/3d/vrml/CMakeLists.txt
index b651598842..ebe3a7f7c7 100644
--- plugins/3d/vrml/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -635,13 +581,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;'>-@@ -87,4 +87,4 @@ install( TARGETS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( KICAD_WIN32_INSTALL_PDBS )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Get the PDBs to copy over for MSVC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(FILES $<TARGET_PDB_FILE:s3d_plugin_vrml> DESTINATION ${KICAD_USER_PLUGIN}/3d)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span> diff --git scripting/CMakeLists.txt scripting/CMakeLists.txt
index 07e7e33d9a..851afbeaf5 100644
--- scripting/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -655,13 +594,6 @@ 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;'>-@@ -86,4 +86,4 @@ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install( DIRECTORY ${PROJECT_SOURCE_DIR}/scripting/kicad_pyshell/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTINATION ${KICAD_DATA}/scripting/kicad_pyshell
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+)
</span> diff --git scripting/python_scripting.cpp scripting/python_scripting.cpp
index e292887ff0..b2531e8891 100644
--- scripting/python_scripting.cpp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -701,16 +633,3 @@ index c6dbff6dfa..2cfc6bed06 100644
</span> # puts binaries into the *.app bundle while linking
set_target_properties( idfcyl idfrect dxf2idf idf2vrml PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_BIN_DIR}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git utils/kicad2step/CMakeLists.txt utils/kicad2step/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2bc9c94e29..5eb4bb177b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- utils/kicad2step/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ utils/kicad2step/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +59,7 @@ target_include_directories( kicad2step_lib PRIVATE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties( kicad2step_bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PROPERTIES OUTPUT_NAME kicad2step)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if( APPLE )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if( KICAD_MACOSX_APP_BUNDLE )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # puts binaries into the *.app bundle while linking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties( kicad2step_bin PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RUNTIME_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_BIN_DIR}
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..728f526b3ac
</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/0002-disable-codesigning.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt 2023-07-24 17:41:09.037114375 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-07-25 08:53:09.659283252 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1071,7 +1071,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory( translation )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if( FALSE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( KICAD_OSX_CODESIGN ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CACHE BOOL "Sign KiCad.app on macOS" FORCE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( KICAD_OSX_SIGNING_ID "-"
</span><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 66478a5cf18..646a4d13073 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;'>@@ -14,12 +14,12 @@ diff --git eeschema/sim/ngspice.cpp eeschema/sim/ngspice.cpp
</span> index 0a3a07ed4b..fe566c9e81 100644
--- eeschema/sim/ngspice.cpp
+++ eeschema/sim/ngspice.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -444,7 +444,7 @@ void NGSPICE::init_dll()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -456,7 +456,7 @@
</span> "/../../../../../Contents/PlugIns/sim"
};
#else // Unix systems
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- const vector<string> dllPaths = { "/usr/local/lib" };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const vector<string> dllPaths = { "@PREFIX_DIR@/lib" };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const std::vector<std::string> dllPaths = { "/usr/local/lib" };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const std::vector<std::string> dllPaths = { "@PREFIX_DIR@/lib" };
</span> #endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #if defined(__WINDOWS__) || (__WXMAC__)
</pre><pre style='margin:0'>
</pre>