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

[Evangelos Foutras]

    Date: Saturday, January 19, 2019 @ 11:50:30
  Author: foutrelis
Revision: 424538

Fix build with poppler 0.73

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

----------------------------+
 PKGBUILD                   |    8 ++++++--
 scribus-poppler-0.73.patch |   14 ++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-19 11:50:02 UTC (rev 424537)
+++ PKGBUILD	2019-01-19 11:50:30 UTC (rev 424538)
@@ -22,7 +22,8 @@
         'https://github.com/scribusproject/scribus/commit/7d4ceeb5cac32287769e3c0238699e0b3e56c24d.patch'
         'https://github.com/scribusproject/scribus/commit/76561c1a55cd07c268f8f2b2fea888532933700b.patch'
         'https://github.com/scribusproject/scribus/commit/8e05d26c19097ac2ad5b4ebbf40a3771ee6faf9c.patch'
-        'scribus-poppler-0.70.patch')
+        'scribus-poppler-0.70.patch'
+        'scribus-poppler-0.73.patch')
 sha256sums=('6480925250b2bb07028e2f378c02b67fe3e33206743671e03c07c701cd05da03'
             'SKIP'
             '0a782958360ad70145a588a5e1c0044d162344e96b4ff9b0aeb31388cc9b2e36'
@@ -29,7 +30,8 @@
             'b20bf0588b30d7777551ea6eb5744caf31ef31dd396b2b08cc4bddf9dd3a22cf'
             '29b09c7cc95e8a5432010b39a6c0478cb106a1bbb425747fb383092465476106'
             '824cbc38b02e15aa742b309a226549c3a6c4e3eb16059c239083145aa4ae6dab'
-            '199b5ea2831d749b91e206f50e3d30a7b787c5e2b85676120e1e4825478f8737')
+            '199b5ea2831d749b91e206f50e3d30a7b787c5e2b85676120e1e4825478f8737'
+            'd998054d117671cbc392ec594ab1a21f8e32b02680429ffa05300cb420d80934')
 validpgpkeys=('5086B8D68E70FDDF4C40045AEF7B95E7F60166DA'  # Peter Linnell <plinnell at scribus.net>
               '757F5E9B13DD648887AD50092D47C099E782504E') # The Scribus Team (www.scribus.net) <the_scribus_team at scribus.net>
 
@@ -47,6 +49,8 @@
     sed -e 's|GBool|bool|g' -e 's|gTrue|true|g' -e 's|gFalse|false|g' -i scribus/plugins/import/pdf/*
     # Poppler 0.72
     sed -e 's|getCString|c_str|g' -i scribus/plugins/import/pdf/*
+    # Poppler 0.73
+    patch -p0 -i ../scribus-poppler-0.73.patch
     # Fix python name
     sed \
         -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \

Added: scribus-poppler-0.73.patch
===================================================================
--- scribus-poppler-0.73.patch	                        (rev 0)
+++ scribus-poppler-0.73.patch	2019-01-19 11:50:30 UTC (rev 424538)
@@ -0,0 +1,14 @@
+Index: scribus/plugins/import/pdf/slaoutput.h
+===================================================================
+--- scribus/plugins/import/pdf/slaoutput.h	(revision 22805)
++++ scribus/plugins/import/pdf/slaoutput.h	(revision 22806)
+@@ -28,7 +28,9 @@
+ #include "selection.h"
+ #include "vgradient.h"
+ 
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 73, 0)
+ #include <poppler/goo/gtypes.h>
++#endif
+ #include <poppler/Object.h>
+ #include <poppler/OutputDev.h>
+ #include <poppler/Gfx.h>