gnu: Switch from xproto to xorgproto.

* gnu/packages/compton.scm (compton)[inputs]: Replace XPROTO with XORGPROTO.
* gnu/packages/enlightenment.scm (efl)[inputs]: Likewise.
* gnu/packages/gnome.scm (totem)[inputs]: Likewise.
* gnu/packages/haskell.scm (ghc-x11-xft)[inputs]: Likewise.
* gnu/packages/image-processing.scm (vtk)[inputs]: Likewise.
* gnu/packages/mate.scm (mate-control-center, mate-netbook, mate-screensaver,
mate-utils)[native-inputs]: Likewise.
* gnu/packages/xdisorg.scm (xautomation)[native-inputs]: Likewise.
* gnu/packages/xnee.scm (xnee)[inputs]: Likewise.
* gnu/packages/xorg.scm (imake, lndir, libxshmfence, libfontenc, libfs,
libxcomposite, libxdmcp, libxft, libxmu, libxpm, libxres, makedepend,
mkfontscale, sessreg, xev, xf86-video-qxl, xkbcomp-intermediate, xkbutils,
xlsfonts, xmodmap, xpr, xprop, xrandr, xset, xwd, xwininfo, xwud, xorg-rgb,
libxdamage, libxrender, libxv, libice, libxau, libxfixes, libxfont, libxi,
libxrandr, libxvmc, xorg-server, libxcursor, libxaw, twm, xinit,
xterm)[inputs]: Likewise.
(xorgproto): Move expression before all other -proto packages.
(xproto)[properties]: Mark as superseded by XORGPROTO.
This commit is contained in:
Marius Bakke 2018-03-10 12:16:48 +01:00
parent 6449e68d35
commit 6a6db57f84
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
10 changed files with 79 additions and 81 deletions

View file

@ -67,7 +67,7 @@ (define-public compton
("libdrm" ,libdrm)
("pkg-config" ,pkg-config)
("python" ,python)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(arguments
`(#:make-flags (list
"CC=gcc"

View file

@ -113,7 +113,7 @@ (define-public efl
("xextproto" ,xextproto)
("xinput" ,xinput)
("xpr" ,xpr)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(propagated-inputs
;; All these inputs are in package config files in section
;; Requires.private.

View file

@ -3650,7 +3650,7 @@ (define-public totem
("clutter" ,clutter)
("clutter-gtk" ,clutter-gtk)
("clutter-gst" ,clutter-gst)
("xproto" ,xproto)
("xorgproto" ,xorgproto)
("libxxf86vm" ,libxxf86vm)
("libxtst" ,libxtst)
("libxrandr" ,libxrandr)

View file

@ -1824,7 +1824,7 @@ (define-public ghc-x11-xft
("ghc-utf8-string" ,ghc-utf8-string)
("libx11" ,libx11)
("libxft" ,libxft)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(build-system haskell-build-system)

View file

@ -164,7 +164,7 @@ (define-public vtk
#:tests? #f)) ;XXX: no "test" target
(inputs
`(("libXt" ,libxt)
("xproto" ,xproto)
("xorgproto" ,xorgproto)
("libX11" ,libx11)
("libxml2" ,libxml2)
("mesa" ,mesa)

View file

@ -928,7 +928,7 @@ (define-public mate-control-center
("renderproto" ,renderproto)
("scrnsaverproto" ,scrnsaverproto)
("xextpro" ,xextproto)
("xproto" ,xproto)
("xorgproto" ,xorgproto)
("xmodmap" ,xmodmap)
("gobject-introspection" ,gobject-introspection)))
(inputs
@ -1142,7 +1142,7 @@ (define-public mate-netbook
("libxtst" ,libxtst)
("libx11" ,libx11)
("mate-panel" ,mate-panel)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(home-page "https://mate-desktop.org/")
(synopsis "Tool for MATE on Netbooks")
(description
@ -1202,7 +1202,7 @@ (define-public mate-screensaver
("scrnsaverproto" ,scrnsaverproto)
("which" ,which)
("xextpro" ,xextproto)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(inputs
`(("cairo" ,cairo)
("dconf" ,dconf)
@ -1257,7 +1257,7 @@ (define-public mate-utils
("pkg-config" ,pkg-config)
("scrollkeeper" ,scrollkeeper)
("xextpro" ,xextproto)
("xproto" ,xproto)
("xorgproto" ,xorgproto)
("yelp-tools" ,yelp-tools)))
(inputs
`(("atk" ,atk)

View file

@ -100,7 +100,7 @@ (define-public expect
(inputs
`(;; TODO: Add these optional dependencies.
;; ("libX11" ,libX11)
;; ("xproto" ,xproto)
;; ("xorgproto" ,xorgproto)
;; ("tk" ,tk)
("tcl" ,tcl)))
(arguments

View file

@ -626,7 +626,7 @@ (define-public xautomation
(native-inputs
`(("inputproto" ,inputproto)
("xextproto" ,xextproto)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(synopsis "Tools to automate tasks in X such as detecting on screen images")
(description
"Xautomation can control X from the command line for scripts, and

View file

@ -47,7 +47,7 @@ (define-public xnee
("libxtst" ,libxtst)
("recordproto" ,recordproto)
("xextproto" ,xextproto)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.gnu.org/software/xnee/")

View file

@ -119,7 +119,7 @@ (define-public imake
`(("pkg-config" ,pkg-config)))
(inputs
`(("xorg-cf-files" ,xorg-cf-files)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -169,7 +169,7 @@ (define-public lndir
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("xproto" ,xproto)))
`(("xorgproto" ,xorgproto)))
(home-page "https://www.x.org/")
(synopsis "Symlink directory into tree")
(description "Create a shadow directory of symbolic links to another
@ -203,6 +203,27 @@ (define-public bdftopcf
which can be read by any architecture.")
(license license:x11)))
(define-public xorgproto
(package
(name "xorgproto")
(version "2018.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://xorg/individual/proto/"
name "-" version ".tar.bz2"))
(sha256
(base32
"180mqkp70i44rkmj430pmn9idssvffrgv4y5h19fm698a7h8bs7y"))))
(build-system gnu-build-system)
(propagated-inputs
;; To get util-macros in (almost?) all package inputs.
`(("util-macros" ,util-macros)))
(home-page "https://cgit.freedesktop.org/xorg/proto/xorgproto")
(synopsis "Xorg protocol headers")
(description
"This package provides the headers and specification documents defining
the core protocol and (many) extensions for the X Window System.")
(license license:x11)))
(define-public bigreqsproto
(package
@ -1041,7 +1062,7 @@ (define-public libxshmfence
"032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj"))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("xproto" ,xproto)))
(inputs `(("xorgproto" ,xorgproto)))
(home-page "https://www.x.org/")
(synopsis "Xorg shared memory fences library")
(description
@ -1069,7 +1090,7 @@ (define-public libfontenc
(build-system gnu-build-system)
(inputs
`(("zlib" ,zlib)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@ -1095,7 +1116,7 @@ (define-public libfs
(build-system gnu-build-system)
(inputs
`(("xtrans" ,xtrans)
("xproto" ,xproto)
("xorgproto" ,xorgproto)
("fontsproto" ,fontsproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -1258,7 +1279,7 @@ (define-public libxcomposite
(build-system gnu-build-system)
(propagated-inputs
;; xcomposite.pc refers to all these.
`(("xproto" ,xproto)
`(("xorgproto" ,xorgproto)
("libxfixes" ,libxfixes)
("libx11" ,libx11)
("compositeproto" ,compositeproto)))
@ -1288,7 +1309,7 @@ (define-public libxdmcp
(build-system gnu-build-system)
(inputs
`(("libbsd" ,libbsd)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@ -1319,7 +1340,7 @@ (define-public libxft
("fontconfig" ,fontconfig)))
(inputs
`(("libx11" ,libx11)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@ -1373,7 +1394,7 @@ (define-public libxmu
(build-system gnu-build-system)
(inputs
`(("libxt" ,libxt)
("xproto" ,xproto)
("xorgproto" ,xorgproto)
("libxext" ,libxext)))
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -1406,7 +1427,7 @@ (define-public libxpm
(inputs
`(("gettext" ,gettext-minimal)
("libxt" ,libxt)
("xproto" ,xproto)
("xorgproto" ,xorgproto)
("libxext" ,libxext)))
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -1432,7 +1453,7 @@ (define-public libxres
"1m0jr0lbz9ixpp9ihk68349q0i7ry2379lnfzdy4mrl86ijc2xgz"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
`(("xorgproto" ,xorgproto)
("libxext" ,libxext)
("libx11" ,libx11)
("resourceproto" ,resourceproto)))
@ -1548,7 +1569,7 @@ (define-public makedepend
"09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)))
`(("xorgproto" ,xorgproto)))
(native-inputs `(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
(synopsis "Xorg makedepend utility")
@ -1574,7 +1595,7 @@ (define-public mkfontscale
(build-system gnu-build-system)
(inputs
`(("zlib" ,zlib)
("xproto" ,xproto)
("xorgproto" ,xorgproto)
("freetype" ,freetype)
("libfontenc" ,libfontenc)))
(native-inputs
@ -1773,7 +1794,7 @@ (define-public sessreg
"1qd66mg2bnppqz4xgdjzif2488zl82vx2c26ld3nb8pnyginm9vq"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)))
`(("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@ -2319,7 +2340,7 @@ (define-public xev
(inputs
`(("libxrender" ,libxrender)
("libxrandr" ,libxrandr)
("xproto" ,xproto)
("xorgproto" ,xorgproto)
("libx11" ,libx11)))
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -3142,7 +3163,7 @@ (define-public xf86-video-qxl
("spice-protocol" ,spice-protocol)
("xf86dgaproto" ,xf86dgaproto)
("xorg-server" ,xorg-server)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(synopsis "Qxl video driver for X server")
@ -3712,7 +3733,7 @@ (define xkbcomp-intermediate ; used as input for xkeyboard-config
"0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
`(("xorgproto" ,xorgproto)
("libxkbfile" ,libxkbfile)
("libx11" ,libx11)))
(native-inputs
@ -3791,7 +3812,7 @@ (define-public xkbutils
(build-system gnu-build-system)
(inputs
`(("libxt" ,libxt)
("xproto" ,xproto)
("xorgproto" ,xorgproto)
("libxaw" ,libxaw)
("inputproto" ,inputproto)))
(native-inputs
@ -3940,7 +3961,7 @@ (define-public xlsfonts
"0s6kxgv78chkwsqmhw929f4pf91gq63f4yvixxnan1h00cx0pf49"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
`(("xorgproto" ,xorgproto)
("libx11" ,libx11)))
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -4036,7 +4057,7 @@ (define-public xmodmap
(patches (search-patches "xmodmap-asprintf.patch"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
`(("xorgproto" ,xorgproto)
("libx11" ,libx11)))
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -4099,7 +4120,7 @@ (define-public xpr
"07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
`(("xorgproto" ,xorgproto)
("libxmu" ,libxmu)
("libx11" ,libx11)))
(native-inputs
@ -4128,7 +4149,7 @@ (define-public xprop
"06sjgahjiz85v0k0pmv5x05chc591xynl5ah1bqzz1bdr0lgnanj"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
`(("xorgproto" ,xorgproto)
("libx11" ,libx11)))
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -4157,7 +4178,7 @@ (define-public xrandr
(inputs
`(("libxrender" ,libxrender)
("libxrandr" ,libxrandr)
("xproto" ,xproto)
("xorgproto" ,xorgproto)
("libx11" ,libx11)))
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -4244,7 +4265,7 @@ (define-public xset
"0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
`(("xorgproto" ,xorgproto)
("libxmu" ,libxmu)
("libxext" ,libxext)
("libx11" ,libx11)))
@ -4360,7 +4381,7 @@ (define-public xwd
(inputs
`(("libxt" ,libxt)
("libxkbfile" ,libxkbfile)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@ -4392,7 +4413,7 @@ (define-public xwininfo
(build-system gnu-build-system)
(inputs
`(("libx11" ,libx11)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@ -4419,7 +4440,7 @@ (define-public xwud
"1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
`(("xorgproto" ,xorgproto)
("libx11" ,libx11)))
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -4446,7 +4467,7 @@ (define-public xorg-rgb
"1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)))
`(("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@ -4504,7 +4525,7 @@ (define-public libxdamage
;; These are all in the Requires or Requires.private field of xdamage.pc
`(("damageproto" ,damageproto)
("libxfixes" ,libxfixes)
("xproto" ,xproto)
("xorgproto" ,xorgproto)
("libx11" ,libx11)))
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -4617,7 +4638,7 @@ (define-public libxrender
(propagated-inputs
`(("renderproto" ,renderproto)))
(inputs
`(("xproto" ,xproto)
`(("xorgproto" ,xorgproto)
("libx11" ,libx11)))
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -4682,7 +4703,7 @@ (define-public libxv
(propagated-inputs
`(("videoproto" ,videoproto)))
(inputs
`(("xproto" ,xproto)
`(("xorgproto" ,xorgproto)
("libxext" ,libxext)
("libx11" ,libx11)))
(native-inputs
@ -4729,7 +4750,6 @@ (define-public mkfontdir
script around the mkfontscale program.")
(license license:x11)))
(define-public xproto
(package
(name "xproto")
@ -4758,30 +4778,8 @@ (define-public xproto
It also includes a number of headers that aren't purely protocol related,
but are depended upon by many other X Window System packages to provide
common definitions and porting layer.")
(license license:x11)))
(define-public xorgproto
(package
(name "xorgproto")
(version "2018.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://xorg/individual/proto/"
name "-" version ".tar.bz2"))
(sha256
(base32
"180mqkp70i44rkmj430pmn9idssvffrgv4y5h19fm698a7h8bs7y"))))
(build-system gnu-build-system)
(propagated-inputs
;; To get util-macros in (almost?) all package inputs.
`(("util-macros" ,util-macros)))
(home-page "https://cgit.freedesktop.org/xorg/proto/xorgproto")
(synopsis "Xorg protocol headers")
(description
"This package provides the headers and specification documents defining
the core protocol and (many) extensions for the X Window System.")
(license license:x11)))
(license license:x11)
(properties `((superseded . ,xorgproto)))))
;; packages of height 2 in the propagated-inputs tree
@ -4801,7 +4799,7 @@ (define-public libice
"00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g"))))
(build-system gnu-build-system)
(propagated-inputs
`(("xproto" ,xproto)))
`(("xorgproto" ,xorgproto)))
(inputs
`(("libbsd" ,libbsd)
("xtrans" ,xtrans)))
@ -4829,7 +4827,7 @@ (define-public libxau
"1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x"))))
(build-system gnu-build-system)
(propagated-inputs
`(("xproto" ,xproto)))
`(("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@ -4857,7 +4855,7 @@ (define-public libxfixes
(propagated-inputs
`(("fixesproto" ,fixesproto)))
(inputs
`(("xproto" ,xproto)
`(("xorgproto" ,xorgproto)
("libx11" ,libx11)))
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -4885,7 +4883,7 @@ (define-public libxfont
`(("fontsproto" ,fontsproto)
("freetype" ,freetype)
("libfontenc" ,libfontenc)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(inputs
`(("zlib" ,zlib)
("xtrans" ,xtrans)))
@ -4935,7 +4933,7 @@ (define-public libxi
("libxext" ,libxext)
("libxfixes" ,libxfixes)))
(inputs
`(("xproto" ,xproto)))
`(("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@ -4964,7 +4962,7 @@ (define-public libxrandr
("libxext" ,libxext)
("libxrender" ,libxrender)
("randrproto" ,randrproto)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@ -4991,7 +4989,7 @@ (define-public libxvmc
(propagated-inputs
`(("libxv" ,libxv)))
(inputs
`(("xproto" ,xproto)
`(("xorgproto" ,xorgproto)
("libxext" ,libxext)
("libx11" ,libx11)))
(native-inputs
@ -5123,7 +5121,7 @@ (define-public xorg-server
("xextproto" ,xextproto)
("xineramaproto" ,xineramaproto)
("xf86driproto" ,xf86driproto)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(inputs
`(("bigreqsproto" ,bigreqsproto)
("compositeproto" ,compositeproto)
@ -5324,7 +5322,7 @@ (define-public libxcursor
`(("libx11" ,libx11)
("libxrender" ,libxrender)
("libxfixes" ,libxfixes)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
;; TODO: add XCURSOR_PATH=.../share/icons to profile search paths, so
@ -5398,7 +5396,7 @@ (define-public libxaw
("libxpm" ,libxpm)
("libxt" ,libxt)))
(inputs
`(("xproto" ,xproto)))
`(("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@ -5427,7 +5425,7 @@ (define-public twm
`(("libxt" ,libxt)
("libxmu" ,libxmu)
("libxext" ,libxext)
("xproto" ,xproto)))
("xorgproto" ,xorgproto)))
(native-inputs
`(("bison" ,bison)
("pkg-config" ,pkg-config)))
@ -5650,7 +5648,7 @@ (define-public xinit
"1vw2wlg74ig52naw0cha3pgzcwwk25l834j42cg8m5zmybp3a213"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
`(("xorgproto" ,xorgproto)
("libx11" ,libx11)))
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -5790,7 +5788,7 @@ (define-public xterm
("libX11" ,libx11)
("libXext" ,libxext)
("libXt" ,libxt)
("xproto" ,xproto)
("xorgproto" ,xorgproto)
("libXaw" ,libxaw)))
(home-page "https://invisible-island.net/xterm/")
(synopsis "Terminal emulator for the X Window System")