Merge pull request #344 from Alexpux/develop

tcl/tk: Add patches, fix building.