gnu: emacspeak: Update to 50.0.

* gnu/packages/emacs.scm (emacspeak): Update to 50.0.
[arguments]: Simplify "configure" phase and adjust "install" phase.
This commit is contained in:
Kei Kebreau 2019-06-03 23:04:35 -04:00
parent 69962ab7a8
commit 92b1b6f6af
No known key found for this signature in database
GPG Key ID: E6A5EE3C19467A0D
1 changed files with 7 additions and 10 deletions

View File

@ -6969,7 +6969,7 @@ highlights quasi-quoted expressions.")
(define-public emacspeak (define-public emacspeak
(package (package
(name "emacspeak") (name "emacspeak")
(version "49.0") (version "50.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -6978,7 +6978,7 @@ highlights quasi-quoted expressions.")
version "/emacspeak-" version ".tar.bz2")) version "/emacspeak-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1smf26m7201z0bk49lzbw9zhbjfi6wylidfjixb8ylp6g0wnh8dx")))) "0rsj7rzfyqmyidfsjrhjnxi2d43axx6r3gac1fhv5xkkbiiqzqkb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:make-flags (list (string-append "prefix=" '(#:make-flags (list (string-append "prefix="
@ -6986,13 +6986,10 @@ highlights quasi-quoted expressions.")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let* ((out (assoc-ref outputs "out")) (setenv "SHELL" (which "sh"))
(lisp (string-append out ;; Configure Emacspeak according to etc/install.org.
"/share/emacs/site-lisp/emacspeak"))) (invoke "make" "config")))
(setenv "SHELL" (which "sh"))
;; Configure Emacspeak according to etc/install.org.
(invoke "make" "config"))))
(add-after 'build 'build-espeak (add-after 'build 'build-espeak
(lambda _ (lambda _
(invoke "make" "espeak"))) (invoke "make" "espeak")))
@ -7009,7 +7006,7 @@ highlights quasi-quoted expressions.")
(for-each (for-each
(lambda (file) (lambda (file)
(copy-recursively file (string-append lisp "/" file))) (copy-recursively file (string-append lisp "/" file)))
'("etc" "info" "js" "lisp" "media" "scapes" "servers" "sounds" '("etc" "info" "js" "lisp" "media" "servers" "sounds"
"stumpwm" "xsl")) "stumpwm" "xsl"))
;; Make sure emacspeak is loaded from the correct directory. ;; Make sure emacspeak is loaded from the correct directory.
(substitute* "etc/emacspeak.sh" (substitute* "etc/emacspeak.sh"