[bug#29027] [PATCH 1/3] gnu: kicad-library: Update to 4.0.6.

[bug#29027] [PATCH 1/3] gnu: kicad-library: Update to 4.0.6.

[Theodoros Foradis]

From: Theodoros Foradis <theodoros.for@openmailbox.org>

* gnu/packages/engineering.scm (kicad-library): Update to 4.0.6.
---
 gnu/packages/engineering.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index c9e184d7d..b5f3647a1 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -708,7 +708,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
       (license license:gpl3+))))
 
 (define-public kicad-library
-  (let ((version "4.0.4"))
+  (let ((version "4.0.6"))
     (package
       (name "kicad-library")
       (version version)
@@ -719,7 +719,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
                       version ".tar.gz"))
                 (sha256
                  (base32
-                  "1wyda58y39lhxml0xv1ngvddi0nqihx9bnlza46ajzms38ajvh12"))))
+                  "16f47pd6f0ddsdxdrp327nr9v05gl8c24d0qypq2aqx5hdjmkp7f"))))
       (build-system cmake-build-system)
       (arguments
        `(#:out-of-source? #t
@@ -762,7 +762,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
                    version ".tar.gz"))
              (sha256
               (base32
-               "0ya4gg6clz3vp2wrb67xwg0bhwh5q8ag39jjmpcp4zjcqs1f48rb"))))))
+               "0vmgqhdw05k5fdnqv42grnvlz7v75g9md82jp2d3dvw2zw050lfb"))))))
       (home-page "http://kicad-pcb.org/")
       (synopsis "Libraries for kicad")
       (description "This package provides Kicad component, footprint and 3D
-- 
2.14.1

[bug#29027] [PATCH 2/3] gnu: kicad: Update to commit 5f4599f.

[Theodoros Foradis]

From: Theodoros Foradis <theodoros.for@openmailbox.org>

* gnu/packages/engineering.scm (kicad): Update to commit 5f4599f.
[arguments]: Add "install-lib-3d" phase.
---
 gnu/packages/engineering.scm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index b5f3647a1..6bfcc975f 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -626,8 +626,8 @@ language.")
 ;; We use kicad from a git commit, because support for boost 1.61.0 has been
 ;; recently added.
 (define-public kicad
-  (let ((commit "4ee344e150bfaf3a6f3f7bf935fb96ae07c423fa")
-        (revision "1"))
+  (let ((commit "5f4599fb56da4dd748845ab10abec02961d477f3")
+        (revision "2"))
     (package
       (name "kicad")
       (version (string-append "4.0-" revision "."
@@ -639,7 +639,7 @@ language.")
                (url "https://git.launchpad.net/kicad")
                (commit commit)))
          (sha256
-          (base32 "0kf6r92nps0658i9n3p9vp5dzbssmc22lvjv5flyvnlf83l63s4n"))
+          (base32 "1833pln2975gmc5s18xf7s8m9vg834lmxxdjk0wlk3lq7bvjjnff"))
          (file-name (string-append name "-" version "-checkout"))))
       (build-system cmake-build-system)
       (arguments
@@ -679,6 +679,14 @@ language.")
                    `("PYTHONPATH" ":" prefix (,path))
                    `("PATH" ":" prefix
                      (,(string-append python "/bin:")))))
+               #t))
+           (add-after 'wrap-program 'install-lib-3d
+             (lambda* (#:key inputs outputs #:allow-other-keys)
+               (for-each
+                (lambda (file)
+                  (install-file file (string-append (assoc-ref outputs "out")
+                                                    "/lib")))
+                (find-files "." "libkicad_3dsg*"))
                #t)))))
       (native-inputs
        `(("boost" ,boost)
-- 
2.14.1

[bug#29027] [PATCH 2/3] gnu: kicad: Update to commit 5f4599f.

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 350 bytes --]

Theodoros Foradis <theodoros@foradis.org> skribis:

> From: Theodoros Foradis <theodoros.for@openmailbox.org>
>
> * gnu/packages/engineering.scm (kicad): Update to commit 5f4599f.
> [arguments]: Add "install-lib-3d" phase.

Pushed with the change below (remember that the 2nd argument of
‘find-files’ is a regexp, not a glob pattern.)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 562 bytes --]

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 5aef2d947..2e9701e9b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -689,7 +689,7 @@ language.")
                 (lambda (file)
                   (install-file file (string-append (assoc-ref outputs "out")
                                                     "/lib")))
-                (find-files "." "libkicad_3dsg*"))
+                (find-files "." "^libkicad_3dsg.*"))
                #t)))))
       (native-inputs
        `(("boost" ,boost)

[bug#29027] [PATCH 3/3] gnu: kicad: Build with ngspice support.

[Theodoros Foradis]

* gnu/packages/engineering.scm (kicad):
[arguments] <configure-flags>: Add KICAD_SPICE flag.
[inputs]: Add libngspice.
---
 gnu/packages/engineering.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 6bfcc975f..826894e5b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -661,6 +661,7 @@ language.")
                               (assoc-ref %build-inputs "wxpython")
                               "/include/wx-3.0")
                "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE"
+               "-DKICAD_SPICE=TRUE"
                ;; TODO: Enable this when CA certs are working with curl.
                "-DBUILD_GITHUB_PLUGIN=OFF")
          #:phases
@@ -701,6 +702,7 @@ language.")
          ("glew" ,glew)
          ("glm" ,glm)
          ("hicolor-icon-theme" ,hicolor-icon-theme)
+         ("libngspice" ,libngspice)
          ("libsm" ,libsm)
          ("mesa" ,mesa)
          ("openssl" ,openssl)
-- 
2.14.1

bug#29027: [PATCH 3/3] gnu: kicad: Build with ngspice support.

[Ludovic Courtès]

Theodoros Foradis <theodoros@foradis.org> skribis:

> * gnu/packages/engineering.scm (kicad):
> [arguments] <configure-flags>: Add KICAD_SPICE flag.
> [inputs]: Add libngspice.

Applied, thanks!

Ludo'.

[bug#29027] [PATCH 1/3] gnu: kicad-library: Update to 4.0.6.

[Ludovic Courtès]

Theodoros Foradis <theodoros@foradis.org> skribis:

> From: Theodoros Foradis <theodoros.for@openmailbox.org>
>
> * gnu/packages/engineering.scm (kicad-library): Update to 4.0.6.

Applied.