[arch-commits] Commit in scribus/trunk (PKGBUILD scribus-poppler-0.86.patch)

Antonio Rojas arojas at archlinux.org
Tue Mar 3 20:39:04 UTC 2020


    Date: Tuesday, March 3, 2020 @ 20:39:04
  Author: arojas
Revision: 589841

Fix build with poppler 0.86

Added:
  scribus/trunk/scribus-poppler-0.86.patch
Modified:
  scribus/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |    7 +
 scribus-poppler-0.86.patch |  186 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 191 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-03 20:36:18 UTC (rev 589840)
+++ PKGBUILD	2020-03-03 20:39:04 UTC (rev 589841)
@@ -21,13 +21,15 @@
          scribus-boost-1.71.patch
          scribus-poppler-0.82.patch::"https://github.com/scribusproject/scribus/commit/6db15ec1.patch"
          scribus-poppler-0.83.patch::"https://github.com/scribusproject/scribus/commit/b51c2bab.patch"
-         scribus-poppler-0.84.patch::"https://github.com/scribusproject/scribus/commit/37425599.patch")
+         scribus-poppler-0.84.patch::"https://github.com/scribusproject/scribus/commit/37425599.patch"
+         scribus-poppler-0.86.patch)
 sha256sums=('7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71'
             'SKIP'
             '19e20b11c0bce2dce07a845e31adb9ff1b680746698fa150d4572776513b243e'
             'a948a5ee53842ffc8acc3f6720291819d55d2ff370c2b46ddffc1122cba07e7f'
             '5631f5a19565cdbd1290c4e1a2c5a87e56ca0af17017c191dc0c00c97a456b3b'
-            '7c0c13abec2682398591ee66e9ab4547b9e0da66f135dd2357f8977589403694')
+            '7c0c13abec2682398591ee66e9ab4547b9e0da66f135dd2357f8977589403694'
+            'ac660067894effdde20e92c2f32095336707a7f6f3f277316498999096f65445')
 validpgpkeys=(5086B8D68E70FDDF4C40045AEF7B95E7F60166DA  # Peter Linnell <plinnell at scribus.net>
               757F5E9B13DD648887AD50092D47C099E782504E  # The Scribus Team (www.scribus.net) <the_scribus_team at scribus.net>
               6558BE84D27273A438A151198BEA48118AEBEE64) # Craig Bradney <cbradney at zipworld.com.au>
@@ -47,6 +49,7 @@
     patch -p1 -i ../scribus-poppler-0.82.patch # Fix build with poppler 0.82
     patch -p1 -i ../scribus-poppler-0.83.patch # Fix build with poppler 0.83
     patch -p1 -i ../scribus-poppler-0.84.patch # Fix build with poppler 0.84
+    patch -p1 -i ../scribus-poppler-0.86.patch # Fix build with poppler 0.86
 }
 
 build() {

Added: scribus-poppler-0.86.patch
===================================================================
--- scribus-poppler-0.86.patch	                        (rev 0)
+++ scribus-poppler-0.86.patch	2020-03-03 20:39:04 UTC (rev 589841)
@@ -0,0 +1,186 @@
+diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
+index 427cd66ef..7fe18d86b 100644
+--- a/scribus/plugins/import/pdf/importpdf.cpp
++++ b/scribus/plugins/import/pdf/importpdf.cpp
+@@ -792,13 +792,13 @@ bool PdfPlug::convert(const QString& fn)
+ 								if (names.isDict())
+ 								{
+ 									LinkAction *linkAction = nullptr;
+-									linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI());
++									linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI()).get();
+ 									if (linkAction)
+ 									{
+ 										LinkJavaScript *jsa = (LinkJavaScript*)linkAction;
+ 										if (jsa->isOk())
+ 										{
+-											QString script = UnicodeParsedString(jsa->getScript());
++											QString script = QString::fromStdString(jsa->getScript());
+ 											if (script.startsWith("this."))
+ 											{
+ 												script.remove(0, 5);
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index 93ceb1e30..d14dfa1d9 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -289,7 +289,7 @@ LinkAction* SlaOutputDev::SC_getAdditionalAction(const char *key, AnnotWidget *a
+ 		{
+ 			Object actionObject = additionalActionsObject.dictLookup(key);
+ 			if (actionObject.isDict())
+-				linkAction = LinkAction::parseAction(&actionObject, pdfDoc->getCatalog()->getBaseURI());
++				linkAction = LinkAction::parseAction(&actionObject, pdfDoc->getCatalog()->getBaseURI()).get();
+ 		}
+ 	}
+ 	return linkAction;
+@@ -420,7 +420,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ 			POPPLER_CONST GooString *ndst = gto->getNamedDest();
+ 			if (ndst)
+ 			{
+-				LinkDest *dstn = pdfDoc->findDest(ndst);
++				LinkDest *dstn = pdfDoc->findDest(ndst).get();
+ 				if (dstn)
+ 				{
+ 					if (dstn->getKind() == destXYZ)
+@@ -464,7 +464,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ 			POPPLER_CONST GooString *ndst = gto->getNamedDest();
+ 			if (ndst)
+ 			{
+-				LinkDest *dstn = pdfDoc->findDest(ndst);
++				LinkDest *dstn = pdfDoc->findDest(ndst).get();
+ 				if (dstn)
+ 				{
+ 					if (dstn->getKind() == destXYZ)
+@@ -482,7 +482,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ 	{
+ 		LinkURI *gto = (LinkURI*)act;
+ 		validLink = true;
+-		fileName = UnicodeParsedString(gto->getURI());
++		fileName = QString::fromStdString(gto->getURI());
+ 	}
+ 	if (validLink)
+ 	{
+@@ -895,7 +895,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			if (jsa->isOk())
+ 			{
+ 				ite->annotation().setActionType(1);
+-				ite->annotation().setAction(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setAction(QString::fromStdString(jsa->getScript()));
+ 			}
+ 		}
+ 		else if (Lact->getKind() == actionGoTo)
+@@ -932,7 +932,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 				POPPLER_CONST GooString *ndst = gto->getNamedDest();
+ 				if (ndst)
+ 				{
+-					LinkDest *dstn = pdfDoc->findDest(ndst);
++					LinkDest *dstn = pdfDoc->findDest(ndst).get();
+ 					if (dstn)
+ 					{
+ 						if (dstn->getKind() == destXYZ)
+@@ -984,7 +984,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 				POPPLER_CONST GooString *ndst = gto->getNamedDest();
+ 				if (ndst)
+ 				{
+-					LinkDest *dstn = pdfDoc->findDest(ndst);
++					LinkDest *dstn = pdfDoc->findDest(ndst).get();
+ 					if (dstn)
+ 					{
+ 						if (dstn->getKind() == destXYZ)
+@@ -1004,7 +1004,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 		else if (Lact->getKind() == actionUnknown)
+ 		{
+ 			LinkUnknown *uno = (LinkUnknown*)Lact;
+-			QString actString = UnicodeParsedString(uno->getAction());
++			QString actString = QString::fromStdString(uno->getAction());
+ 			if (actString == "ResetForm")
+ 			{
+ 				ite->annotation().setActionType(4);
+@@ -1048,7 +1048,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 		{
+ 			LinkNamed *uno = (LinkNamed*)Lact;
+ 			ite->annotation().setActionType(10);
+-			ite->annotation().setAction(UnicodeParsedString(uno->getName()));
++			ite->annotation().setAction(QString::fromStdString(uno->getName()));
+ 		}
+ 		else
+ 			qDebug() << "Found unsupported Action of type" << Lact->getKind();
+@@ -1061,7 +1061,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setD_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setD_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 			}
+ 		}
+@@ -1075,7 +1075,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setE_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setE_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 			}
+ 		}
+@@ -1089,7 +1089,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setX_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setX_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 			}
+ 		}
+@@ -1103,7 +1103,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setFo_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setFo_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 			}
+ 		}
+@@ -1117,7 +1117,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setBl_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setBl_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 			}
+ 		}
+@@ -1131,7 +1131,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setC_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setC_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 			}
+ 		}
+@@ -1145,7 +1145,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setF_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setF_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 				ite->annotation().setFormat(5);
+ 			}
+@@ -1160,7 +1160,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setK_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setK_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 				ite->annotation().setFormat(5);
+ 			}
+@@ -1175,7 +1175,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setV_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setV_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 			}
+ 		}



More information about the arch-commits mailing list