Use upstream patch
Obtained from: https://github.com/xapian/xapian/commit/40f35d33ee31433b00e8241ba29f03ce8f98477a