guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

12/27: gnu: Switch from damageproto to xorgproto.


From: Marius Bakke
Subject: 12/27: gnu: Switch from damageproto to xorgproto.
Date: Sat, 17 Mar 2018 19:21:08 -0400 (EDT)

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

commit be56161df16b7a6e72c88ff3a21177485fd93580
Author: Marius Bakke <address@hidden>
Date:   Sat Mar 10 13:51:26 2018 +0100

    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 63b045b..d895f56 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -297,8 +297,8 @@ the damage protocol.")
     (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 @@ cannot be adequately worked around on the client side of 
the wire.")
     (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 @@ over Xlib, including:
         ("xf86driproto" ,xf86driproto)
         ("xorgproto" ,xorgproto)))
     (inputs
-      `(("damageproto" ,damageproto)
-        ("udev" ,eudev)
+      `(("udev" ,eudev)
         ("dbus" ,dbus)
         ("libdmx" ,libdmx)
         ("libepoxy" ,libepoxy)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]