[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/27: gnu: Switch from compositeproto to xorgproto.
From: |
Marius Bakke |
Subject: |
06/27: gnu: Switch from compositeproto to xorgproto. |
Date: |
Sat, 17 Mar 2018 19:21:07 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 3bad0d842e0ccd7c85da6b67e08ddde720e5fd94
Author: Marius Bakke <address@hidden>
Date: Sat Mar 10 13:01:29 2018 +0100
gnu: Switch from compositeproto to xorgproto.
* gnu/packages/xorg.scm (compositeproto)[properties]: Mark as superseded by
XORGPROTO.
(libxcomposite)[propagated-inputs]: Remove COMPOSITEPROTO.
(xorg-server)[inputs]: Likewise.
* gnu/packages/enlightenment.scm (efl)[inputs]: Likewise.
---
gnu/packages/enlightenment.scm | 1 -
gnu/packages/xorg.scm | 10 ++++------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index ca6b3dd..f3374ea 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -76,7 +76,6 @@
`(("pkg-config" ,pkg-config)))
(inputs
`(("alsa-lib" ,alsa-lib)
- ("compositeproto" ,compositeproto)
("curl" ,curl)
("ghostscript" ,ghostscript)
("giflib" ,giflib)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 4e97481..bd84fec 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -273,8 +273,8 @@ requests that exceed 262140 bytes in length.")
(description
"Composite Extension contains header files and documentation for
the damage protocol.")
- (license license:x11)))
-
+ (license license:x11)
+ (properties `((superseded . ,xorgproto)))))
(define-public damageproto
(package
@@ -1281,8 +1281,7 @@ with the Cygwin XWin server when running X11 in a
rootless mode.")
;; xcomposite.pc refers to all these.
`(("xorgproto" ,xorgproto)
("libxfixes" ,libxfixes)
- ("libx11" ,libx11)
- ("compositeproto" ,compositeproto)))
+ ("libx11" ,libx11)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@@ -5120,8 +5119,7 @@ over Xlib, including:
("xf86driproto" ,xf86driproto)
("xorgproto" ,xorgproto)))
(inputs
- `(("compositeproto" ,compositeproto)
- ("damageproto" ,damageproto)
+ `(("damageproto" ,damageproto)
("udev" ,eudev)
("dbus" ,dbus)
("dmxproto" ,dmxproto)
- branch core-updates updated (6449e68 -> ba57d60), Marius Bakke, 2018/03/17
- 02/27: gnu: Switch from randrproto to xorgproto., Marius Bakke, 2018/03/17
- 05/27: gnu: Switch from fixesproto to xorgproto., Marius Bakke, 2018/03/17
- 04/27: gnu: Switch from xextproto to xorgproto., Marius Bakke, 2018/03/17
- 12/27: gnu: Switch from damageproto to xorgproto., Marius Bakke, 2018/03/17
- 03/27: gnu: Switch from bigreqsproto to xorgproto., Marius Bakke, 2018/03/17
- 07/27: gnu: Switch from kbproto to xorgproto., Marius Bakke, 2018/03/17
- 11/27: gnu: Switch from dmxproto to xorgproto., Marius Bakke, 2018/03/17
- 08/27: gnu: Switch from inputproto to xorgproto., Marius Bakke, 2018/03/17
- 25/27: gnu: Switch from xf86bigfontproto to xorgproto., Marius Bakke, 2018/03/17
- 06/27: gnu: Switch from compositeproto to xorgproto.,
Marius Bakke <=
- 09/27: gnu: Switch from fontsproto to xorgproto., Marius Bakke, 2018/03/17
- 13/27: gnu: Switch from dri2proto to xorgproto., Marius Bakke, 2018/03/17
- 24/27: gnu: Switch from xf86dgaproto to xorgproto., Marius Bakke, 2018/03/17
- 14/27: gnu: Switch from dri3proto to xorgproto., Marius Bakke, 2018/03/17
- 15/27: gnu: Switch from videoproto to xorgproto., Marius Bakke, 2018/03/17
- 17/27: gnu: Switch from xcmiscproto to xorgproto., Marius Bakke, 2018/03/17
- 26/27: gnu: Switch from xf86vidmodeproto to xorgproto., Marius Bakke, 2018/03/17
- 23/27: gnu: Switch from xf86driproto to xorgproto., Marius Bakke, 2018/03/17
- 20/27: gnu: Switch from resourceproto to xorgproto., Marius Bakke, 2018/03/17
- 19/27: gnu: Switch from renderproto to xorgproto., Marius Bakke, 2018/03/17