guix_mirror_bot pushed a commit to branch c++-team
in repository guix.
commit b33980620d8b646dcee333d5c25012cfbf72aaac
Author: Greg Hogan <c...@greghogan.com>
AuthorDate: Thu Apr 3 13:13:47 2025 +0000
gnu: Use argument for test exclusion.
* gnu/packages/fontutils.scm (fontforge, graphite2)
[arguments]<#:test-exclude>: Move regex from custom 'check phase.
Change-Id: I51d1480b9fd87b7e32b7d09e24b73c9d93729b8d
---
gnu/packages/fontutils.scm | 128 +++++++++++++++++----------------------------
1 file changed, 49 insertions(+), 79 deletions(-)
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index d5734372e8..e0895389f1 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -1536,22 +1536,7 @@ translated keywords and acts.")
(list freetype))
(arguments
(if (system-hurd?)
- (list
- #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- ;; cmake-build-system ignores #:make-flags for make check
- (lambda* (#:key test-target tests? parallel-tests?
- #:allow-other-keys)
- (if tests?
- (let ((jobs (if parallel-tests?
- (number->string (parallel-job-count))
- "1")))
- (invoke "make"
- (string-append
- "ARGS=-j " jobs " --exclude-regex ^awamicmp3$")
- test-target))
- (format #t "test suite not run~%"))))))
+ (list #:test-exclude "awamicmp3")
'()))
(synopsis "Reimplementation of the SIL Graphite text processing engine")
(description
@@ -1731,69 +1716,54 @@ definitions.")
python
zlib))
(arguments
- (list
- #:configure-flags #~`(;; TODO: Provide GTK+ for the Wayland-friendly GDK
- ;; backend, instead of the legacy X11 backend.
- ;; Currently it introduces a circular dependency.
- "-DENABLE_X11=ON")
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'do-not-override-RPATH
- (lambda _
- ;; Do not attempt to set a default RPATH, as our ld-wrapper
- ;; already does the right thing.
- (substitute* "CMakeLists.txt"
- (("^set_default_rpath\\(\\)")
- ""))))
- (add-after 'unpack 'do-not-use-msgfmt--check
- (lambda _
- ;; msgfmt --check from gettext-0.23 fails on fr.po:
- ;; 'msgstr' is not a valid C format string
- (substitute* "po/CMakeLists.txt"
- ((" --check") ""))))
- #$@(if (target-hurd?)
- #~((add-after 'unpack 'apply-hurd-patch
- (lambda _
- (let ((patch-file
- #$(local-file
- (search-patch "fontforge-hurd.patch"))))
- (invoke "patch" "--force" "-p1" "-i" patch-file)))))
- #~())
- #$@(if (system-hurd?)
- #~((replace 'check
- ;; cmake-build-system ignores #:make-flags for make check
- (lambda* (#:key test-target tests? parallel-tests?
- #:allow-other-keys)
- (let ((skip '("test0001_py" "test0001_pyhook")))
- (if tests?
- (let ((jobs
- (if parallel-tests?
- (number->string (parallel-job-count))
- "1")))
- (invoke "make"
- (string-append "ARGS=-j " jobs
- " --exclude-regex ^"
- (string-join skip "\\|")
- "$")
- test-target))
- (format #t "test suite not run~%"))))))
- #~())
- (add-after 'install 'set-library-path
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (potrace (dirname
- (search-input-file inputs "bin/potrace"))))
- (wrap-program (string-append out "/bin/fontforge")
- ;; Fontforge dynamically opens libraries.
- `("LD_LIBRARY_PATH" ":" prefix
- ,(map (lambda (input)
- (string-append (assoc-ref inputs input)
- "/lib"))
- '("libtiff" "libjpeg-turbo" "libpng" "libungif"
- "libxml2" "zlib" "libspiro" "freetype"
- "pango" "cairo" "fontconfig-minimal")))
- ;; Checks for potrace program at runtime
- `("PATH" ":" prefix (,potrace)))))))))
+ (append
+ (if (system-hurd?)
+ (list #:test-exclude "test0001_py|test0001_pyhook")
+ '())
+ (list
+ #:configure-flags #~`(;; TODO: Provide GTK+ for the Wayland-friendly GDK
+ ;; backend, instead of the legacy X11 backend.
+ ;; Currently it introduces a circular dependency.
+ "-DENABLE_X11=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'do-not-override-RPATH
+ (lambda _
+ ;; Do not attempt to set a default RPATH, as our ld-wrapper
+ ;; already does the right thing.
+ (substitute* "CMakeLists.txt"
+ (("^set_default_rpath\\(\\)")
+ ""))))
+ (add-after 'unpack 'do-not-use-msgfmt--check
+ (lambda _
+ ;; msgfmt --check from gettext-0.23 fails on fr.po:
+ ;; 'msgstr' is not a valid C format string
+ (substitute* "po/CMakeLists.txt"
+ ((" --check") ""))))
+ #$@(if (target-hurd?)
+ #~((add-after 'unpack 'apply-hurd-patch
+ (lambda _
+ (let ((patch-file
+ #$(local-file
+ (search-patch "fontforge-hurd.patch"))))
+ (invoke "patch" "--force" "-p1" "-i" patch-file)))))
+ #~())
+ (add-after 'install 'set-library-path
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (potrace (dirname
+ (search-input-file inputs "bin/potrace"))))
+ (wrap-program (string-append out "/bin/fontforge")
+ ;; Fontforge dynamically opens libraries.
+ `("LD_LIBRARY_PATH" ":" prefix
+ ,(map (lambda (input)
+ (string-append (assoc-ref inputs input)
+ "/lib"))
+ '("libtiff" "libjpeg-turbo" "libpng" "libungif"
+ "libxml2" "zlib" "libspiro" "freetype"
+ "pango" "cairo" "fontconfig-minimal")))
+ ;; Checks for potrace program at runtime
+ `("PATH" ":" prefix (,potrace))))))))))
(synopsis "Outline font editor")
(description
"FontForge allows you to create and modify postscript, truetype and
