System POPPLER_VERSION redefined, won't build

Biulding from Git with --with-system-poppler I get a warning repeatedly:
In file included from
/mnt/windows/libreoffice-src/core/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx:24:0,            
    
from
/mnt/windows/libreoffice-src/core/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx:20:/mnt/windows/libreoffice-src/core/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx:57:0:
warning: "POPPLER_VERSION" redefined #define POPPLER_VERSION "0.12.3" ^In
file included from /usr/include/poppler/GfxState.h:38:0,                
from
/mnt/windows/libreoffice-src/core/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx:33,         
       
from
/mnt/windows/libreoffice-src/core/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx:24,              
  
from
/mnt/windows/libreoffice-src/core/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx:20:/usr/include/poppler/poppler-config.h:37:0:
note: this is the location of the previous definition #define
POPPLER_VERSION "0.33.0" ^
And gcc fails because the arguments to processLink() are wrong:
In file included from
/mnt/windows/libreoffice-src/core/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx:24:0,            
    
from
/mnt/windows/libreoffice-src/core/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx:20:/mnt/windows/libreoffice-src/core/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx:200:34:
error: ‘Link’ has not been declared         virtual void processLink(Link
*link, Catalog *catalog) override;                                 
^/mnt/windows/libreoffice-src/core/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx:185:22:
error: ‘virtual void pdfi::PDFOutDev::startPage(int, GfxState*)’ marked
‘override’, but does not override         virtual void startPage(int
pageNum, GfxState *state                      ^




--
View this message in context: 
http://nabble.documentfoundation.org/System-POPPLER-VERSION-redefined-won-t-build-tp4165697.html
Sent from the Dev mailing list archive at Nabble.com.