20/27: gnu: Switch from resourceproto to xorgproto.

[Marius Bakke]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 2bf1fa98f2d24bbc3fd6aa04a8451c7f2762ca9e
Author: Marius Bakke <address@hidden>
Date:   Sat Mar 10 14:15:06 2018 +0100

    gnu: Switch from resourceproto to xorgproto.
    
    * gnu/packages/xorg.scm (libxres)[inputs]: Remove RESOURCEPROTO.
    (resourceproto)[properties]: Mark as superseded by XORGPROTO.
    (xorg-server)[propagated-inputs]: Remove RESOURCEPROTO.
---
 gnu/packages/xorg.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 17f22b9..a1af127 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1453,8 +1453,7 @@ treat it as part of their software base when porting.")
     (inputs
       `(("xorgproto" ,xorgproto)
         ("libxext" ,libxext)
-        ("libx11" ,libx11)
-        ("resourceproto" ,resourceproto)))
+        ("libx11" ,libx11)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/";)
@@ -1751,8 +1750,8 @@ as the foundation of a new rendering model within the X 
Window System.")
     (description
      "Resource Extension defines a protocol that allows a client to
 query the X server about its usage of various resources.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public scrnsaverproto
   (package
@@ -5097,7 +5096,6 @@ over Xlib, including:
       `(("libpciaccess" ,libpciaccess)
         ("mesa" ,mesa)
         ("pixman" ,pixman)
-        ("resourceproto" ,resourceproto)
         ("scrnsaverproto" ,scrnsaverproto)
         ("xineramaproto" ,xineramaproto)
         ("xf86driproto" ,xf86driproto)