summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-03-10 13:20:38 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-03-18 00:19:55 +0100
commit82b4d9ec8c49ecffa77184c30fe0fbe935bd3c27 (patch)
tree346c17dec27ff88819731db189dcc779ffd087a9
parent2d03009860cbe003431ce561aed7b74b89b1014f (diff)
downloadgnu-guix-82b4d9ec8c49ecffa77184c30fe0fbe935bd3c27.tar
gnu-guix-82b4d9ec8c49ecffa77184c30fe0fbe935bd3c27.tar.gz
gnu: Switch from inputproto to xorgproto.
* gnu/packages/gl.scm (freeglut)[inputs]: Replace INPUTPROTO with XORGPROTO. * gnu/packages/ratpoison.scm (ratpoison)[inputs]: Remove INPUTPROTO. * gnu/packages/xdisorg.scm (xautomation)[native-inputs]: Likewise. * gnu/packages/xnee.scm (xnee)[inputs]: Likewise. * gnu/packages/xorg.scm (inputproto)[properties]: Mark as superseded by XORGPROTO. (xdpyinfo, xinput, libxtst)[inputs]: Replace INPUTPROTO with XORGPROTO. (libxi, xorg-server)[propagated-inputs]: Remove INPUTPROTO. (xkbutils, libx11)[inputs]: Likewise.
-rw-r--r--gnu/packages/gl.scm2
-rw-r--r--gnu/packages/ratpoison.scm3
-rw-r--r--gnu/packages/xdisorg.scm3
-rw-r--r--gnu/packages/xnee.scm1
-rw-r--r--gnu/packages/xorg.scm21
5 files changed, 11 insertions, 19 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index b1b60d0040..27d064346e 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -105,7 +105,7 @@ as ASCII text.")
("libxi" ,libxi)
("libxrandr" ,libxrandr)
("libxxf86vm" ,libxxf86vm)
- ("inputproto" ,inputproto)
+ ("xorgproto" ,xorgproto)
("xinput" ,xinput)))
(propagated-inputs
;; Headers from Mesa and GLU are needed.
diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm
index 4c83d0f67c..b1f012eb79 100644
--- a/gnu/packages/ratpoison.scm
+++ b/gnu/packages/ratpoison.scm
@@ -66,8 +66,7 @@
(copy-file (assoc-ref inputs rpd)
(string-append dst rpd))))))))
(inputs
- `(("inputproto" ,inputproto)
- ("fontconfig" ,fontconfig)
+ `(("fontconfig" ,fontconfig)
("freetype" ,freetype)
("libXft" ,libxft)
("libXi" ,libxi)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index deee636764..ceee6fa832 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -624,8 +624,7 @@ things less distracting.")
("libxi" ,libxi)
("libxtst" ,libxtst)))
(native-inputs
- `(("inputproto" ,inputproto)
- ("xorgproto" ,xorgproto)))
+ `(("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
diff --git a/gnu/packages/xnee.scm b/gnu/packages/xnee.scm
index 207a11c63d..025dc2185d 100644
--- a/gnu/packages/xnee.scm
+++ b/gnu/packages/xnee.scm
@@ -40,7 +40,6 @@
(build-system gnu-build-system)
(inputs
`(("gtk+" ,gtk+-2)
- ("inputproto" ,inputproto)
("libx11" ,libx11)
("libxext" ,libxext)
("libxi" ,libxi)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 82817f7a59..6ca60226f2 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -988,8 +988,8 @@ authentication records.")
(description
"Input Extension defines a protocol to provide additional input
devices management such as graphic tablets.")
- (license license:x11)))
-
+ (license license:x11)
+ (properties `((superseded . ,xorgproto)))))
(define-public kbproto
(package
@@ -2271,7 +2271,7 @@ X server: 'handhelds', 'redglass' and 'whiteglass'.")
"0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"))))
(build-system gnu-build-system)
(inputs
- `(("inputproto" ,inputproto)
+ `(("xorgproto" ,xorgproto)
("libx11" ,libx11)
("libxxf86vm" ,libxxf86vm)
("libxxf86dga" ,libxxf86dga)
@@ -3707,7 +3707,7 @@ alternative implementations like XRandR or TwinView.")
("libxext" ,libxext)
("libxi" ,libxi)
("libx11" ,libx11)
- ("inputproto" ,inputproto)))
+ ("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@@ -3812,9 +3812,8 @@ requested commands if they occur.")
(build-system gnu-build-system)
(inputs
`(("libxt" ,libxt)
- ("xorgproto" ,xorgproto)
("libxaw" ,libxaw)
- ("inputproto" ,inputproto)))
+ ("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@@ -4667,7 +4666,7 @@ cannot be adequately worked around on the client side of the wire.")
("libxi" ,libxi)))
(inputs
`(("libx11" ,libx11)
- ("inputproto" ,inputproto)))
+ ("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@@ -4927,12 +4926,10 @@ new API's in libXft, or the legacy API's in libX11.")
"0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2"))))
(build-system gnu-build-system)
(propagated-inputs
- `(("inputproto" ,inputproto)
+ `(("xorgproto" ,xorgproto)
("libx11" ,libx11)
("libxext" ,libxext)
("libxfixes" ,libxfixes)))
- (inputs
- `(("xorgproto" ,xorgproto)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@@ -5105,7 +5102,6 @@ over Xlib, including:
`(("dri2proto" ,dri2proto)
("dri3proto" ,dri3proto)
("fontsproto" ,fontsproto)
- ("inputproto" ,inputproto)
("libpciaccess" ,libpciaccess)
("mesa" ,mesa)
("pixman" ,pixman)
@@ -5284,8 +5280,7 @@ draggable titlebars and borders.")
`(("xorgproto" ,xorgproto)
("libxcb" ,libxcb)))
(inputs
- `(("inputproto" ,inputproto)
- ("xtrans" ,xtrans)))
+ `(("xtrans" ,xtrans)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")