From: phodina via Guix-patches via <guix-patches@gnu.org>
To: Guillaume Le Vaillant <glv@posteo.net>
Cc: "53149@debbugs.gnu.org" <53149@debbugs.gnu.org>
Subject: [bug#53149] [PATCH v3 1/3] gnu: opencascade-occt: Update to 7.6.0.
Date: Wed, 09 Feb 2022 11:12:52 +0000 [thread overview]
Message-ID: <dpZBHoVLd_YwJ9aSm39j7J1u9dTTmDtBHiacwesq3aiC-sHyDom15SXMfx-aF_V8PqYlyCxOtsrNHlu_Xj-zSOTk7C43Lg_KoviKGgulQs0=@protonmail.com> (raw)
In-Reply-To: <87y2302kp1.fsf@kitej>
[-- Attachment #1: Type: text/plain, Size: 1370 bytes --]
Hi Guillaume,
On Friday, January 28th, 2022 at 11:45 AM, Guillaume Le Vaillant <glv@posteo.net> wrote:
> phodina via Guix-patches via guix-patches@gnu.org skribis:
>
> > From 64195144def5a3dfdd593494523dd44df39be6f0 Mon Sep 17 00:00:00 2001
> >
> > From: Petr Hodina phodina@protonmail.com
> >
> > Date: Sun, 9 Jan 2022 23:04:57 +0100
> >
> > Subject: [PATCH v2 2/3] gnu: kicad: Update to 6.0.1.
> >
> > - gnu/packages/engineering.scm (kicad): Update to 6.0.1.
> >
> > Applied guix style command.
> >
> > [native-inputs]: Remove kicad-i18n. Use new syntax.
> >
> > [inputs]: Add bash-minimal, gtk+ and use opencascade-occt instead of
> >
> > opencascade-oce. Use new syntax.
> >
> > [arguments]: Remove phase install-translations.
>
> Hi,
>
> If the kicad-i18n package is not used anymore, I guess its definition
>
> can be removed.
>
> Also, the kicad-doc, kicad-symbols, kicad-footprints, kicad-packages3d
>
> and kicad-templates packages inherit their version number from the kicad
>
> package. So when the version of the kicad package changes, their base32
>
> hashes usually have to be updated, or they may fail to build.
You're right about keeping the packages in sync. Here is an updated version + rebased on latest master.
The changes for the dependent packages are in one commit.
----
Petr
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: v3-0001-gnu-opencascade-occt-Update-to-7.6.0.patch --]
[-- Type: text/x-patch; name=v3-0001-gnu-opencascade-occt-Update-to-7.6.0.patch, Size: 1441 bytes --]
From f57cd1868b9ae986c27668e15e70c8b9da2113d3 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 9 Jan 2022 23:00:13 +0100
Subject: [PATCH v3 1/3] gnu: opencascade-occt: Update to 7.6.0.
* gnu/packages/maths.scm (opencascade-occt): Update to 7.6.0.
[native-inputs]: Add fontconfig.
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index e37ed7dd35..06bf081a27 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2708,7 +2708,7 @@ (define-public opencascade-oce
(define-public opencascade-occt
(package
(name "opencascade-occt")
- (version "7.3.0p3")
+ (version "7.6.0")
(source
(origin
(method git-fetch)
@@ -2720,7 +2720,7 @@ (define-public opencascade-occt
version)))))
(file-name (git-file-name name version))
(sha256
- (base32 "0bdywwxb6mk0ykbiajlvsb37295akqjp0a60y672qjfa67k0ljv4"))
+ (base32 "1rcwm9fkx0j4wrsyikb6g7qd611kpry7dand5dzdjvs5vzd13zvd"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -2757,6 +2757,7 @@ (define-public opencascade-occt
"-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON"
"-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON"
"-UCMAKE_INSTALL_LIBDIR")))
+ (native-inputs (list fontconfig))
(inputs
(list doxygen
;("freeimage" ,freeimage)
--
2.34.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: v3-0003-gnu-Remove-kicad-i18n.patch --]
[-- Type: text/x-patch; name=v3-0003-gnu-Remove-kicad-i18n.patch, Size: 1658 bytes --]
From 1dd6f6b81e646665d25f2a3b4e8585fc98a746e5 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 9 Jan 2022 23:08:42 +0100
Subject: [PATCH v3 3/3] gnu: Remove kicad-i18n.
* gnu/packages/engineering.scm (kicad-i18n): Remove variable. i18n is handled
directly now in kicad@6.0.0 package source tree.
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index e78a2c64d9..054291801a 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1039,33 +1039,6 @@ (define-public kicad
electrical diagrams), gerbview (viewing Gerber files) and others.")
(license license:gpl3+)))
-(define kicad-i18n
- (package
- (name "kicad-i18n")
- (version (package-version kicad))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.com/kicad/code/kicad-i18n.git")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0y51l0r62cnxkvpc21732p3cx7pjvaqjih8193502hlv9kv1j9p6"))))
- (build-system cmake-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (delete 'build)
- (delete 'check))))
- (native-inputs
- `(("gettext" ,gettext-minimal)))
- (home-page (package-home-page kicad))
- (synopsis "KiCad GUI translations")
- (description "This package contains the po files that are used for the GUI
-translations for KiCad.")
- (license license:gpl3+)))
-
(define-public kicad-doc
(package
(name "kicad-doc")
--
2.34.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: v3-0002-gnu-kicad-Update-to-6.0.1.patch --]
[-- Type: text/x-patch; name=v3-0002-gnu-kicad-Update-to-6.0.1.patch, Size: 13175 bytes --]
From 89772f0ae376ea69e1b1855ed23349191f9ffc3e Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 9 Jan 2022 23:04:57 +0100
Subject: [PATCH v3 2/3] gnu: kicad: Update to 6.0.1.
* gnu/packages/engineering.scm (kicad): Update to 6.0.1.
Applied guix style command.
[native-inputs]: Remove kicad-i18n. Use new syntax.
[inputs]: Add bash-minimal, gtk+ and use opencascade-occt instead of
opencascade-oce. Use new syntax.
[arguments]: Remove phase install-translations.
(kicad-doc): Update to 6.0.1.
[native-inputs]: Add ruby-asciidoctor. Simplify inputs.
(kicad-symbols, kicad-footprints, kicad-packages3d, kicad-templates): Update
to 6.0.1.
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index ca665385bc..e78a2c64d9 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -25,7 +25,7 @@
;;; Copyright © 2021 Gerd Heber <gerd.heber@gmail.com>
;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
-;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
+;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;; Copyright © 2022 Evgeny Pisemsky <evgeny@pisemsky.com>
;;;
@@ -65,6 +65,7 @@ (define-module (gnu packages engineering)
#:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
@@ -119,6 +120,7 @@ (define-module (gnu packages engineering)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages ruby)
#:use-module (gnu packages serialization)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages swig)
@@ -928,37 +930,41 @@ (define-public inspekt3d
(define-public kicad
(package
(name "kicad")
- (version "5.1.12")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.com/kicad/code/kicad.git")
- (commit version)))
- (sha256
- (base32 "0kgikchqxds3mp71nkg307mr4c1dgv8akbmksz4w9x8jg4i1mfqq"))
- (file-name (git-file-name name version))))
+ (version "6.0.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/kicad/code/kicad.git")
+ (commit version)))
+ (sha256
+ (base32
+ "1vpcbhhw8844hm6vpk3kk405wak531pvcvcpc66z0b48iprk3imr"))
+ (file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
`(#:out-of-source? #t
- #:tests? #f ; no tests
- #:build-type "Release"
+ #:tests?
+ #f ;no tests
+ #:build-type
+ "Release"
#:configure-flags
- ,#~(list
- "-DKICAD_SCRIPTING_PYTHON3=ON"
- "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON"
- "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE"
- (string-append "-DOCC_INCLUDE_DIR="
- #$(this-package-input "opencascade-occt") "/include/opencascade"))
+ (list "-DKICAD_SCRIPTING_PYTHON3=ON"
+ (string-append "-DOCC_INCLUDE_DIR="
+ (assoc-ref %build-inputs "opencascade-occt")
+ "/include/opencascade")
+ "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON"
+ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-ngspice-detection
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "eeschema/CMakeLists.txt"
- (("NGSPICE_DLL_FILE=\"\\$\\{NGSPICE_DLL_FILE\\}\"")
- (string-append "NGSPICE_DLL_FILE=\""
- (assoc-ref inputs "libngspice")
- "/lib/libngspice.so\"")))))
+ (("NGSPICE_DLL_FILE=\"\\$\\{NGSPICE_DLL_FILE\\}\"") (string-append
+ "NGSPICE_DLL_FILE=\""
+ (assoc-ref
+ inputs
+ "libngspice")
+ "/lib/libngspice.so\"")))))
(add-after 'unpack 'fix-python-detection
(lambda _
(substitute* "CMakeModules/FindPythonLibs.cmake"
@@ -967,72 +973,67 @@ (define-public kicad
(add-after 'unpack 'add-missing-include
(lambda _
(substitute* "common/lib_tree_model.cpp"
- (("#include <eda_pattern_match.h>" all)
- (string-append "#include <algorithm>\n" all)))))
- (add-after 'install 'install-translations
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (copy-recursively (assoc-ref inputs "kicad-i18n")
- (assoc-ref outputs "out"))
- #t))
+ (("#include <eda_pattern_match.h>" all) (string-append
+ "#include <algorithm>
+"
+ all)))))
(add-after 'install 'wrap-program
;; Ensure correct Python at runtime.
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (python (assoc-ref inputs "python"))
+ (let* ((out (assoc-ref outputs "out")) (python (assoc-ref inputs
+ "python"))
(file (string-append out "/bin/kicad"))
- (path (string-append
- out
- "/lib/python"
- ,(version-major+minor
- (package-version python))
- "/site-packages:"
- (getenv "GUIX_PYTHONPATH"))))
+ (path (string-append out "/lib/python"
+ ,(version-major+minor (package-version
+ python))
+ "/site-packages:"
+ (getenv "GUIX_PYTHONPATH"))))
(wrap-program file
- `("GUIX_PYTHONPATH" ":" prefix (,path))
- `("PATH" ":" prefix
- (,(string-append python "/bin:")))))
- #t)))))
+ `("GUIX_PYTHONPATH" ":" prefix
+ (,path))
+ `("PATH" ":" prefix
+ (,(string-append python "/bin:"))))) #t)))))
(native-search-paths
(list (search-path-specification
- (variable "KICAD") ; to find kicad-doc
+ (variable "KICAD") ;to find kicad-doc
(files '("")))
(search-path-specification
(variable "KICAD_TEMPLATE_DIR")
(files '("share/kicad/template")))
(search-path-specification
- (variable "KICAD_SYMBOL_DIR") ; symbol path
+ (variable "KICAD_SYMBOL_DIR") ;symbol path
(files '("share/kicad/library")))
(search-path-specification
- (variable "KISYSMOD") ; footprint path
+ (variable "KISYSMOD") ;footprint path
(files '("share/kicad/modules")))
(search-path-specification
- (variable "KISYS3DMOD") ; 3D model path
+ (variable "KISYS3DMOD") ;3D model path
(files '("share/kicad/modules/packages3d")))))
- (native-inputs
- `(("boost" ,boost)
- ("desktop-file-utils" ,desktop-file-utils)
- ("gettext" ,gettext-minimal)
- ("kicad-i18n" ,kicad-i18n)
- ("pkg-config" ,pkg-config)
- ("swig" ,swig)
- ("zlib" ,zlib)))
- (inputs
- `(("cairo" ,cairo)
- ("curl" ,curl)
- ("glew" ,glew)
- ("glm" ,glm)
- ("hicolor-icon-theme" ,hicolor-icon-theme)
- ("libngspice" ,libngspice)
- ("libsm" ,libsm)
- ("mesa" ,mesa)
- ("opencascade-occt" ,opencascade-occt)
- ("openssl" ,openssl)
- ("python" ,python-wrapper)
- ("wxwidgets" ,wxwidgets)
- ("wxpython" ,python-wxpython)))
+ (native-inputs (list boost
+ desktop-file-utils
+ gettext-minimal
+ pkg-config
+ swig
+ zlib))
+ (inputs (list bash-minimal
+ cairo
+ curl
+ glew
+ glm
+ hicolor-icon-theme
+ libngspice
+ libsm
+ mesa
+ opencascade-occt
+ openssl
+ python-wrapper
+ gtk+
+ wxwidgets
+ python-wxpython))
(home-page "https://www.kicad.org/")
(synopsis "Electronics Design Automation Suite")
- (description "Kicad is a program for the formation of printed circuit
+ (description
+ "Kicad is a program for the formation of printed circuit
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.")
@@ -1077,23 +1078,24 @@ (define-public kicad-doc
(file-name (git-file-name name version))
(sha256
(base32
- "026cz4zm903i75yhdvzha2nsnk4c0w07q3gd3xw3jmsmn18imgm3"))))
+ "0zaafa9ckvdgsim6nhp3flj4r2fzzmwn054lc3iijwgga82qy7il"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags (list "-DBUILD_FORMATS=html")
- #:tests? #f ; no test suite
+ #:tests?
+ #f ;no test suite
#:phases
(modify-phases %standard-phases
(delete 'build))))
- (native-inputs
- `(("asciidoc" ,asciidoc)
- ("gettext" ,gettext-minimal)
- ("git" ,git-minimal)
- ("perl" ,perl)
- ("perl-unicode-linebreak" ,perl-unicode-linebreak)
- ("perl-yaml-tiny" ,perl-yaml-tiny)
- ("po4a" ,po4a)
- ("source-highlight" ,source-highlight)))
+ (native-inputs (list asciidoc
+ gettext-minimal
+ git-minimal
+ perl
+ perl-unicode-linebreak
+ perl-yaml-tiny
+ po4a
+ ruby-asciidoctor
+ source-highlight))
(home-page "https://kicad.org")
(synopsis "KiCad official documentation")
(description "This repository contains the official KiCad documentation.")
@@ -1111,7 +1113,7 @@ (define-public kicad-symbols
(file-name (git-file-name name version))
(sha256
(base32
- "1zdajim409570xzis53kmrbdcf7000v2vmc90f49h214lrx2zhr2"))))
+ "1azjx1bmxaz8bniyw75lq60mc8hvay00jn9qdc2zp7isy3c9ibp0"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ; no tests exist
@@ -1140,7 +1142,7 @@ (define-public kicad-footprints
(file-name (git-file-name name version))
(sha256
(base32
- "0qpii55dgv2gxqg1qq0dngdnbb9din790qi5qv0l6qqrzx843h5s"))))
+ "0mv9xs0mmmfn0yhzx1v55r5app13ckagb16249rabyiz3v5crdpb"))))
(synopsis "Official KiCad footprint libraries")
(description "This package contains the official KiCad footprint libraries.")))
@@ -1157,7 +1159,7 @@ (define-public kicad-packages3d
(file-name (git-file-name name version))
(sha256
(base32
- "12w7m5nbk9kcnlnlg4sk1sd7xgb9i2kxfi0jcbd0phs89qyl7wjr"))))
+ "0vwcbzq42hzjl4f0zjaswmiff1x59hv64g5n00mx1gl0gwngnyla"))))
(synopsis "Official KiCad 3D model libraries")
(description "This package contains the official KiCad 3D model libraries.")))
@@ -1174,7 +1176,7 @@ (define-public kicad-templates
(file-name (git-file-name name version))
(sha256
(base32
- "1fbhn1l3j2rwc29aida9b408wif55i23bp9ddcs7dvf83smjm05g"))))
+ "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"))))
(synopsis "Official KiCad project and worksheet templates")
(description "This package contains the official KiCad project and
worksheet templates.")))
--
2.34.0
next prev parent reply other threads:[~2022-02-09 11:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-09 22:45 [bug#53149] Update Kicad to 6.0.0 phodina via Guix-patches via
2022-01-11 19:54 ` Leo Famulari
2022-01-28 10:11 ` [bug#53149] [PATCH v2 1/3] gnu: opencascade-occt: Update to 7.6.0 phodina via Guix-patches via
2022-01-28 10:45 ` Guillaume Le Vaillant
2022-02-09 11:12 ` phodina via Guix-patches via [this message]
2022-02-11 15:48 ` bug#53149: [PATCH v3 " Guillaume Le Vaillant
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='dpZBHoVLd_YwJ9aSm39j7J1u9dTTmDtBHiacwesq3aiC-sHyDom15SXMfx-aF_V8PqYlyCxOtsrNHlu_Xj-zSOTk7C43Lg_KoviKGgulQs0=@protonmail.com' \
--to=guix-patches@gnu.org \
--cc=53149@debbugs.gnu.org \
--cc=glv@posteo.net \
--cc=phodina@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.