ok On 16/12/19 22:30 +0100, Matthias Kilian wrote: > Unbreak the build with poppler-0.83.0. > > To be committed right after poppler. > > ok? > > Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx > =================================================================== > RCS file: > /cvs/ports/editors/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx,v > retrieving revision 1.6 > diff -u -p -r1.6 patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx > --- patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx > 7 Nov 2019 18:44:39 -0000 1.6 > +++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx > 15 Dec 2019 15:34:15 -0000 > @@ -4,9 +4,26 @@ Fix build with poppler-8.82.0. > > > https://gerrit.libreoffice.org/plugins/gitiles/core/+/2eadd46ab81058087af95bdfc1fea28fcdb65998%5E%21 > > +And with poppler-0.83.0. > + > Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx > --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig > +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx > +@@ -491,12 +491,12 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) cons > + gfree(pBuf); > + } > + > +-void PDFOutDev::printPath( GfxPath* pPath ) > ++void PDFOutDev::printPath( const GfxPath* pPath ) > + { > + int nSubPaths = pPath ? pPath->getNumSubpaths() : 0; > + for( int i=0; i<nSubPaths; i++ ) > + { > +- GfxSubpath* pSub = pPath->getSubpath( i ); > ++ const GfxSubpath* pSub = pPath->getSubpath( i ); > + const int nPoints = pSub->getNumPoints(); > + > + printf( " subpath %d", pSub->isClosed() ); > @@ -863,11 +863,20 @@ void PDFOutDev::eoClip(GfxState *state) > local offset of character (zero for horizontal writing mode). not > taken into account for output pos updates. Used for vertical writing. > Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx > =================================================================== > RCS file: > /cvs/ports/editors/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx,v > retrieving revision 1.6 > diff -u -p -r1.6 patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx > --- patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx > 7 Nov 2019 18:44:39 -0000 1.6 > +++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx > 15 Dec 2019 15:34:15 -0000 > @@ -4,9 +4,20 @@ Fix build with poppler-8.82.0. > > > https://gerrit.libreoffice.org/plugins/gitiles/core/+/2eadd46ab81058087af95bdfc1fea28fcdb65998%5E%21 > > +And with poppler-0.83.0. > + > Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx > --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig > +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx > +@@ -149,7 +149,7 @@ namespace pdfi > + > + int parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) > const; > + void writeFontFile( GfxFont* gfxFont ) const; > +- static void printPath( GfxPath* pPath ); > ++ static void printPath( const GfxPath* pPath ); > + > + public: > + explicit PDFOutDev( PDFDoc* pDoc ); > @@ -232,10 +232,17 @@ namespace pdfi > virtual void eoClip(GfxState *state) override; > > Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_wrapper_gpl_cxx > =================================================================== > RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_wrapper_gpl_cxx > diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_wrapper_gpl_cxx > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-sdext_source_pdfimport_xpdfwrapper_wrapper_gpl_cxx 15 Dec > 2019 15:34:15 -0000 > @@ -0,0 +1,16 @@ > +$OpenBSD$ > + > +Fix build with poppler-0.83.0. > + > +Index: sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx > +--- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx.orig > ++++ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx > +@@ -68,7 +68,7 @@ int main(int argc, char **argv) > + } > + > + // read config file > +- globalParams = new GlobalParams(); > ++ globalParams = std::make_unique<GlobalParams>(); > + globalParams->setErrQuiet(true); > + #if defined(_MSC_VER) > + globalParams->setupBaseFonts(nullptr);
-- Regards, Robert Nagy
