diff options
Diffstat (limited to '0003-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch')
| -rw-r--r-- | 0003-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/0003-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch b/0003-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch new file mode 100644 index 000000000000..3ec7388d12b1 --- /dev/null +++ b/0003-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch @@ -0,0 +1,33 @@ +From 37d1bd4999f06c7c4b3094cb74b7614c552ecc1d Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org> +Date: Thu, 24 Aug 2023 01:28:17 +0200 +Subject: [PATCH 3/8] sphinx: kfigure.py: Convert outdir to str before using + len + +Sphinx 7.2 replaced several uses of str with pathlib Paths, causing the +build to fail with a TypeError when attempting to use len on one. + +Patch by @loqs; thanks. + +Fixes: https://bugs.archlinux.org/task/79446 +Signed-off-by: Jan Alexander Steffens (heftig) <heftig@archlinux.org> +--- + Documentation/sphinx/kfigure.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Documentation/sphinx/kfigure.py b/Documentation/sphinx/kfigure.py +index cefdbb7e75230..13e885bbd499c 100644 +--- a/Documentation/sphinx/kfigure.py ++++ b/Documentation/sphinx/kfigure.py +@@ -309,7 +309,7 @@ def convert_image(img_node, translator, src_fname=None): + if dst_fname: + # the builder needs not to copy one more time, so pop it if exists. + translator.builder.images.pop(img_node['uri'], None) +- _name = dst_fname[len(translator.builder.outdir) + 1:] ++ _name = dst_fname[len(str(translator.builder.outdir)) + 1:] + + if isNewer(dst_fname, src_fname): + kernellog.verbose(app, +-- +2.41.0 + |