add patches to fix compilation of 1.9.3 and 2.0.0 on cygwin, fix #2632