From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#37121] [PATCH 32/40] gnu: libxklavier: Update to 5.4. Resent-Message-ID: From: L p R n d n Date: Tue, 20 Aug 2019 23:50:35 +0200 Message-Id: <20190820215043.32077-32-guix@lprndn.info> In-Reply-To: <20190820215043.32077-1-guix@lprndn.info> References: <20190820215043.32077-1-guix@lprndn.info> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 37121@debbugs.gnu.org * 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) -- 2.22.0