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

[Evangelos Foutras]

    Date: Saturday, January 19, 2019 @ 12:05:03
  Author: foutrelis
Revision: 424561

Follow-up fix for poppler 0.73

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

----------------------------+
 PKGBUILD                   |    2 +-
 scribus-poppler-0.73.patch |   16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-19 12:04:00 UTC (rev 424560)
+++ PKGBUILD	2019-01-19 12:05:03 UTC (rev 424561)
@@ -31,7 +31,7 @@
             '29b09c7cc95e8a5432010b39a6c0478cb106a1bbb425747fb383092465476106'
             '824cbc38b02e15aa742b309a226549c3a6c4e3eb16059c239083145aa4ae6dab'
             '199b5ea2831d749b91e206f50e3d30a7b787c5e2b85676120e1e4825478f8737'
-            'd998054d117671cbc392ec594ab1a21f8e32b02680429ffa05300cb420d80934')
+            'f09488ff56177fd360d588bf70f2960adeba80cb34cec692d4d967dc081fe4ad')
 validpgpkeys=('5086B8D68E70FDDF4C40045AEF7B95E7F60166DA'  # Peter Linnell <plinnell at scribus.net>
               '757F5E9B13DD648887AD50092D47C099E782504E') # The Scribus Team (www.scribus.net) <the_scribus_team at scribus.net>
 

Modified: scribus-poppler-0.73.patch
===================================================================
--- scribus-poppler-0.73.patch	2019-01-19 12:04:00 UTC (rev 424560)
+++ scribus-poppler-0.73.patch	2019-01-19 12:05:03 UTC (rev 424561)
@@ -1,3 +1,19 @@
+Index: scribus/plugins/import/pdf/importpdfconfig.h
+===================================================================
+--- scribus/plugins/import/pdf/importpdfconfig.h	(revision 22797)
++++ scribus/plugins/import/pdf/importpdfconfig.h	(revision 22798)
+@@ -37,4 +37,11 @@
+ #define getCString  c_str
+ #endif
+ 
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 73, 0)
++#define Guchar  unsigned char
++#define Gushort unsigned short
++#define Guint   unsigned int
++#define Gulong  unsigned long
+ #endif
++
++#endif
 Index: scribus/plugins/import/pdf/slaoutput.h
 ===================================================================
 --- scribus/plugins/import/pdf/slaoutput.h	(revision 22805)