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

gnu: Switch from fontsproto to xorgproto. 

* gnu/packages/xorg.scm (fontsproto)[properties]: Mark as superseded by XORGPROTO.
(libfs, xf86-video-qxl)[inputs]: Remove FONTSPROTO.
(libxfont, xorg-server)[propagated-inputs]: Likewise.
This commit is contained in:
Marius Bakke 2018-03-10 13:43:06 +01:00
parent 82b4d9ec8c
commit b4d7aef536
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/xorg.scm
View File

@ -911,8 +911,8 @@ For example: '6x10', '9x15bold', etc.")
(description (description
"Fonts Extension contains header files and documentation for "Fonts Extension contains header files and documentation for
the fonts protocol.") the fonts protocol.")
(license license:x11))) (license license:x11)
(properties `((superseded . ,xorgproto)))))
(define-public glproto (define-public glproto
(package (package
@ -1116,8 +1116,7 @@ synchronization between the X server and direct-rendering clients.")
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("xtrans" ,xtrans) `(("xtrans" ,xtrans)
("xorgproto" ,xorgproto) ("xorgproto" ,xorgproto)))
("fontsproto" ,fontsproto)))
(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/")
@ -3158,8 +3157,7 @@ UniChrome Pro and Chrome9 integrated graphics processors.")
"14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi")))) "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("fontsproto" ,fontsproto) `(("libxfont" ,libxfont2)
("libxfont" ,libxfont2)
("spice-protocol" ,spice-protocol) ("spice-protocol" ,spice-protocol)
("xf86dgaproto" ,xf86dgaproto) ("xf86dgaproto" ,xf86dgaproto)
("xorg-server" ,xorg-server) ("xorg-server" ,xorg-server)
@ -4878,8 +4876,7 @@ an X Window System display.")
"0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs")))) "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("fontsproto" ,fontsproto) `(("freetype" ,freetype)
("freetype" ,freetype)
("libfontenc" ,libfontenc) ("libfontenc" ,libfontenc)
("xorgproto" ,xorgproto))) ("xorgproto" ,xorgproto)))
(inputs (inputs
@ -5101,7 +5098,6 @@ over Xlib, including:
(propagated-inputs (propagated-inputs
`(("dri2proto" ,dri2proto) `(("dri2proto" ,dri2proto)
("dri3proto" ,dri3proto) ("dri3proto" ,dri3proto)
("fontsproto" ,fontsproto)
("libpciaccess" ,libpciaccess) ("libpciaccess" ,libpciaccess)
("mesa" ,mesa) ("mesa" ,mesa)
("pixman" ,pixman) ("pixman" ,pixman)