[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/27: gnu: Switch from kbproto to xorgproto.
From: |
Marius Bakke |
Subject: |
07/27: gnu: Switch from kbproto to xorgproto. |
Date: |
Sat, 17 Mar 2018 19:21:07 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 2d03009860cbe003431ce561aed7b74b89b1014f
Author: Marius Bakke <address@hidden>
Date: Sat Mar 10 13:10:59 2018 +0100
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.
---
gnu/packages/mate.scm | 2 --
gnu/packages/xorg.scm | 8 +++-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index d39711b..8c3ea16 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 bd84fec..82817f7 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)))
- branch core-updates updated (6449e68 -> ba57d60), Marius Bakke, 2018/03/17
- 02/27: gnu: Switch from randrproto to xorgproto., Marius Bakke, 2018/03/17
- 05/27: gnu: Switch from fixesproto to xorgproto., Marius Bakke, 2018/03/17
- 04/27: gnu: Switch from xextproto to xorgproto., Marius Bakke, 2018/03/17
- 12/27: gnu: Switch from damageproto to xorgproto., Marius Bakke, 2018/03/17
- 03/27: gnu: Switch from bigreqsproto to xorgproto., Marius Bakke, 2018/03/17
- 07/27: gnu: Switch from kbproto to xorgproto.,
Marius Bakke <=
- 11/27: gnu: Switch from dmxproto to xorgproto., Marius Bakke, 2018/03/17
- 08/27: gnu: Switch from inputproto to xorgproto., Marius Bakke, 2018/03/17
- 25/27: gnu: Switch from xf86bigfontproto to xorgproto., Marius Bakke, 2018/03/17
- 06/27: gnu: Switch from compositeproto to xorgproto., Marius Bakke, 2018/03/17
- 09/27: gnu: Switch from fontsproto to xorgproto., Marius Bakke, 2018/03/17
- 13/27: gnu: Switch from dri2proto to xorgproto., Marius Bakke, 2018/03/17
- 24/27: gnu: Switch from xf86dgaproto to xorgproto., Marius Bakke, 2018/03/17
- 14/27: gnu: Switch from dri3proto to xorgproto., Marius Bakke, 2018/03/17
- 15/27: gnu: Switch from videoproto to xorgproto., Marius Bakke, 2018/03/17
- 17/27: gnu: Switch from xcmiscproto to xorgproto., Marius Bakke, 2018/03/17