gentoo resync : 20.03.2022

5 files changed, 218 insertions, 3 deletions

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 71c28ab672ca..91053a268b99 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -5,9 +5,12 @@ AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e
 AUX scribus-1.5.7-osg-cpp17.patch 11762 BLAKE2B 4f83dd7de919025606068ca5c05d2dd234b0d21d35cb7f784b1cebccc068f638730b7527ea07ed9a2bee16dd1524fa99e0e0ae10db5e98148066c882c00853fb SHA512 1e1e18967ce764d0b228d667d1673f6f7a03a7cba6fe07371435a6c7b9dcb0900fe73974a3a06ff22c87b35f27434bb44a3ec0b264914b8329c92b7e8d857c2c
 AUX scribus-1.5.8-findhyphen-1.patch 1264 BLAKE2B e35c561c275ef945aca9a7cc34e9ac9732450d7a2d15f5766c2a637f296d026fbc1d777266634b98cc5e8ad09364019f8eeeffd63f634e0836144cb6dacd3f5d SHA512 c0db1a12698b2e9770049b20c73b33e3cd5f56d8a69486a42955949f37216c0347df32e6acbdd7567075f98450dd59e9ef2f6a42f82ce38699fa704d77fbc60d
 AUX scribus-1.5.8-harfbuzz-3.patch 2703 BLAKE2B c870a6be1a9e2921ff3336852782bb1fbeb51c0fd797de1a59605723810279e4c48ac65bc8abce5a71cdad16a9c62c7d2f0759fa7593bc3ddc70f5f22a6e0d5b SHA512 589e87973d316d8a96d731e649becfe63b24f26bab9e81da57cf8d049b9a0da78a659c089ab71439232fa56019c0cfaea6fbdce3081eb90c2cd07c6c995d740e
+AUX scribus-1.5.8-poppler-22.03.0.patch 2176 BLAKE2B 72f636999677cb166b96ba35896887daa71e1302081698c8b6a70ecc0d4a6e5c6a5dba41ff911d2bbad76ae17b20483050ba71595948e3d3097026506390e67c SHA512 86ea87f3a31ba5729e7c3f18ddcfcbe706d824c80d3fad85d6ea296ca6468e8f19964d6b6a771b5a8bc9deb1ed0b0baf4a0d2253aa562acad0c65e71c3f2e448
+AUX scribus-1.5.8-poppler-22.2.0-1.patch 3899 BLAKE2B 616ded940828b14309b1dca597b5b209da3374e41aad01ed3a204888c3ad3ff25fce61bdfa69c947ead67b0a9cbe11f2e4fbdb6054f02bd251477830ddafd375 SHA512 7a5e21cc98bb7d87c326a8576e6ccf368d5fc64538896f5aedcb13598f2aa11cc6f999011e6920f0bf6116e46f5469a713bb7f04fa8c2ca308b0dd07f2c088af
+AUX scribus-1.5.8-poppler-22.2.0-2.patch 1190 BLAKE2B 5eb29f6246d157f14af0a12bf2234f5981bbd012253ac867a499d2fa3c96221724c060af5549731d00ab96ee67dfd18a26662d601d59a5458fd39c69f022c73e SHA512 826f671ae67e157a6a71befaac77b6fa1888fbbd3c708a3d412d01bfe28a9d3b268ecf33b05fa94390904a140b0eba1e46e712024a02e0ec33933df2a711a611
 DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01
 DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B 6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686 SHA512 eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d
 EBUILD scribus-1.5.7.ebuild 4100 BLAKE2B b2006dbed58cbb72a90c7956d7fc6b270ba309279117a073a004c7ce14645e3bb7a67176ff351a252c131c1dbc56632433002dd8bba01b5bdda6523f907cb8a7 SHA512 b1a23ef9be8fd537072537c2a80710019c0cd0f85d2ed333c0b44cfb3deb7eb4cfbfd50ba8afc9165f4ee4e8791ba91a2d4ac8e98272003e4b4b8a17e2103d48
-EBUILD scribus-1.5.8.ebuild 4005 BLAKE2B 2875954cd01e544ede0ff32287642f48e35591ad74531d8396dfb4b56890038d160602496996736ea7561df8844749c38a5fcb02b2c5490fdce414d2af64d894 SHA512 3f2aa342ce51d088a55a7a324185be88069fac494af37139e64609737b9ce076a75738ebbb8c6d28dc51fe1c868b35544318b4b7479346f1d2a4cadc796a14bf
+EBUILD scribus-1.5.8.ebuild 4147 BLAKE2B f641545877dcf0459d89fa846f253c044deb3028d8b557610e6b79c5d1cb9bebb03f4abfdd033b35806e054d144d841583ab4114fe87958eafba366cd847add0 SHA512 87759327320e136225d2748ec03401416268c1ba8ec3c96d80baefdb6cf80b60b0c443fd66aab274baffb13ff02705268b2df520ab4d8a7e4ee297f3ba6f8f8d
 EBUILD scribus-9999.ebuild 3964 BLAKE2B 8152771bbcb2b632c8b691b441613103147eb2cdb4bb50765940c20342f33308f01967d7b929ed076cb3be2a012fba00fb47d49040eb1220e2a20e28b76e5d28 SHA512 e3d4884e9f265257a33941eaec56d20cbf0bd0fc0155ca8852db23e54766285d19e4b74017faba3824aeb843e08906dee2387949bdcef73fa5191b16def49499
 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91
diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.03.0.patch b/app-office/scribus/files/scribus-1.5.8-poppler-22.03.0.patch
new file mode 100644
index 000000000000..f7a0c03fdd96
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-poppler-22.03.0.patch
@@ -0,0 +1,52 @@
+From f19410ac3b27e33dd62105746784e61e85b90a1d Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Wed, 2 Mar 2022 22:22:53 +0000
+Subject: [PATCH] #16764: Build break with poppler 22.03.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24982 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/importpdf.cpp | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
+index 154e58a3f0..392dcd9e64 100644
+--- a/scribus/plugins/import/pdf/importpdf.cpp
++++ b/scribus/plugins/import/pdf/importpdf.cpp
+@@ -89,7 +89,11 @@ QImage PdfPlug::readThumbnail(const QString& fName)
+ #endif

+ 	globalParams->setErrQuiet(gTrue);

+ 

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)

++	PDFDoc pdfDoc{ std::make_unique<GooString>(fname) };

++#else

+ 	PDFDoc pdfDoc{fname, nullptr, nullptr, nullptr};

++#endif

+ 	if (!pdfDoc.isOk() || pdfDoc.getErrorCode() == errEncrypted)

+ 		return QImage();

+ 

+@@ -342,7 +346,11 @@ bool PdfPlug::convert(const QString& fn)
+ 	globalParams->setErrQuiet(gTrue);

+ //	globalParams->setPrintCommands(gTrue);

+ 	QList<OptionalContentGroup*> ocgGroups;

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)

++	auto pdfDoc = std::make_unique<PDFDoc>(std::make_unique<GooString>(fname));

++#else

+ 	auto pdfDoc = std::unique_ptr<PDFDoc>(new PDFDoc(fname, nullptr, nullptr, nullptr));

++#endif

+ 	if (pdfDoc)

+ 	{

+ 		if (pdfDoc->getErrorCode() == errEncrypted)

+@@ -361,8 +369,13 @@ bool PdfPlug::convert(const QString& fn)
+ #else

+ 				auto fname = new GooString(QFile::encodeName(fn).data());

+ #endif

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)

++				std::optional<GooString> userPW(std::in_place, text.toLocal8Bit().data());

++				pdfDoc.reset(new PDFDoc(std::make_unique<GooString>(fname), userPW, userPW, nullptr));

++#else

+ 				auto userPW = new GooString(text.toLocal8Bit().data());

+ 				pdfDoc.reset(new PDFDoc(fname, userPW, userPW, nullptr));

++#endif

+ 				qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));

+ 			}

+ 			if ((!pdfDoc) || (pdfDoc->getErrorCode() != errNone))

diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-1.patch b/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-1.patch
new file mode 100644
index 000000000000..4e0f607c6a07
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-1.patch
@@ -0,0 +1,129 @@
+From 85c0dff3422fa3c26fbc2e8d8561f597ec24bd92 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Wed, 2 Feb 2022 23:12:52 +0000
+Subject: [PATCH] #16734: Build break with poppler 22.2.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24884 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 47 +++++++++++++++++++-----
+ 1 file changed, 37 insertions(+), 10 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index 5894bf2ad6..3650c96f52 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -7,6 +7,11 @@ for which a new license (GPL+exception) is in place.
+ 

+ #include "slaoutput.h"

+ 

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

++#include <memory>

++#include <optional>

++#endif

++

+ #include <poppler/GlobalParams.h>

+ #include <poppler/poppler-config.h>

+ #include <poppler/FileSpec.h>

+@@ -3027,18 +3032,24 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name, Dict *properties)
+ void SlaOutputDev::updateFont(GfxState *state)

+ {

+ 	GfxFont *gfxFont;

+-	GfxFontLoc *fontLoc;

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

++	std::optional<GfxFontLoc> fontLoc;

++	const GooString * fileName = nullptr;

++	std::unique_ptr<FoFiTrueType> ff;

++#else

++	GfxFontLoc * fontLoc = nullptr;

++	GooString * fileName = nullptr;

++	FoFiTrueType * ff = nullptr;

++#endif

+ 	GfxFontType fontType;

+ 	SlaOutFontFileID *id;

+ 	SplashFontFile *fontFile;

+ 	SplashFontSrc *fontsrc = nullptr;

+-	FoFiTrueType *ff;

+ 	Object refObj, strObj;

+-	GooString *fileName;

+-	char *tmpBuf;

++	char *tmpBuf = nullptr;

+ 	int tmpBufLen = 0;

+-	int *codeToGID;

+-	const double *textMat;

++	int *codeToGID = nullptr;

++	const double *textMat = nullptr;

+ 	double m11, m12, m21, m22, fontSize;

+ 	SplashCoord mat[4];

+ 	int n = 0;

+@@ -3046,9 +3057,6 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 	SplashCoord matrix[6];

+ 

+ 	m_font = nullptr;

+-	fileName = nullptr;

+-	tmpBuf = nullptr;

+-	fontLoc = nullptr;

+ 

+ 	gfxFont = state->getFont();

+ 	if (!gfxFont)

+@@ -3083,7 +3091,11 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 		}

+ 		else

+ 		{ // gfxFontLocExternal

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

++			fileName = fontLoc->pathAsGooString();

++#else

+ 			fileName = fontLoc->path;

++#endif

+ 			fontType = fontLoc->fontType;

+ 		}

+ 

+@@ -3136,9 +3148,14 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 				ff = FoFiTrueType::make(tmpBuf, tmpBufLen);

+ 			if (ff)

+ 			{

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

++				codeToGID = ((Gfx8BitFont*) gfxFont)->getCodeToGIDMap(ff.get());

++				ff.reset();

++#else

+ 				codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff);

+-				n = 256;

+ 				delete ff;

++#endif

++				n = 256;

+ 			}

+ 			else

+ 			{

+@@ -3209,8 +3226,13 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 					ff = FoFiTrueType::make(tmpBuf, tmpBufLen);

+ 				if (! ff)

+ 					goto err2;

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

++				codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n);

++				ff.reset();

++#else

+ 				codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n);

+ 				delete ff;

++#endif

+ 			}

+ 			if (!(fontFile = m_fontEngine->loadTrueTypeFont(

+ 							id,

+@@ -3247,14 +3269,19 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 	mat[3] = -m22;

+ 	m_font = m_fontEngine->getFont(fontFile, mat, matrix);

+ 

++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)

+ 	delete fontLoc;

++#endif

+ 	if (fontsrc && !fontsrc->isFile)

+ 		fontsrc->unref();

+ 	return;

+ 

+ err2:

+ 	delete id;

++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)

+ 	delete fontLoc;

++#endif

++

+ err1:

+ 	if (fontsrc && !fontsrc->isFile)

+ 		fontsrc->unref();

diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-2.patch b/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-2.patch
new file mode 100644
index 000000000000..73beac2d70d0
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-2.patch
@@ -0,0 +1,28 @@
+From f75c1613db67f4067643d0218a2db3235e42ec9f Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Thu, 3 Feb 2022 19:46:13 +0000
+Subject: [PATCH] Small update vs latest code in poppler
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24885 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index 3650c96f52..a6f4e00fa9 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -3072,10 +3072,10 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 		delete id;

+ 	else

+ 	{

+-		if (!(fontLoc = gfxFont->locateFont(xref, nullptr)))

++		fontLoc = gfxFont->locateFont((xref) ? xref : pdfDoc->getXRef(), nullptr);

++		if (!fontLoc)

+ 		{

+-			error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",

+-			gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

++			error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

+ 			goto err2;

+ 		}

+ 

diff --git a/app-office/scribus/scribus-1.5.8.ebuild b/app-office/scribus/scribus-1.5.8.ebuild
index 472e6c130552..c344d68a2691 100644
--- a/app-office/scribus/scribus-1.5.8.ebuild
+++ b/app-office/scribus/scribus-1.5.8.ebuild
@@ -9,11 +9,11 @@ inherit cmake desktop flag-o-matic python-single-r1 xdg
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="https://www.scribus.net/"
-SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -76,6 +76,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
 	"${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
 	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
+	"${FILESDIR}"/${PN}-1.5.8-poppler-22.2.0-1.patch
+	"${FILESDIR}"/${PN}-1.5.8-poppler-22.2.0-2.patch
+	"${FILESDIR}"/${PN}-1.5.8-poppler-22.03.0.patch # bug 834537
 )
 
 CMAKE_BUILD_TYPE="Release"