Fix error when building with Sphinx 4.5

[mitya57]

Ideally, we should stop monkey-patching and forward the fix to Sphinx upstream. I don't know details of the fix, so it would be better if the original author @cpitclaudel does this.

Fixes / closes #15956

[rwmjones]

I tested this patch and it fixes the problem we had building Coq in Fedora Rawhide with the latest Sphinx.

[Alizter]

@Zimmi48 what more needs to be done for this?

[rwmjones]

Fedora package patched: https://src.fedoraproject.org/rpms/coq/c/00b57637d8246e51eaae207988a3b922aaf19ede?branch=rawhide

[Zimmi48]

As the author of the PR wrote, this patch cannot be merged as is because it breaks the build with older Sphinx version. Probably it should be a draft PR to reflect this.

We are also looking for feedback from @cpitclaudel on this code to know how to proceed.

[SkySkimmer]

Can we do something like if sphinx_version < whatever then previous code else new code? (the CR is just \n so we don't need to import it)

[mitya57]

Can we do something like if sphinx_version < whatever then previous code else new code? (the CR is just \n so we don't need to import it)

Done. I left CR imported to make it easier to compare patched function with original version.

[cpitclaudel]

I will try to look this weekend

[Zimmi48]

FWIW, I am fine with merging this solution.

@cpitclaudel Did you get the chance to look at it?

[cpitclaudel]

Oh, the patch looks fine (thanks @mitya57!). By look at I meant that I'd try to upstream the change, but since I haven't had time since two weeks ago it's unlikely that I'll find the time soon :/ @mitya57 would you fell comfortable opening a PR on the Sphinx side?

[Zimmi48]

@coqbot merge now

[mitya57]

By look at I meant that I'd try to upstream the change, but since I haven't had time since two weeks ago it's unlikely that I'll find the time soon :/ @mitya57 would you fell comfortable opening a PR on the Sphinx side?

Done in sphinx-doc/sphinx#10647.

[cpitclaudel]

Thanks!