Update kicad

  • Done
  • quality assurance status badge
Details
3 participants
  • Arun Isaac
  • Danny Milosavljevic
  • Ludovic Courtès
Owner
unassigned
Submitted by
Arun Isaac
Severity
normal
A
A
Arun Isaac wrote on 3 Nov 2019 23:34
(address . guix-patches@gnu.org)
cu7wocgh9mj.fsf@systemreboot.net
This patchset updates KiCad and moves it to the new "Phoenix" version of
wxpython.
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl2/VgQACgkQLiXui2GA
K7McrAgAgVTZgNEtZ3Ze8J5PrFIKvU1Ck7WPR0EpPRxk3U3XDR1idBwgFalBELJV
BmdhLW5VeNZvsCqSzrtr9vJTC1cGZGCJgIATevQKXdksMZWywdsOaZRqSRZ7VTF5
t0Wh8FFRosvCwCBr5yctJvw0dy/k8qz2J0JA2n9ocjP+oc19b32/kB/yyfc1u8o4
J3TgNkfmmu5fEqy/NcQbaNhFIoqr1dO7xsxJ7104/3yHRGaOhr3Nv6TfyCTr3qRP
XskM9DCE1YKxyOphEiReIAJO2rVeNW4reGrmGziNwp143TrqbYL+06I9a5u/gBb6
R1juR9335X5LQ3/eGUnQJCcWX0d4Og==
=r4ND
-----END PGP SIGNATURE-----

A
A
Arun Isaac wrote on 4 Nov 2019 12:24
[PATCH 3/3] gnu: kicad-symbols: Update to 5.1.4.
(address . 38052@debbugs.gnu.org)(name . Arun Isaac)(address . arunisaac@systemreboot.net)
20191104112418.10030-3-arunisaac@systemreboot.net
* gnu/packages/engineering.scm (kicad-symbols): Update to 5.1.4.
---
gnu/packages/engineering.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 2c5ae53317..17d959b870 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -900,7 +900,7 @@ render model libraries.")
(define-public kicad-symbols
(package
(name "kicad-symbols")
- (version "5.0.2")
+ (version "5.1.4")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -909,7 +909,7 @@ render model libraries.")
(file-name (git-file-name name version))
(sha256
(base32
- "1rjh2pjcrc3bhcgyyskj5pssm7vffrjk0ymwr70fb7sjpmk96yjk"))))
+ "1lna4xlvzrxif3569pkp6mrg7fj62z3a3ri5j97lnmnnzhiddnh3"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ; No tests exist
--
2.23.0
A
A
Arun Isaac wrote on 4 Nov 2019 12:24
[PATCH 1/3] gnu: Add python-wxpython.
(address . 38052@debbugs.gnu.org)(name . Arun Isaac)(address . arunisaac@systemreboot.net)
20191104112418.10030-1-arunisaac@systemreboot.net
* gnu/packages/wxwidgets.scm (python-wxpython): New variable.
---
gnu/packages/wxwidgets.scm | 62 ++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)

Toggle diff (89 lines)
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index caa0ad2372..48e6c31f6c 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019 Arun Isaac <arunisaac@systemreboot.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -42,6 +43,7 @@
#:use-module (gnu packages video)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-xyz)
#:use-module (gnu packages sdl)
#:use-module (gnu packages webkit)
#:use-module (gnu packages xorg)
@@ -165,6 +167,66 @@ and many other languages.")
(package-inputs wxwidgets-3.1))))
(name "wxwidgets-gtk2")))
+(define-public python-wxpython
+ (package
+ (name "python-wxpython")
+ (version "4.0.7.post1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "wxPython" version))
+ (sha256
+ (base32
+ "1jppcr3n428m8pgwb9q3g0iiqydxd451ncri4njk8b53xsiflhys"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove bundled wxwidgets
+ (delete-file-recursively "ext/wxWidgets")
+ #t))))
+ (build-system python-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'configure
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "WXWIN" (assoc-ref inputs "wxwidgets"))
+ ;; Copy the waf executable to the source directory since it needs
+ ;; to be in a writable directory.
+ (copy-file (string-append (assoc-ref inputs "python-waf") "/bin/waf")
+ "bin/waf")
+ (setenv "WAF" "bin/waf")
+ ;; The build script tries to copy license files from the
+ ;; wxwidgets source tree. Prevent it.
+ (substitute* "wscript"
+ (("updateLicenseFiles\\(cfg\\)" all)
+ (string-append "#" all)))
+ ;; The build script tries to write to demo/version.py. So, we set
+ ;; correct write permissions.
+ (chmod "demo/version.py" #o644)
+ ;; Build only the python bindings, not wxwidgets also.
+ (substitute* "setup.py"
+ (("'build']") "'build_py', '--use_syswx']"))
+ #t)))))
+ (inputs
+ `(("gtk+" ,gtk+)
+ ("wxwidgets" ,wxwidgets)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("python-waf" ,python-waf)))
+ (propagated-inputs
+ `(("python-numpy" ,python-numpy)
+ ("python-pillow" ,python-pillow)
+ ("python-six" ,python-six)))
+ (home-page "http://wxPython.org/")
+ (synopsis "Cross platform GUI toolkit for Python")
+ (description "wxPython is a cross-platform GUI toolkit for the Python
+programming language. It is implemented as a set of Python extension modules
+that wrap the GUI components of the popular wxWidgets cross platform C++
+library. In most cases, wxPython uses the native widgets on each platform to
+provide a 100% native look and feel for the application.")
+ (license l:wxwindows3.1+)))
+
(define-public python2-wxpython
(package
(name "python2-wxpython")
--
2.23.0
A
A
Arun Isaac wrote on 4 Nov 2019 12:24
[PATCH 2/3] gnu: kicad: Update to 5.1.4.
(address . 38052@debbugs.gnu.org)(name . Arun Isaac)(address . arunisaac@systemreboot.net)
20191104112418.10030-2-arunisaac@systemreboot.net
* gnu/packages/engineering.scm (kicad): Update to 5.1.4.
[arguments]: Remove unrecognized flags and flags that are redundant because
they specify default values. Use python 3 and the "Phoenix" version of
wxPython. Enable the GitHub plugin for pcbnew. Remove adjust-boost-include
phase.
[inputs]: Replace python-2 with python, wxwidgets-gtk2 with wxwidgets and
python2-wxpython with python-wxpython.
---
gnu/packages/engineering.scm | 41 +++++++++---------------------------
1 file changed, 10 insertions(+), 31 deletions(-)

Toggle diff (75 lines)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index d1626f0342..2c5ae53317 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -767,48 +767,27 @@ language.")
(define-public kicad
(package
(name "kicad")
- (version "5.0.2")
+ (version "5.1.4")
(source
(origin
(method url-fetch)
(file-name (string-append name "-" version ".tar.xz"))
(uri (string-append
- "https://launchpad.net/kicad/" (version-major+minor version)
- "/" version "/+download/kicad-" version ".tar.xz"))
+ "https://launchpad.net/kicad/" (version-major version)
+ ".0/" version "/+download/kicad-" version ".tar.xz"))
(sha256
- (base32 "10605rr10x0353n6yk2z095ydnkd1i6j1ncbq64pfxdn5vkhcd1g"))))
+ (base32 "1r60dgh6aalbpq1wsmpyxkz0nn4ck8ydfdjcrblpl69k5rks5k2j"))))
(build-system cmake-build-system)
(arguments
`(#:out-of-source? #t
#:tests? #f ; no tests
#:build-type "Release"
#:configure-flags
- (list "-DKICAD_STABLE_VERSION=ON"
- "-DKICAD_REPO_NAME=stable"
- "-DKICAD_SKIP_BOOST=ON"; Use our system's boost library.
- "-DKICAD_SCRIPTING=ON"
- "-DKICAD_SCRIPTING_MODULES=ON"
- "-DKICAD_SCRIPTING_WXPYTHON=ON"
- ;; Has to be set explicitly, as we don't have the wxPython
- ;; headers in the wxwidgets store item, but in wxPython.
- (string-append "-DCMAKE_CXX_FLAGS=-I"
- (assoc-ref %build-inputs "wxpython")
- "/include/wx-"
- ,(version-major+minor
- (package-version python2-wxpython)))
- "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE"
- "-DKICAD_SPICE=TRUE"
- ;; TODO: Enable this when CA certs are working with curl.
- "-DBUILD_GITHUB_PLUGIN=OFF")
+ (list "-DKICAD_SCRIPTING_PYTHON3=ON"
+ "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON"
+ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE")
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'adjust-boost-include
- (lambda _
- ;; The location of this header changed in Boost 1.66.
- (substitute* "3d-viewer/3d_cache/3d_cache.cpp"
- (("boost/uuid/sha1\\.hpp")
- "boost/uuid/detail/sha1.hpp"))
- #t))
(add-after 'install 'wrap-program
;; Ensure correct Python at runtime.
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -845,9 +824,9 @@ language.")
("mesa" ,mesa)
("opencascade-oce" ,opencascade-oce)
("openssl" ,openssl)
- ("python" ,python-2)
- ("wxwidgets" ,wxwidgets-gtk2)
- ("wxpython" ,python2-wxpython)))
+ ("python" ,python)
+ ("wxwidgets" ,wxwidgets)
+ ("wxpython" ,python-wxpython)))
(home-page "http://kicad-pcb.org/")
(synopsis "Electronics Design Automation Suite")
(description "Kicad is a program for the formation of printed circuit
--
2.23.0
D
D
Danny Milosavljevic wrote on 5 Nov 2019 11:03
Re: [bug#38052] Update kicad
(name . Arun Isaac)(address . arunisaac@systemreboot.net)(address . 38052@debbugs.gnu.org)
20191105110321.17d66f32@scratchpost.org
LGTM!
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl3BSOkACgkQ5xo1VCww
uqXTYwgAlvy0AJd4F4FD1qtLD7faXMNbLD1g5gzZuZbOmDBCWJoxmLpR+fQwJHFA
c5NEwml9bl/ECPfNufQuCrE8DJxQ+nw1ztUBIAoKEfpqAZGOqdlnypg1X77m0Kit
Pc6t1j1Fs0KDlrdyS1cvi+jY56sdYBICnNZiXUa2cmjVHaFj9rv81IFsNJeCh9Bo
H6+/sDaNc+THxIS+qezGic0mcjKtOxn21qbhpMeSduGNuvsH3xzS2L9s3AyZgk0G
AlDkpj9Kmz/EygW+coY5U5RAjW0jQyjVPZEjHBw04vNDzqjLVSVOGMBOvX4qpjEA
zB/0id6i4RcCXP2jwIRbW4LgpUFayQ==
=yy3G
-----END PGP SIGNATURE-----


L
L
Ludovic Courtès wrote on 18 Nov 2019 11:54
control message for bug #38052
(address . control@debbugs.gnu.org)
87zhgtjvzc.fsf@gnu.org
tags 38052 fixed
close 38052
quit
A
A
Arun Isaac wrote on 18 Nov 2019 19:20
Re: [bug#38052] Update kicad
(name . Danny Milosavljevic)(address . dannym@scratchpost.org)
cu7a78t11y4.fsf@systemreboot.net
Toggle quote (2 lines)
> LGTM!

I pushed these patches long back (on November 5). Sorry I forgot to
reply back and close this bug report.
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl3S4OMACgkQLiXui2GA
K7OygQf8CoiKZ8MNgkcjFne/0ZuunKdv/vVUIZYnL2Jc4BSBuaUeNiTlhQeMmc0m
rz2fzDQ06dOETC++gtk9yLHjo6/6zzznyXia6nn/P8k7cBv+2LY1LYpJGaA6U9A3
Ds+5Q5zTv9UQq66et7xfZmDguO2JeuRkAesHlX2elQTWWbozPMSPcLeNpEFZ/XM/
GmqDypEhWnIxiOCsRLroESEJngq4t6/brmkDlwLafKHdpsBTyW+GjXdArIgyA7kK
1gEfs6tD6pT+c0srBWNc2IVr83i5Gh0jb6KhqZYfRBMpxXJuUSAQO0evg4LlIhLZ
fsRA/8hcPY9YxDd/UJirVz0GRw/5Rg==
=hb6D
-----END PGP SIGNATURE-----

?
Your comment

This issue is archived.

To comment on this conversation send an email to 38052@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 38052
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch