Hi! I've prepared a fix, however, I've been unable to test it as there's a massive chain of dependencies that need updating; some can be simply recompiled but some FTBFS on their own.
It's pushed to the collab-maint git. -- A tit a day keeps the vet away.
