Also updated weston to 1.0.5, and got rid of the patch that's no longer needed. They fixed it upstream even if it was actually caused by our pkg-config patch.
Also updated weston to 1.0.4, which now fails to build. Doh!
I also removed the screenshooter-client-protocol patch as this was fixed upstream.