gnu: geda-gaf: Update to 1.10.0.

* gnu/packages/engineering.scm (geda-gaf): Update to 1.10.0.
[arguments]: Adjust phase "disable-failing-tests".
[inputs]: Add gamin and python-2.
This commit is contained in:
Ricardo Wurmus 2019-12-20 22:01:19 +01:00
parent 1e600ed0f7
commit 1101c73c7f
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC

View File

@ -186,16 +186,16 @@ plans and designs.")
(define-public geda-gaf (define-public geda-gaf
(package (package
(name "geda-gaf") (name "geda-gaf")
(version "1.9.2") (version "1.10.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"http://ftp.geda-project.org/geda-gaf/unstable/v" "http://ftp.geda-project.org/geda-gaf/stable/v"
(version-major+minor version) "/" (version-major+minor version) "/"
version "/geda-gaf-" version ".tar.gz")) version "/geda-gaf-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"14mk45pfz11v54q66gafw2l68n1p5ssvvjmdm8ffgc8x1w5ajfrz")))) "06ivgarvwbzjz2wigxzzkm8iszldi2p6x3a6jnlczjyrz4csddsy"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -205,12 +205,14 @@ plans and designs.")
(lambda _ (lambda _
(setenv "HOME" (getenv "TMPDIR")) (setenv "HOME" (getenv "TMPDIR"))
#t)) #t))
;; FIXME: These two tests fail for unknown reasons. They return "2"
;; when they should return "1".
(add-after 'unpack 'disable-failing-tests (add-after 'unpack 'disable-failing-tests
(lambda _ (lambda _
(substitute* "utils/tests/gxyrs/tests.list" (substitute* "xorn/tests/Makefile.in"
(("^do_nothing.*") "")) (("-Werror") ""))
;; This test returns its correct result in an unexpected order.
(substitute* "libgeda/scheme/unit-tests/t0402-config.scm"
(("\\(begin-config-test 'config-keys" m)
(string-append "#;" m)))
#t))) #t)))
#:configure-flags #:configure-flags
(let ((pcb (assoc-ref %build-inputs "pcb"))) (let ((pcb (assoc-ref %build-inputs "pcb")))
@ -219,13 +221,15 @@ plans and designs.")
pcb "/share/pcb/pcblib-newlib:" pcb "/share/pcb/pcblib-newlib:"
pcb "/share/pcb/newlib"))))) pcb "/share/pcb/newlib")))))
(inputs (inputs
`(("glib" ,glib) `(("gamin" ,gamin)
("glib" ,glib)
("gtk" ,gtk+-2) ("gtk" ,gtk+-2)
("guile" ,guile-2.0) ("guile" ,guile-2.0)
("desktop-file-utils" ,desktop-file-utils) ("desktop-file-utils" ,desktop-file-utils)
("shared-mime-info" ,shared-mime-info) ("shared-mime-info" ,shared-mime-info)
("m4" ,m4) ("m4" ,m4)
("pcb" ,pcb))) ("pcb" ,pcb)
("python" ,python-2))) ; for xorn
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("perl" ,perl))) ; for tests ("perl" ,perl))) ; for tests