From patchwork Tue Aug 20 21:50:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: L p R n d n X-Patchwork-Id: 15036 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E7420172F9; Tue, 20 Aug 2019 20:54:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id AC864172CD for ; Tue, 20 Aug 2019 20:54:35 +0100 (BST) Received: from localhost ([::1]:40934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0ADC-0000aq-Ti for patchwork@mira.cbaines.net; Tue, 20 Aug 2019 15:54:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43041) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0AAK-0006dh-9S for guix-patches@gnu.org; Tue, 20 Aug 2019 15:51:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0AAD-0000fj-0q for guix-patches@gnu.org; Tue, 20 Aug 2019 15:51:31 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53516) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0AA5-0000dC-Ms for guix-patches@gnu.org; Tue, 20 Aug 2019 15:51:24 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0AA5-0003ZS-Jx for guix-patches@gnu.org; Tue, 20 Aug 2019 15:51:21 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37121] [PATCH 32/40] gnu: libxklavier: Update to 5.4. Resent-From: L p R n d n Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Aug 2019 19:51:21 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37121 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37121@debbugs.gnu.org Received: via spool by 37121-submit@debbugs.gnu.org id=B37121.156633067413634 (code B ref 37121); Tue, 20 Aug 2019 19:51:21 +0000 Received: (at 37121) by debbugs.gnu.org; 20 Aug 2019 19:51:14 +0000 Received: from localhost ([127.0.0.1]:34091 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0A9x-0003Xj-N5 for submit@debbugs.gnu.org; Tue, 20 Aug 2019 15:51:14 -0400 Received: from mout02.posteo.de ([185.67.36.142]:57337) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0A9c-0003P6-SE for 37121@debbugs.gnu.org; Tue, 20 Aug 2019 15:50:54 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 9838A2400E5 for <37121@debbugs.gnu.org>; Tue, 20 Aug 2019 21:50:43 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 46ChH7285Pz9rxL for <37121@debbugs.gnu.org>; Tue, 20 Aug 2019 21:50:43 +0200 (CEST) From: L p R n d n Date: Tue, 20 Aug 2019 23:50:35 +0200 Message-Id: <20190820215043.32077-32-guix@lprndn.info> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190820215043.32077-1-guix@lprndn.info> References: <20190820215043.32077-1-guix@lprndn.info> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (libxklavier): Update to 5.4. [source] Switch to git source. [arguments] Add no-configure phase. Disable xmodmap in #:configure-flags. [inputs] Add which, intltool, gtk-doc, which, automake, autoconf and libtool. --- gnu/packages/gnome.scm | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d5e46e09c1..8b54abbb91 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2537,24 +2537,40 @@ and objects.") (define-public libxklavier (package (name "libxklavier") - (version "5.3") + (version "5.4") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - version "/" name "-" version ".tar.xz")) + (method git-fetch) + (uri + (git-reference + (url (string-append "https://anongit.freedesktop.org/git/" name)) + (commit "396955bd2ba2db34a42b3807b03155fcc11dfe50"))) (sha256 (base32 - "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b")))) + "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - '(#:configure-flags + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'no-configure + (lambda* _ + (setenv "NOCONFIGURE" "1") + #t))) + #:configure-flags (list (string-append "--with-xkb-base=" (assoc-ref %build-inputs "xkeyboard-config") - "/share/X11/xkb")))) + "/share/X11/xkb") + "--disable-xmodmap-support"))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("gtk-doc" ,gtk-doc) + ("intltool" ,intltool) + ("which" ,which) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (propagated-inputs ;; Required by libxklavier.pc. `(("glib" ,glib)