gnu: Switch from xextproto to xorgproto.

* gnu/packages/enlightenment.scm (efl)[inputs]: Remove XEXTPROTO.
* gnu/packages/mate.scm (mate-control-center, mate-screensaver,
mate-utils)[native-inputs]: Likewise.
* gnu/packages/xdisorg.scm (xautomation)[inputs]: Likewise.
* gnu/packages/gtk.scm (cairo)[inputs]: Replace XEXTPROTO with XORGPROTO.
* gnu/packages/ratpoison.scm (ratpoison)[inputs]: Likewise.
* gnu/packages/xnee.scm (xnee)[inputs]: Likewise.
* gnu/packages/xorg.scm (libdmx, libwindowswm, fixesproto, libxext,
libx11)[inputs]: Likewise.
(xorg-server): [inputs]: Remove XEXTPROTO.
(libxext)[properties]: Mark as superseded by XORGPROTO.
This commit is contained in:
Marius Bakke 2018-03-10 12:49:27 +01:00
parent 727f076fcd
commit caf90259fc
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
7 changed files with 9 additions and 16 deletions

View File

@ -110,7 +110,6 @@
("printproto" ,printproto) ("printproto" ,printproto)
("scrnsaverproto" ,scrnsaverproto) ("scrnsaverproto" ,scrnsaverproto)
("wayland-protocols" ,wayland-protocols) ("wayland-protocols" ,wayland-protocols)
("xextproto" ,xextproto)
("xinput" ,xinput) ("xinput" ,xinput)
("xpr" ,xpr) ("xpr" ,xpr)
("xorgproto" ,xorgproto))) ("xorgproto" ,xorgproto)))

View File

@ -133,7 +133,7 @@ tools have full access to view and control running applications.")
`(("ghostscript" ,ghostscript) `(("ghostscript" ,ghostscript)
("libspectre" ,libspectre) ("libspectre" ,libspectre)
("poppler" ,poppler) ("poppler" ,poppler)
("xextproto" ,xextproto) ("xorgproto" ,xorgproto)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)

View File

@ -926,7 +926,6 @@ icons on the MATE desktop. It works on local and remote file systems.")
("kbproto" ,kbproto) ("kbproto" ,kbproto)
("renderproto" ,renderproto) ("renderproto" ,renderproto)
("scrnsaverproto" ,scrnsaverproto) ("scrnsaverproto" ,scrnsaverproto)
("xextpro" ,xextproto)
("xorgproto" ,xorgproto) ("xorgproto" ,xorgproto)
("xmodmap" ,xmodmap) ("xmodmap" ,xmodmap)
("gobject-introspection" ,gobject-introspection))) ("gobject-introspection" ,gobject-introspection)))
@ -1199,7 +1198,6 @@ Re-decorates windows on un-maximise.
("renderproto" ,renderproto) ("renderproto" ,renderproto)
("scrnsaverproto" ,scrnsaverproto) ("scrnsaverproto" ,scrnsaverproto)
("which" ,which) ("which" ,which)
("xextpro" ,xextproto)
("xorgproto" ,xorgproto))) ("xorgproto" ,xorgproto)))
(inputs (inputs
`(("cairo" ,cairo) `(("cairo" ,cairo)
@ -1254,7 +1252,6 @@ can be used as backgrounds in the MATE Desktop environment.")
("libsm" ,libsm) ("libsm" ,libsm)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("scrollkeeper" ,scrollkeeper) ("scrollkeeper" ,scrollkeeper)
("xextpro" ,xextproto)
("xorgproto" ,xorgproto) ("xorgproto" ,xorgproto)
("yelp-tools" ,yelp-tools))) ("yelp-tools" ,yelp-tools)))
(inputs (inputs

View File

@ -77,7 +77,7 @@
("libXtst" ,libxtst) ("libXtst" ,libxtst)
("libX11" ,libx11) ("libX11" ,libx11)
("readline" ,readline) ("readline" ,readline)
("xextproto" ,xextproto))) ("xorgproto" ,xorgproto)))
(native-inputs (native-inputs
`(("perl",perl) `(("perl",perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)

View File

@ -625,7 +625,6 @@ things less distracting.")
("libxtst" ,libxtst))) ("libxtst" ,libxtst)))
(native-inputs (native-inputs
`(("inputproto" ,inputproto) `(("inputproto" ,inputproto)
("xextproto" ,xextproto)
("xorgproto" ,xorgproto))) ("xorgproto" ,xorgproto)))
(synopsis "Tools to automate tasks in X such as detecting on screen images") (synopsis "Tools to automate tasks in X such as detecting on screen images")
(description (description

View File

@ -46,7 +46,6 @@
("libxi" ,libxi) ("libxi" ,libxi)
("libxtst" ,libxtst) ("libxtst" ,libxtst)
("recordproto" ,recordproto) ("recordproto" ,recordproto)
("xextproto" ,xextproto)
("xorgproto" ,xorgproto))) ("xorgproto" ,xorgproto)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

View File

@ -1035,7 +1035,7 @@ of new capabilities and controls for text keyboards.")
"00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9")))) "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("xextproto" ,xextproto) `(("xorgproto" ,xorgproto)
("libxext" ,libxext) ("libxext" ,libxext)
("libx11" ,libx11) ("libx11" ,libx11)
("dmxproto" ,dmxproto))) ("dmxproto" ,dmxproto)))
@ -1246,7 +1246,7 @@ hit when running single-threaded.")
"1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15")))) "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("xextproto" ,xextproto) `(("xorgproto" ,xorgproto)
("libxext" ,libxext) ("libxext" ,libxext)
("libx11" ,libx11) ("libx11" ,libx11)
("windowswmproto" ,windowswmproto))) ("windowswmproto" ,windowswmproto)))
@ -2381,8 +2381,8 @@ usage.")
Extended-Visual-Information, Generic Event Extension, LBX, MIT-SHM, Extended-Visual-Information, Generic Event Extension, LBX, MIT-SHM,
MIT-SUNDRY-NONSTANDARD, Multi-Buffering, SECURITY, SHAPE, SYNC, TOG-CUP, MIT-SUNDRY-NONSTANDARD, Multi-Buffering, SECURITY, SHAPE, SYNC, TOG-CUP,
XC-APPGROUP, XTEST.") XC-APPGROUP, XTEST.")
(license license:x11))) (license license:x11)
(properties `((superseded . ,xorgproto)))))
(define-public libevdev (define-public libevdev
(package (package
@ -4495,7 +4495,7 @@ formatted dump file, such as produced by xwd.")
"1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs")))) "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("xextproto" ,xextproto))) `(("xorgproto" ,xorgproto)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/") (home-page "https://www.x.org/wiki/")
@ -4552,7 +4552,7 @@ cannot be adequately worked around on the client side of the wire.")
"0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m")))) "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("xextproto" ,xextproto))) `(("xorgproto" ,xorgproto)))
(inputs (inputs
`(("libxau" ,libxau) `(("libxau" ,libxau)
("libx11" ,libx11))) ("libx11" ,libx11)))
@ -5117,7 +5117,6 @@ over Xlib, including:
("resourceproto" ,resourceproto) ("resourceproto" ,resourceproto)
("scrnsaverproto" ,scrnsaverproto) ("scrnsaverproto" ,scrnsaverproto)
("videoproto" ,videoproto) ("videoproto" ,videoproto)
("xextproto" ,xextproto)
("xineramaproto" ,xineramaproto) ("xineramaproto" ,xineramaproto)
("xf86driproto" ,xf86driproto) ("xf86driproto" ,xf86driproto)
("xorgproto" ,xorgproto))) ("xorgproto" ,xorgproto)))
@ -5290,7 +5289,7 @@ draggable titlebars and borders.")
("libxcb" ,libxcb))) ("libxcb" ,libxcb)))
(inputs (inputs
`(("inputproto" ,inputproto) `(("inputproto" ,inputproto)
("xextproto" ,xextproto) ("xorgproto" ,xorgproto)
("xtrans" ,xtrans))) ("xtrans" ,xtrans)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))