gentoo Easter resync : 12.04.2020

4 files changed, 469 insertions, 12 deletions

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index ee54df35d808..f99a08ebe3c9 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -5,9 +5,10 @@ AUX scribus-1.5.5-findhyphen-2.patch 567 BLAKE2B c0aac324b9dc2238d5fd4ae857bcd2a
 AUX scribus-1.5.5-poppler-0.82.patch 5228 BLAKE2B 4d3dac11d77a41bca4ace028a249acacd07d4595dbd1611b15ad697fd6da5848cea880cb5edbc4411ed512bc3414261129b95984510750bdd5c1066185833d78 SHA512 8621876aa7ba5d91f48e2d4b1c9d865b2179e4029fdf1b122defa619454690328cc30d03963aad0865fe6dff480285fb21ba44c82d57d81f5b7ce1d687c34cc4
 AUX scribus-1.5.5-poppler-0.83.patch 5538 BLAKE2B 0d4b14e157f47dc6f0811918a2423f726c7a7019f75e99fc98744ece42b9516e15612879d16705d585c56d7ccd15ed7f0381787915958bd104076c527552e971 SHA512 1866f9f7c0ba51cb2030ab3fc0905dc49ba905f8400adbcdcc0395c46196b042fce07d67aab70f5d3847c1c2e5a74468375c20e90b222d9e27141a1ce85fb01c
 AUX scribus-1.5.5-poppler-0.84.patch 1359 BLAKE2B 7c0b3998fce5149a0b3d2e8d9f01ef66b2bd13d909d029f7970e264fa0d5fcc9e9beb16ecb77b858ff8ce237fb2d3ad8b7affa2d57b1d2719437869fc8bfafda SHA512 f593d62d3c7002e536f5d24c29ec7b54a6fb7f82ffb3c9363fc4816a27487a4c6929f174cb8808920d91ea2a57e181a9579b1d4182676a7e329775c1581143b6
+AUX scribus-1.5.5-poppler-0.86.patch 14366 BLAKE2B 868382aa0bce211465ebe26a704b784fe44fe67bc39bdc62532a3e1ae29766cb077d1b3cba9c9f5aeebe2cdbfdcbd1d7b37e33ef747cd212e6dec10cbe250b77 SHA512 5aef27942d02097e2b67c8249188e885086046399edcbf41018fe7480c5d1b6705609326a0823d7aec9c5b20fc8dfb16cc6435118792952a5e141bd434550583
 AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06
 AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
 DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B 1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b SHA512 2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50
-EBUILD scribus-1.5.5.ebuild 4352 BLAKE2B 39eb9370b8a1278ab148060af129a39efadb2fafeac6ce0ff6f89ad84d1191e0cfab95132e5a4543016e5e66ce38063b6f8e2c19c7ba00792a03d7cc852c7da2 SHA512 9d35f00c8db2fa2f57925e68fee5943de27410426bdca491d53366ce01747848b50fc518453087acd3bc51c9b7f88fa95ff38ce20a34a488be407c1e34b6ae2b
-EBUILD scribus-9999.ebuild 4173 BLAKE2B 5ba87679b20ed0581292caed110a0bc05a203fcab2f08cea1591c7ec26f800c603bdf3d6390ea7d14c5c778cee2577963a54fd53f28086c22b21b85d7e6a07a6 SHA512 e15af57a5ebddf40ac266ad2cd7634c294b8c669bd9495d3df543ca9fa383dde09b4bc2ee0b5370b6bb50729a71b6403af2830062508533bf1cbb881dc898e3a
+EBUILD scribus-1.5.5-r1.ebuild 4390 BLAKE2B ea711309e8db29264d6f2f618c84d022f35a8352f205f9abb3a46793ea1b95063a82942a5f8b604c9d4250f2daa3f2db93e4c2d8dd12c3609070268831ca4a02 SHA512 49ea3697a62d02d9b6c42c6c31f505e94f12ecc8ecf01081fc7198bd6403631a8c9feaadea0f9854f84be784997091d57b2e63b76d07fb3246722684c3ab0d01
+EBUILD scribus-9999.ebuild 3984 BLAKE2B 0998817295edfa90796eb89669efc9cee334415c77196e649088f2c92ffb15d3a103479263052e75d169e2f749f17fac3ea5d3ca54c2b52d9cf83cd3f3212506 SHA512 f645622279c8c1b2524ac48807aeeedbfccdebbef6fc5f8609921da427af40d8810c25a97449d6e2cd0177bea59607ebd57cc4ede109e959f75d78db8c736814
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch
new file mode 100644
index 000000000000..e91bb3afdb6c
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch
@@ -0,0 +1,459 @@
+From 67f8771aaff2f55d61b8246f420e762f4b526944 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Mon, 2 Mar 2020 14:45:59 +0000
+Subject: [PATCH] PDF import plugin: support poppler 0.86.x
+
+git-svn-id: svn://scribus.net/trunk/Scribus@23478 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/importpdf.cpp |  51 +++++++-
+ scribus/plugins/import/pdf/importpdf.h   |  19 +--
+ scribus/plugins/import/pdf/slaoutput.cpp | 154 +++++++++++++++++++++--
+ scribus/plugins/import/pdf/slaoutput.h   |  13 +-
+ 4 files changed, 215 insertions(+), 22 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
+index 427cd66ef2..4679674a4d 100644
+--- a/scribus/plugins/import/pdf/importpdf.cpp
++++ b/scribus/plugins/import/pdf/importpdf.cpp
+@@ -791,11 +791,20 @@ bool PdfPlug::convert(const QString& fn)
+ 								names = catDict.dictLookup("OpenAction");

+ 								if (names.isDict())

+ 								{

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++									std::unique_ptr<LinkAction> linkAction;

++									linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI());

++#else

+ 									LinkAction *linkAction = nullptr;

+ 									linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI());

++#endif

+ 									if (linkAction)

+ 									{

+-										LinkJavaScript *jsa = (LinkJavaScript*)linkAction;

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++										LinkJavaScript *jsa = (LinkJavaScript*) linkAction.get();

++#else

++										LinkJavaScript *jsa = (LinkJavaScript*) linkAction;

++#endif

+ 										if (jsa->isOk())

+ 										{

+ 											QString script = UnicodeParsedString(jsa->getScript());

+@@ -1003,3 +1012,43 @@ QString PdfPlug::UnicodeParsedString(POPPLER_CONST GooString *s1)
+ 	}

+ 	return result;

+ }

++

++QString PdfPlug::UnicodeParsedString(const std::string& s1)

++{

++	if (s1.length() == 0)

++		return QString();

++	GBool isUnicode;

++	int i;

++	Unicode u;

++	QString result;

++	if ((s1.at(0) & 0xff) == 0xfe && (s1.length() > 1 && (s1.at(1) & 0xff) == 0xff))

++	{

++		isUnicode = gTrue;

++		i = 2;

++		result.reserve((s1.length() - 2) / 2);

++	}

++	else

++	{

++		isUnicode = gFalse;

++		i = 0;

++		result.reserve(s1.length());

++	}

++	while (i < s1.length())

++	{

++		if (isUnicode)

++		{

++			u = ((s1.at(i) & 0xff) << 8) | (s1.at(i+1) & 0xff);

++			i += 2;

++		}

++		else

++		{

++			u = s1.at(i) & 0xff;

++			++i;

++		}

++		// #15616: imagemagick may write unicode strings incorrectly in PDF

++		if (u == 0)

++			continue;

++		result += QChar( u );

++	}

++	return result;

++}

+diff --git a/scribus/plugins/import/pdf/importpdf.h b/scribus/plugins/import/pdf/importpdf.h
+index bb58fd208f..bc55819618 100644
+--- a/scribus/plugins/import/pdf/importpdf.h
++++ b/scribus/plugins/import/pdf/importpdf.h
+@@ -82,6 +84,7 @@ class PdfPlug : public QObject
+ 	bool convert(const QString& fn);
+ 	QRectF getCBox(int box, int pgNum);
+ 	QString UnicodeParsedString(POPPLER_CONST GooString *s1);
++	QString UnicodeParsedString(const std::string& s1);
+ 	
+ 	QList<PageItem*> Elements;
+ 	double baseX, baseY;

+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index 93ceb1e305..6e73049ef7 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -273,9 +273,15 @@ LinkAction* SlaOutputDev::SC_getAction(AnnotWidget *ano)
+ }

+ 

+ /* Replacement for the crippled Poppler function LinkAction* AnnotWidget::getAdditionalAction(AdditionalActionsType type) */

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++std::unique_ptr<LinkAction> SlaOutputDev::SC_getAdditionalAction(const char *key, AnnotWidget *ano)

++{

++	std::unique_ptr<LinkAction> linkAction;

++#else

+ LinkAction* SlaOutputDev::SC_getAdditionalAction(const char *key, AnnotWidget *ano)

+ {

+ 	LinkAction *linkAction = nullptr;

++#endif

+ 	Object obj;

+ 	Ref refa = ano->getRef();

+ 

+@@ -420,7 +426,11 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ 			POPPLER_CONST GooString *ndst = gto->getNamedDest();

+ 			if (ndst)

+ 			{

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++				std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);

++#else

+ 				LinkDest *dstn = pdfDoc->findDest(ndst);

++#endif

+ 				if (dstn)

+ 				{

+ 					if (dstn->getKind() == destXYZ)

+@@ -464,7 +474,11 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ 			POPPLER_CONST GooString *ndst = gto->getNamedDest();

+ 			if (ndst)

+ 			{

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++				std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);

++#else

+ 				LinkDest *dstn = pdfDoc->findDest(ndst);

++#endif

+ 				if (dstn)

+ 				{

+ 					if (dstn->getKind() == destXYZ)

+@@ -932,7 +946,11 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 				POPPLER_CONST GooString *ndst = gto->getNamedDest();

+ 				if (ndst)

+ 				{

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++					std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);

++#else

+ 					LinkDest *dstn = pdfDoc->findDest(ndst);

++#endif

+ 					if (dstn)

+ 					{

+ 						if (dstn->getKind() == destXYZ)

+@@ -984,7 +1002,11 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 				POPPLER_CONST GooString *ndst = gto->getNamedDest();

+ 				if (ndst)

+ 				{

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++					std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);

++#else

+ 					LinkDest *dstn = pdfDoc->findDest(ndst);

++#endif

+ 					if (dstn)

+ 					{

+ 						if (dstn->getKind() == destXYZ)

+@@ -1053,96 +1075,148 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 		else

+ 			qDebug() << "Found unsupported Action of type" << Lact->getKind();

+ 	}

+-	LinkAction *Aact = SC_getAdditionalAction("D", ano);

++	auto Aact = SC_getAdditionalAction("D", ano);

+ 	if (Aact)

+ 	{

+ 		if (Aact->getKind() == actionJavaScript)

+ 		{

+-			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

++#else

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

++#endif

+ 			if (jsa->isOk())

+ 			{

+ 				ite->annotation().setD_act(UnicodeParsedString(jsa->getScript()));

+ 				ite->annotation().setAAact(true);

+ 			}

+ 		}

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++		Aact.reset();

++#else

+ 		Aact = nullptr;

++#endif

+ 	}

+ 	Aact = SC_getAdditionalAction("E", ano);

+ 	if (Aact)

+ 	{

+ 		if (Aact->getKind() == actionJavaScript)

+ 		{

+-			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

++#else

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

++#endif

+ 			if (jsa->isOk())

+ 			{

+ 				ite->annotation().setE_act(UnicodeParsedString(jsa->getScript()));

+ 				ite->annotation().setAAact(true);

+ 			}

+ 		}

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++		Aact.reset();

++#else

+ 		Aact = nullptr;

++#endif

+ 	}

+ 	Aact = SC_getAdditionalAction("X", ano);

+ 	if (Aact)

+ 	{

+ 		if (Aact->getKind() == actionJavaScript)

+ 		{

+-			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

++#else

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

++#endif

+ 			if (jsa->isOk())

+ 			{

+ 				ite->annotation().setX_act(UnicodeParsedString(jsa->getScript()));

+ 				ite->annotation().setAAact(true);

+ 			}

+ 		}

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++		Aact.reset();

++#else

+ 		Aact = nullptr;

++#endif

+ 	}

+ 	Aact = SC_getAdditionalAction("Fo", ano);

+ 	if (Aact)

+ 	{

+ 		if (Aact->getKind() == actionJavaScript)

+ 		{

+-			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

++#else

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

++#endif

+ 			if (jsa->isOk())

+ 			{

+ 				ite->annotation().setFo_act(UnicodeParsedString(jsa->getScript()));

+ 				ite->annotation().setAAact(true);

+ 			}

+ 		}

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++		Aact.reset();

++#else

+ 		Aact = nullptr;

++#endif

+ 	}

+ 	Aact = SC_getAdditionalAction("Bl", ano);

+ 	if (Aact)

+ 	{

+ 		if (Aact->getKind() == actionJavaScript)

+ 		{

+-			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

++#else

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

++#endif

+ 			if (jsa->isOk())

+ 			{

+ 				ite->annotation().setBl_act(UnicodeParsedString(jsa->getScript()));

+ 				ite->annotation().setAAact(true);

+ 			}

+ 		}

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++		Aact.reset();

++#else

+ 		Aact = nullptr;

++#endif

+ 	}

+ 	Aact = SC_getAdditionalAction("C", ano);

+ 	if (Aact)

+ 	{

+ 		if (Aact->getKind() == actionJavaScript)

+ 		{

+-			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

++#else

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

++#endif

+ 			if (jsa->isOk())

+ 			{

+ 				ite->annotation().setC_act(UnicodeParsedString(jsa->getScript()));

+ 				ite->annotation().setAAact(true);

+ 			}

+ 		}

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++		Aact.reset();

++#else

+ 		Aact = nullptr;

++#endif

+ 	}

+ 	Aact = SC_getAdditionalAction("F", ano);

+ 	if (Aact)

+ 	{

+ 		if (Aact->getKind() == actionJavaScript)

+ 		{

+-			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

++#else

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

++#endif

+ 			if (jsa->isOk())

+ 			{

+ 				ite->annotation().setF_act(UnicodeParsedString(jsa->getScript()));

+@@ -1150,14 +1224,22 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 				ite->annotation().setFormat(5);

+ 			}

+ 		}

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++		Aact.reset();

++#else

+ 		Aact = nullptr;

++#endif

+ 	}

+ 	Aact = SC_getAdditionalAction("K", ano);

+ 	if (Aact)

+ 	{

+ 		if (Aact->getKind() == actionJavaScript)

+ 		{

+-			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

++#else

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

++#endif

+ 			if (jsa->isOk())

+ 			{

+ 				ite->annotation().setK_act(UnicodeParsedString(jsa->getScript()));

+@@ -1165,21 +1247,33 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 				ite->annotation().setFormat(5);

+ 			}

+ 		}

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++		Aact.reset();

++#else

+ 		Aact = nullptr;

++#endif

+ 	}

+ 	Aact = SC_getAdditionalAction("V", ano);

+ 	if (Aact)

+ 	{

+ 		if (Aact->getKind() == actionJavaScript)

+ 		{

+-			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

++#else

++			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

++#endif

+ 			if (jsa->isOk())

+ 			{

+ 				ite->annotation().setV_act(UnicodeParsedString(jsa->getScript()));

+ 				ite->annotation().setAAact(true);

+ 			}

+ 		}

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++		Aact.reset();

++#else

+ 		Aact = nullptr;

++#endif

+ 	}

+ }

+ 

+@@ -3901,6 +3995,46 @@ QString SlaOutputDev::UnicodeParsedString(POPPLER_CONST GooString *s1)
+ 	return result;

+ }

+ 

++QString SlaOutputDev::UnicodeParsedString(const std::string& s1)

++{

++	if (s1.length() == 0)

++		return QString();

++	GBool isUnicode;

++	int i;

++	Unicode u;

++	QString result;

++	if ((s1.at(0) & 0xff) == 0xfe && (s1.length() > 1 && (s1.at(1) & 0xff) == 0xff))

++	{

++		isUnicode = gTrue;

++		i = 2;

++		result.reserve((s1.length() - 2) / 2);

++	}

++	else

++	{

++		isUnicode = gFalse;

++		i = 0;

++		result.reserve(s1.length());

++	}

++	while (i < s1.length())

++	{

++		if (isUnicode)

++		{

++			u = ((s1.at(i) & 0xff) << 8) | (s1.at(i+1) & 0xff);

++			i += 2;

++		}

++		else

++		{

++			u = s1.at(i) & 0xff;

++			++i;

++		}

++		// #15616: imagemagick may write unicode strings incorrectly in PDF

++		if (u == 0)

++			continue;

++		result += QChar( u );

++	}

++	return result;

++}

++

+ bool SlaOutputDev::checkClip()

+ {

+ 	bool ret = false;

+diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
+index d928fada81..67b5a51937 100644
+--- a/scribus/plugins/import/pdf/slaoutput.h
++++ b/scribus/plugins/import/pdf/slaoutput.h
+@@ -20,6 +20,8 @@ for which a new license (GPL+exception) is in place.
+ #include <QTextStream>

+ #include <QTransform>

+ 

++#include <memory>

++

+ #include "fpointarray.h"

+ #include "importpdfconfig.h"

+ #include "pageitem.h"

+@@ -159,7 +161,11 @@ class SlaOutputDev : public OutputDev
+ 	virtual ~SlaOutputDev();

+ 

+ 	LinkAction* SC_getAction(AnnotWidget *ano);

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

++	std::unique_ptr<LinkAction> SC_getAdditionalAction(const char *key, AnnotWidget *ano);

++#else

+ 	LinkAction* SC_getAdditionalAction(const char *key, AnnotWidget *ano);

++#endif

+ 	static GBool annotations_callback(Annot *annota, void *user_data);

+ 	bool handleTextAnnot(Annot* annota, double xCoor, double yCoor, double width, double height);

+ 	bool handleLinkAnnot(Annot* annota, double xCoor, double yCoor, double width, double height);

+@@ -287,6 +293,7 @@ class SlaOutputDev : public OutputDev
+ 	void applyMask(PageItem *ite);

+ 	void pushGroup(const QString& maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false);

+ 	QString UnicodeParsedString(POPPLER_CONST GooString *s1);

++	QString UnicodeParsedString(const std::string& s1);

+ 	bool checkClip();

+ 	bool pathIsClosed {false};

+ 	QString CurrColorFill;

diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5-r1.ebuild
index ca708fa897bc..48d5cb285e7d 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa 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}
@@ -34,7 +34,7 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtgui:5[-gles2-only]
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
@@ -75,6 +75,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-poppler-0.82.patch
 	"${FILESDIR}"/${P}-poppler-0.83.patch
 	"${FILESDIR}"/${P}-poppler-0.84.patch
+	"${FILESDIR}"/${P}-poppler-0.86.patch
 	# non(?)-upstreamable
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
 	"${FILESDIR}"/${P}-docdir.patch
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 97d62f8d370d..d532762422ed 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -36,7 +36,7 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtgui:5[-gles2-only]
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
@@ -80,18 +80,13 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
 )
 
+CMAKE_BUILD_TYPE="Release"
+
 src_prepare() {
 	cmake_src_prepare
 
 	rm -r codegen/cheetah scribus/third_party/hyphen || die
 
-	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
-	find_package(PkgConfig)
-	pkg_check_modules(ZLIB minizip zlib)
-	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
-	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
-	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
-	EOF
 	sed \
 		-e "/^\s*unzip\.[ch]/d" \
 		-e "/^\s*ioapi\.[ch]/d" \
@@ -115,6 +110,7 @@ src_configure() {
 		-DHAVE_PYTHON=ON
 		-DWANT_DISTROBUILD=ON
 		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
+		-DPython3_EXECUTABLE="${PYTHON}"
 		-DWITH_BOOST=$(usex boost)
 		-DWANT_DEBUG=$(usex debug)
 		-DWANT_NOEXAMPLES=$(usex !examples)