gnu: Switch from inputproto to xorgproto.
* gnu/packages/gl.scm (freeglut)[inputs]: Replace INPUTPROTO with XORGPROTO. * gnu/packages/ratpoison.scm (ratpoison)[inputs]: Remove INPUTPROTO. * gnu/packages/xdisorg.scm (xautomation)[native-inputs]: Likewise. * gnu/packages/xnee.scm (xnee)[inputs]: Likewise. * gnu/packages/xorg.scm (inputproto)[properties]: Mark as superseded by XORGPROTO. (xdpyinfo, xinput, libxtst)[inputs]: Replace INPUTPROTO with XORGPROTO. (libxi, xorg-server)[propagated-inputs]: Remove INPUTPROTO. (xkbutils, libx11)[inputs]: Likewise.
This commit is contained in:
parent
2d03009860
commit
82b4d9ec8c
|
@ -105,7 +105,7 @@ (define-public freeglut
|
|||
("libxi" ,libxi)
|
||||
("libxrandr" ,libxrandr)
|
||||
("libxxf86vm" ,libxxf86vm)
|
||||
("inputproto" ,inputproto)
|
||||
("xorgproto" ,xorgproto)
|
||||
("xinput" ,xinput)))
|
||||
(propagated-inputs
|
||||
;; Headers from Mesa and GLU are needed.
|
||||
|
|
|
@ -66,8 +66,7 @@ (define-public ratpoison
|
|||
(copy-file (assoc-ref inputs rpd)
|
||||
(string-append dst rpd))))))))
|
||||
(inputs
|
||||
`(("inputproto" ,inputproto)
|
||||
("fontconfig" ,fontconfig)
|
||||
`(("fontconfig" ,fontconfig)
|
||||
("freetype" ,freetype)
|
||||
("libXft" ,libxft)
|
||||
("libXi" ,libxi)
|
||||
|
|
|
@ -624,8 +624,7 @@ (define-public xautomation
|
|||
("libxi" ,libxi)
|
||||
("libxtst" ,libxtst)))
|
||||
(native-inputs
|
||||
`(("inputproto" ,inputproto)
|
||||
("xorgproto" ,xorgproto)))
|
||||
`(("xorgproto" ,xorgproto)))
|
||||
(synopsis "Tools to automate tasks in X such as detecting on screen images")
|
||||
(description
|
||||
"Xautomation can control X from the command line for scripts, and
|
||||
|
|
|
@ -40,7 +40,6 @@ (define-public xnee
|
|||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("gtk+" ,gtk+-2)
|
||||
("inputproto" ,inputproto)
|
||||
("libx11" ,libx11)
|
||||
("libxext" ,libxext)
|
||||
("libxi" ,libxi)
|
||||
|
|
|
@ -988,8 +988,8 @@ (define-public inputproto
|
|||
(description
|
||||
"Input Extension defines a protocol to provide additional input
|
||||
devices management such as graphic tablets.")
|
||||
(license license:x11)))
|
||||
|
||||
(license license:x11)
|
||||
(properties `((superseded . ,xorgproto)))))
|
||||
|
||||
(define-public kbproto
|
||||
(package
|
||||
|
@ -2271,7 +2271,7 @@ (define-public xdpyinfo
|
|||
"0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("inputproto" ,inputproto)
|
||||
`(("xorgproto" ,xorgproto)
|
||||
("libx11" ,libx11)
|
||||
("libxxf86vm" ,libxxf86vm)
|
||||
("libxxf86dga" ,libxxf86dga)
|
||||
|
@ -3707,7 +3707,7 @@ (define-public xinput
|
|||
("libxext" ,libxext)
|
||||
("libxi" ,libxi)
|
||||
("libx11" ,libx11)
|
||||
("inputproto" ,inputproto)))
|
||||
("xorgproto" ,xorgproto)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(home-page "https://www.x.org/wiki/")
|
||||
|
@ -3812,9 +3812,8 @@ (define-public xkbutils
|
|||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libxt" ,libxt)
|
||||
("xorgproto" ,xorgproto)
|
||||
("libxaw" ,libxaw)
|
||||
("inputproto" ,inputproto)))
|
||||
("xorgproto" ,xorgproto)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(home-page "https://www.x.org/wiki/")
|
||||
|
@ -4667,7 +4666,7 @@ (define-public libxtst
|
|||
("libxi" ,libxi)))
|
||||
(inputs
|
||||
`(("libx11" ,libx11)
|
||||
("inputproto" ,inputproto)))
|
||||
("xorgproto" ,xorgproto)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(home-page "https://www.x.org/wiki/")
|
||||
|
@ -4927,12 +4926,10 @@ (define-public libxi
|
|||
"0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
`(("inputproto" ,inputproto)
|
||||
`(("xorgproto" ,xorgproto)
|
||||
("libx11" ,libx11)
|
||||
("libxext" ,libxext)
|
||||
("libxfixes" ,libxfixes)))
|
||||
(inputs
|
||||
`(("xorgproto" ,xorgproto)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(home-page "https://www.x.org/wiki/")
|
||||
|
@ -5105,7 +5102,6 @@ (define-public xorg-server
|
|||
`(("dri2proto" ,dri2proto)
|
||||
("dri3proto" ,dri3proto)
|
||||
("fontsproto" ,fontsproto)
|
||||
("inputproto" ,inputproto)
|
||||
("libpciaccess" ,libpciaccess)
|
||||
("mesa" ,mesa)
|
||||
("pixman" ,pixman)
|
||||
|
@ -5284,8 +5280,7 @@ (define-public libx11
|
|||
`(("xorgproto" ,xorgproto)
|
||||
("libxcb" ,libxcb)))
|
||||
(inputs
|
||||
`(("inputproto" ,inputproto)
|
||||
("xtrans" ,xtrans)))
|
||||
`(("xtrans" ,xtrans)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(home-page "https://www.x.org/wiki/")
|
||||
|
|
Loading…
Reference in a new issue