From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eugk7-0000hk-QT for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eugk6-0005Hz-6b for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:46556) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eugk6-0005Hp-0v for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eugk5-0004wq-QI for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:05 -0500 Subject: [bug#30763] [PATCH core-updates 09/27] gnu: Switch from fontsproto to xorgproto. Resent-Message-ID: From: Marius Bakke Date: Sat, 10 Mar 2018 16:47:49 +0100 Message-Id: <20180310154807.7225-9-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 (fontsproto)[properties]: Mark as superseded by XORGPROTO. (libfs, xf86-video-qxl)[inputs]: Remove FONTSPROTO. (libxfont, xorg-server)[propagated-inputs]: Likewise. --- gnu/packages/xorg.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3bec70a0c..358e22776 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -909,8 +909,8 @@ For example: '6x10', '9x15bold', etc.") (description "Fonts Extension contains header files and documentation for the fonts protocol.") - (license license:x11))) - + (license license:x11) + (properties `((superseded . ,xorgproto))))) (define-public glproto (package @@ -1114,8 +1114,7 @@ synchronization between the X server and direct-rendering clients.") (build-system gnu-build-system) (inputs `(("xtrans" ,xtrans) - ("xorgproto" ,xorgproto) - ("fontsproto" ,fontsproto))) + ("xorgproto" ,xorgproto))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") @@ -3166,8 +3165,7 @@ UniChrome Pro and Chrome9 integrated graphics processors.") "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi")))) (build-system gnu-build-system) (inputs - `(("fontsproto" ,fontsproto) - ("libxfont" ,libxfont2) + `(("libxfont" ,libxfont2) ("spice-protocol" ,spice-protocol) ("xf86dgaproto" ,xf86dgaproto) ("xorg-server" ,xorg-server) @@ -4886,8 +4884,7 @@ an X Window System display.") "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs")))) (build-system gnu-build-system) (propagated-inputs - `(("fontsproto" ,fontsproto) - ("freetype" ,freetype) + `(("freetype" ,freetype) ("libfontenc" ,libfontenc) ("xorgproto" ,xorgproto))) (inputs @@ -5111,7 +5108,6 @@ over Xlib, including: (propagated-inputs `(("dri2proto" ,dri2proto) ("dri3proto" ,dri3proto) - ("fontsproto" ,fontsproto) ("libpciaccess" ,libpciaccess) ("mesa" ,mesa) ("pixman" ,pixman) -- 2.16.2