Updated the patch to be better able to use the libs as static libs.
Removed a redundant patch hunk.