[PATCH] gnu: libxklavier: Update to 5.4.

  • Done
  • quality assurance status badge
Details
2 participants
  • L p R n d n
  • Ludovic Courtès
Owner
unassigned
Submitted by
L p R n d n
Severity
normal
L
L
L p R n d n wrote on 2 Sep 2019 15:15
(address . guix-patches@gnu.org)
20190902131531.3750-1-guix@lprndn.info
* 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(-)

Toggle diff (55 lines)
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
L
L
Ludovic Courtès wrote on 1 Sep 2019 22:21
(name . L p R n d n)(address . guix@lprndn.info)(address . 37253-done@debbugs.gnu.org)
87lfv7938b.fsf@gnu.org
Hi,

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

Toggle quote (5 lines)
> * 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’.
Closed
?