01/12: gnu: libx11: Ungraft.

[guix-commits]

podiki pushed a commit to branch mesa-updates
in repository guix.

commit 5dcbd9accfcf0e97579604f57681c0565ae07ec2
Author: John Kehayias <john.kehayias@protonmail.com>
AuthorDate: Sun Nov 5 00:15:57 2023 -0400

    gnu: libx11: Ungraft.
    
    * gnu/packages/xorg.scm (libx11): Update to 1.8.7.
    [replacement]: Remove.
    [source]: Update URL.
    (libx11-fixed): Remove variable.
    
    Change-Id: I945c5d15ca7ef3ed9f5de348815f9644028b1c9a
---
 gnu/packages/xorg.scm | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index f65ffa7476..4039f8675a 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5332,16 +5332,15 @@ Wayland.")
 (define-public libx11
   (package
     (name "libx11")
-    (version "1.8.1")
-    (replacement libx11-fixed)          ;security fixes
+    (version "1.8.7")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "https://xorg.freedesktop.org/archive/";
-                           "/individual/lib/libX11-" version ".tar.xz"))
+       (uri (string-append "mirror://xorg/individual/lib/libX11-"
+                           version ".tar.xz"))
        (sha256
         (base32
-         "1xyry8i7zqmlkvpbyyqwi18rrdw6ycczlvfp63rh2570pfhimi0v"))))
+         "1vlrgrdibp4lr84wgmsdy1ihzaai8bvvqc68npi1m19wir36gwh5"))))
     (build-system gnu-build-system)
     (outputs '("out"
                "doc"))                  ;8 MiB of man pages + XML
@@ -5363,19 +5362,6 @@ Wayland.")
     (description "Xorg Core X11 protocol client library.")
     (license license:x11)))
 
-(define-public libx11-fixed
-  (package
-    (inherit libx11)
-    (version "1.8.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://xorg/individual/lib/libX11-"
-                           version ".tar.xz"))
-       (sha256
-        (base32
-         "1vlrgrdibp4lr84wgmsdy1ihzaai8bvvqc68npi1m19wir36gwh5"))))))
-
 ;; packages of height 5 in the propagated-inputs tree
 
 (define-public libxcursor