guix_mirror_bot pushed a commit to branch mesa-updates
in repository guix.
commit a4cead976b97012eb759044e2c29577912a284cd
Author: John Kehayias <j...@guixotic.coop>
AuthorDate: Sun Sep 14 17:49:37 2025 -0400
gnu: libxkbcommon: Update to 1.11.0.
* gnu/packages/xdisorg.scm (libxkbcommon): Update to 1.11.0.
[source]: Use git-fetch instead of url-fetch.
[native-inputs]: Add xorg-server-for-tests and xkbcomp. Reformat.
[arguments]<#:configure-flags>: Add flag to enable docs.
(libxkbcommon-1.5, libxkbcommon-1.8): Remove variables.
* gnu/packages/terminals.scm (foot)[inputs]: Use libxkbcommon instead of
libxkbcommon-1.8.
Change-Id: I0e4ce4cab04c059916ea7dddd31d2780c7b49b26
---
gnu/packages/terminals.scm | 2 +-
gnu/packages/xdisorg.scm | 69 +++++++++++++++-------------------------------
2 files changed, 23 insertions(+), 48 deletions(-)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 7d9b2db940..8021652dbc 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -887,7 +887,7 @@ eye-candy, customizable, and reasonably lightweight.")
(list (search-path-specification
(variable "TERMINFO_DIRS")
(files '("share/terminfo")))))
- (inputs (list fcft libxkbcommon-1.8 wayland wayland-protocols))
+ (inputs (list fcft libxkbcommon wayland wayland-protocols))
(synopsis "Wayland-native terminal emulator")
(description
"@command{foot} is a terminal emulator for systems using the Wayland
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 5933853408..6e7ea8dd09 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -633,14 +633,16 @@ avoiding password prompts when X11 forwarding has already
been setup.")
(define-public libxkbcommon
(package
(name "libxkbcommon")
- (version "1.6.0")
+ (version "1.11.0")
(source (origin
- (method url-fetch)
- (uri (string-append
"https://xkbcommon.org/download/libxkbcommon-";
- version ".tar.xz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xkbcommon/libxkbcommon";)
+ (commit (string-append "xkbcommon-" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0awwz5pg9x5bj0d7dpg4a7bd4gl6k55mlpxwb12534fkrpn19p0f"))))
+ "1swa6rf63c0wi0qq5r661g63yk2iwa9l66148078xkrwcf05sp91"))))
(outputs '("out" "doc"))
(build-system meson-build-system)
(inputs
@@ -652,12 +654,19 @@ avoiding password prompts when X11 forwarding has already
been setup.")
xkeyboard-config))
(native-inputs
(append
- (list bison doxygen pkg-config python
- ;; wayland-scanner is required at build time.
- wayland)
- (if (%current-target-system)
- (list pkg-config-for-build)
- '())))
+ (list bison
+ doxygen
+ pkg-config
+ python
+ ;; wayland-scanner is required at build time.
+ wayland
+ ;; Xvfb for tests.
+ xorg-server-for-tests
+ ;; xkbcomp for tests.
+ xkbcomp)
+ (if (%current-target-system)
+ (list pkg-config-for-build)
+ '())))
(arguments
(list
#:configure-flags
@@ -666,7 +675,8 @@ avoiding password prompts when X11 forwarding has already
been setup.")
%build-inputs "share/X11/xkb"))
(string-append "-Dx-locale-root="
(search-input-directory
- %build-inputs "share/X11/locale")))
+ %build-inputs "share/X11/locale"))
+ "-Denable-docs=true")
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'move-doc
@@ -695,41 +705,6 @@ X11 (yet).")
"See 'COPYING' in the distribution."))
(properties '((cpe-name . "xkbcommon")))))
-(define-public libxkbcommon-1.5
- (package
- (inherit libxkbcommon)
- (version "1.5.0")
- (source (origin
- (inherit (package-source libxkbcommon))
- (method url-fetch)
- (uri (string-append
"https://xkbcommon.org/download/libxkbcommon-";
- version ".tar.xz"))
- (sha256
- (base32
- "05z08rpa464x8myjxddhix7jp9jcmakd7xrybx4hz8dwpg2123sn"))))))
-
-(define-public libxkbcommon-1.8
- (package
- (inherit libxkbcommon)
- (version "1.8.1")
- (source (origin
- (inherit (package-source libxkbcommon))
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/xkbcommon/libxkbcommon";)
- (commit (string-append "xkbcommon-" version))))
- (file-name (git-file-name (package-name libxkbcommon) version))
- (sha256
- (base32
- "0fz6mf99lyp7x6g6v33210hhpykbg32fjmckyvxfpd805cza0xrj"))))
- (arguments
- (substitute-keyword-arguments (package-arguments libxkbcommon)
- ((#:configure-flags flags #~(list))
- #~(cons "-Denable-docs=true" #$flags))))
- (native-inputs (modify-inputs (package-native-inputs libxkbcommon)
- (append xorg-server ;; Xvfb for tests
- xkbcomp))))) ;; xkbcomp for tests
-
(define-public libfakekey
(package
(name "libfakekey")
