xorg-server: remove now-upstreamed patch

I'm sorry I completely forgot to test the previous commit.
Also remove some long unused patch.