From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eugk6-0000hC-4m for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eugk4-0005H2-Fl for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:46552) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eugk4-0005Gv-BN for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eugk4-0004wL-4o for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:04 -0500 Subject: [bug#30763] [PATCH core-updates 05/27] gnu: Switch from fixesproto to xorgproto. Resent-Message-ID: From: Marius Bakke Date: Sat, 10 Mar 2018 16:47:45 +0100 Message-Id: <20180310154807.7225-5-mbakke@fastmail.com> In-Reply-To: <20180310154807.7225-1-mbakke@fastmail.com> References: <20180310154807.7225-1-mbakke@fastmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30763@debbugs.gnu.org * 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 71e5f004c..63e00b5e1 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/") @@ -4512,8 +4512,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 @@ -4862,10 +4862,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/") -- 2.16.2