nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Marius Bakke 2018-03-10 13:10:59 +01:00
parent 3bad0d842e
commit 2d03009860
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/mate.scm
View File

@ -923,7 +923,6 @@ icons on the MATE desktop. It works on local and remote file systems.")
("intltool" ,intltool) ("intltool" ,intltool)
("yelp-tools" ,yelp-tools) ("yelp-tools" ,yelp-tools)
("desktop-file-utils" ,desktop-file-utils) ("desktop-file-utils" ,desktop-file-utils)
("kbproto" ,kbproto)
("renderproto" ,renderproto) ("renderproto" ,renderproto)
("scrnsaverproto" ,scrnsaverproto) ("scrnsaverproto" ,scrnsaverproto)
("xorgproto" ,xorgproto) ("xorgproto" ,xorgproto)
@ -1192,7 +1191,6 @@ Re-decorates windows on un-maximise.
("autoconf" ,autoconf-wrapper) ("autoconf" ,autoconf-wrapper)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("intltool" ,intltool) ("intltool" ,intltool)
("kbproto" ,kbproto)
("mate-common" ,mate-common) ("mate-common" ,mate-common)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("renderproto" ,renderproto) ("renderproto" ,renderproto)

8
gnu/packages/xorg.scm
View File

@ -1012,8 +1012,8 @@ devices management such as graphic tablets.")
(description (description
"X Keyboard (XKB) Extension defines a protocol to provide a number "X Keyboard (XKB) Extension defines a protocol to provide a number
of new capabilities and controls for text keyboards.") of new capabilities and controls for text keyboards.")
(license license:x11))) (license license:x11)
(properties `((superseded . ,xorgproto)))))
;; requires applewmproto, which compiles only on macos ;; requires applewmproto, which compiles only on macos
;; (define-public libapplewm ;; (define-public libapplewm
@ -5106,7 +5106,6 @@ over Xlib, including:
("dri3proto" ,dri3proto) ("dri3proto" ,dri3proto)
("fontsproto" ,fontsproto) ("fontsproto" ,fontsproto)
("inputproto" ,inputproto) ("inputproto" ,inputproto)
("kbproto" ,kbproto)
("libpciaccess" ,libpciaccess) ("libpciaccess" ,libpciaccess)
("mesa" ,mesa) ("mesa" ,mesa)
("pixman" ,pixman) ("pixman" ,pixman)
@ -5282,11 +5281,10 @@ draggable titlebars and borders.")
(assoc-ref %outputs "doc") (assoc-ref %outputs "doc")
"/share/man")))) "/share/man"))))
(propagated-inputs (propagated-inputs
`(("kbproto" ,kbproto) `(("xorgproto" ,xorgproto)
("libxcb" ,libxcb))) ("libxcb" ,libxcb)))
(inputs (inputs
`(("inputproto" ,inputproto) `(("inputproto" ,inputproto)
("xorgproto" ,xorgproto)
("xtrans" ,xtrans))) ("xtrans" ,xtrans)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))