ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 06:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Switch from kbproto to xorgproto.

Browse source 
* 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 @@ (define-public mate-control-center
("intltool" ,intltool)
("yelp-tools" ,yelp-tools)
("desktop-file-utils" ,desktop-file-utils)
("kbproto" ,kbproto)
("renderproto" ,renderproto)
("scrnsaverproto" ,scrnsaverproto)
("xorgproto" ,xorgproto)
@ -1192,7 +1191,6 @@ (define-public mate-screensaver
("autoconf" ,autoconf-wrapper)
("gettext" ,gettext-minimal)
("intltool" ,intltool)
("kbproto" ,kbproto)
("mate-common" ,mate-common)
("pkg-config" ,pkg-config)
("renderproto" ,renderproto)

8
gnu/packages/xorg.scm
View file

@ -1012,8 +1012,8 @@ (define-public kbproto
(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 @@ (define-public xorg-server
("dri3proto" ,dri3proto)
("fontsproto" ,fontsproto)
("inputproto" ,inputproto)
("kbproto" ,kbproto)
("libpciaccess" ,libpciaccess)
("mesa" ,mesa)
("pixman" ,pixman)
@ -5282,11 +5281,10 @@ (define-public libx11
(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)))