[rtems-docs commit] sphinx/style: Fix building with the latest sphinx

[Joel Sherrill]

It didn't work on the CentOS 7 system because Chris pushed while I was
switching VMs.

I now get the same output on CentOS 7 as on Rocky 9. It has sphinx-build
5.3.0

--joel

On Tue, Dec 19, 2023 at 3:10 PM Chris Johns <chrisj at rtems.org> wrote:

> Module:    rtems-docs
> Branch:    master
> Commit:    e31a0b22fe43e0ec910678cdc4bdcf2be661a461
> Changeset:
> http://git.rtems.org/rtems-docs/commit/?id=e31a0b22fe43e0ec910678cdc4bdcf2be661a461
>
> Author:    Chris Johns <chrisj at rtems.org>
> Date:      Tue Dec 19 12:31:52 2023 +1100
>
> sphinx/style: Fix building with the latest sphinx
>
> 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                             | 4 +---
>  2 files changed, 6 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..5f811f6 100644
> --- a/common/waf.py
> +++ b/common/waf.py
> @@ -16,11 +16,9 @@ from waflib.Build import BuildContext
>  import latex
>  import conf
>
> -# 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" ' \
>
> _______________________________________________
> vc mailing list
> vc at rtems.org
> http://lists.rtems.org/mailman/listinfo/vc
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/devel/attachments/20231219/161a48f1/attachment-0001.htm>