From 70b02a6a6a329c6a6f95be4e0af3ebdb0dfb726c Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sat, 10 Mar 2018 13:47:49 +0100
Subject: [PATCH] gnu: Switch from glproto to xorgproto.

* gnu/packages/gl.scm (mesa)[propaged-inputs]: Replace GLPROTO with XORGPROTO.
* gnu/packages/xorg.scm (glproto)[properties]: Mark as superseded by XORGPROTO.
---
 gnu/packages/gl.scm   | 6 +++---
 gnu/packages/xorg.scm | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 27d064346e..8494b48603 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -240,15 +240,15 @@ also known as DXTn or DXTC) for Mesa.")
                          "mesa-skip-disk-cache-test.patch"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("glproto" ,glproto)
-        ;; The following are in the Requires.private field of gl.pc.
+      `(;; The following are in the Requires.private field of gl.pc.
         ("libdrm" ,libdrm)
         ("libvdpau" ,libvdpau)
         ("libx11" ,libx11)
         ("libxdamage" ,libxdamage)
         ("libxfixes" ,libxfixes)
         ("libxshmfence" ,libxshmfence)
-        ("libxxf86vm" ,libxxf86vm)))
+        ("libxxf86vm" ,libxxf86vm)
+        ("xorgproto" ,xorgproto)))
     (inputs
       `(("expat" ,expat)
         ("dri2proto" ,dri2proto)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index cf062fd253..fade6e8fea 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -935,8 +935,8 @@ the fonts protocol.")
     (description
      "OpenGL Extension defines a protocol for the client to send 3D
 rendering commands to the X server.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public iceauth
   (package