From 4e6febec687f7ae443b511ebf8c41637459a595e Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 10 Nov 2019 10:16:43 +0200
Subject: 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(-)

(limited to 'gnu/packages/fribidi.scm')

diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm
index 61aa6fd726..b775053ba5 100644
--- a/gnu/packages/fribidi.scm
+++ b/gnu/packages/fribidi.scm
@@ -27,7 +27,6 @@ (define-module (gnu packages fribidi)
 
 (define-public fribidi
   (package
-    (replacement fribidi/fixed)
     (name "fribidi")
     (version "1.0.5")
     (source
@@ -38,7 +37,8 @@ (define-public fribidi
                         "/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 @@ (define-public fribidi
 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"))))))
-- 
cgit v1.2.3