nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Switch from renderproto to xorgproto. 

* gnu/packages/mate.scm (mate-control-center,
mate-screensaver)[native-inputs]: Remove RENDERPROTO.
* gnu/packages/xorg.scm (renderproto)[properties]: Mark as superseded by XORGPROTO.
(libxrender)[propagated-inputs]: Replace RENDERPROTO with XORGPROTO.
[inputs]: Remove XORGPROTO.
* gnu/packages/xorg.scm (xorg-server)[inputs]: Remove RENDERPROTO.
This commit is contained in:
Marius Bakke 2018-03-10 14:08:40 +01:00
parent 314144d212
commit f579a1d2fa
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 4 additions and 8 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 @@ icons on the MATE desktop. It works on local and remote file systems.")
("intltool" ,intltool) ("intltool" ,intltool)
("yelp-tools" ,yelp-tools) ("yelp-tools" ,yelp-tools)
("desktop-file-utils" ,desktop-file-utils) ("desktop-file-utils" ,desktop-file-utils)
("renderproto" ,renderproto)
("scrnsaverproto" ,scrnsaverproto) ("scrnsaverproto" ,scrnsaverproto)
("xorgproto" ,xorgproto) ("xorgproto" ,xorgproto)
("xmodmap" ,xmodmap) ("xmodmap" ,xmodmap)
@ -1193,7 +1192,6 @@ Re-decorates windows on un-maximise.
("intltool" ,intltool) ("intltool" ,intltool)
("mate-common" ,mate-common) ("mate-common" ,mate-common)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("renderproto" ,renderproto)
("scrnsaverproto" ,scrnsaverproto) ("scrnsaverproto" ,scrnsaverproto)
("which" ,which) ("which" ,which)
("xorgproto" ,xorgproto))) ("xorgproto" ,xorgproto)))

10
gnu/packages/xorg.scm
View File

@ -1727,8 +1727,8 @@ of user actions in the X Window System.")
(description (description
"Rendering Extension defines a protcol for a digital image composition "Rendering Extension defines a protcol for a digital image composition
as the foundation of a new rendering model within the X Window System.") as the foundation of a new rendering model within the X Window System.")
(license license:x11))) (license license:x11)
(properties `((superseded . ,xorgproto)))))
(define-public resourceproto (define-public resourceproto
(package (package
@ -4633,10 +4633,9 @@ cannot be adequately worked around on the client side of the wire.")
"0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0")))) "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("renderproto" ,renderproto))) `(("xorgproto" ,xorgproto)))
(inputs (inputs
`(("xorgproto" ,xorgproto) `(("libx11" ,libx11)))
("libx11" ,libx11)))
(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/")
@ -5098,7 +5097,6 @@ over Xlib, including:
`(("libpciaccess" ,libpciaccess) `(("libpciaccess" ,libpciaccess)
("mesa" ,mesa) ("mesa" ,mesa)
("pixman" ,pixman) ("pixman" ,pixman)
("renderproto" ,renderproto)
("resourceproto" ,resourceproto) ("resourceproto" ,resourceproto)
("scrnsaverproto" ,scrnsaverproto) ("scrnsaverproto" ,scrnsaverproto)
("xineramaproto" ,xineramaproto) ("xineramaproto" ,xineramaproto)