02/03: gnu: fribidi: Ungraft.

[guix-commits]

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

commit 4e6febec687f7ae443b511ebf8c41637459a595e
Author: Efraim Flashner <address@hidden>
Date:   Sun Nov 10 10:16:43 2019 +0200

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

diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm
index 61aa6fd..b775053 100644
--- a/gnu/packages/fribidi.scm
+++ b/gnu/packages/fribidi.scm
@@ -27,7 +27,6 @@
 
 (define-public fribidi
   (package
-    (replacement fribidi/fixed)
     (name "fribidi")
     (version "1.0.5")
     (source
@@ -38,7 +37,8 @@
                         "/download/v" version "/fribidi-" version
                          ".tar.bz2"))
         (sha256
-          (base32 "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a"))))
+         (base32 "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a"))
+        (patches (search-patches "fribidi-CVE-2019-18397.patch"))))
     (build-system gnu-build-system)
     (synopsis "Implementation of the Unicode bidirectional algorithm")
     (description
@@ -47,10 +47,3 @@ Algorithm.  This algorithm is used to properly display text 
in left-to-right
 or right-to-left ordering as necessary.")
     (home-page "https://github.com/fribidi/fribidi";)
     (license lgpl2.1+)))
-
-(define fribidi/fixed
-  (package
-    (inherit fribidi)
-    (source
-      (origin (inherit (package-source fribidi))
-              (patches (search-patches "fribidi-CVE-2019-18397.patch"))))))