[rtems-docs PATCH] sphinx/style: Fix building with the latest sphinx
chrisj at rtems.org
chrisj at rtems.org
Tue Dec 19 01:34:30 UTC 2023
From: Chris Johns <chrisj at rtems.org>
Tested on sphinx 7.2, 6.1.3 AND 5.3.0
Closes #4980
---
common/sphinx_rtd_theme_rtems/layout.html | 6 +++++-
common/waf.py | 5 ++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/common/sphinx_rtd_theme_rtems/layout.html b/common/sphinx_rtd_theme_rtems/layout.html
index 0fe6c65..3542bea 100644
--- a/common/sphinx_rtd_theme_rtems/layout.html
+++ b/common/sphinx_rtd_theme_rtems/layout.html
@@ -67,7 +67,11 @@
{%- endblock %}
{# CSS #}
- <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
+ {%- if sphinx_version <= "5.9.0" -%}
+ <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
+ {%- else %}
+ <link rel="stylesheet" href="{{ pathto('_static/' + styles[-1], 1) }}" type="text/css" />
+ {%- endif %}
<link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
{%- for css in css_files %}
{%- if css|attr("rel") %}
diff --git a/common/waf.py b/common/waf.py
index 6efe038..79c4057 100644
--- a/common/waf.py
+++ b/common/waf.py
@@ -16,11 +16,10 @@ from waflib.Build import BuildContext
import latex
import conf
-# Sphinx >= 6 are currently broken.
+# Sphinx >= 6 are currently broken.
# If you do not want to check for a maximum version, set it to None.
sphinx_min_version = (1, 3)
-sphinx_max_version = (5, 9)
-#sphinx_max_version = None
+sphinx_max_version = None
def version_cmdline(ctx):
return '-Drelease="%s" -Dversion="%s" -Drtems_major="%s" ' \
--
2.42.0
More information about the devel
mailing list