From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eugk6-0000hG-Dh 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 1eugk5-0005HT-B0 for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:46554) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eugk5-0005HM-68 for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eugk4-0004wa-Ve for guix-patches@gnu.org; Sat, 10 Mar 2018 10:49:04 -0500 Subject: [bug#30763] [PATCH core-updates 07/27] gnu: Switch from kbproto to xorgproto. Resent-Message-ID: From: Marius Bakke Date: Sat, 10 Mar 2018 16:47:47 +0100 Message-Id: <20180310154807.7225-7-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)[inputs]: Remove KBPROTO. * gnu/packages/xorg.scm (kbproto)[properties]: Mark as superseded by XORGPROTO. (xorg-server)[inputs]: Remove KBPROTO. (libx11)[propated-inputs]: Replace KBPROTO with XORGPROTO. [inputs]: Remove XORGPROTO. --- gnu/packages/mate.scm | 2 -- gnu/packages/xorg.scm | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index d39711b6d..8c3ea160d 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) - ("kbproto" ,kbproto) ("renderproto" ,renderproto) ("scrnsaverproto" ,scrnsaverproto) ("xorgproto" ,xorgproto) @@ -1192,7 +1191,6 @@ Re-decorates windows on un-maximise. ("autoconf" ,autoconf-wrapper) ("gettext" ,gettext-minimal) ("intltool" ,intltool) - ("kbproto" ,kbproto) ("mate-common" ,mate-common) ("pkg-config" ,pkg-config) ("renderproto" ,renderproto) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 5eeec7504..21a65e7ec 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1010,8 +1010,8 @@ devices management such as graphic tablets.") (description "X Keyboard (XKB) Extension defines a protocol to provide a number of new capabilities and controls for text keyboards.") - (license license:x11))) - + (license license:x11) + (properties `((superseded . ,xorgproto))))) ;; requires applewmproto, which compiles only on macos ;; (define-public libapplewm @@ -5116,7 +5116,6 @@ over Xlib, including: ("dri3proto" ,dri3proto) ("fontsproto" ,fontsproto) ("inputproto" ,inputproto) - ("kbproto" ,kbproto) ("libpciaccess" ,libpciaccess) ("mesa" ,mesa) ("pixman" ,pixman) @@ -5292,11 +5291,10 @@ draggable titlebars and borders.") (assoc-ref %outputs "doc") "/share/man")))) (propagated-inputs - `(("kbproto" ,kbproto) + `(("xorgproto" ,xorgproto) ("libxcb" ,libxcb))) (inputs `(("inputproto" ,inputproto) - ("xorgproto" ,xorgproto) ("xtrans" ,xtrans))) (native-inputs `(("pkg-config" ,pkg-config))) -- 2.16.2