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

Previous Next

Package: guix-patches;

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

Date: Sun, 1 Sep 2019 13:17:01 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#37253: closed ([PATCH] gnu: libxklavier: Update to 5.4.)
Date: Sun, 01 Sep 2019 20:23:03 +0000
[Message part 1 (text/plain, inline)]
Your message dated Sun, 01 Sep 2019 22:21:56 +0200
with message-id <87lfv7938b.fsf <at> gnu.org>
and subject line Re: [bug#37253] [PATCH] gnu: libxklavier: Update to 5.4.
has caused the debbugs.gnu.org bug report #37253,
regarding [PATCH] gnu: libxklavier: Update to 5.4.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
37253: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=37253
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
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 part 3 (message/rfc822, inline)]
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’.


This bug report was last modified 5 years and 263 days ago.

Previous Next


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