From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date: Tue, 6 Oct 2020 15:56:59 +0000 (+0200)
Subject: doc: Sphinx.override_domain() deprecated
X-Git-Tag: v2021.01-rc1~25^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40a3008632abd8bb393eefc212547456f2a5cb25;p=thirdparty%2Fu-boot.git

doc: Sphinx.override_domain() deprecated

Sphinx.override_domain() is deprecated since Sphinx 1.8 and removed in
Sphinx 3.

Use Sphinx.add_domain(, override=True) instead.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---

diff --git a/doc/sphinx/cdomain.py b/doc/sphinx/cdomain.py
index cf13ff3a656..cbac8e608dc 100644
--- a/doc/sphinx/cdomain.py
+++ b/doc/sphinx/cdomain.py
@@ -48,7 +48,10 @@ major, minor, patch = sphinx.version_info[:3]
 
 def setup(app):
 
-    app.override_domain(CDomain)
+    if (major == 1 and minor < 8):
+        app.override_domain(CDomain)
+    else:
+        app.add_domain(CDomain, override=True)
 
     return dict(
         version = __version__,