guix_mirror_bot pushed a commit to branch mesa-updates
in repository guix.

commit 460ef6fd80b9c4483c7bc860574b1a36ace486f0
Author: Amrit <[email protected]>
AuthorDate: Sun Oct 18 14:45:48 2026 -0400

    gnu: wayland: Update to 1.26.0.
    
    Adapted from guix/guix!11319.  Use a patch from upstream,
    
<https://gitlab.freedesktop.org/wayland/wayland/-/commit/6c0a03a8fade7386d202dde1b2ace76dd6897417>,
    to allow disabling building docs with mdbook, at least for now.  Since that 
is
    a rust package (not currently in Guix), this would bring rust into many
    packages' dependencies, e.g. through mesa.
    
    * gnu/packages/freedesktop.scm (wayland): Update to 1.26.0.
    [source]: Add patch.
    [arguments]: Add configure-flags to disable building docs with mdbook.
    * gnu/packages/patches/wayland-no-mdbook.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Register it.
    
    Co-authored-by: John Kehayias <[email protected]>
---
 gnu/local.mk                                 |  1 +
 gnu/packages/freedesktop.scm                 |  8 +++--
 gnu/packages/patches/wayland-no-mdbook.patch | 53 ++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index d785109e0c5..c99234ff8fc 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2736,6 +2736,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/warzone2100-unbundle-inih.patch         \
   %D%/packages/patches/warzone2100-unbundle-utfcpp.patch       \
   %D%/packages/patches/watcher-fix-pkg-config.patch             \
+  %D%/packages/patches/wayland-no-mdbook.patch \
   %D%/packages/patches/wcstools-extend-makefiles.patch \
   %D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch     \
   %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 16a97be9b3e..db701b73662 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1479,19 +1479,21 @@ in and for C++.")
 (define-public wayland
   (package
     (name "wayland")
-    (version "1.24.0")
+    (version "1.26.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://gitlab.freedesktop.org/"; name
                                   "/" name  "/-/releases/" version 
"/downloads/"
                                   name "-" version ".tar.xz"))
+              (patches (search-patches "wayland-no-mdbook.patch")) 
               (sha256
                (base32
-                "0dh5bldg24ajxz7xmylwm01nmj572x1vb0ya9qrppmhsl23j92c2"))))
+                "18xpc8qv5ll1hfswjfphzlbzrbrihgpyby46w81rk5p48sm6w5v4"))))
     (build-system meson-build-system)
     (outputs '("out" "doc"))
     (arguments
-     (list #:phases
+     (list #:configure-flags #~(list "-Dbook=false")
+           #:phases
            #~(modify-phases %standard-phases
                (add-after 'install 'move-doc
                  (lambda _
diff --git a/gnu/packages/patches/wayland-no-mdbook.patch 
b/gnu/packages/patches/wayland-no-mdbook.patch
new file mode 100644
index 00000000000..048b180aa0c
--- /dev/null
+++ b/gnu/packages/patches/wayland-no-mdbook.patch
@@ -0,0 +1,53 @@
+From 6c0a03a8fade7386d202dde1b2ace76dd6897417 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <[email protected]>
+Date: Thu, 9 Jul 2026 17:02:36 -0400
+Subject: [PATCH] doc: add option to not build the book
+
+mdbook is not available in all distributions, and other documentation does
+not require it.
+
+Signed-off-by: Yaakov Selkowitz <[email protected]>
+---
+ doc/meson.build   | 6 ++++--
+ meson_options.txt | 4 ++++
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index b9f6fcba7..7b3d7d830 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -6,7 +6,7 @@ dot = find_program('dot')
+ doxygen = find_program('doxygen')
+ xsltproc = find_program('xsltproc')
+ xmlto = find_program('xmlto')
+-mdbook = find_program('mdbook')
++mdbook = find_program('mdbook', required: get_option('book'))
+ 
+ cmd = run_command(doxygen, '--version', check: true)
+ message('doxygen: ' + cmd.stdout().strip())
+@@ -40,4 +40,6 @@ publican_html_dir = 'html'
+ 
+ subdir('doxygen')
+ subdir('publican')
+-subdir('book')
++if mdbook.found()
++      subdir('book')
++endif
+diff --git a/meson_options.txt b/meson_options.txt
+index 02c2346a6..3445f3fed 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -22,6 +22,10 @@ option('dtd_validation',
+   description: 'Validate the protocol DTD (requires libxml2)',
+   type: 'boolean',
+   value: true)
++option('book',
++  description: 'Build the Wayland Book (requires mdbook)',
++  type: 'boolean',
++  value: true)
+ option('icon_directory',
+   description: 'Location used to look for cursors (defaults to 
${datadir}/icons if unset)',
+   type: 'string',
+-- 
+GitLab
+

Reply via email to