Subject: [bug#75160] [PATCH xorg-updates 005/109] gnu: xorgproto: Update to 2024.1.

From: [email-masked]
Date: Sat, 28 Dec 2024 19:14:36 +0800

From: 宋文武 <[email-masked]>

* gnu/packages/xorg.scm (xorgproto): Update to 2024.1.
(xorgproto-2024): Remove package.
(xorg-server-wayland)[inputs]: Replace xorgproto-2024 with xorgproto.

Change-Id: I330362aae60521c73928e1f2d4ceda05a922240d
---
 gnu/packages/xorg.scm | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 5251f436d6..04cee9da29 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -253,14 +253,14 @@ (define-public bdftopcf
 (define-public xorgproto
   (package
     (name "xorgproto")
-    (version "2023.2")
+    (version "2024.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://xorg/individual/proto"
                                   "/xorgproto-" version ".tar.xz"))
               (sha256
                (base32
-                "0b4c27aq25w1fccks49p020avf9jzh75kaq5qwnww51bp1yvq7xn"))))
+                "0nfbbi4j130m2gxzp20hp642xizbbl68jpbzahiq8nw183yja8ip"))))
     (build-system gnu-build-system)
     (propagated-inputs
      ;; To get util-macros in (almost?) all package inputs.
@@ -272,18 +272,6 @@ (define-public xorgproto
 the core protocol and (many) extensions for the X Window System.")
     (license license:x11)))
 
-(define-public xorgproto-2024
-  (package
-    (inherit xorgproto)
-    (version "2024.1")
-        (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://xorg/individual/proto"
-                                  "/xorgproto-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0nfbbi4j130m2gxzp20hp642xizbbl68jpbzahiq8nw183yja8ip"))))))
-
 (define-public bigreqsproto
   (package
     (name "bigreqsproto")
@@ -5378,7 +5366,7 @@ (define-public xorg-server-xwayland
                   wayland-protocols
                   xkbcomp
                   xkeyboard-config
-                  xorgproto-2024
+                  xorgproto
                   xtrans))
     (native-inputs (cons pkg-config
                          (if (%current-target-system)
-- 
2.46.0