[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/25: gnu: freetype: Update remove-reference-to-pkg-config phase.
From: |
guix-commits |
Subject: |
05/25: gnu: freetype: Update remove-reference-to-pkg-config phase. |
Date: |
Sat, 15 Apr 2023 00:27:32 -0400 (EDT) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit e6090152a686b95b2bd2f95f7b94205f049e5754
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Apr 14 21:08:05 2023 -0400
gnu: freetype: Update remove-reference-to-pkg-config phase.
* gnu/packages/fontutils.scm (freetype) [arguments]: Use the newer
remove-reference-to-pkg-config phase variant, with a small adjustment to
make
the target group optional. Use gexps and search-input-file.
[propagated-inputs]: Update comment regarding harfbuzz.
---
gnu/packages/fontutils.scm | 75 ++++++++++++++++++++--------------------------
1 file changed, 32 insertions(+), 43 deletions(-)
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 7ff56892e7..152da73a7e 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -85,54 +85,43 @@
(define-public freetype
(package
- (name "freetype")
- (version "2.13.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://savannah/freetype/freetype-"
- version ".tar.xz"))
- (sha256
- (base32 "0k32jaaz4pfhw34xwr6a38fncrpwr9fn5ij35m5w4dkn0jykmqjy"))))
- (build-system gnu-build-system)
- (arguments
- ;; The use of "freetype-config" is deprecated, but other packages still
- ;; depend on it.
- `(#:configure-flags (list "--enable-freetype-config")
- #:disallowed-references (,pkg-config)
+ (name "freetype")
+ (version "2.13.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://savannah/freetype/freetype-"
+ version ".tar.xz"))
+ (sha256
+ (base32 "0k32jaaz4pfhw34xwr6a38fncrpwr9fn5ij35m5w4dkn0jykmqjy"))))
+ (build-system gnu-build-system)
+ (arguments
+ ;; The use of "freetype-config" is deprecated, but other packages still
+ ;; depend on it.
+ (list
+ #:configure-flags #~(list "--enable-freetype-config")
+ #:disallowed-references (list pkg-config)
#:phases
- ;; TODO: Keep only the first variant on the next core rebuild cycle.
- ,(if (%current-target-system)
- '(modify-phases %standard-phases
- (add-after 'install 'remove-reference-to-pkg-config
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (substitute* (string-append out "/bin/freetype-config")
- (("/([a-zA-Z0-9/\\._-]+)/bin/([a-zA-Z0-9_-]+)pkg-config"
- _ store target)
- "pkg-config"))))))
- '(modify-phases %standard-phases
- (add-after 'install 'remove-reference-to-pkg-config
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (substitute* (string-append out "/bin/freetype-config")
- (((search-input-file inputs "/bin/pkg-config"))
- "pkg-config")))))))))
- (native-inputs
- (list pkg-config))
- (propagated-inputs
- ;; These are all in the Requires.private field of freetype2.pc.
- ;; XXX: add harfbuzz.
- (list libpng zlib))
- (synopsis "Font rendering library")
- (description
- "Freetype is a library that can be used by applications to access the
+ #~(modify-phases %standard-phases
+ (add-after 'install 'remove-reference-to-pkg-config
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* (search-input-file outputs "bin/freetype-config")
+ (("/([a-zA-Z0-9/\\._-]+)/bin/([a-zA-Z0-9_-]+)?pkg-config"
+ _ store target)
+ "pkg-config")))))))
+ (native-inputs (list pkg-config))
+ ;; XXX: Not adding harfbuzz here, as it would introduce a dependency
+ ;; cycle.
+ (propagated-inputs (list libpng zlib))
+ (synopsis "Font rendering library")
+ (description
+ "Freetype is a library that can be used by applications to access the
contents of font files. It provides a uniform interface to access font files.
It supports both bitmap and scalable formats, including TrueType, OpenType,
Type1, CID, CFF, Windows FON/FNT, X11 PCF, and others. It supports high-speed
anti-aliased glyph bitmap generation with 256 gray levels.")
- (license license:freetype) ; some files have other licenses
- (home-page "https://freetype.org/")))
+ (license license:freetype) ; some files have other licenses
+ (home-page "https://freetype.org/")))
(define-public opentype-sanitizer
(package
- branch core-updates updated (f14aa6d0a3 -> 7ccf994302), guix-commits, 2023/04/15
- 05/25: gnu: freetype: Update remove-reference-to-pkg-config phase.,
guix-commits <=
- 09/25: gnu: python-docutils: Update to 0.19., guix-commits, 2023/04/15
- 03/25: maint: Merge sanity-check-next.py into sanity-check.py., guix-commits, 2023/04/15
- 08/25: gnu: source-highlight: Inline skip-doc-directory phase., guix-commits, 2023/04/15
- 02/25: gnu: nss: Add which to to native inputs and use regular nspr., guix-commits, 2023/04/15
- 01/25: gnu: python-clickgen: Replace python-numpy-next with python-numpy., guix-commits, 2023/04/15
- 04/25: gnu: poppler-next: Delete variable., guix-commits, 2023/04/15
- 12/25: gnu: ruby-tzinfo-data: Remove #:guile argument in file-union call., guix-commits, 2023/04/15
- 19/25: gnu: hplip: Update to 3.23.3., guix-commits, 2023/04/15
- 21/25: gnu: python-jsonschema: Update to 4.5.1., guix-commits, 2023/04/15
- 13/25: gnu: valgrind/interactive: Rely on non-stripped glibc symbols., guix-commits, 2023/04/15