Signed-off-by: Jo Shields <directhex@apebox.org> [adjusted the patch to the new upstream build code] Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>