gnu: Switch from scrnsaverproto to xorgproto.

* gnu/packages/enlightenment.scm (efl)[inputs]: Remove SCRNSAVERPROTO.
* gnu/packages/mate.scm (mate-control-center,
mate-screensaver)[native-inputs]: Remove SCRNSAVERPROTO.
* gnu/packages/xorg.scm (libxscrnsaver)[propagated-inputs]: Change from
SCRNSAVERPROTO to XORGPROTO.
(scrnsaverproto)[properties]: Mark as superseded by XORGPROTO.
(xorg-server)[propagated-inputs]: Remove SCRNSAVERPROTO.
This commit is contained in:
Marius Bakke 2018-03-10 14:20:25 +01:00
parent ec89471d83
commit e399d6cae3
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
3 changed files with 3 additions and 7 deletions

View file

@ -107,7 +107,6 @@ (define-public efl
("openjpeg" ,openjpeg-1) ("openjpeg" ,openjpeg-1)
("poppler" ,poppler) ("poppler" ,poppler)
("printproto" ,printproto) ("printproto" ,printproto)
("scrnsaverproto" ,scrnsaverproto)
("wayland-protocols" ,wayland-protocols) ("wayland-protocols" ,wayland-protocols)
("xinput" ,xinput) ("xinput" ,xinput)
("xpr" ,xpr) ("xpr" ,xpr)

View file

@ -923,7 +923,6 @@ (define-public mate-control-center
("intltool" ,intltool) ("intltool" ,intltool)
("yelp-tools" ,yelp-tools) ("yelp-tools" ,yelp-tools)
("desktop-file-utils" ,desktop-file-utils) ("desktop-file-utils" ,desktop-file-utils)
("scrnsaverproto" ,scrnsaverproto)
("xorgproto" ,xorgproto) ("xorgproto" ,xorgproto)
("xmodmap" ,xmodmap) ("xmodmap" ,xmodmap)
("gobject-introspection" ,gobject-introspection))) ("gobject-introspection" ,gobject-introspection)))
@ -1192,7 +1191,6 @@ (define-public mate-screensaver
("intltool" ,intltool) ("intltool" ,intltool)
("mate-common" ,mate-common) ("mate-common" ,mate-common)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("scrnsaverproto" ,scrnsaverproto)
("which" ,which) ("which" ,which)
("xorgproto" ,xorgproto))) ("xorgproto" ,xorgproto)))
(inputs (inputs

View file

@ -1481,7 +1481,7 @@ (define-public libxscrnsaver
`(("libxext" ,libxext) `(("libxext" ,libxext)
("libx11" ,libx11))) ("libx11" ,libx11)))
(propagated-inputs (propagated-inputs
`(("scrnsaverproto" ,scrnsaverproto))) `(("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/")
@ -1774,8 +1774,8 @@ (define-public scrnsaverproto
(description (description
"Screen Saver Extension defines a protocol to control screensaver "Screen Saver Extension defines a protocol to control screensaver
features and to query screensaver info on specific windows.") features and to query screensaver info on specific windows.")
(license license:x11))) (license license:x11)
(properties `((superseded . ,xorgproto)))))
(define-public sessreg (define-public sessreg
(package (package
@ -5095,7 +5095,6 @@ (define-public xorg-server
`(("libpciaccess" ,libpciaccess) `(("libpciaccess" ,libpciaccess)
("mesa" ,mesa) ("mesa" ,mesa)
("pixman" ,pixman) ("pixman" ,pixman)
("scrnsaverproto" ,scrnsaverproto)
("xineramaproto" ,xineramaproto) ("xineramaproto" ,xineramaproto)
("xf86driproto" ,xf86driproto) ("xf86driproto" ,xf86driproto)
("xorgproto" ,xorgproto))) ("xorgproto" ,xorgproto)))