From 0098b209e41c272bf043db93e203a47cd41b1cbe Mon Sep 17 00:00:00 2001 From: Akira Yokosawa Date: Wed, 23 Aug 2023 10:56:45 +0900 Subject: [PATCH] WIP Tentative fix to htmldocs build error with Sphinx 7.2.x Forward port of change suggested by @severach in Sphinx github issue #11629 [1]. Link: [1] https://github.com/sphinx-doc/sphinx/issues/11629 --- Documentation/sphinx/kerneldoc.py | 2 +- Documentation/sphinx/kfigure.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/sphinx/kerneldoc.py b/Documentation/sphinx/kerneldoc.py index 9395892c7ba38b..69ee7d4e8e6e46 100644 --- a/Documentation/sphinx/kerneldoc.py +++ b/Documentation/sphinx/kerneldoc.py @@ -138,7 +138,7 @@ def run(self): lineoffset = int(match.group(1)) - 1 # we must eat our comments since the upset the markup else: - doc = env.srcdir + "/" + env.docname + ":" + str(self.lineno) + doc = scr(env.srcdir) + "/" + str(env.docname) + ":" + str(self.lineno) result.append(line, doc + ": " + filename, lineoffset) lineoffset += 1 diff --git a/Documentation/sphinx/kfigure.py b/Documentation/sphinx/kfigure.py index cefdbb7e75230b..13e885bbd499c6 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,