From c3ca0f3f3168130d8a3143f7c521b74303c0c141 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 30 Dec 2024 15:30:37 +0100
Subject: [PATCH] gnu: xorg-server-for-test: Update to 21.1.15; fixes build
 with gcc-14.

* gnu/packages/xorg.scm (xorg-server-for-tests): Just inherit from xorg-server
again.

Change-Id: I922eb37183e8c0fa2ea8991c68fe08dfc08a7594
---
 gnu/packages/xorg.scm | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 498a83a36bc295c6a0ad9e0627b4409a039ca9dc..f7fe843bdd3eb271520a88f14bac40f5dc0c97a0 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5299,30 +5299,7 @@ draggable titlebars and borders.")
 (define-public xorg-server-for-tests
   (hidden-package
    (package
-     (inherit xorg-server)
-     (version "21.1.15")
-     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "https://xorg.freedesktop.org/archive/individual"
-                            "/xserver/xorg-server-" version ".tar.xz"))
-        (sha256
-         (base32
-          "12g0g9ksswzx1kgn23gvrpa570fnpkdkmw1dfqjjg4422a884744"))
-        (patches
-         (list
-          ;; See:
-          ;;   https://lists.fedoraproject.org/archives/list/devel@lists.
-          ;;      fedoraproject.org/message/JU655YB7AM4OOEQ4MOMCRHJTYJ76VFOK/
-          (origin
-            (method url-fetch)
-            (uri (string-append
-                  "http://pkgs.fedoraproject.org/cgit/rpms/xorg-x11-server.git"
-                  "/plain/06_use-intel-only-on-pre-gen4.diff"))
-            (sha256
-             (base32
-              "0mm70y058r8s9y9jiv7q2myv0ycnaw3iqzm7d274410s0ik38w7q"))
-            (file-name "xorg-server-use-intel-only-on-pre-gen4.diff")))))))))
+     (inherit xorg-server))))
 
 (define-public eglexternalplatform
   (package