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 compositeproto to xorgproto.

Browse source 
* 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.
This commit is contained in:
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/packages/enlightenment.scm
View file

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

10
gnu/packages/xorg.scm
View file

@ -273,8 +273,8 @@ (define-public compositeproto
(description (description
"Composite Extension contains header files and documentation for "Composite Extension contains header files and documentation for
the damage protocol.") the damage protocol.")
(license license:x11))) (license license:x11)
(properties `((superseded . ,xorgproto)))))
(define-public damageproto (define-public damageproto
(package (package
@ -1281,8 +1281,7 @@ (define-public libxcomposite
;; xcomposite.pc refers to all these. ;; xcomposite.pc refers to all these.
`(("xorgproto" ,xorgproto) `(("xorgproto" ,xorgproto)
("libxfixes" ,libxfixes) ("libxfixes" ,libxfixes)
("libx11" ,libx11) ("libx11" ,libx11)))
("compositeproto" ,compositeproto)))
(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/")
@ -5120,8 +5119,7 @@ (define-public xorg-server
("xf86driproto" ,xf86driproto) ("xf86driproto" ,xf86driproto)
("xorgproto" ,xorgproto))) ("xorgproto" ,xorgproto)))
(inputs (inputs
`(("compositeproto" ,compositeproto) `(("damageproto" ,damageproto)
("damageproto" ,damageproto)
("udev" ,eudev) ("udev" ,eudev)
("dbus" ,dbus) ("dbus" ,dbus)
("dmxproto" ,dmxproto) ("dmxproto" ,dmxproto)