Merge pull request #144 from xytovl/master

fontsproto removal breaks xorg-server build