Subject: bug#32616: closed (Re: [bug#32616] [PATCH 1/1] gnu: kicad: Update to 5.0.0.)

From: [email-masked] (GNU bug Tracking System)
Date: Tue, 04 Sep 2018 13:19:02 +0000

Your bug report

#32616: [PATCH 1/1] gnu: kicad: Update to 5.0.0.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
32616: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=32616
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#32616] [PATCH 1/1] gnu: kicad: Update to 5.0.0.
From: [email-masked] (Ludovic Courtès)
To: Jonathan Brielmaier <[email-masked]>
Cc: [email-masked]
Date: Tue, 04 Sep 2018 15:18:06 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Jonathan Brielmaier <[email-masked]> skribis:

>>>From 4d01274e9db300c120c7586d40db9b07f94e21a6 Mon Sep 17 00:00:00 2001
> From: Jonathan Brielmaier <[email-masked]>
> Date: Thu, 16 Aug 2018 13:33:48 +0200
> Subject: [PATCH 1/1] gnu: kicad: Update to 5.0.0.
>
> * gnu/packages/engineering.scm (kicad): Update to 5.0.0.
> [source]: Change from git to url-fetch.
> [arguments]: Remove now unneeded build version parameter.
> [inputs]: Add opencascade-oce.

Perfect.  Applied, thanks!

Ludo'.

Subject: [PATCH 1/1] gnu: kicad: Update to 5.0.0.
From: Jonathan Brielmaier <[email-masked]>
To: [email-masked]
Date: Sun, 2 Sep 2018 21:48:43 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hello Guix,

the attached patch updates KiCAD to version 5.0.0.

kicad-library is still on version 4.0.7, because upstream splitted it into three individual repos:
- symbols
- footprints
- 3D models
See https://kicad.github.io/

This work will be left over for another patch...

Jonathan
>From 0a77d3c9c278a4b82f02095a18df64764e42a743 Mon Sep 17 00:00:00 2001
From: Jonathan Brielmaier <[email-masked]>
Date: Thu, 16 Aug 2018 13:33:48 +0200
Subject: [PATCH 1/1] gnu: kicad: Update to 5.0.0.

* gnu/packages/engineering.scm (kicad): Update to 5.0.0.
[source]: Change from git to url-fetch.
[arguments]: Remove now unneeded build version parameter.
---
 gnu/packages/engineering.scm | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index d53b25cff..be58cb9ac 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2017 Julien Lepiller <[email-masked]>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2018 Clément Lassieur <[email-masked]>
+;;; Copyright © 2018 Jonathan Brielmaier <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -680,24 +681,19 @@ language.")
 (define-public ao
   (deprecated-package "ao-cad" libfive))
 
-;; We use kicad from a git commit, because support for boost 1.61.0 has been
-;; recently added.
 (define-public kicad
-  (let ((commit "5f4599fb56da4dd748845ab10abec02961d477f3")
-        (revision "2"))
     (package
       (name "kicad")
-      (version (string-append "4.0-" revision "."
-                              (string-take commit 7)))
+      (version "5.0.0")
       (source
        (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://git.launchpad.net/kicad")
-               (commit commit)))
+         (method url-fetch)
+         (file-name (string-append name "-" version ".tar.xz"))
+         (uri (string-append
+                "https://launchpad.net/kicad/5.0/" version "/+download/" name
+                "-" version ".tar.xz"))
          (sha256
-          (base32 "1833pln2975gmc5s18xf7s8m9vg834lmxxdjk0wlk3lq7bvjjnff"))
-         (file-name (string-append name "-" version "-checkout"))))
+          (base32 "17nqjszyvd25wi6550j981whlnb1wxzmlanljdjihiki53j84x9p"))))
       (build-system cmake-build-system)
       (arguments
        `(#:out-of-source? #t
@@ -706,8 +702,6 @@ language.")
          #:configure-flags
          (list "-DKICAD_STABLE_VERSION=ON"
                "-DKICAD_REPO_NAME=stable"
-               ,(string-append "-DKICAD_BUILD_VERSION=4.0-"
-                               (string-take commit 7))
                "-DKICAD_SKIP_BOOST=ON"; Use our system's boost library.
                "-DKICAD_SCRIPTING=ON"
                "-DKICAD_SCRIPTING_MODULES=ON"
@@ -764,7 +758,7 @@ language.")
 boards and electrical circuits.  The software has a number of programs that
 perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing
 electrical diagrams), gerbview (viewing Gerber files) and others.")
-      (license license:gpl3+))))
+      (license license:gpl3+)))
 
 (define-public kicad-library
   (let ((version "4.0.7"))
-- 
2.16.4