[PATCH rtems-docs 1/2] layout.html: Revert patch forcing Spinx to >= 6.0

Joel Sherrill joel at rtems.org
Tue Jul 25 20:25:45 UTC 2023


Unfortunately, updating past Sphinx 5.x results in unordered bullet
lists not formatting correctly as show in a screen capture attached
to #4928. Revert this patch until the issue is resolved and output
is reviewed for other potential issues.

    From: Utkarsh Verma <utkarsh at bitbanged.com>
    Date: Wed, 14 Jun 2023 05:36:26 +0000
    Subject: [PATCH] eng: Fix builds for newer Sphinx versions (>=7)

    The current Sphinx theme depends on the `style` parameter which got
    deprecated in v5.1 and finally got removed in v7. Now, the `styles` key
    should be preferred which is a list of stylesheets. This commit
    implements this change.

Updates #4915.
Updates #4928.
---
 common/sphinx_rtd_theme_rtems/layout.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/sphinx_rtd_theme_rtems/layout.html b/common/sphinx_rtd_theme_rtems/layout.html
index 91d67b5..0fe6c65 100644
--- a/common/sphinx_rtd_theme_rtems/layout.html
+++ b/common/sphinx_rtd_theme_rtems/layout.html
@@ -67,9 +67,7 @@
   {%- endblock %}
 
   {# CSS #}
-  {% for style in styles %}
   <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
-  {% endfor %}
   <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
   {%- for css in css_files %}
     {%- if css|attr("rel") %}
-- 
2.31.1



More information about the devel mailing list