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] sphinx-doc/sphinx#11629
akiyks · Aug 23, 2023 · 0098b20 · 0098b20 · severach · Aug 23, 2023
1 parent 21b25bd
commit 0098b20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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,