aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-03-10 12:49:27 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-03-18 00:19:54 +0100
commitcaf90259fc032d6404e7db8d9cad5fa1666d43fa (patch)
treea9231ab6da8ebde17f489737d592653ed122906b
parent727f076fcd0ec9709493215562b7e86209f37a9f (diff)
downloadguix-caf90259fc032d6404e7db8d9cad5fa1666d43fa.tar
guix-caf90259fc032d6404e7db8d9cad5fa1666d43fa.tar.gz
gnu: Switch from xextproto to xorgproto.
* gnu/packages/enlightenment.scm (efl)[inputs]: Remove XEXTPROTO. * gnu/packages/mate.scm (mate-control-center, mate-screensaver, mate-utils)[native-inputs]: Likewise. * gnu/packages/xdisorg.scm (xautomation)[inputs]: Likewise. * gnu/packages/gtk.scm (cairo)[inputs]: Replace XEXTPROTO with XORGPROTO. * gnu/packages/ratpoison.scm (ratpoison)[inputs]: Likewise. * gnu/packages/xnee.scm (xnee)[inputs]: Likewise. * gnu/packages/xorg.scm (libdmx, libwindowswm, fixesproto, libxext, libx11)[inputs]: Likewise. (xorg-server): [inputs]: Remove XEXTPROTO. (libxext)[properties]: Mark as superseded by XORGPROTO.
-rw-r--r--gnu/packages/enlightenment.scm1
-rw-r--r--gnu/packages/gtk.scm2
-rw-r--r--gnu/packages/mate.scm3
-rw-r--r--gnu/packages/ratpoison.scm2
-rw-r--r--gnu/packages/xdisorg.scm1
-rw-r--r--gnu/packages/xnee.scm1
-rw-r--r--gnu/packages/xorg.scm15
7 files changed, 9 insertions, 16 deletions
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index e32158e631..ca6b3ddb6e 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -110,7 +110,6 @@
("printproto" ,printproto)
("scrnsaverproto" ,scrnsaverproto)
("wayland-protocols" ,wayland-protocols)
- ("xextproto" ,xextproto)
("xinput" ,xinput)
("xpr" ,xpr)
("xorgproto" ,xorgproto)))
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 501ab1b860..6f9c6dd63d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -133,7 +133,7 @@ tools have full access to view and control running applications.")
`(("ghostscript" ,ghostscript)
("libspectre" ,libspectre)
("poppler" ,poppler)
- ("xextproto" ,xextproto)
+ ("xorgproto" ,xorgproto)
("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index d6ad022989..d39711b6db 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -926,7 +926,6 @@ icons on the MATE desktop. It works on local and remote file systems.")
("kbproto" ,kbproto)
("renderproto" ,renderproto)
("scrnsaverproto" ,scrnsaverproto)
- ("xextpro" ,xextproto)
("xorgproto" ,xorgproto)
("xmodmap" ,xmodmap)
("gobject-introspection" ,gobject-introspection)))
@@ -1199,7 +1198,6 @@ Re-decorates windows on un-maximise.
("renderproto" ,renderproto)
("scrnsaverproto" ,scrnsaverproto)
("which" ,which)
- ("xextpro" ,xextproto)
("xorgproto" ,xorgproto)))
(inputs
`(("cairo" ,cairo)
@@ -1254,7 +1252,6 @@ can be used as backgrounds in the MATE Desktop environment.")
("libsm" ,libsm)
("pkg-config" ,pkg-config)
("scrollkeeper" ,scrollkeeper)
- ("xextpro" ,xextproto)
("xorgproto" ,xorgproto)
("yelp-tools" ,yelp-tools)))
(inputs
diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm
index d630c24fd4..4c83d0f67c 100644
--- a/gnu/packages/ratpoison.scm
+++ b/gnu/packages/ratpoison.scm
@@ -77,7 +77,7 @@
("libXtst" ,libxtst)
("libX11" ,libx11)
("readline" ,readline)
- ("xextproto" ,xextproto)))
+ ("xorgproto" ,xorgproto)))
(native-inputs
`(("perl",perl)
("pkg-config" ,pkg-config)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index d8f8eb211c..deee636764 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -625,7 +625,6 @@ things less distracting.")
("libxtst" ,libxtst)))
(native-inputs
`(("inputproto" ,inputproto)
- ("xextproto" ,xextproto)
("xorgproto" ,xorgproto)))
(synopsis "Tools to automate tasks in X such as detecting on screen images")
(description
diff --git a/gnu/packages/xnee.scm b/gnu/packages/xnee.scm
index 36fc5b963a..207a11c63d 100644
--- a/gnu/packages/xnee.scm
+++ b/gnu/packages/xnee.scm
@@ -46,7 +46,6 @@
("libxi" ,libxi)
("libxtst" ,libxtst)
("recordproto" ,recordproto)
- ("xextproto" ,xextproto)
("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index ff407c4f5c..19767b06bc 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1035,7 +1035,7 @@ of new capabilities and controls for text keyboards.")
"00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9"))))
(build-system gnu-build-system)
(inputs
- `(("xextproto" ,xextproto)
+ `(("xorgproto" ,xorgproto)
("libxext" ,libxext)
("libx11" ,libx11)
("dmxproto" ,dmxproto)))
@@ -1246,7 +1246,7 @@ hit when running single-threaded.")
"1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"))))
(build-system gnu-build-system)
(inputs
- `(("xextproto" ,xextproto)
+ `(("xorgproto" ,xorgproto)
("libxext" ,libxext)
("libx11" ,libx11)
("windowswmproto" ,windowswmproto)))
@@ -2381,8 +2381,8 @@ usage.")
Extended-Visual-Information, Generic Event Extension, LBX, MIT-SHM,
MIT-SUNDRY-NONSTANDARD, Multi-Buffering, SECURITY, SHAPE, SYNC, TOG-CUP,
XC-APPGROUP, XTEST.")
- (license license:x11)))
-
+ (license license:x11)
+ (properties `((superseded . ,xorgproto)))))
(define-public libevdev
(package
@@ -4495,7 +4495,7 @@ formatted dump file, such as produced by xwd.")
"1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs"))))
(build-system gnu-build-system)
(propagated-inputs
- `(("xextproto" ,xextproto)))
+ `(("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@@ -4552,7 +4552,7 @@ cannot be adequately worked around on the client side of the wire.")
"0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m"))))
(build-system gnu-build-system)
(propagated-inputs
- `(("xextproto" ,xextproto)))
+ `(("xorgproto" ,xorgproto)))
(inputs
`(("libxau" ,libxau)
("libx11" ,libx11)))
@@ -5117,7 +5117,6 @@ over Xlib, including:
("resourceproto" ,resourceproto)
("scrnsaverproto" ,scrnsaverproto)
("videoproto" ,videoproto)
- ("xextproto" ,xextproto)
("xineramaproto" ,xineramaproto)
("xf86driproto" ,xf86driproto)
("xorgproto" ,xorgproto)))
@@ -5290,7 +5289,7 @@ draggable titlebars and borders.")
("libxcb" ,libxcb)))
(inputs
`(("inputproto" ,inputproto)
- ("xextproto" ,xextproto)
+ ("xorgproto" ,xorgproto)
("xtrans" ,xtrans)))
(native-inputs
`(("pkg-config" ,pkg-config)))