From be56161df16b7a6e72c88ff3a21177485fd93580 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sat, 10 Mar 2018 13:51:26 +0100
Subject: [PATCH] gnu: Switch from damageproto to xorgproto.

* gnu/packages/xorg.scm (damageproto)[properties]: Mark as superseded by XORGPROTO.
(libxdamage)[propagated-inputs]: Remove DAMAGEPROTO.
(xorg-server)[inputs]: Likewise.
---
 gnu/packages/xorg.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 63b045bc6a..d895f56387 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -297,8 +297,8 @@ (define-public damageproto
     (description
      "Damage Extension contains header files and documentation for
 the damage protocol.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public dmxproto
   (package
@@ -4519,8 +4519,7 @@ (define-public libxdamage
     (build-system gnu-build-system)
     (propagated-inputs
       ;; These are all in the Requires or Requires.private field of xdamage.pc
-      `(("damageproto" ,damageproto)
-        ("libxfixes" ,libxfixes)
+      `(("libxfixes" ,libxfixes)
         ("xorgproto" ,xorgproto)
         ("libx11" ,libx11)))
     (native-inputs
@@ -5109,8 +5108,7 @@ (define-public xorg-server
         ("xf86driproto" ,xf86driproto)
         ("xorgproto" ,xorgproto)))
     (inputs
-      `(("damageproto" ,damageproto)
-        ("udev" ,eudev)
+      `(("udev" ,eudev)
         ("dbus" ,dbus)
         ("libdmx" ,libdmx)
         ("libepoxy" ,libepoxy)