Log Message:
Fix broken build on amd64. Also combine two patches that were to the same
file, don't include the SUBST results in the patch, and add a missing dep
on libX11. PKGREVISION++.