nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: freetype: Ungraft. 

* gnu/packages/fontutils.scm (freetype)[replacement]: Remove field.
[source]: Add patch from former replacement.
(freetype/fixed): Remove variable.
This commit is contained in:
Mark H Weaver 2018-03-17 03:24:31 -04:00
parent 4e1435be0b
commit a732d49b0d
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/fontutils.scm
View File

@ -54,13 +54,13 @@
(package (package
(name "freetype") (name "freetype")
(version "2.8.1") (version "2.8.1")
(replacement freetype/fixed)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/freetype/freetype-" (uri (string-append "mirror://savannah/freetype/freetype-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (base32 (sha256 (base32
"0y3xrimgp0k39gwq1vdi7b7wjy0z9fhwmzafisxqfardw015yhz5")))) "0y3xrimgp0k39gwq1vdi7b7wjy0z9fhwmzafisxqfardw015yhz5"))
(patches (search-patches "freetype-CVE-2018-6942.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("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 (license license:freetype) ; some files have other licenses
(home-page "https://www.freetype.org/"))) (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 (define-public ttfautohint
(package (package
(name "ttfautohint") (name "ttfautohint")