--- Begin Message ---
|
Subject: |
[PATCH] gnu: praat: Update to 6.3.10. |
|
Date: |
Fri, 12 May 2023 17:09:33 -0500 |
* gnu/packages/language.scm (praat): Update to 6.3.10.
[arguments]: Use make-flags to set CC to gcc. Add tests and remove broken
one. Remove final #t from all lambdas.
[inputs]: Update to gtk+3 and reformat.
---
gnu/packages/language.scm | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 36968ad11c..530842d2c8 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -850,37 +850,45 @@ (define-public link-grammar
(define-public praat
(package
(name "praat")
- (version "6.1.30")
+ (version "6.3.10")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/praat/praat";)
- (commit (string-append "v" version))))
+ (url "https://github.com/praat/praat";)
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "1pjfifyv3wjn68l3i2dr83xm75nf2kxvfxrk9qqbmwz58p183jw4"))))
+ "0kwv0p2bn2x5h0c61rymm87icqqwnbj699awgc5afl4qp53azci8"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no test target
+ '(#:make-flags
+ ;; For some reason this variable doesn't properly percolate down to the
+ ;; recursive subcalls of make despite being defined in makefile.defs,
+ ;; which is sourced by all the other makefiles. Setting it as a flag
+ ;; guarantees that the right compiler is called every time.
+ '("-E" "CC = gcc")
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'remove-problem-tests
+ (lambda _
+ ;; FIXME: Why doesn't this test pass?
+ (delete-file "test/sys/graphicsText.praat")))
(replace 'configure
(lambda _
- (copy-file "makefiles/makefile.defs.linux.pulse" "makefile.defs")
- #t))
+ (copy-file "makefiles/makefile.defs.linux.pulse"
"makefile.defs")))
+ (replace 'check
+ (lambda _
+ ;; Run only the tests that don't require a GUI.
+ (invoke "./praat" "--run" "test/runAllTests_batch.praat")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(mkdir-p bin)
- (copy-file "praat" (string-append bin "/praat")))
- #t)))))
+ (copy-file "praat" (string-append bin "/praat"))))))))
(inputs
- `(("alsa-lib" ,alsa-lib)
- ("gtk" ,gtk+-2)
- ("jack" ,jack-1)
- ("publesaudio" ,pulseaudio)))
+ (list alsa-lib gtk+ jack-1 pulseaudio))
(native-inputs
(list pkg-config))
(home-page "https://www.fon.hum.uva.nl/praat/";)
base-commit: b4e5844700b2304bfde451322feb5797bf0c6179
prerequisite-patch-id: e1af5f52c721c7905ea34bdbbd20dfac5190126e
prerequisite-patch-id: 14803245981fe2f3cdfb052d35c41dad2fec89d1
--
2.39.2
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: bug#63473: [PATCH] gnu: praat: Update to 6.3.10. |
|
Date: |
Mon, 07 Aug 2023 16:21:40 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) |
Hi Preston,
Preston Miller Firestone <firestone.preston@gmail.com> skribis:
> Thank you for the feedback and help. I have reformatted the patch as a
> series. Let me know whether there's anything else that needs fixing.
Finally applied, thank you!
Ludo’.
--- End Message ---