svn commit: r567940 - head/print/scribus-devel/files

[Piotr Kubaj]

Author: pkubaj
Date: Tue Mar  9 15:53:11 2021
New Revision: 567940
URL: https://svnweb.freebsd.org/changeset/ports/567940

Log:
  print/scribus-devel: fix build after poppler 21.03.0 upgrade
  
  PR:		254158
  Submitted by:	tcberner
  Reported by:	vvd at unislabs.com

Added:
  head/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp   (contents, props changed)
  head/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h   (contents, props changed)

Added: head/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp	Tue Mar  9 15:53:11 2021	(r567940)
@@ -0,0 +1,35 @@
+--- scribus/plugins/import/pdf/slaoutput.cpp.orig	2021-03-09 15:39:49 UTC
++++ scribus/plugins/import/pdf/slaoutput.cpp
+@@ -2291,9 +2291,19 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *stat
+ 	return gTrue;
+ }
+ 
+-GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
++bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep)
++#else
++GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int /*paintType*/, int /*tilingType*/, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
++#endif
+ {
+ //	qDebug() << "SlaOutputDev::tilingPatternFill";
++ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
++	const double *bbox = tPat->getBBox();
++	const double *pmat = tPat->getMatrix();
++	Dict *resDict = tPat->getResDict();
++#endif
++
+ 	PDFRectangle box;
+ 	Gfx *gfx;
+ 	QString id;
+@@ -2325,7 +2335,11 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state,
+ 	// Unset the clip path as it is unrelated to the pattern's coordinate space.
+ 	QPainterPath savedClip = m_currentClipPath;
+ 	m_currentClipPath = QPainterPath();
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
++	gfx->display(tPat->getContentStream());
++#else
+ 	gfx->display(str);
++#endif
+ 	m_currentClipPath = savedClip;
+ 	inPattern--;
+ 	gElements = m_groupStack.pop();

Added: head/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h	Tue Mar  9 15:53:11 2021	(r567940)
@@ -0,0 +1,14 @@
+--- scribus/plugins/import/pdf/slaoutput.h.orig	2021-03-09 15:40:35 UTC
++++ scribus/plugins/import/pdf/slaoutput.h
+@@ -196,7 +196,11 @@ class SlaOutputDev : public OutputDev (public)
+ 	void stroke(GfxState *state) override;
+ 	void fill(GfxState *state) override;
+ 	void eoFill(GfxState *state) override;
++ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
++	bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) override;
++#else
+ 	GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) override;
++#endif
+ 	GBool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * /*shading*/) override { qDebug() << "Function Shaded Fill";  return gFalse; }
+ 	GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override;
+ 	GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading)  override { return (shading->getExtend0() == shading->getExtend1()); }