[arch-commits] Commit in scribus/trunk (PKGBUILD poppler-21.3.0.patch)

[Evangelos Foutras]

    Date: Tuesday, March 2, 2021 @ 16:19:44
  Author: foutrelis
Revision: 877579

Fix build with poppler 21.3.0

Added:
  scribus/trunk/poppler-21.3.0.patch
Modified:
  scribus/trunk/PKGBUILD

----------------------+
 PKGBUILD             |    3 ++
 poppler-21.3.0.patch |   53 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-02 16:19:30 UTC (rev 877578)
+++ PKGBUILD	2021-03-02 16:19:44 UTC (rev 877579)
@@ -20,9 +20,11 @@
 optdepends=('tk: scripts based on tkinter'
             'hyphen-lang: hyphenation patterns for desired languages')
 source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc}
+        poppler-21.3.0.patch
         scribus-podofo-0.9.7.patch::https://github.com/scribusproject/scribus/commit/c6182ef92820b422d61c904e40e9fed865458eb5.patch)
 sha256sums=('d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab'
             'SKIP'
+            'df9141dc7db53762f28f448b27d518a2e6ecf5665efe79d8f341b41159e6f147'
             'ef40f58da30e024d85abc20384853b4d3e7ec02ec8db97f3470528c351119d99')
 validpgpkeys=(5086B8D68E70FDDF4C40045AEF7B95E7F60166DA  # Peter Linnell <plinnell at scribus.net>
               757F5E9B13DD648887AD50092D47C099E782504E  # The Scribus Team (www.scribus.net) <the_scribus_team at scribus.net>
@@ -30,6 +32,7 @@
 
 prepare() {
   cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../poppler-21.3.0.patch
   patch -Np1 -i ../scribus-podofo-0.9.7.patch
 }
 

Added: poppler-21.3.0.patch
===================================================================
--- poppler-21.3.0.patch	                        (rev 0)
+++ poppler-21.3.0.patch	2021-03-02 16:19:44 UTC (rev 877579)
@@ -0,0 +1,53 @@
+From 990cf7531eedd5e54abf8b6668c510e1c91ade93 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Tue, 2 Mar 2021 18:05:08 +0200
+Subject: [PATCH] Fix build with poppler 21.3.0
+
+Update SlaOutputDev::tilingPatternFill's prototype after the commit:
+https://gitlab.freedesktop.org/poppler/poppler/-/commit/2589f3252fe3
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 10 ++++++++++
+ scribus/plugins/import/pdf/slaoutput.h   |  4 ++++
+ 2 files changed, 14 insertions(+)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index 7cbc73e..9fb91f5 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -2292,10 +2292,20 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *sh
+ 	return gTrue;
+ }
+ 
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
++GBool 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";
+ 	PDFRectangle box;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
++	const double *bbox = tPat->getBBox();
++	const double *pmat = tPat->getMatrix();
++	Dict *resDict = tPat->getResDict();
++	Object *str = tPat->getContentStream();
++#endif
+ 	Gfx *gfx;
+ 	QString id;
+ 	PageItem *ite;
+diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
+index 5149f19..4673bcf 100644
+--- a/scribus/plugins/import/pdf/slaoutput.h
++++ b/scribus/plugins/import/pdf/slaoutput.h
+@@ -197,7 +197,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)
++	GBool 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()); }