Now I really have broken the build

Okay, I will do that and include a comment about why. I guess when I compile locally the compiler does not produce warnings.

Do I simply prepare a new patch and push it? I will wait until the Sphinx problem is solved.