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

[Antonio Rojas]

    Date: Tuesday, April 23, 2019 @ 20:51:20
  Author: arojas
Revision: 453239

Fix build with poppler 0.76

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

----------------------------+
 PKGBUILD                   |    8 ++++++--
 scribus-poppler-0.76.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-23 20:42:08 UTC (rev 453238)
+++ PKGBUILD	2019-04-23 20:51:20 UTC (rev 453239)
@@ -24,7 +24,8 @@
         'https://github.com/scribusproject/scribus/commit/8e05d26c19097ac2ad5b4ebbf40a3771ee6faf9c.patch'
         'scribus-poppler-0.70.patch'
         'scribus-poppler-0.73.patch'
-        'scribus-poppler-0.75.patch')
+        'scribus-poppler-0.75.patch'
+        'scribus-poppler-0.76.patch')
 sha256sums=('6480925250b2bb07028e2f378c02b67fe3e33206743671e03c07c701cd05da03'
             'SKIP'
             '0a782958360ad70145a588a5e1c0044d162344e96b4ff9b0aeb31388cc9b2e36'
@@ -33,7 +34,8 @@
             '824cbc38b02e15aa742b309a226549c3a6c4e3eb16059c239083145aa4ae6dab'
             '199b5ea2831d749b91e206f50e3d30a7b787c5e2b85676120e1e4825478f8737'
             'f09488ff56177fd360d588bf70f2960adeba80cb34cec692d4d967dc081fe4ad'
-            '0e69817dc9b047852540dd76aaec39b54a4781c273e4d5fe2764c773b3160ed2')
+            '0e69817dc9b047852540dd76aaec39b54a4781c273e4d5fe2764c773b3160ed2'
+            '115ec3b46e303f648ecf55769ab5c6cfeefcf914822164ec187a0bcb22699305')
 validpgpkeys=('5086B8D68E70FDDF4C40045AEF7B95E7F60166DA'  # Peter Linnell <plinnell at scribus.net>
               '757F5E9B13DD648887AD50092D47C099E782504E') # The Scribus Team (www.scribus.net) <the_scribus_team at scribus.net>
 
@@ -55,6 +57,8 @@
     patch -p0 -i ../scribus-poppler-0.73.patch
     # Poppler 0.75
     patch -p1 --binary -i ../scribus-poppler-0.75.patch
+    # Poppler 0.76
+    patch -p1 -i ../scribus-poppler-0.76.patch
     # Fix python name
     sed \
         -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \

Added: scribus-poppler-0.76.patch
===================================================================
--- scribus-poppler-0.76.patch	                        (rev 0)
+++ scribus-poppler-0.76.patch	2019-04-23 20:51:20 UTC (rev 453239)
@@ -0,0 +1,40 @@
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index fe9794a65..2012d98d3 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -430,7 +430,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ 				if (dst->isPageRef())
+ 				{
+ 					Ref dstr = dst->getPageRef();
+-					pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
++					pagNum = pdfDoc->findPage(dstr);
+ 				}
+ 				else
+ 					pagNum = dst->getPageNum();
+@@ -452,7 +452,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ 						if (dstn->isPageRef())
+ 						{
+ 							Ref dstr = dstn->getPageRef();
+-							pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
++							pagNum = pdfDoc->findPage(dstr);
+ 						}
+ 						else
+ 							pagNum = dstn->getPageNum();
+@@ -932,7 +932,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 					if (dst->isPageRef())
+ 					{
+ 						Ref dstr = dst->getPageRef();
+-						pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
++						pagNum = pdfDoc->findPage(dstr);
+ 					}
+ 					else
+ 						pagNum = dst->getPageNum();
+@@ -956,7 +956,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 							if (dstn->isPageRef())
+ 							{
+ 								Ref dstr = dstn->getPageRef();
+-								pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
++								pagNum = pdfDoc->findPage(dstr);
+ 							}
+ 							else
+ 								pagNum = dstn->getPageNum();