summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-03-10 13:10:59 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-03-18 00:19:55 +0100
commit2d03009860cbe003431ce561aed7b74b89b1014f (patch)
tree79657c0083d4c8eb51c692b84e34db732c0c1512
parent3bad0d842e0ccd7c85da6b67e08ddde720e5fd94 (diff)
downloadpatches-2d03009860cbe003431ce561aed7b74b89b1014f.tar
patches-2d03009860cbe003431ce561aed7b74b89b1014f.tar.gz
gnu: Switch from kbproto to xorgproto.
* gnu/packages/mate.scm (mate-control-center, mate-screensaver)[inputs]: Remove KBPROTO. * gnu/packages/xorg.scm (kbproto)[properties]: Mark as superseded by XORGPROTO. (xorg-server)[inputs]: Remove KBPROTO. (libx11)[propated-inputs]: Replace KBPROTO with XORGPROTO. [inputs]: Remove XORGPROTO.
-rw-r--r--gnu/packages/mate.scm2
-rw-r--r--gnu/packages/xorg.scm8
2 files changed, 3 insertions, 7 deletions
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index d39711b6db..8c3ea160df 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -923,7 +923,6 @@ icons on the MATE desktop. It works on local and remote file systems.")
("intltool" ,intltool)
("yelp-tools" ,yelp-tools)
("desktop-file-utils" ,desktop-file-utils)
- ("kbproto" ,kbproto)
("renderproto" ,renderproto)
("scrnsaverproto" ,scrnsaverproto)
("xorgproto" ,xorgproto)
@@ -1192,7 +1191,6 @@ Re-decorates windows on un-maximise.
("autoconf" ,autoconf-wrapper)
("gettext" ,gettext-minimal)
("intltool" ,intltool)
- ("kbproto" ,kbproto)
("mate-common" ,mate-common)
("pkg-config" ,pkg-config)
("renderproto" ,renderproto)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index bd84fecc0e..82817f7a59 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1012,8 +1012,8 @@ devices management such as graphic tablets.")
(description
"X Keyboard (XKB) Extension defines a protocol to provide a number
of new capabilities and controls for text keyboards.")
- (license license:x11)))
-
+ (license license:x11)
+ (properties `((superseded . ,xorgproto)))))
;; requires applewmproto, which compiles only on macos
;; (define-public libapplewm
@@ -5106,7 +5106,6 @@ over Xlib, including:
("dri3proto" ,dri3proto)
("fontsproto" ,fontsproto)
("inputproto" ,inputproto)
- ("kbproto" ,kbproto)
("libpciaccess" ,libpciaccess)
("mesa" ,mesa)
("pixman" ,pixman)
@@ -5282,11 +5281,10 @@ draggable titlebars and borders.")
(assoc-ref %outputs "doc")
"/share/man"))))
(propagated-inputs
- `(("kbproto" ,kbproto)
+ `(("xorgproto" ,xorgproto)
("libxcb" ,libxcb)))
(inputs
`(("inputproto" ,inputproto)
- ("xorgproto" ,xorgproto)
("xtrans" ,xtrans)))
(native-inputs
`(("pkg-config" ,pkg-config)))