Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scribus

Browse Source
This commit is contained in:
Rmys
2021-03-12 21:47:16 +03:00
committed by GitHub
parent ce5fe99af3
commit 822e350411
2 changed files with 84 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
office/misc/scribus/files/poppler-21.3.0.patch
+81
View File
@@ -0,0 +1,81 @@
From 7ce0ac16fd42d61ef9082b27822c7d9d79c7fef7 Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@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
git-svn-id: svn://scribus.net/trunk/Scribus@24537 11d20701-8431-0410-a711-e3c959e3b870
---
scribus/plugins/import/pdf/slaoutput.cpp | 12 +++++++++++-
scribus/plugins/import/pdf/slaoutput.h | 4 ++++
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..d1b37a0 100644
--- a/scribus/plugins/import/pdf/slaoutput.cpp
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
@@ -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)
+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;
diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
index 5149f19..66c3420 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)
+ 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()); }
From 6b9ff916959bcb941866f0bd86da639a421337f8 Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@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();
office/misc/scribus/pspec.xml
+3 -2
View File
@@ -19,6 +19,7 @@
<Dependency>cups-devel</Dependency>
<Dependency>desktop-file-utils</Dependency>
<Dependency>lcms2-devel</Dependency>
<Dependency>libmspub-devel</Dependency>
<Dependency>libart_lgpl-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>libpng-devel</Dependency>
@@ -55,8 +56,7 @@
<!-- <Patch>findOpenSSL.patch</Patch> -->
<Patch>scribus-1.5.3-fpic.patch</Patch>
<Patch>PisiLinux-correctly_link_to_libxml2.patch</Patch>
<!-- <Patch>scribus-standard-font-paths.patch</Patch> -->
<!--Patch>scribus-1.5.2-qt57-build.patch</Patch-->
<Patch>poppler-21.3.0.patch</Patch>
</Patches>
</Source>
@@ -74,6 +74,7 @@
<Dependency>python</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>poppler</Dependency>
<Dependency>libmspub</Dependency>
<Dependency>freetype</Dependency>
<Dependency>hunspell</Dependency>
<Dependency>qt5-base</Dependency>