GNU bug report logs - #37253
[PATCH] gnu: libxklavier: Update to 5.4.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 37253 in the body.
You can then email your comments to 37253 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: L  p R n  d n <guix <at> lprndn.info>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: libxklavier: Update to 5.4.
Date: Mon,  2 Sep 2019 15:15:31 +0200

* 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..9e83b7997e 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 "https://anongit.freedesktop.org/git/libxklavier")
+                (commit (string-append "libxklavier-" version))))
               (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

Message #10 received at 37253-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: L p R n d n <guix <at> lprndn.info>
Cc: 37253-done <at> debbugs.gnu.org
Subject: Re: [bug#37253] [PATCH] gnu: libxklavier: Update to 5.4.
Date: Sun, 01 Sep 2019 22:21:56 +0200

Hi,

L  p R n  d n <guix <at> lprndn.info> skribis:

> * 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.

Committed!  I added a comment stating there’s no tarball for this
version, hence the checkout.

Thanks,
Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.