--- pdf-backend.cc.orig	2019-06-10 17:06:44 UTC

+++ pdf-backend.cc

@@ -103,7 +103,7 @@ static void poppler_error_handler(void *data, ErrorCat

 pdf::Environment::Environment()

 {

-  globalParams = new GlobalParams();

+  globalParams = std::unique_ptr<GlobalParams>(new GlobalParams);

   setErrorCallback(poppler_error_handler, nullptr);

 }

@@ -499,12 +499,11 @@ bool pdf::get_glyph(splash::Splash *splash, splash::Fo

 void pdf::Renderer::convert_path(pdf::gfx::State *state, splash::Path &splash_path)

 {

   /* Source was copied from <poppler/SplashOutputDev.c>. */

-  pdf::gfx::Subpath *subpath;

-  pdf::gfx::Path *path = state->getPath();

+  auto path = state->getPath();

   int n_subpaths = path->getNumSubpaths();

   for (int i = 0; i < n_subpaths; i++)

   {

-    subpath = path->getSubpath(i);

+    auto subpath = path->getSubpath(i);

     if (subpath->getNumPoints() > 0)

     {

       double x1, y1, x2, y2, x3, y3;

Source: Timo Gurr <timo.gurr@gmail.com>

Upstream: Reported, https://bugs.kde.org/show_bug.cgi?id=414795

Reason: Fix build with poppler 0.83.0

diff -Naur calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp calligra-3.1.0.new/filters/karbon/pdf/PdfImport.cpp

--- filters/karbon/pdf/PdfImport.cpp	2019-12-04 12:41:13.000000000 +0100

+++ filters/karbon/pdf/PdfImport.cpp	2019-12-04 12:39:03.000000000 +0100

@@ -60,19 +60,17 @@

     }

     // read config file

-    globalParams = new GlobalParams();

+    globalParams.reset(new GlobalParams());

     if (! globalParams)

         return KoFilter::NotImplemented;

     GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());

     PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);

     if (! pdfDoc) {

-        delete globalParams;

         return KoFilter::StupidError;

     }

     if (! pdfDoc->isOk()) {

-        delete globalParams;

         delete pdfDoc;

         return KoFilter::StupidError;

     }

@@ -99,7 +97,6 @@

     delete dev;

     delete pdfDoc;

-    delete globalParams;

     globalParams = 0;

     return KoFilter::OK;

diff -Naur calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.cpp

--- filters/karbon/pdf/SvgOutputDev.cpp	2019-12-04 12:41:14.000000000 +0100

+++ filters/karbon/pdf/SvgOutputDev.cpp	2019-12-04 12:35:30.000000000 +0100

@@ -172,7 +172,7 @@

     *d->body << "/>" << endl;

 }

-QString SvgOutputDev::convertPath(GfxPath *path)

+QString SvgOutputDev::convertPath(const GfxPath *path)

 {

     if (! path)

         return QString();

@@ -180,7 +180,7 @@

     QString output;

     for (int i = 0; i < path->getNumSubpaths(); ++i) {

-        GfxSubpath * subpath = path->getSubpath(i);

+        const GfxSubpath * subpath = path->getSubpath(i);

         if (subpath->getNumPoints() > 0) {

             output += QString("M%1 %2").arg(subpath->getX(0)).arg(subpath->getY(0));

             int j = 1;

diff -Naur calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.h

--- filters/karbon/pdf/SvgOutputDev.h	2019-12-04 12:41:14.000000000 +0100

+++ filters/karbon/pdf/SvgOutputDev.h	2019-12-04 12:30:41.000000000 +0100

@@ -83,7 +83,7 @@

     /// Dumps content to svg file

     void dumpContent();

 private:

-    QString convertPath(GfxPath *path);

+    QString convertPath(const GfxPath *path);

     QString convertMatrix(const QMatrix &matrix);

     QString convertMatrix(const double * matrix);

     QString printFill();

From 9065cd8d9a19864f6b618f2dc10daf577badd9ee Mon Sep 17 00:00:00 2001

From: Martin Milata <martin@martinmilata.cz>

Date: Wed, 4 Dec 2019 02:37:40 +0100

Subject: [PATCH] Fix build with poppler-0.83

Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9

Reviewed-on: https://gerrit.libreoffice.org/84384

Tested-by: Jenkins

Reviewed-by: Michael Stahl <michael.stahl@cib.de>

---

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 +++++++

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++

 sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx    | 4 ++++

 3 files changed, 15 insertions(+)

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx

index 26048177e87d..e9c2a407c279 100644

--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx

+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx

@@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const

     gfree(pBuf);

 }

+#if POPPLER_CHECK_VERSION(0, 83, 0)

+void PDFOutDev::printPath( const GfxPath* pPath )

+#else

 void PDFOutDev::printPath( GfxPath* pPath )

+#endif

 {

     int nSubPaths = pPath ? pPath->getNumSubpaths() : 0;

     for( int i=0; i<nSubPaths; i++ )

     {

+#if POPPLER_CHECK_VERSION(0, 83, 0)

+        const

+#endif

         GfxSubpath* pSub  = pPath->getSubpath( i );

         const int nPoints = pSub->getNumPoints();

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx

index 02f6b59f6f15..2e7d2186f9a1 100644

--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx

+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx

@@ -149,7 +149,11 @@ namespace pdfi

         int  parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const;

         void writeFontFile( GfxFont* gfxFont ) const;

+#if POPPLER_CHECK_VERSION(0, 83, 0)

+        static void printPath( const GfxPath* pPath );

+#else

         static void printPath( GfxPath* pPath );

+#endif

     public:

         explicit PDFOutDev( PDFDoc* pDoc );

diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx

index 42178b650cdd..b1a54bd09c5f 100644

--- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx

+++ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx

@@ -68,7 +68,11 @@ int main(int argc, char **argv)

     }

     // read config file

+#if POPPLER_CHECK_VERSION(0, 83, 0)

+    globalParams = std::make_unique<GlobalParams>();

+#else

     globalParams = new GlobalParams();

+#endif

     globalParams->setErrQuiet(true);

 #if defined(_MSC_VER)

     globalParams->setupBaseFonts(nullptr);

	# Fix build with poppler 0.83

	${REINPLACE_CMD} -e 's|(GfxPath|(const GfxPath|g' \

			  -e 's|GfxSubpath|const GfxSubpath|g' \

			  -e 's|new GlobalParams()|std::unique_ptr<GlobalParams>(new GlobalParams())|g' \

			  -e 's|new GlobalParams(poppler_datadir)|std::unique_ptr<GlobalParams>(new GlobalParams(poppler_datadir))|g' \

		${WRKSRC}/src/extension/internal/pdfinput/*.cpp

Fix build with poppler 0.83

--- Extra/ReadPDF.cpp.orig	2020-01-18 15:54:18 UTC

+++ Extra/ReadPDF.cpp

@@ -134,7 +134,7 @@ false

     if (!popplerData.empty()) {

         struct stat sb;

         if (stat(popplerData.c_str(), &sb) == 0 && S_ISDIR(sb.st_mode)) {

-            globalParams = new GlobalParams(popplerData.c_str());

+            globalParams = std::unique_ptr<GlobalParams>(new GlobalParams(popplerData.c_str()));

         }

     }

 }

--- scribus/plugins/import/pdf/importpdf.cpp.orig	2020-01-18 17:59:00 UTC

+++ scribus/plugins/import/pdf/importpdf.cpp

@@ -75,7 +75,7 @@ PdfPlug::PdfPlug(ScribusDoc* doc, int flags)

 QImage PdfPlug::readThumbnail(const QString& fName)

 {

 	QString pdfFile = QDir::toNativeSeparators(fName);

-	globalParams = new GlobalParams();

+	globalParams.reset(new GlobalParams());

 	if (globalParams)

 	{

 #if defined(Q_OS_WIN32) && POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 62, 0)

@@ -90,7 +90,6 @@ QImage PdfPlug::readThumbnail(const QString& fName)

 			if (pdfDoc->getErrorCode() == errEncrypted)

 			{

 				delete pdfDoc;

-				delete globalParams;

 				return QImage();

 			}

 			if (pdfDoc->isOk())

@@ -134,11 +133,9 @@ QImage PdfPlug::readThumbnail(const QString& fName)

 				image.setText("YSize", QString("%1").arg(h));

 				delete dev;

 				delete pdfDoc;

-				delete globalParams;

 				return image;

 			}

 			delete pdfDoc;

-			delete globalParams;

 		}

 	}

 	return QImage();

@@ -387,7 +384,7 @@ bool PdfPlug::convert(const QString& fn)

 		qApp->processEvents();

 	}

-	globalParams = new GlobalParams();

+	globalParams.reset(new GlobalParams());

 	GooString *userPW = nullptr;

 	if (globalParams)

 	{

@@ -429,7 +426,6 @@ bool PdfPlug::convert(const QString& fn)

 					if (progressDialog)

 						progressDialog->close();

 					delete pdfDoc;

-					delete globalParams;

 					return false;

 				}

 				if (progressDialog)

@@ -474,7 +470,6 @@ bool PdfPlug::convert(const QString& fn)

 							progressDialog->close();

 						delete optImp;

 						delete pdfDoc;

-						delete globalParams;

 						return false;

 					}

 					pageString = optImp->getPagesString();

@@ -908,7 +903,7 @@ bool PdfPlug::convert(const QString& fn)

 		}

 		delete pdfDoc;

 	}

-	delete globalParams;

+	globalParams.release();

 	globalParams = nullptr;

 //	qDebug() << "converting finished";

@@ -3705,7 +3696,7 @@ QString SlaOutputDev::getAnnotationColor(const AnnotCo

 	return fNam;

 }

-QString SlaOutputDev::convertPath(GfxPath *path)

+QString SlaOutputDev::convertPath(const GfxPath *path)

 {

 	if (! path)

 		return QString();

@@ -3715,7 +3706,7 @@ QString SlaOutputDev::convertPath(GfxPath *path)

 	for (int i = 0; i < path->getNumSubpaths(); ++i)

 	{

-		GfxSubpath * subpath = path->getSubpath(i);

+		const GfxSubpath * subpath = path->getSubpath(i);

 		if (subpath->getNumPoints() > 0)

 		{

 			output += QString("M %1 %2").arg(subpath->getX(0)).arg(subpath->getY(0));

@@ -282,7 +282,7 @@ class SlaOutputDev : public OutputDev (public)

 	void getPenState(GfxState *state);

 	QString getColor(GfxColorSpace *color_space, POPPLER_CONST_070 GfxColor *color, int *shade);

 	QString getAnnotationColor(const AnnotColor *color);

-	QString convertPath(GfxPath *path);

+	QString convertPath(const GfxPath *path);

 	int getBlendMode(GfxState *state);

 	void applyMask(PageItem *ite);

 	void pushGroup(const QString& maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false);