git+https
Only a few adjustments were left but nothing critical to the build. So let's try to upstream the remaining ones and get rid of the patches here.