Damn. Well, time to fork everything and keep internal patches internal.
This system is unworkable.
replies(1):
When a third party dep is broken or needs a workaround, just include a patch in the build (or fork). Then those patches can be upstreamed asynchronously without slowing down development.