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

[Antonio Rojas]

    Date: Friday, March 22, 2019 @ 10:29:14
  Author: arojas
Revision: 443135

Fix build with poppler 0.75

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

----------------------------+
 PKGBUILD                   |    5 ++++-
 scribus-poppler-0.75.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-22 10:11:17 UTC (rev 443134)
+++ PKGBUILD	2019-03-22 10:29:14 UTC (rev 443135)
@@ -23,7 +23,8 @@
         'https://github.com/scribusproject/scribus/commit/76561c1a55cd07c268f8f2b2fea888532933700b.patch'
         'https://github.com/scribusproject/scribus/commit/8e05d26c19097ac2ad5b4ebbf40a3771ee6faf9c.patch'
         'scribus-poppler-0.70.patch'
-        'scribus-poppler-0.73.patch')
+        'scribus-poppler-0.73.patch'
+        'scribus-poppler-0.75.patch')
 sha256sums=('6480925250b2bb07028e2f378c02b67fe3e33206743671e03c07c701cd05da03'
             'SKIP'
             '0a782958360ad70145a588a5e1c0044d162344e96b4ff9b0aeb31388cc9b2e36'
@@ -51,6 +52,8 @@
     sed -e 's|getCString|c_str|g' -i scribus/plugins/import/pdf/*
     # Poppler 0.73
     patch -p0 -i ../scribus-poppler-0.73.patch
+    # Poppler 0.75
+    patch -p1 --binary -i ../scribus-poppler-0.75.patch
     # Fix python name
     sed \
         -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \

Added: scribus-poppler-0.75.patch
===================================================================
--- scribus-poppler-0.75.patch	                        (rev 0)
+++ scribus-poppler-0.75.patch	2019-03-22 10:29:14 UTC (rev 443135)
@@ -0,0 +1,40 @@
+--- scribus-1.5.4/scribus/plugins/import/pdf/importpdf.cpp.orig	2019-03-22 09:47:14.760191871 +0000
++++ scribus-1.5.4/scribus/plugins/import/pdf/importpdf.cpp	2019-03-22 09:47:37.363809447 +0000
+@@ -535,7 +535,7 @@
+ 									if (orderItem.isDict())
+ 									{
+ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
+-										Object ref = order->getNF(i);		
++										Object ref = order->getNF(i).copy();		
+ #else
+ 										Object ref;
+ 										order->getNF(i, &ref);
+--- scribus-1.5.4/scribus/plugins/import/pdf/slaoutput.cpp.orig	2019-03-22 10:02:43.145371895 +0000
++++ scribus-1.5.4/scribus/plugins/import/pdf/slaoutput.cpp	2019-03-22 10:07:03.085386627 +0000
+@@ -310,7 +310,7 @@
+ 	if (obj.isDict())
+ 	{
+ 		Dict* adic = obj.getDict();
+-		additionalActions = adic->lookupNF("A");
++		additionalActions = adic->lookupNF("A").copy();
+ 		Object additionalActionsObject = additionalActions.fetch(pdfDoc->getXRef());
+ 		if (additionalActionsObject.isDict())
+ 		{
+@@ -370,7 +370,7 @@
+ 	if (obj.isDict())
+ 	{
+ 		Dict* adic = obj.getDict();
+-		additionalActions = adic->lookupNF("AA");
++		additionalActions = adic->lookupNF("AA").copy();
+ 		Object additionalActionsObject = additionalActions.fetch(pdfDoc->getXRef());
+ 		if (additionalActionsObject.isDict())
+ 		{
+@@ -939,7 +939,7 @@
+ 				QList<int> radList;
+ 				for (int i = 0; i < obj2.arrayGetLength(); i++)
+ 				{
+-					Object childRef = obj2.arrayGetNF(i);
++					Object childRef = obj2.arrayGetNF(i).copy();
+ 					if (!childRef.isRef())
+ 						continue;
+ 					Object childObj = obj2.arrayGet(i);