CVS commit: pkgsrc/print/scribus-qt5

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Jun 22 21:24:15 UTC 2021

Modified Files:
        pkgsrc/print/scribus-qt5: distinfo
Added Files:
        pkgsrc/print/scribus-qt5/patches:
            patch-scribus_plugins_import_pdf_slaoutput.cpp
            patch-scribus_plugins_import_pdf_slaoutput.h

Log Message:
scribus-qt5: fix build with poppler >= 21.3


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/scribus-qt5/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_slaoutput.cpp \
    pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_slaoutput.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/scribus-qt5/distinfo
diff -u pkgsrc/print/scribus-qt5/distinfo:1.1 pkgsrc/print/scribus-qt5/distinfo:1.2
--- pkgsrc/print/scribus-qt5/distinfo:1.1       Sun Jun 14 07:35:58 2020
+++ pkgsrc/print/scribus-qt5/distinfo   Tue Jun 22 21:24:15 2021
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.1 2020/06/14 07:35:58 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2021/06/22 21:24:15 markd Exp $
 
 SHA1 (scribus-1.5.6pre20200611-37c361f2fcd24dea40c61a7f9638e6248ea3e68a.tar.gz) = bfd17ea98c3cd98e733c3a38ca929f8889467fec
 RMD160 (scribus-1.5.6pre20200611-37c361f2fcd24dea40c61a7f9638e6248ea3e68a.tar.gz) = 4f5bd60e682b71fdf58ebffddbe4fdb4882fdbd5
 SHA512 (scribus-1.5.6pre20200611-37c361f2fcd24dea40c61a7f9638e6248ea3e68a.tar.gz) = 
d2d3ce3c4ca2bbe7e8950f5ad4f967d90b4d7cb300dfb0d475f501055304cf6dd58fec3fc977890dca5f1725108da8c5c4b55209ab75c65c2fb147613f880049
 Size (scribus-1.5.6pre20200611-37c361f2fcd24dea40c61a7f9638e6248ea3e68a.tar.gz) = 87492633 bytes
 SHA1 (patch-CMakeLists__Dependencies.cmake) = 583d1b0f0e0fe2c3dda674b5d4a2b172a4b1624f
+SHA1 (patch-scribus_plugins_import_pdf_slaoutput.cpp) = 03c33ecab1b3041da24942081a7f1df2a09c432b
+SHA1 (patch-scribus_plugins_import_pdf_slaoutput.h) = 56c4773d1422cc51c4747a2410f974acdc5560bb
 SHA1 (patch-scribus_ui_colorlistmodel.cpp) = c5ac59338ba07f46a42bd882c6a876c2c7c8404a
 SHA1 (patch-scribus_ui_colorlistmodel.h) = 781b1dc06e6abd9e494a58b6a80d2f8e97936c49

Added files:

Index: pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_slaoutput.cpp
diff -u /dev/null pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_slaoutput.cpp:1.1
--- /dev/null   Tue Jun 22 21:24:15 2021
+++ pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_slaoutput.cpp     Tue Jun 22 21:24:15 2021
@@ -0,0 +1,39 @@
+$NetBSD: patch-scribus_plugins_import_pdf_slaoutput.cpp,v 1.1 2021/06/22 21:24:15 markd Exp $
+
+patches for poppler >= 21.3
+
+--- scribus/plugins/import/pdf/slaoutput.cpp.orig      2020-06-11 09:56:15.000000000 +0000
++++ scribus/plugins/import/pdf/slaoutput.cpp
+@@ -2291,9 +2291,19 @@ GBool SlaOutputDev::patchMeshShadedFill(
+       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(Gf
+       // 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();
Index: pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_slaoutput.h
diff -u /dev/null pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_slaoutput.h:1.1
--- /dev/null   Tue Jun 22 21:24:15 2021
+++ pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_slaoutput.h       Tue Jun 22 21:24:15 2021
@@ -0,0 +1,30 @@
+$NetBSD: patch-scribus_plugins_import_pdf_slaoutput.h,v 1.1 2021/06/22 21:24:15 markd Exp $
+
+fixes for poppler >=21.3
+
+--- scribus/plugins/import/pdf/slaoutput.h.orig        2020-06-11 09:56:15.000000000 +0000
++++ scribus/plugins/import/pdf/slaoutput.h
+@@ -195,7 +195,11 @@ 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()); }
+@@ -367,7 +371,11 @@ private:
+       Catalog *catalog {nullptr};
+       SplashFontEngine *m_fontEngine {nullptr};
+       SplashFont *m_font {nullptr};
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 4, 0)
++      std::unique_ptr<FormPageWidgets> m_formWidgets;
++#else
+       FormPageWidgets *m_formWidgets {nullptr};
++#endif
+       QHash<QString, QList<int> > m_radioMap;
+       QHash<int, PageItem*> m_radioButtons;
+       int m_actPage;