Re-instate dropped libiconv patch

.. and build much less deep directory on MSYS
as I ran into 262 character-long pathnames.