gnu: libxklavier: Update to 5.4.

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

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
L p R n d n 2019-09-02 15:15:31 +02:00 committed by Ludovic Courtès
parent 5042f33e3b
commit 5f39050b1e
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 24 additions and 8 deletions

View File

@ -2537,24 +2537,40 @@ and objects.")
(define-public libxklavier (define-public libxklavier
(package (package
(name "libxklavier") (name "libxklavier")
(version "5.3") (version "5.4")
(source (origin (source (origin
(method url-fetch) ;; Note: There's no tarball at ftp.gnome.org for this version.
(uri (string-append "mirror://gnome/sources/" name "/" (method git-fetch)
version "/" name "-" version ".tar.xz")) (uri (git-reference
(url "https://anongit.freedesktop.org/git/libxklavier")
(commit (string-append "libxklavier-" version))))
(sha256 (sha256
(base32 (base32
"016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b")))) "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"))
(file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (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=" (list (string-append "--with-xkb-base="
(assoc-ref %build-inputs "xkeyboard-config") (assoc-ref %build-inputs "xkeyboard-config")
"/share/X11/xkb")))) "/share/X11/xkb")
"--disable-xmodmap-support")))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection) ("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 (propagated-inputs
;; Required by libxklavier.pc. ;; Required by libxklavier.pc.
`(("glib" ,glib) `(("glib" ,glib)