From 8008ef29f2f13d998e82bbc5bb66f8489321ae85 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Sun, 11 Oct 2020 16:41:52 +0200
Subject: gnu: xorg-server: Remove graft for 1.20.9.

* gnu/packages/xorg.scm (xorg-server): Update to 1.20.9.
[replacement]: Remove.
(xorg-server/fixed): Remove variable.
---
 gnu/packages/xorg.scm | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 6faf7a5698..31f6c03e1f 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5309,8 +5309,7 @@ (define-public libxcb
 (define-public xorg-server
   (package
     (name "xorg-server")
-    (version "1.20.8")
-    (replacement xorg-server/fixed)
+    (version "1.20.9")
     (source
       (origin
         (method url-fetch)
@@ -5318,7 +5317,7 @@ (define-public xorg-server
                             "xorg-server-" version ".tar.bz2"))
         (sha256
          (base32
-          "0ih15m7gh1z1ly6z7g82bkni719yisqmbk61a1wgp82bxrmn8yyi"))
+          "0w9mrnffvjgmwi50kln15i8rpdskxv97r78l75wlcmg4vzhg46g2"))
         (patches
          (list
           ;; See:
@@ -5434,19 +5433,6 @@ (define-public xorg-server
 draggable titlebars and borders.")
     (license license:x11)))
 
-(define xorg-server/fixed  ; security fixes
-  (package
-    (inherit xorg-server)
-    (version "1.20.9")
-    (source
-     (origin
-       (inherit (package-source xorg-server))
-       (uri (string-append "mirror://xorg/individual/xserver/"
-                           "xorg-server-" version ".tar.bz2"))
-       (sha256
-        (base32
-         "0w9mrnffvjgmwi50kln15i8rpdskxv97r78l75wlcmg4vzhg46g2"))))))
-
 ;; This package is intended to be used when building GTK+.
 ;; Note: It's currently marked as "hidden" to avoid having two non-eq?
 ;; packages with the same name and version.
-- 
cgit v1.2.3