07/15: gnu: libx11: Absorb grafted replacement.

[guix-commits]

lfam pushed a commit to branch wip-ungrafting
in repository guix.

commit 0b398a1e757a51e1ca7f593c07eb5d44fe96359c
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Fri Mar 12 14:26:58 2021 -0500

    gnu: libx11: Absorb grafted replacement.
    
    * gnu/packages/xorg.scm (libx11): Update to 1.6.12.
    [replacement]: Remove field.
    (libx11/fixed): Remove variable.
---
 gnu/packages/xorg.scm | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index dea4f8e..439fbc2 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5481,7 +5481,7 @@ draggable titlebars and borders.")
 (define-public libx11
   (package
     (name "libx11")
-    (version "1.6.10")
+    (version "1.6.12")
     (source
       (origin
         (method url-fetch)
@@ -5491,11 +5491,10 @@ draggable titlebars and borders.")
                ".tar.bz2"))
         (sha256
           (base32
-            "09k2pqmqbn2m1bpgl7jfxyqxaaxsnzbnp2bp8ycmqldqi5ln4j5g"))))
-    (replacement libx11/fixed)
+           "1ivfzl1qwk8zh7gc0m5vb58gdxz11jwg7w3d356w16j1d5s2427i"))))
     (build-system gnu-build-system)
     (outputs '("out"
-               "doc"))                            ;8 MiB of man pages + XML
+               "doc"))                            ;6.7 MiB of man pages + XML
     (arguments
      `(#:configure-flags
        (list (string-append "--mandir="
@@ -5520,21 +5519,6 @@ draggable titlebars and borders.")
     (description "Xorg Core X11 protocol client library.")
     (license license:x11)))
 
-(define-public libx11/fixed
-  (package
-    (inherit libx11)
-    (version "1.6.12")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "mirror://xorg/individual/lib/libX11-"
-               version
-               ".tar.bz2"))
-        (sha256
-          (base32
-            "1ivfzl1qwk8zh7gc0m5vb58gdxz11jwg7w3d356w16j1d5s2427i"))))))
-
 ;; packages of height 5 in the propagated-inputs tree
 
 (define-public libxcursor