libreoffice pdfimport w/ poppler-0.73.0: build failure

[Andreas Sturmlechner <asturm@xxxxxxxxxx>]

In 6.2.0.2 (git master has no relevant commits over this part), libreoffice 
fails to build with:

In file included from /usr/src/portage/app-office/libreoffice-6.2.0.2/work/
libreoffice-6.2.0.2/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx:24,
                 from /usr/src/portage/app-office/libreoffice-6.2.0.2/work/
libreoffice-6.2.0.2/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx:20:
/usr/src/portage/app-office/libreoffice-6.2.0.2/work/libreoffice-6.2.0.2/sdext/
source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx:281:9: error:  typedef Guchar 
Output_t;
         ^~~~~~
         u_char
/usr/src/portage/app-office/libreoffice-6.2.0.2/work/libreoffice-6.2.0.2/sdext/
source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx:282:22: error:  typedef 
std::vector< Output_t > OutputBuffer;
                      ^~~~~~~~
cat /usr/src/portage/app-office/libreoffice-6.2.0.2/work/libreoffice-6.2.0.2/sysui/
desktop/mimetypes/openoffice.mime | tr -d "\015" > /usr/src/portage/app-office/
libreoffice-6.2.0.2/work/libreoffice-6.2.0.2/workdir/CustomTarget/sysui/share/
libreoffice/openoffice.mime
/usr/src/portage/app-office/libreoffice-6.2.0.2/work/libreoffice-6.2.0.2/sdext/
source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx:282:22: note: suggested 
alternative: ‘OutputDev typedef std::vector< Output_t > OutputBuffer;
                      ^~~~~~~~
                      OutputDev
/usr/src/portage/app-office/libreoffice-6.2.0.2/work/libreoffice-6.2.0.2/sdext/
source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx:282:31: error: template argument 
1 is invalid
 typedef std::vector< Output_t > OutputBuffer;
                               ^
/usr/src/portage/app-office/libreoffice-6.2.0.2/work/libreoffice-6.2.0.2/sdext/
source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx:282:31: error: template argument 
2 is invalid
In file included from /usr/src/portage/app-office/libreoffice-6.2.0.2/work/
libreoffice-6.2.0.2/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx:20:
/usr/src/portage/app-office/libreoffice-6.2.0.2/work/libreoffice-6.2.0.2/sdext/
source/pdfimport/xpdfwrapper/pnghelper.hxx:56:48: error:          static 
sal_uInt32 deflateBuffer( const Output_t* i_pBuf, size_t i_nLen, OutputBuffer& 
o_rOut );
                                                ^~~~~~~~
                                                OutputDev
/usr/src/portage/app-office/libreoffice-6.2.0.2/work/libreoffice-6.2.0.2/sdext/
source/pdfimport/xpdfwrapper/pnghelper.hxx: In static member function ‘static 
void pdfi::PngHelper::append(sal_uInt32, OutputBuffer&)/usr/src/portage/app-
office/libreoffice-6.2.0.2/work/libreoffice-6.2.0.2/sdext/source/pdfimport/
xpdfwrapper/pnghelper.hxx:42:40: error: request for member ‘size             
size_t nCur = o_rOutputBuf.size();
                                        ^~~~
/usr/src/portage/app-office/libreoffice-6.2.0.2/work/libreoffice-6.2.0.2/sdext/
source/pdfimport/xpdfwrapper/pnghelper.hxx:43:26: error: request for member 
‘insert             o_rOutputBuf.insert( o_rOutputBuf.end(), 4, Output_t(0) );
                          ^~~~~~
/usr/src/portage/app-office/libreoffice-6.2.0.2/work/libreoffice-6.2.0.2/sdext/
source/pdfimport/xpdfwrapper/pnghelper.hxx:43:47: error: request for member 
‘end             o_rOutputBuf.insert( o_rOutputBuf.end(), 4, Output_t(0) );
                                               ^~~
/usr/src/portage/app-office/libreoffice-6.2.0.2/work/libreoffice-6.2.0.2/sdext/
source/pdfimport/xpdfwrapper/pnghelper.hxx:43:57: error:              
o_rOutputBuf.insert( o_rOutputBuf.end(), 4, Output_t(0) );
                                                         ^~~~~~~~

(it goes on like that)

The relevant change in poppler 0.73 release notes:
* Remove Gulong, Guint, Gushort, Guchar typedefs

Regards,
Andreas



_______________________________________________
LibreOffice mailing list
LibreOffice@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/libreoffice