gentoo resync : 12.05.2022

3 files changed, 304 insertions, 8 deletions

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 0bca2bc4a997..57be2761d717 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -3,9 +3,10 @@ AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5
 AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
 AUX scribus-1.5.8-findhyphen-1.patch 1264 BLAKE2B e35c561c275ef945aca9a7cc34e9ac9732450d7a2d15f5766c2a637f296d026fbc1d777266634b98cc5e8ad09364019f8eeeffd63f634e0836144cb6dacd3f5d SHA512 c0db1a12698b2e9770049b20c73b33e3cd5f56d8a69486a42955949f37216c0347df32e6acbdd7567075f98450dd59e9ef2f6a42f82ce38699fa704d77fbc60d
 AUX scribus-1.5.8-poppler-22.03.0.patch 2176 BLAKE2B 72f636999677cb166b96ba35896887daa71e1302081698c8b6a70ecc0d4a6e5c6a5dba41ff911d2bbad76ae17b20483050ba71595948e3d3097026506390e67c SHA512 86ea87f3a31ba5729e7c3f18ddcfcbe706d824c80d3fad85d6ea296ca6468e8f19964d6b6a771b5a8bc9deb1ed0b0baf4a0d2253aa562acad0c65e71c3f2e448
+AUX scribus-1.5.8-poppler-22.04.0.patch 11352 BLAKE2B 392bf170c922c3e47167da287d86d63bbb3110c09bf68c40f3c55ae5886d72b05032c4ef746fbcf0f1934991482ed7891177956229834731e73bdadb292cbc98 SHA512 f05a3607702df1b398e8fdcd913bab761606aeff12e359df0df98d2f8fb2f41f266776d4ba10be9f8a745de6ec70678f8340dc1f8fee85b9bbc2a527d318b5e2
 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.8.tar.xz 74543476 BLAKE2B 6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686 SHA512 eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d
+EBUILD scribus-1.5.8-r1.ebuild 4223 BLAKE2B 08e9472f250891190a1f6a5279ae3ab59b0e78338a3b125c8762516c4462708be3345f9799f1c5d34531a5ffc1375d1cdde171e206c60a3558a4232a114f70ce SHA512 c947803dbacfcaebb326ea33f35e87976656afeb7b471228cace38aba94ae1cfa93c56870a767d6cb57d246adb2e40bfe8e3aaf651a42f4bfd97bb1dc5f816c9
 EBUILD scribus-1.5.8.ebuild 4146 BLAKE2B e32ad027e529fd267c4b37de0dbd91c1d4c53855ceb6b8f691f06f112125a765b7395b7f4114a23a699ffcd34fbc522a050b921c44575f683e6b2c21c6f0d0f0 SHA512 21a0d6772d46005f6191e812b2b8e58d94bad4cf7a23d6fd926325f1bd82960a28013a70c4b5951082c3ce67f7d78be14bef5218b4519b3edc468f54e86dc398
-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.04.0.patch b/app-office/scribus/files/scribus-1.5.8-poppler-22.04.0.patch
new file mode 100644
index 000000000000..290484e7e872
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-poppler-22.04.0.patch
@@ -0,0 +1,291 @@
+https://bugs.gentoo.org/843287
+https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch
+
+From f2237b8f0b5cf7690e864a22ef7a63a6d769fa36 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Fri, 1 Apr 2022 23:52:32 +0000
+Subject: [PATCH] Fix build with poppler 22.04.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@25074 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 123 ++++++++++++++---------
+ 1 file changed, 78 insertions(+), 45 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index e20a81f99e..5626fe3477 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -174,8 +174,13 @@ void AnoOutputDev::drawString(GfxState *state, POPPLER_CONST GooString *s)
+ 	int shade = 100;

+ 	currColorText = getColor(state->getFillColorSpace(), state->getFillColor(), &shade);

+ 	fontSize = state->getFontSize();

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

++	if (state->getFont() && state->getFont()->getName())

++		fontName = new GooString(state->getFont()->getName().value());

++#else

+ 	if (state->getFont())

+ 		fontName = state->getFont()->getName()->copy();

++#endif

+ 	itemText = s->copy();

+ }

+ 

+@@ -357,7 +362,12 @@ std::unique_ptr<LinkAction> SlaOutputDev::SC_getAdditionalAction(const char *key
+ GBool SlaOutputDev::annotations_callback(Annot *annota, void *user_data)

+ {

+ 	SlaOutputDev *dev = (SlaOutputDev*)user_data;

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

++	const PDFRectangle& annotRect = annota->getRect();;

++	const PDFRectangle* box = &annotRect;

++#else

+ 	PDFRectangle *box = annota->getRect();

++#endif

+ 	double xCoor = dev->m_doc->currentPage()->xOffset() + box->x1 - dev->cropOffsetX;

+ 	double yCoor = dev->m_doc->currentPage()->yOffset() + dev->m_doc->currentPage()->height() - box->y2 + dev->cropOffsetY;

+ 	double width = box->x2 - box->x1;

+@@ -684,7 +694,12 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor,
+ 			if (apa || !achar)

+ 			{

+ 				AnoOutputDev *annotOutDev = new AnoOutputDev(m_doc, m_importedColors);

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

++				const PDFRectangle& annotaRect = annota->getRect();

++				Gfx* gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), &annotaRect, nullptr);

++#else

+ 				Gfx *gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), annota->getRect(), nullptr);

++#endif

+ 				ano->draw(gfx, false);

+ 				if (!bgFound)

+ 					m_currColorFill = annotOutDev->currColorFill;

+@@ -2916,22 +2931,27 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name, Dict *properties)
+ 

+ void SlaOutputDev::updateFont(GfxState *state)

+ {

+-	GfxFont *gfxFont;

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

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

++	std::optional<GfxFontLoc> fontLoc;

++	std::string fileName;

++	std::unique_ptr<FoFiTrueType> ff;

++	std::optional<std::vector<unsigned char>> tmpBuf;

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

+ 	std::optional<GfxFontLoc> fontLoc;

+ 	const GooString * fileName = nullptr;

+ 	std::unique_ptr<FoFiTrueType> ff;

++	char* tmpBuf = nullptr;

+ #else

+ 	GfxFontLoc * fontLoc = nullptr;

+ 	GooString * fileName = nullptr;

+ 	FoFiTrueType * ff = nullptr;

++	char* tmpBuf = nullptr;

+ #endif

+ 	GfxFontType fontType;

+ 	SlaOutFontFileID *id;

+ 	SplashFontFile *fontFile;

+ 	SplashFontSrc *fontsrc = nullptr;

+ 	Object refObj, strObj;

+-	char *tmpBuf = nullptr;

+ 	int tmpBufLen = 0;

+ 	int *codeToGID = nullptr;

+ 	const double *textMat = nullptr;

+@@ -2943,7 +2963,11 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 

+ 	m_font = nullptr;

+ 

+-	gfxFont = state->getFont();

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

++	GfxFont* gfxFont = state->getFont().get();

++#else

++	GfxFont* gfxFont = state->getFont();

++#endif

+ 	if (!gfxFont)

+ 		goto err1;

+ 

+@@ -2968,15 +2992,23 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 		if (fontLoc->locType == gfxFontLocEmbedded)

+ 		{

+ 			// if there is an embedded font, read it to memory

+-			tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen);

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

++			tmpBuf = gfxFont->readEmbFontFile((xref) ? xref : pdfDoc->getXRef());

+ 			if (! tmpBuf)

+ 				goto err2;

++#else

++			tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen);

++			if (!tmpBuf)

++				goto err2;

++#endif

+ 

+ 			// external font

+ 		}

+ 		else

+ 		{ // gfxFontLocExternal

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

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

++			fileName = fontLoc->path;

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

+ 			fileName = fontLoc->pathAsGooString();

+ #else

+ 			fileName = fontLoc->path;

+@@ -2985,52 +3017,54 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 		}

+ 

+ 		fontsrc = new SplashFontSrc;

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

++		if (!fileName.empty())

++			fontsrc->setFile(fileName);

++		else

++			fontsrc->setBuf(std::move(tmpBuf.value()));

++#else

+ 		if (fileName)

+ 			fontsrc->setFile(fileName, gFalse);

+ 		else

+ 			fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue);

++#endif

+ 

+ 		// load the font file

+ 		switch (fontType) {

+ 		case fontType1:

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

+-				id,

+-				fontsrc,

+-				(const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))

++			if (!(fontFile = m_fontEngine->loadType1Font(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))

+ 			{

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

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

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

+ 				goto err2;

+ 			}

+ 			break;

+ 		case fontType1C:

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

+-							id,

+-							fontsrc,

+-							(const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))

++			if (!(fontFile = m_fontEngine->loadType1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))

+ 			{

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

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

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

+ 				goto err2;

+ 			}

+ 			break;

+ 		case fontType1COT:

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

+-							id,

+-							fontsrc,

+-							(const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))

++			if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))

+ 			{

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

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

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

+ 				goto err2;

+ 			}

+ 			break;

+ 		case fontTrueType:

+ 		case fontTrueTypeOT:

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

++			if (!fileName.empty())

++				ff = FoFiTrueType::load(fileName.c_str());

++			else

++				ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size());

++#else

+ 			if (fileName)

+ 				ff = FoFiTrueType::load(fileName->getCString());

+ 			else

+ 				ff = FoFiTrueType::make(tmpBuf, tmpBufLen);

++#endif

+ 			if (ff)

+ 			{

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

+@@ -3047,24 +3081,17 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 				codeToGID = nullptr;

+ 				n = 0;

+ 			}

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

+-							id,

+-							fontsrc,

+-							codeToGID, n)))

++			if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n)))

+ 			{

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

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

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

+ 				goto err2;

+ 			}

+ 			break;

+ 		case fontCIDType0:

+ 		case fontCIDType0C:

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

+-							id,

+-							fontsrc)))

++			if (!(fontFile = m_fontEngine->loadCIDFont(id, fontsrc)))

+ 			{

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

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

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

+ 				goto err2;

+ 			}

+ 			break;

+@@ -3080,10 +3107,7 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 				codeToGID = nullptr;

+ 				n = 0;

+ 			}

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

+-							id,

+-							fontsrc,

+-							codeToGID, n)))

++			if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(id, fontsrc, codeToGID, n)))

+ 			{

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

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

+@@ -3105,10 +3129,17 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 			}

+ 			else

+ 			{

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

++				if (!fileName.empty())

++					ff = FoFiTrueType::load(fileName.c_str());

++				else

++					ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size());

++#else

+ 				if (fileName)

+ 					ff = FoFiTrueType::load(fileName->getCString());

+ 				else

+ 					ff = FoFiTrueType::make(tmpBuf, tmpBufLen);

++#endif

+ 				if (! ff)

+ 					goto err2;

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

+@@ -3119,13 +3150,9 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 				delete ff;

+ #endif

+ 			}

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

+-							id,

+-							fontsrc,

+-							codeToGID, n, faceIndex)))

++			if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n, faceIndex)))

+ 			{

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

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

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

+ 				goto err2;

+ 			}

+ 			break;

+@@ -3269,9 +3296,15 @@ void SlaOutputDev::drawChar(GfxState* state, double x, double y, double dx, doub
+ GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen)

+ {

+ //	qDebug() << "beginType3Char";

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

+ 	GfxFont *gfxFont;

++	if (!(gfxFont = state->getFont().get()))

++		return gTrue;

++#else

++	GfxFont* gfxFont;

+ 	if (!(gfxFont = state->getFont()))

+ 		return gTrue;

++#endif

+ 	if (gfxFont->getType() != fontType3)

+ 		return gTrue;

+ 	F3Entry f3e;

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-1.5.8-r1.ebuild
index b8abdb6f421f..d54fc9affaaa 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r1.ebuild
@@ -1,21 +1,19 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
+inherit cmake desktop flag-o-matic python-single-r1 xdg
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="https://www.scribus.net/"
-SRC_URI=""
-ESVN_REPO_URI="svn://scribus.net/trunk/Scribus"
-ESVN_PROJECT=Scribus-1.5
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -44,6 +42,7 @@ DEPEND="${PYTHON_DEPS}
 	media-libs/lcms:2
 	media-libs/libcdr
 	media-libs/libfreehand
+	media-libs/libjpeg-turbo:=
 	media-libs/libpagemaker
 	media-libs/libpng:0=
 	media-libs/libvisio
@@ -51,7 +50,6 @@ DEPEND="${PYTHON_DEPS}
 	media-libs/tiff:0
 	net-print/cups
 	sys-libs/zlib[minizip]
-	virtual/jpeg:0=
 	x11-libs/cairo[X,svg]
 	boost? ( dev-libs/boost:= )
 	graphicsmagick? ( media-gfx/graphicsmagick:= )
@@ -78,10 +76,16 @@ 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
+	"${FILESDIR}"/${PN}-1.5.8-poppler-22.04.0.patch # bug 843287
 )
 
 CMAKE_BUILD_TYPE="Release"
 
+S="${WORKDIR}/${P}"
+
 src_prepare() {
 	cmake_src_prepare