CVS commit: pkgsrc/cad/kicad

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/cad/kicad
From: "Manuel Bouyer" <bouyer%netbsd.org@localhost>
Date: Tue, 6 Jun 2023 10:20:58 +0000

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Tue Jun  6 10:20:58 UTC 2023

Modified Files:
        pkgsrc/cad/kicad: Makefile distinfo
Added Files:
        pkgsrc/cad/kicad: options.mk
        pkgsrc/cad/kicad/patches: patch-eeschema_sim_sim_model_tline.cpp
            patch-eeschema_sim_sim_property.cpp
Removed Files:
        pkgsrc/cad/kicad/patches: patch-common_lib__tree__model.cpp

Log Message:
Update cad/kicad to 7.0.5
pkgsrc change: Add option ng-spice, default to on. This brings cad/kicad
closer to default upstream builds.

Changes since 7.0.0: mostly bug fixes and small UI improvements.
For more complete changes see
https://www.kicad.org/blog/2023/03/KiCad-7.0.1-Release/
https://www.kicad.org/blog/2023/04/KiCad-7.0.2-Release/
https://www.kicad.org/blog/2023/05/KiCad-7.0.5-Release/
(7.0.3 and 7.0.4 were not released)

Selected changes:
Handle user defined attributes when importing Eagle schematics
Make footprint drag include connected traces
Use constraints to determine netclass width
Fill shapes with open path when importing SVG
PCB Calculator: save regulator calculator settings.
Remove non-global labels from label properties dialog selection list
Create field name if user doesn't specify one.
Ignore unknown attributes when importing CADSTAR schematic
Snap to grid on orthoganal dimension creation
Allow solder mask bridges between net-tie-group pads
Add hole clearance to mounting hole keepouts for SPECCTRA export
Enable zone hatch settings in properties panel.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/cad/kicad/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/cad/kicad/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/cad/kicad/options.mk
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/cad/kicad/patches/patch-common_lib__tree__model.cpp
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/cad/kicad/patches/patch-eeschema_sim_sim_model_tline.cpp \
    pkgsrc/cad/kicad/patches/patch-eeschema_sim_sim_property.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cad/kicad/Makefile
diff -u pkgsrc/cad/kicad/Makefile:1.77 pkgsrc/cad/kicad/Makefile:1.78
--- pkgsrc/cad/kicad/Makefile:1.77      Sun Apr 23 14:26:12 2023
+++ pkgsrc/cad/kicad/Makefile   Tue Jun  6 10:20:58 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.77 2023/04/23 14:26:12 adam Exp $
+# $NetBSD: Makefile,v 1.78 2023/06/06 10:20:58 bouyer Exp $
 #
 
-V=             7.0.0
+V=             7.0.5
 DISTNAME=      kicad-${V}
-PKGREVISION=   2
+#PKGREVISION=  3
 CATEGORIES=    cad
 MASTER_SITES=  ${MASTER_SITE_GITLAB:=kicad/code/}
 GITLAB_PROJECT=        kicad
@@ -26,7 +26,6 @@ USE_CMAKE=            yes
 USE_TOOLS+=            pkg-config msgfmt msgmerge xgettext
 
 CMAKE_ARGS+=           -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=           -DKICAD_SPICE=OFF
 CMAKE_ARGS+=           -DKICAD_SCRIPTING_WXPYTHON=OFF
 CMAKE_ARGS+=           -DKICAD_BUILD_I18N=ON
 
@@ -48,6 +47,8 @@ PY_PATCHPLIST=                yes
 # I didn't commit them yet because it segfaults. -tnn 20220102
 NOT_FOR_PLATFORM+=     Darwin-*-*
 
+.include "options.mk"
+
 # needs 64-bit CAS for std::atomic<size_t>
 .include "../../mk/atomic64.mk"
 .include "../../cad/occt/buildlink3.mk"

Index: pkgsrc/cad/kicad/distinfo
diff -u pkgsrc/cad/kicad/distinfo:1.22 pkgsrc/cad/kicad/distinfo:1.23
--- pkgsrc/cad/kicad/distinfo:1.22      Mon Feb 13 07:59:01 2023
+++ pkgsrc/cad/kicad/distinfo   Tue Jun  6 10:20:58 2023
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.22 2023/02/13 07:59:01 tnn Exp $
+$NetBSD: distinfo,v 1.23 2023/06/06 10:20:58 bouyer Exp $
 
-BLAKE2s (kicad-7.0.0.tar.bz2) = c9bad62e9b643f7d6a07dcb6d2a872dcc1375e6ea33db41d2664f7a71e30a14b
-SHA512 (kicad-7.0.0.tar.bz2) = cb6f4cf6eee9a583d3a622bf8e48e5b604b047df0d742081cff1e5e387cf97cc1cd3f03fb58a17b44c47085634b95eea642bd1a6805e80807dbe0473c8d19d96
-Size (kicad-7.0.0.tar.bz2) = 42583715 bytes
+BLAKE2s (kicad-7.0.5.tar.bz2) = f61bf73159005879d96b05382163ae5ed5e24f31cd6cf10cc027ce83812289ae
+SHA512 (kicad-7.0.5.tar.bz2) = 72f35bca74f29f9e8066fa15564d58bc14d8a196c762406e68ee1dac99ccc2d69056e1d4005ecf7aaed97f0be4c33a49065f5bfc03b4fc713ee5f12edacf3d6a
+Size (kicad-7.0.5.tar.bz2) = 43490022 bytes
 SHA1 (patch-3d-viewer_3d_cache_sg_CMakeLists.txt) = c6e55d62646e890ba02b2a56dc3481f75ffba8a0
 SHA1 (patch-cmake_config.h.cmake) = 325b9c81e90477152b778e04c4fabe41548aa51d
-SHA1 (patch-common_lib__tree__model.cpp) = 9b98a1520aac99f835547e240a1cd7367db436e3
 SHA1 (patch-cvpcb_CMakeLists.txt) = 80a3735a7a4a7c54dd577b436e2c3b3527d5e496
 SHA1 (patch-eeschema_CMakeLists.txt) = 0e00b5aa3df075f6f237eef114c4e55f37c96ea0
 SHA1 (patch-eeschema_sim_kibis_ibis__parser.cpp) = e173ccb32679174033540395e321abaee9eb2200
 SHA1 (patch-eeschema_sim_kibis_kibis.cpp) = 18d804db727498cffef4dffc36b30dbe2c608bcb
+SHA1 (patch-eeschema_sim_sim_model_tline.cpp) = 901488c10a8a2c558a4bebe15dc1339d1bbce066
+SHA1 (patch-eeschema_sim_sim_property.cpp) = 0fca731eb9a966f30053cdd87e89a92d5a1aeb8a
 SHA1 (patch-gerbview_CMakeLists.txt) = 4d2011a4dfc80ce8c8b0f4524823b25787b14cf5
 SHA1 (patch-include_kiway.h) = 7208f474e895ea07ba5e5f56bab46d4d529b9e57
 SHA1 (patch-pagelayout__editor_CMakeLists.txt) = 7e93ca6e41cd85e06ee6c35abbc28c7eb85eba37

Added files:

Index: pkgsrc/cad/kicad/options.mk
diff -u /dev/null pkgsrc/cad/kicad/options.mk:1.1
--- /dev/null   Tue Jun  6 10:20:58 2023
+++ pkgsrc/cad/kicad/options.mk Tue Jun  6 10:20:58 2023
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2023/06/06 10:20:58 bouyer Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.kicad
+PKG_SUPPORTED_OPTIONS= ng-spice 
+PKG_SUGGESTED_OPTIONS= ng-spice 
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mng-spice)
+.  include "../../cad/ng-spice-shared/buildlink3.mk"
+CMAKE_ARGS+=           -DKICAD_SPICE=ON
+.else
+CMAKE_ARGS+=           -DKICAD_SPICE=OFF
+.endif

Index: pkgsrc/cad/kicad/patches/patch-eeschema_sim_sim_model_tline.cpp
diff -u /dev/null pkgsrc/cad/kicad/patches/patch-eeschema_sim_sim_model_tline.cpp:1.1
--- /dev/null   Tue Jun  6 10:20:58 2023
+++ pkgsrc/cad/kicad/patches/patch-eeschema_sim_sim_model_tline.cpp     Tue Jun  6 10:20:58 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-eeschema_sim_sim_model_tline.cpp,v 1.1 2023/06/06 10:20:58 bouyer Exp $
+
+Needs isnan in scope on NetBSD.
+
+--- eeschema/sim/sim_model_tline.cpp.orig      2023-06-03 11:47:42.920032391 +0200
++++ eeschema/sim/sim_model_tline.cpp   2023-06-03 11:48:46.124305265 +0200
+@@ -26,6 +26,8 @@
+ 
+ #include <fmt/core.h>
+ 
++using std::isnan;
++
+ using PARAM = SIM_MODEL::PARAM;
+ 
+ 
Index: pkgsrc/cad/kicad/patches/patch-eeschema_sim_sim_property.cpp
diff -u /dev/null pkgsrc/cad/kicad/patches/patch-eeschema_sim_sim_property.cpp:1.1
--- /dev/null   Tue Jun  6 10:20:58 2023
+++ pkgsrc/cad/kicad/patches/patch-eeschema_sim_sim_property.cpp        Tue Jun  6 10:20:58 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-eeschema_sim_sim_property.cpp,v 1.1 2023/06/06 10:20:58 bouyer Exp $
+
+Needs isnan in scope on NetBSD.
+
+--- eeschema/sim/sim_property.cpp.orig 2023-06-03 11:54:31.739102496 +0200
++++ eeschema/sim/sim_property.cpp      2023-06-03 11:55:13.347928053 +0200
+@@ -30,6 +30,8 @@
+ #include <sim/sim_value.h>
+ #include <ki_exception.h>
+ 
++using std::isnan;
++
+ 
+ SIM_PROPERTY::SIM_PROPERTY( SIM_MODEL& aModel, int aParamIndex ) :
+         m_model( aModel ),

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/cad
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/cad
Indexes:

Home | Main Index | Thread Index | Old Index