From bea5239a3fe302f04874319a54db8b6a08996bf0 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sat, 10 Mar 2018 12:32:17 +0100
Subject: [PATCH] gnu: Switch from randrproto to xorgproto.

* gnu/packages/mate.scm (mate-control-center, mate-screensaver)[inputs]:
Remove RANDRPROTO.
* gnu/packages/xorg.scm (libxrandr, xorg-server)[inputs]: Likewise.
(randrproto)[properties]: Mark as superseded by XORGPROTO.
---
 gnu/packages/mate.scm | 2 --
 gnu/packages/xorg.scm | 5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 1faabd1330..d6ad022989 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -924,7 +924,6 @@ (define-public mate-control-center
        ("yelp-tools" ,yelp-tools)
        ("desktop-file-utils" ,desktop-file-utils)
        ("kbproto" ,kbproto)
-       ("randrproto" ,randrproto)
        ("renderproto" ,renderproto)
        ("scrnsaverproto" ,scrnsaverproto)
        ("xextpro" ,xextproto)
@@ -1197,7 +1196,6 @@ (define-public mate-screensaver
        ("kbproto" ,kbproto)
        ("mate-common" ,mate-common)
        ("pkg-config" ,pkg-config)
-       ("randrproto" ,randrproto)
        ("renderproto" ,renderproto)
        ("scrnsaverproto" ,scrnsaverproto)
        ("which" ,which)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 183e0587b8..5e480c23de 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1679,7 +1679,8 @@ (define-public randrproto
      "Resize and Rotate Extension defines a protocol for clients to
 dynamically change X screens, so as to resize, rotate and reflect the root
 window of a screen.")
-    (license license:x11)))
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 
 (define-public recordproto
@@ -4961,7 +4962,6 @@ (define-public libxrandr
       `(("libx11" ,libx11)
         ("libxext" ,libxext)
         ("libxrender" ,libxrender)
-        ("randrproto" ,randrproto)
         ("xorgproto" ,xorgproto)))
     (native-inputs
        `(("pkg-config" ,pkg-config)))
@@ -5113,7 +5113,6 @@ (define-public xorg-server
         ("mesa" ,mesa)
         ("pixman" ,pixman)
         ("presentproto" ,presentproto)
-        ("randrproto" ,randrproto)
         ("renderproto" ,renderproto)
         ("resourceproto" ,resourceproto)
         ("scrnsaverproto" ,scrnsaverproto)