[arch-commits] Commit in scribus/trunk (PKGBUILD poppler-21.3.0.patch)
Evangelos Foutras
foutrelis at archlinux.org
Tue Mar 2 18:42:19 UTC 2021
Date: Tuesday, March 2, 2021 @ 18:42:19
Author: foutrelis
Revision: 877764
upgpkg: scribus 1.5.6.1-9: use upstream patch for poppler 21.3.0
Modified:
scribus/trunk/PKGBUILD
scribus/trunk/poppler-21.3.0.patch
----------------------+
PKGBUILD | 4 +--
poppler-21.3.0.patch | 62 +++++++++++++++++++++++++++++++++++--------------
2 files changed, 47 insertions(+), 19 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-02 18:34:13 UTC (rev 877763)
+++ PKGBUILD 2021-03-02 18:42:19 UTC (rev 877764)
@@ -7,7 +7,7 @@
pkgname=scribus
pkgver=1.5.6.1
-pkgrel=8
+pkgrel=9
pkgdesc="Desktop publishing software"
arch=(x86_64)
url="https://www.scribus.net/"
@@ -24,7 +24,7 @@
scribus-podofo-0.9.7.patch::https://github.com/scribusproject/scribus/commit/c6182ef92820b422d61c904e40e9fed865458eb5.patch)
sha256sums=('d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab'
'SKIP'
- 'df9141dc7db53762f28f448b27d518a2e6ecf5665efe79d8f341b41159e6f147'
+ '5d3edce42d3931d786d1f9d59bafb3291c93fd590b2a047f1e4998ec7238f5de'
'ef40f58da30e024d85abc20384853b4d3e7ec02ec8db97f3470528c351119d99')
validpgpkeys=(5086B8D68E70FDDF4C40045AEF7B95E7F60166DA # Peter Linnell <plinnell at scribus.net>
757F5E9B13DD648887AD50092D47C099E782504E # The Scribus Team (www.scribus.net) <the_scribus_team at scribus.net>
Modified: poppler-21.3.0.patch
===================================================================
--- poppler-21.3.0.patch 2021-03-02 18:34:13 UTC (rev 877763)
+++ poppler-21.3.0.patch 2021-03-02 18:42:19 UTC (rev 877764)
@@ -1,42 +1,42 @@
-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
+From 7ce0ac16fd42d61ef9082b27822c7d9d79c7fef7 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali at libertysurf.fr>
+Date: Mon, 1 Mar 2021 21:52:54 +0000
+Subject: [PATCH 1/2] Attempt to fix build of pdf import plugin with poppler
+ 21.03.0
-Update SlaOutputDev::tilingPatternFill's prototype after the commit:
-https://gitlab.freedesktop.org/poppler/poppler/-/commit/2589f3252fe3
+git-svn-id: svn://scribus.net/trunk/Scribus@24537 11d20701-8431-0410-a711-e3c959e3b870
---
- scribus/plugins/import/pdf/slaoutput.cpp | 10 ++++++++++
+ scribus/plugins/import/pdf/slaoutput.cpp | 12 +++++++++++-
scribus/plugins/import/pdf/slaoutput.h | 4 ++++
- 2 files changed, 14 insertions(+)
+ 2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 7cbc73e..9fb91f5 100644
+index 7cbc73e..d1b37a0 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
+@@ -2292,9 +2292,19 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *sh
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)
-+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)
++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)
++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
++
+ PDFRectangle box;
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
+index 5149f19..66c3420 100644
--- a/scribus/plugins/import/pdf/slaoutput.h
+++ b/scribus/plugins/import/pdf/slaoutput.h
@@ -197,7 +197,11 @@ public:
@@ -44,7 +44,7 @@
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;
++ 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
@@ -51,3 +51,31 @@
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()); }
+
+From 6b9ff916959bcb941866f0bd86da639a421337f8 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali at libertysurf.fr>
+Date: Mon, 1 Mar 2021 22:00:02 +0000
+Subject: [PATCH 2/2] Attempt to fix build of pdf import plugin with poppler
+ 21.03.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24538 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index d1b37a0..de0a414 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -2336,7 +2336,11 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *c
+ // 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();
More information about the arch-commits
mailing list