Add some port patches to source-highlight, and relbump and rebuild