Fix WebKitGTK build again

I'm not sure why this was failing, but it was an issue with jhbuild, so I cherry-picked the relevant commits.