gentoo resync : 12.03.2021

4 files changed, 85 insertions, 2 deletions

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index fe27cd151225..e76ee05ba3c7 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -2,7 +2,9 @@ AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27
 AUX scribus-1.5.5-findhyphen-1.patch 1118 BLAKE2B c542a292601b43f12ee2b682225064bd650f2017466aed4aa3a256610dfe1aaa662857cf60682b3c8f1a0dd1b22b34b8c058967bc4879412e8599a641e254b18 SHA512 d536cce91eb161e2d8ead619f932111bcfe661bae9e0706567a0a789ef80eef28e6f81c357bd7bdaaeb97f8c6a872deb7147fea7fef84e279b7e8e812a821cef
 AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06
 AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
+AUX scribus-1.5.6.1-poppler-21.03.0-1.patch 3383 BLAKE2B e72297007c3c27b5089340f6704ab685bf3b21eed7e0324dff3ba66c57eaa707847873417fa1b136b1b981bca44819ebada61d954309035af194cd523390942e SHA512 15c0e6f207ae700ab6cb899ee517bad323347f856c6fbbca6cbd4b1393ecb8ce884acb8ebe47575b398f299ee49f2e63b61be6a705e584683eeb9760be8e7368
+AUX scribus-1.5.6.1-poppler-21.03.0-2.patch 1137 BLAKE2B 59594ede7b957602a66a7d42afa137031553422f7dd6bb4a7711a5a7655e126ed2cb435e0425fe28a6efe24544df77c6ed66eacdc6419021c58c7c2011002928 SHA512 f51009e841761c014bad115e1c3b7b3496bd8a2d2cc85b69b819130629996992ec9c80a97c59d18d5f7c3ba88f978b457e893f29bed60e2763ed42963a27870e
 DIST scribus-1.5.6.1.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
-EBUILD scribus-1.5.6.1.ebuild 4044 BLAKE2B 3aebb282dba9d67c20a1245f22c03a22b267d44eb3cc2af70632bf304169e068e857816367e797a33841b2afacdc8110d564eda1f241b1933bffe63790986478 SHA512 a00593df0f8847b76e8d1e3da5b9788db64b08095ae65e8aa548cdfc3a4295296c4b3437fe7f7420b2634bd0019c2937673db54a6bd4b894f4ceadfaeaeeba48
+EBUILD scribus-1.5.6.1.ebuild 4092 BLAKE2B 8f9b25d1b14931d3a1bfe6ce1b02f9c21e9244fe64d871ea503eb21b9d34ea314d51aa4a5149f4c784ca0657833be2b97e51628f79202b2f9d1a65cdcbbd1e8d SHA512 72e7b7f2756e770d9f89cc0de92a3ecf9713d830026511fcd6fa6b254e3391faa991ee26d8b8896ffef754b3cbb854782031b1ca05f7191a7a77dd344dbd9ad2
 EBUILD scribus-9999.ebuild 3952 BLAKE2B 324e637c48bfa8d2d4c1b4f065e21263300df57ea11189f294b0121a1d1925678fcff30b36f5f75d23a2be455ee43a3f8845a326cef99c77cd5527bf54829146 SHA512 38c4ec22cbc9df9c3664bae7ff0e6131003b29da21e13956d04b7a3493e7ae0e7d3f05c025b303d9d51ce6f5a00fb5ad31be0808212413974e131937036933ec
 MISC metadata.xml 882 BLAKE2B 87f52990c93874472eeb73cbf7b46b4c1fa41d25e17d179f5cb9f5067d21aea18ac4ac323e5878c2bf49d075f67230353860cd6b45b9458435ca7b0fae9854b0 SHA512 403eb2874bccc2929284f1e44042e1fa84c2ad9d6abcb1b9600f327060e1b476366ab40cf6f8876aa18bf8195c21f82e2deaecfa7e1868b2fcfeba42c72e9d58
diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch
new file mode 100644
index 000000000000..18c1edcaaa99
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch
@@ -0,0 +1,53 @@
+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] 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 7cbc73e8d4..d1b37a0c21 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 5149f19e31..66c34203ae 100644
+--- a/scribus/plugins/import/pdf/slaoutput.h
++++ b/scribus/plugins/import/pdf/slaoutput.h
+@@ -197,7 +197,11 @@ class SlaOutputDev : public OutputDev
+ 	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()); }

diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch
new file mode 100644
index 000000000000..bff1c08b39ad
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch
@@ -0,0 +1,27 @@
+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] 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 d1b37a0c21..de0a4145ef 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();

diff --git a/app-office/scribus/scribus-1.5.6.1.ebuild b/app-office/scribus/scribus-1.5.6.1.ebuild
index cd06c4f588f9..5d0d78d897af 100644
--- a/app-office/scribus/scribus-1.5.6.1.ebuild
+++ b/app-office/scribus/scribus-1.5.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -72,6 +72,7 @@ RDEPEND="${DEPEND}
 "
 
 PATCHES=(
+	"${FILESDIR}"/${P}-poppler-21.03.0-{1,2}.patch
 	# non(?)-upstreamable
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
 	"${FILESDIR}"/${PN}-1.5.6-docdir.patch