merge master into x-updates (would-be fast-forward)
poppler_0_18: remove, only used by libreoffice

I need to test libreoffice still builds, so I push this to x-updates.
(I hate having to do such things to try a couple of jobs.)
libreoffice: add deps needed now (libXdmcp, libpthreadstubs)

Configure phase passes now.
Merge: remove poppler_0_18 from libreoffice