From 22b6eb874012df48fcf8c682e02fdfdabc6e45e5 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Fri, 12 Aug 2022 00:06:41 +0200
Subject: [PATCH] gnu: aspell: Incorporate grafted changes.

* gnu/packages/aspell.scm (aspell)[replacement]: Remove.
[source](patches): Add aspell-CVE-2019-25051.patch.
* gnu/packages/aspell.scm (aspell/replacement): Remove variable.
---
 gnu/packages/aspell.scm | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm
index ec0dafbc7a..d2737ee79a 100644
--- a/gnu/packages/aspell.scm
+++ b/gnu/packages/aspell.scm
@@ -47,7 +47,6 @@
   (package
     (name "aspell")
     (version "0.60.8")
-    (replacement aspell/replacement)
     (source
      (origin
       (method url-fetch)
@@ -56,7 +55,8 @@
       (sha256
        (base32
         "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr"))
-      (patches (search-patches "aspell-default-dict-dir.patch"))))
+      (patches (search-patches "aspell-default-dict-dir.patch"
+                               "aspell-CVE-2019-25051.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -93,16 +93,6 @@ documents written in the UTF-8 encoding and its ability to use multiple
 dictionaries, including personal ones.")
     (license lgpl2.1+)))
 
-;; Replacement package with security fixes.
-(define aspell/replacement
-  (package
-    (inherit aspell)
-    (source
-     (origin
-       (inherit (package-source aspell))
-       (patches (append (origin-patches (package-source aspell))
-                        (search-patches "aspell-CVE-2019-25051.patch")))))))
-
 ;;;
 ;;; Dictionaries.
 ;;;