fix-cross-compiling.diff fix-gsocket-name-clash.diff