gnu: Switch from compositeproto to xorgproto.

* gnu/packages/xorg.scm (compositeproto)[properties]: Mark as superseded by
XORGPROTO.
(libxcomposite)[propagated-inputs]: Remove COMPOSITEPROTO.
(xorg-server)[inputs]: Likewise.
* gnu/packages/enlightenment.scm (efl)[inputs]: Likewise.
master
Marius Bakke 2018-03-10 13:01:29 +01:00
parent 89ad4fc6b3
commit 3bad0d842e
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 4 additions and 7 deletions

View File

@ -76,7 +76,6 @@
`(("pkg-config" ,pkg-config)))
(inputs
`(("alsa-lib" ,alsa-lib)
("compositeproto" ,compositeproto)
("curl" ,curl)
("ghostscript" ,ghostscript)
("giflib" ,giflib)

View File

@ -273,8 +273,8 @@ requests that exceed 262140 bytes in length.")
(description
"Composite Extension contains header files and documentation for
the damage protocol.")
(license license:x11)))
(license license:x11)
(properties `((superseded . ,xorgproto)))))
(define-public damageproto
(package
@ -1281,8 +1281,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.")
;; xcomposite.pc refers to all these.
`(("xorgproto" ,xorgproto)
("libxfixes" ,libxfixes)
("libx11" ,libx11)
("compositeproto" ,compositeproto)))
("libx11" ,libx11)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@ -5120,8 +5119,7 @@ over Xlib, including:
("xf86driproto" ,xf86driproto)
("xorgproto" ,xorgproto)))
(inputs
`(("compositeproto" ,compositeproto)
("damageproto" ,damageproto)
`(("damageproto" ,damageproto)
("udev" ,eudev)
("dbus" ,dbus)
("dmxproto" ,dmxproto)