qt5 packages: yet more patches from upstream