ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 06:36:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: fritzing: Update to 0.9.6.

Browse source 
* gnu/packages/engineering.scm (fritzing): Update to 0.9.6.
[arguments]: Update libgit2 substitutions.
This commit is contained in:
Gabriel Wicki 2022-11-10 02:27:21 +01:00 committed by Tobias Geerinckx-Rice
parent 7e3becd791
commit b39d77e7f7
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/engineering.scm
View file

@ -669,7 +669,7 @@ (define-public fasthenry
(define-public fritzing (define-public fritzing
(package (package
(name "fritzing") (name "fritzing")
(version "0.9.3b") (version "0.9.6")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -678,7 +678,7 @@ (define-public fritzing
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0hpyc550xfhr6gmnc85nq60w00rm0ljm0y744dp0z88ikl04f4s3")))) "083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -687,24 +687,18 @@ (define-public fritzing
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(copy-recursively (assoc-ref inputs "fritzing-parts-db") (copy-recursively (assoc-ref inputs "fritzing-parts-db")
"parts") "parts")
;; Make compatible with libgit2 > 0.24
(substitute* "src/version/partschecker.cpp"
(("error = git_remote_connect\\(remote, GIT_DIRECTION_FETCH, &callbacks\\)")
"error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL, NULL)"))
;; Use system libgit2 and boost. ;; Use system libgit2 and boost.
(substitute* "phoenix.pro" (substitute* "phoenix.pro"
(("^LIBGIT2INCLUDE =.*") (("^LIBGIT_STATIC.*")
(string-append "LIBGIT2INCLUDE=" (string-append "LIBGIT2INCLUDE=" (assoc-ref inputs "libgit2") "/include\n"
(assoc-ref inputs "libgit2") "/include\n")) "LIBGIT2LIB=" (assoc-ref inputs "libgit2") "/lib\n"
(("^ LIBGIT2LIB =.*") "INCLUDEPATH += $$LIBGIT2INCLUDE\n"
(string-append " LIBGIT2LIB=" "LIBS += -L$$LIBGIT2LIB -lgit2\n"))
(assoc-ref inputs "libgit2") "/lib\n"))) (("^.*pri/libgit2detect.pri.") ""))
;; This file checks for old versions of Boost, insisting on ;; Trick the internal mechanism to load the parts
;; having us download the boost sources and placing them in the (substitute* "src/version/partschecker.cpp"
;; build directory. ((".*git_libgit2_init.*")
(substitute* "pri/utils.pri" "return \"083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs\";"))
(("error\\(") "message("))
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(invoke "qmake" (invoke "qmake"
@ -723,11 +717,11 @@ (define-public fritzing
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/fritzing/fritzing-parts") (url "https://github.com/fritzing/fritzing-parts")
(commit version))) (commit (string-append "release_" version))))
(file-name (git-file-name "fritzing-parts" version)) (file-name (git-file-name "fritzing-parts" version))
(sha256 (sha256
(base32 (base32
"1d2v8k7p176j0lczx4vx9n9gbg3vw09n2c4b6w0wj5wqmifywhc1")))))) "0wsvn57v6n0ygnhk2my94rrfzb962z1cj4d1xmp1farwck3811h6"))))))
(home-page "https://fritzing.org") (home-page "https://fritzing.org")
(synopsis "Electronic circuit design") (synopsis "Electronic circuit design")
(description (description