summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-03-10 14:17:20 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-03-18 00:19:56 +0100
commitec89471d8300fb3c9027f77e1d0afd263c790e15 (patch)
treed185518a30d75fd83cd0d96a6c2d7e635cf0f520
parent2bf1fa98f2d24bbc3fd6aa04a8451c7f2762ca9e (diff)
downloadpatches-ec89471d8300fb3c9027f77e1d0afd263c790e15.tar
patches-ec89471d8300fb3c9027f77e1d0afd263c790e15.tar.gz
gnu: Switch from recordproto to xorgproto.
* gnu/packages/xnee.scm (xnee)[inputs]: Remove RECORDPROTO. * gnu/packages/xorg.scm (recordproto)[properties]: Mark as superseded by XORGPROTO. (libxtst)[propagated-inputs]: Replace RECORDPROTO with XORGPROTO. [inputs]: Remove XORGPROTO. * gnu/packages/xorg.scm (xorg-server)[inputs]: Remove RECORDPROTO.
-rw-r--r--gnu/packages/xnee.scm1
-rw-r--r--gnu/packages/xorg.scm12
2 files changed, 5 insertions, 8 deletions
diff --git a/gnu/packages/xnee.scm b/gnu/packages/xnee.scm
index 025dc2185d..5cd20cbef1 100644
--- a/gnu/packages/xnee.scm
+++ b/gnu/packages/xnee.scm
@@ -44,7 +44,6 @@
("libxext" ,libxext)
("libxi" ,libxi)
("libxtst" ,libxtst)
- ("recordproto" ,recordproto)
("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index a1af127f72..d04c83146d 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1702,8 +1702,8 @@ window of a screen.")
(description
"Record Extension defines a protocol for the recording and playback
of user actions in the X Window System.")
- (license license:x11)))
-
+ (license license:x11)
+ (properties `((superseded . ,xorgproto)))))
(define-public renderproto
(package
@@ -4658,11 +4658,10 @@ cannot be adequately worked around on the client side of the wire.")
"012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"))))
(build-system gnu-build-system)
(propagated-inputs
- `(("recordproto" ,recordproto)
- ("libxi" ,libxi)))
+ `(("libxi" ,libxi)
+ ("xorgproto" ,xorgproto)))
(inputs
- `(("libx11" ,libx11)
- ("xorgproto" ,xorgproto)))
+ `(("libx11" ,libx11)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@@ -5117,7 +5116,6 @@ over Xlib, including:
("libxshmfence" ,libxshmfence)
("libxt" ,libxt)
("libxv" ,libxv)
- ("recordproto" ,recordproto)
("xf86bigfontproto" ,xf86bigfontproto)
("xf86dgaproto" ,xf86dgaproto)
("xf86vidmodeproto" ,xf86vidmodeproto)