From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eugkB-0000mI-Eh for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eugkA-0005Lp-G1 for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:11 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:46566) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eugkA-0005Lb-CB for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eugkA-0004y3-5D for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:10 -0500 Subject: [bug#30763] [PATCH core-updates 19/27] gnu: Switch from renderproto to xorgproto. Resent-Message-ID: From: Marius Bakke Date: Sat, 10 Mar 2018 16:47:59 +0100 Message-Id: <20180310154807.7225-19-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/mate.scm (mate-control-center, mate-screensaver)[native-inputs]: Remove RENDERPROTO. * gnu/packages/xorg.scm (renderproto)[properties]: Mark as superseded by XORGPROTO. (libxrender)[propagated-inputs]: Replace RENDERPROTO with XORGPROTO. [inputs]: Remove XORGPROTO. * gnu/packages/xorg.scm (xorg-server)[inputs]: Remove RENDERPROTO. --- gnu/packages/mate.scm | 2 -- gnu/packages/xorg.scm | 10 ++++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 8c3ea160d..7b1612797 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -923,7 +923,6 @@ icons on the MATE desktop. It works on local and remote file systems.") ("intltool" ,intltool) ("yelp-tools" ,yelp-tools) ("desktop-file-utils" ,desktop-file-utils) - ("renderproto" ,renderproto) ("scrnsaverproto" ,scrnsaverproto) ("xorgproto" ,xorgproto) ("xmodmap" ,xmodmap) @@ -1193,7 +1192,6 @@ Re-decorates windows on un-maximise. ("intltool" ,intltool) ("mate-common" ,mate-common) ("pkg-config" ,pkg-config) - ("renderproto" ,renderproto) ("scrnsaverproto" ,scrnsaverproto) ("which" ,which) ("xorgproto" ,xorgproto))) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 996d18728..15ef60e36 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1725,8 +1725,8 @@ of user actions in the X Window System.") (description "Rendering Extension defines a protcol for a digital image composition as the foundation of a new rendering model within the X Window System.") - (license license:x11))) - + (license license:x11) + (properties `((superseded . ,xorgproto))))) (define-public resourceproto (package @@ -4641,10 +4641,9 @@ cannot be adequately worked around on the client side of the wire.") "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0")))) (build-system gnu-build-system) (propagated-inputs - `(("renderproto" ,renderproto))) + `(("xorgproto" ,xorgproto))) (inputs - `(("xorgproto" ,xorgproto) - ("libx11" ,libx11))) + `(("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") @@ -5108,7 +5107,6 @@ over Xlib, including: `(("libpciaccess" ,libpciaccess) ("mesa" ,mesa) ("pixman" ,pixman) - ("renderproto" ,renderproto) ("resourceproto" ,resourceproto) ("scrnsaverproto" ,scrnsaverproto) ("xineramaproto" ,xineramaproto) -- 2.16.2