04/07: gnu: freetype: Ungraft.

[Mark H. Weaver]

mhw pushed a commit to branch core-updates
in repository guix.

commit a732d49b0ddeeab63afcd2e5281598949aaaf533
Author: Mark H Weaver <address@hidden>
Date:   Sat Mar 17 03:24:31 2018 -0400

    gnu: freetype: Ungraft.
    
    * gnu/packages/fontutils.scm (freetype)[replacement]: Remove field.
    [source]: Add patch from former replacement.
    (freetype/fixed): Remove variable.
---
 gnu/packages/fontutils.scm | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 22382f7..22bdfe7 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")