<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/d267a1cb353b4d144987cc0915e7da582dedd126">https://github.com/macports/macports-ports/commit/d267a1cb353b4d144987cc0915e7da582dedd126</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 d267a1cb353 kicad: Update to 7.0.11
</span>d267a1cb353 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d267a1cb353b4d144987cc0915e7da582dedd126
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Apr 2 03:01:18 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> kicad: Update to 7.0.11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Switch to boost181 because that's the latest version in MacPorts. The
</span><span style='display:block; white-space:pre;color:#404040;'> build fails if the boost port is also active so declare that conflict.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Move boost and legacysupport and compiler restrictions into main port
</span><span style='display:block; white-space:pre;color:#404040;'> because there's no need for them in the noarch subports.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use a separate patchfile for each noarch subport so that each patch can
</span><span style='display:block; white-space:pre;color:#404040;'> be applied without fuzz or offset.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Consolidate common code.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix livecheck to exclude only x.99.y development versions.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix license.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/69647
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/69648
</span>---
science/kicad/Portfile | 134 ++++++++++-----------
...ake-adding-KICAD_MACOSX_APP_BUNDLE-option.patch | 6 +-
...cmakelists.txt.patch => kicad-footprints.patch} | 4 +-
...cmakelists.txt.patch => kicad-packages3D.patch} | 4 +-
...es_cmakelists.txt.patch => kicad-symbols.patch} | 8 +-
..._cmakelists.txt.patch => kicad-templates.patch} | 6 +-
science/kicad/files/macports_prefix.patch | 4 +-
science/kicad/files/wxwidgets-4.1-deprecated.patch | 38 ------
8 files changed, 80 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 304e659c68b..e2d2f6dfee6 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;'>@@ -3,37 +3,32 @@
</span> PortSystem 1.0
PortGroup cmake 1.1
PortGroup gitlab 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup boost 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup legacysupport 1.1
</span>
name kicad
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.0.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.0.11
</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.
categories science
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3+
</span> maintainers {ra1nb0w @ra1nb0w} openmaintainer
homepage https://www.kicad.org/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Cannot update to python 3.12 because there is no py312-wxpython-4.0 port
</span> set python_version 3.11
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:#ffe0e0;'>-compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# It requires c++17 <filesystem> and abs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.newest_darwin_requires_legacy 19
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.use_mp_libcxx yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup boost 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup conflicts_build 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup legacysupport 1.1
</span>
gitlab.setup kicad/code kicad ${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 0902e2ce3ffd94d071ff2c4c39f6e9b7eecad915 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 96164051ead3c43543a411ce0f9a7837336e5243b4c9bf921e4844a652b634ca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 43991960
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 05936277e09b18f03f773d7e8ffdd7fbb54e3376 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 24feb0747ee8d767c903fac5254c314a5012f4aee7016e961da845765764cf73 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 44083805
</span>
patchfiles-append \
macports_prefix.patch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +36,21 @@ if {${name} eq ${subport}} {
</span> 0001-cmake-adding-KICAD_MACOSX_APP_BUNDLE-option.patch \
0002-disable-codesigning.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ common/gestfich.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eeschema/sim/ngspice.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boost.version 1.81
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # It requires c++17 <filesystem> and abs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacysupport.newest_darwin_requires_legacy 19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacysupport.use_mp_libcxx yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
path:bin/doxygen:doxygen \
path:bin/pkg-config:pkgconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,16 +93,11 @@ if {${name} eq ${subport}} {
</span> -DPYTHON_LIBRARY=${python_framework_dir}/Python \
-DDOXYGEN_DOT_EXECUTABLE=${prefix}/bin/dot \
-DDOXYGEN_EXECUTABLE=${prefix}/bin/doxygen \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DNGSPICE_LIB_NAME=libngspice.0.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DNGSPICE_LIB_NAME=libngspice.dylib \
</span> -DOCC_INCLUDE_DIR=${prefix}/libexec/opencascade/include/opencascade \
-DOCC_LIBRARY_DIR=${prefix}/libexec/opencascade/lib \
-Wno-dev
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX_BIN@|${prefix}/bin|g" ${worksrcpath}/common/gestfich.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX_DIR@|${prefix}|g" ${worksrcpath}/eeschema/sim/ngspice.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
foreach app_name {bitmap2component eeschema gerbview kicad pcb_calculator pcbnew} {
set app_dir ${destroot}${applications_dir}/KiCad/${app_name}.app/Contents
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,15 +120,25 @@ if {${name} eq ${subport}} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gitlab.livecheck.regex {([0-9]+\.[0-8]+\.[0-9]+)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Exclude x.99.y development versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gitlab.livecheck.regex {([0-9]+\.([1-8]?[0-9]|9[0-8])\.[0-9]+)}
</span> } else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platforms any
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} ne "kicad-docs"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append ${subport}.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type none
}
subport kicad-docs {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platforms any
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 9b5c9570129336d2cf603e91cbcc29f7668da69c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0ecf3c1b748a1a2d07cc3f8e74e3ffcca948ee997b1eed2ef371ae4d7992ab9a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 602194906
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description KiCad documentation
long_description {*}${description}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,10 +147,6 @@ 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 417797fcc37a7aabaa9c0ad7030102f15ba309fb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5f48e580e9e917e9442d7a3b2a500e921d1e6e5f80f77efdd1629dbe555ca77a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 694461148
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure no
build {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,62 +158,45 @@ subport kicad-docs {
</span> }
subport kicad-symbols {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platforms any
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Kicad symbols
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> gitlab.setup kicad/libraries kicad-symbols ${version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 dd69fdc2cf17e0574508663285024e6369348d43 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 666acf1ef282430721e64b651672d5a0b6896b3db7d8854f6035de767bf9b21b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3369887
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 6929b8becfecb70cec513a6187457ae6df56e324 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 510c145d07fea3d57097783208f7befa2aff4e087dc2d684f623710b829585d5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3119612
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append kicad_libraries_cmakelists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Kicad symbols
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}
</span> }
subport kicad-footprints {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platforms any
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Kicad footprints
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> gitlab.setup kicad/libraries kicad-footprints ${version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 e9f5b60f98f393c0d78b20e82bef74bb36fecc2f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c07a5886023793efc4e697bd49b07c7e13d5ec6eb18db8bf62b849add219b48f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22722611
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d8ba6585b550b5e57ffcc1a0a497ee8634b50452 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 369771dd04e36c7bd4e24e82526db0a1972b0a4f721eb12f664c010ae99ec290 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 24478270
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append kicad_libraries_cmakelists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Kicad footprints
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}
</span> }
subport kicad-packages3D {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platforms any
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Kicad package 3D
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> gitlab.setup kicad/libraries kicad-packages3D ${version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 36f02b35321c7e203fb6308d8d9912bfe28d343f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 11361137f3604d11b12a1f5c132e939f6fed806bb2675d9990a985c967fae2f9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 774735333
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 f16d8a686b16d5665efd02c8f2c9cdc4f93aed2f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9ca3119afe9d3d99bd7ef540471a13092d423f6fda88e661388c0b6ced65c072 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 773216530
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append kicad_libraries_cmakelists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Kicad package 3D
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}
</span> }
subport kicad-templates {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platforms any
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Kicad templates
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> gitlab.setup kicad/libraries kicad-templates ${version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 10be23bfa01d8b1e617197774b1e2768797a6e12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 df708e2ac2a81cbe1fb8b655b0d29694dc8c530616d244330f4cd70a9e463fd2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1348043
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8373a4b10015abb83c36bb1feedc387ee8a60c63 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b55381038863ebe627c4c2552c36ad7eeab0ae36861a2ce0aa56c9b334cad8fe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1347681
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append kicad_libraries_cmakelists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Kicad templates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}
</span> }
<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 af5178b3e4d..bc639ebce52 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;'>@@ -182,7 +182,7 @@
</span> path = GetOSXKicadDataDir();
#elif defined( __WXMSW__ )
path = getWindowsKiCadRoot() + wxT( "share/kicad" );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -187,7 +187,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -198,7 +198,7 @@
</span> {
wxString path;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,7 +191,7 @@
</span> path = GetOSXKicadMachineDataDir();
#elif defined( __WXMSW__ )
path = GetStockDataPath( false );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -286,7 +286,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -297,7 +297,7 @@
</span> fn.Assign( tfname, "" );
fn.AppendDir( wxT( "kicad" ) );
fn.AppendDir( wxT( "plugins" ) );
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -200,7 +200,7 @@
</span> fn.Assign( wxStandardPaths::Get().GetPluginsDir(), wxEmptyString );
// This must be mapped to main bundle for everything but kicad.app
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -352,7 +352,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -363,7 +363,7 @@
</span> {
wxString path;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/kicad/files/kicad_libraries_cmakelists.txt.patch b/science/kicad/files/kicad-footprints.patch
</span>similarity index 78%
copy from science/kicad/files/kicad_libraries_cmakelists.txt.patch
copy to science/kicad/files/kicad-footprints.patch
<span style='display:block; white-space:pre;color:#808080;'>index f0b36202469..bce1c8e4f04 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/kicad/files/kicad_libraries_cmakelists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/kicad/files/kicad-footprints.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2021-12-31 08:36:48.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2021-12-31 08:36:55.000000000 +0100
</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> @@ -6,7 +6,7 @@
#================================================
# Locations for install targets.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/kicad/files/kicad_libraries_cmakelists.txt.patch b/science/kicad/files/kicad-packages3D.patch
</span>similarity index 78%
copy from science/kicad/files/kicad_libraries_cmakelists.txt.patch
copy to science/kicad/files/kicad-packages3D.patch
<span style='display:block; white-space:pre;color:#808080;'>index f0b36202469..bce1c8e4f04 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/kicad/files/kicad_libraries_cmakelists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/kicad/files/kicad-packages3D.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2021-12-31 08:36:48.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2021-12-31 08:36:55.000000000 +0100
</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> @@ -6,7 +6,7 @@
#================================================
# Locations for install targets.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/kicad/files/kicad_libraries_cmakelists.txt.patch b/science/kicad/files/kicad-symbols.patch
</span>similarity index 62%
copy from science/kicad/files/kicad_libraries_cmakelists.txt.patch
copy to science/kicad/files/kicad-symbols.patch
<span style='display:block; white-space:pre;color:#808080;'>index f0b36202469..32ab157e3fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/kicad/files/kicad_libraries_cmakelists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/kicad/files/kicad-symbols.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.orig 2021-12-31 08:36:48.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2021-12-31 08:36:55.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,7 +6,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;'>+@@ -5,7 +5,7 @@
</span> #================================================
# Locations for install targets.
#================================================
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,4 +8,4 @@
</span> +if( FALSE )
# Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
set( CMAKE_INSTALL_PREFIX "/Library/Application Support/kicad/" CACHE PATH "" )
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Everything without leading / is relative to CMAKE_INSTALL_PREFIX.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/kicad/files/kicad_libraries_cmakelists.txt.patch b/science/kicad/files/kicad-templates.patch
</span>similarity index 75%
rename from science/kicad/files/kicad_libraries_cmakelists.txt.patch
rename to science/kicad/files/kicad-templates.patch
<span style='display:block; white-space:pre;color:#808080;'>index f0b36202469..d9903896ccf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/kicad/files/kicad_libraries_cmakelists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/kicad/files/kicad-templates.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.orig 2021-12-31 08:36:48.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2021-12-31 08:36:55.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,7 +6,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;'>+@@ -5,7 +5,7 @@
</span> #================================================
# Locations for install targets.
#================================================
<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 9a56b32f17c..1628e72e322 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;'>@@ -4,7 +4,7 @@
</span> wxT( "/usr/bin/" ),
wxT( "/usr/local/bin/" ),
wxT( "/usr/local/kicad/bin/" ),
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wxT( "@PREFIX_BIN@/" ),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wxT( "@PREFIX@/bin/" ),
</span> #endif
};
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@
</span> };
#else // Unix systems
- const std::vector<std::string> dllPaths = { "/usr/local/lib" };
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const std::vector<std::string> dllPaths = { "@PREFIX_DIR@/lib" };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const std::vector<std::string> dllPaths = { "@PREFIX@/lib" };
</span> #endif
#if defined(__WINDOWS__) || (__WXMAC__)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/kicad/files/wxwidgets-4.1-deprecated.patch b/science/kicad/files/wxwidgets-4.1-deprecated.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 983d1a9a49d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/kicad/files/wxwidgets-4.1-deprecated.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git pcbnew/dialogs/dialog_pad_properties_base.cpp pcbnew/dialogs/dialog_pad_properties_base.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4fb2baf..920be58 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pcbnew/dialogs/dialog_pad_properties_base.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pcbnew/dialogs/dialog_pad_properties_base.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1567,7 +1567,7 @@ DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE::DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE( wxWi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this->Centre( wxBOTH );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Connect Events
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_gridCornersList->Connect( wxEVT_GRID_RANGE_SELECT, wxGridRangeSelectEventHandler( DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE::onGridSelect ), NULL, this );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_gridCornersList->Connect( wxEVT_GRID_RANGE_SELECTED, wxGridRangeSelectEventHandler( DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE::onGridSelect ), NULL, this );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_gridCornersList->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE::onCellSelect ), NULL, this );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_addButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE::OnButtonAdd ), NULL, this );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_deleteButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE::OnButtonDelete ), NULL, this );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1578,7 +1578,7 @@ DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE::DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE( wxWi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE::~DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Disconnect Events
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_gridCornersList->Disconnect( wxEVT_GRID_RANGE_SELECT, wxGridRangeSelectEventHandler( DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE::onGridSelect ), NULL, this );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_gridCornersList->Disconnect( wxEVT_GRID_RANGE_SELECTED, wxGridRangeSelectEventHandler( DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE::onGridSelect ), NULL, this );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_gridCornersList->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE::onCellSelect ), NULL, this );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_addButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE::OnButtonAdd ), NULL, this );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_deleteButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE::OnButtonDelete ), NULL, this );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git pcbnew/widgets/appearance_controls.cpp pcbnew/widgets/appearance_controls.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bf82600..d9df620 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pcbnew/widgets/appearance_controls.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pcbnew/widgets/appearance_controls.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -197,8 +197,9 @@ void NET_GRID_TABLE::SetValueAsCustom( int aRow, int aCol, const wxString& aType
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( GetView() )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- wxGridTableMessage msg( this, wxGRIDTABLE_REQUEST_VIEW_GET_VALUES );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GetView()->ProcessTableMessage( msg );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // removed from the C++ code because it "never did anything..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ //wxGridTableMessage msg( this, wxGRIDTABLE_REQUEST_VIEW_GET_VALUES );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ //GetView()->ProcessTableMessage( msg );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>