On 3/20/20 2:18 AM, Sean Anderson wrote:
> From: Jonathan Corbet <cor...@lwn.net>
>
> commit 3bc8088464712fdcb078eefb68837ccfcc413c88 upstream.
>
> Our version check in Documentation/conf.py never envisioned a world where
> Sphinx moved beyond 1.x. Now that the unthinkable has happened, fix our
> version check to handle higher version numbers correctly.
>
> Signed-off-by: Jonathan Corbet <cor...@lwn.net>
> [rebase for u-boot]
> Signed-off-by: Sean Anderson <sean...@gmail.com>
> ---
>
> doc/conf.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/doc/conf.py b/doc/conf.py
> index 0772fb6f0c..8bb27ad9e2 100644
> --- a/doc/conf.py
> +++ b/doc/conf.py
> @@ -37,7 +37,7 @@ needs_sphinx = '1.3'
> extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain',
> 'kfigure']
>
> # The name of the math extension changed on Sphinx 1.4
> -if major == 1 and minor > 3:
> +if (major == 1 and minor > 3) or (major > 1):
> extensions.append("sphinx.ext.imgmath")
> else:
> extensions.append("sphinx.ext.pngmath")
>
*bump*
It's been a month, any comments on this?
--Sean
