11/24: gnu: libxkbcommon: Update to 0.9.1.

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit 3a24bf3a2a7fc89c04dba4c74419e9183e509eb0
Author: Marius Bakke <address@hidden>
Date:   Mon Dec 9 22:29:58 2019 +0100

    gnu: libxkbcommon: Update to 0.9.1.
    
    * gnu/packages/xdisorg.scm (libxkbcommon): Update to 0.9.1.
    [build-system]: Change to MESON-BUILD-SYSTEM.
    [inputs]: Add WAYLAND and WAYLAND-PROTOCOLS.
    [native-inputs]: Add DOXYGEN.
    [arguments]: Adjust #:configure-flags for Meson.
---
 gnu/packages/xdisorg.scm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 8e53afe..f82bd9e 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -261,28 +261,31 @@ avoiding password prompts when X11 forwarding has already 
been setup.")
 (define-public libxkbcommon
   (package
     (name "libxkbcommon")
-    (version "0.8.4")
+    (version "0.9.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://xkbcommon.org/download/libxkbcommon-";
                                  version ".tar.xz"))
              (sha256
               (base32
-               "12vc91ydhphd5sddz15560r41l7k0i7mq6nma8kkbzdp6bwwzpb0"))))
-    (build-system gnu-build-system)
+               "1q4v378sr9ad8fy9znl7k8xpf0wch655r9m6z0bcc7sw1azsminl"))))
+    (build-system meson-build-system)
     (inputs
      `(("libx11" ,libx11)
        ("libxcb" ,libxcb)
+       ("wayland" ,wayland)
+       ("wayland-protocols" ,wayland-protocols)
        ("xkeyboard-config" ,xkeyboard-config)))
     (native-inputs
      `(("bison" ,bison)
+       ("doxygen" ,doxygen)
        ("pkg-config" ,pkg-config)))
     (arguments
      `(#:configure-flags
-       (list (string-append "--with-xkb-config-root="
+       (list (string-append "-Dxkb-config-root="
                             (assoc-ref %build-inputs "xkeyboard-config")
                             "/share/X11/xkb")
-             (string-append "--with-x-locale-root="
+             (string-append "-Dx-locale-root="
                             (assoc-ref %build-inputs "libx11")
                             "/share/X11/locale"))))
     (home-page "https://xkbcommon.org/";)