From 89ad4fc6b3836ebb409c6cebac7e8ac3e5bfdf71 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 12:57:28 +0100 Subject: [PATCH] gnu: Switch from fixesproto to xorgproto. * gnu/packages/xorg.scm (compositeproto)[inputs]: Replace FIXESPROTO with XORGPROTO. (libxfixes)[propagated-inputs]: Likewise. [inputs]: Remove XORGPROTO. (fixesproto)[properties]: Mark as superseded by XORGPROTO. --- gnu/packages/xorg.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 19767b06bc..4e97481f0c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -265,7 +265,7 @@ requests that exceed 262140 bytes in length.") "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4")))) (build-system gnu-build-system) (inputs - `(("fixesproto" ,fixesproto))) + `(("xorgproto" ,xorgproto))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") @@ -4504,8 +4504,8 @@ formatted dump file, such as produced by xwd.") "Fixes Extension makes changes to many areas of the protocol to resolve issues raised by application interaction with core protocol mechanisms that cannot be adequately worked around on the client side of the wire.") - (license license:x11))) - + (license license:x11) + (properties `((superseded . ,xorgproto))))) (define-public libxdamage (package @@ -4854,10 +4854,9 @@ an X Window System display.") "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y")))) (build-system gnu-build-system) (propagated-inputs - `(("fixesproto" ,fixesproto))) + `(("xorgproto" ,xorgproto))) (inputs - `(("xorgproto" ,xorgproto) - ("libx11" ,libx11))) + `(("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/")