Merge patches for Ruby makefile patch.
Bump dep to build against a good package.