Include v4hn's patch for Linux build process

Fixes case where /usr/X11R6/lib contains a JS library
Set cargo_type to CARGO_NOT_CARGO by default for non-CLASS_CARGO ships