Rebase instantbird/fix-mingw-build.patch