diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-03-17 03:24:31 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-03-17 03:36:07 -0400 |
| commit | a732d49b0ddeeab63afcd2e5281598949aaaf533 (patch) | |
| tree | 38bd7411485558aa757c79cc922fafd4637f4eb4 | |
| parent | 4e1435be0bcb44afd3bebc5334444ca32a30c0db (diff) | |
| download | guix-a732d49b0ddeeab63afcd2e5281598949aaaf533.tar.gz guix-a732d49b0ddeeab63afcd2e5281598949aaaf533.zip | |
gnu: freetype: Ungraft.
* gnu/packages/fontutils.scm (freetype)[replacement]: Remove field.
[source]: Add patch from former replacement.
(freetype/fixed): Remove variable.
| -rw-r--r-- | gnu/packages/fontutils.scm | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 22382f745a..22bdfe7a46 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -54,13 +54,13 @@ (package (name "freetype") (version "2.8.1") - (replacement freetype/fixed) (source (origin (method url-fetch) (uri (string-append "mirror://savannah/freetype/freetype-" version ".tar.bz2")) (sha256 (base32 - "0y3xrimgp0k39gwq1vdi7b7wjy0z9fhwmzafisxqfardw015yhz5")))) + "0y3xrimgp0k39gwq1vdi7b7wjy0z9fhwmzafisxqfardw015yhz5")) + (patches (search-patches "freetype-CVE-2018-6942.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -79,13 +79,6 @@ anti-aliased glyph bitmap generation with 256 gray levels.") (license license:freetype) ; some files have other licenses (home-page "https://www.freetype.org/"))) -(define freetype/fixed - (package/inherit freetype - (source - (origin - (inherit (package-source freetype)) - (patches (search-patches "freetype-CVE-2018-6942.patch")))))) - (define-public ttfautohint (package (name "ttfautohint") |