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

[Evangelos Foutras]

    Date: Monday, April 5, 2021 @ 00:20:50
  Author: foutrelis
Revision: 911814

upgpkg: scribus 1.5.6.1-11: use upstream patch for poppler 21.4.0

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

----------------------+
 PKGBUILD             |    6 +++---
 poppler-21.4.0.patch |   12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-04 23:24:58 UTC (rev 911813)
+++ PKGBUILD	2021-04-05 00:20:50 UTC (rev 911814)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.6.1
-pkgrel=10
+pkgrel=11
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/"
@@ -26,7 +26,7 @@
 sha256sums=('d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab'
             'SKIP'
             '5d3edce42d3931d786d1f9d59bafb3291c93fd590b2a047f1e4998ec7238f5de'
-            'c746dae91a4c6da0c5d6df8474819ce999d061308b4cef652759b968f21e689c'
+            '664a6a67d9cdf2ac583249c28252e1832bf1475408c9657c42559cfdfc435d34'
             'ef40f58da30e024d85abc20384853b4d3e7ec02ec8db97f3470528c351119d99')
 validpgpkeys=(5086B8D68E70FDDF4C40045AEF7B95E7F60166DA  # Peter Linnell <plinnell at scribus.net>
               757F5E9B13DD648887AD50092D47C099E782504E  # The Scribus Team (www.scribus.net) <the_scribus_team at scribus.net>
@@ -35,7 +35,7 @@
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -Np1 -i ../poppler-21.3.0.patch # https://bugs.scribus.net/view.php?id=16502
-  patch -Np1 -i ../poppler-21.4.0.patch # https://bugs.scribus.net/view.php?id=16536
+  patch -Np0 -i ../poppler-21.4.0.patch # https://bugs.scribus.net/view.php?id=16536
   patch -Np1 -i ../scribus-podofo-0.9.7.patch
 }
 

Modified: poppler-21.4.0.patch
===================================================================
--- poppler-21.4.0.patch	2021-04-04 23:24:58 UTC (rev 911813)
+++ poppler-21.4.0.patch	2021-04-05 00:20:50 UTC (rev 911814)
@@ -1,13 +1,13 @@
-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index 66c3420..a4eae02 100644
---- a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -379,7 +379,11 @@ private:
+Index: scribus/plugins/import/pdf/slaoutput.h
+===================================================================
+--- scribus/plugins/import/pdf/slaoutput.h	(revision 24598)
++++ scribus/plugins/import/pdf/slaoutput.h	(revision 24599)
+@@ -379,7 +379,11 @@
  	Catalog *catalog {nullptr};
  	SplashFontEngine *m_fontEngine {nullptr};
  	SplashFont *m_font {nullptr};
 +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 4, 0)
-+	std::unique_ptr<FormPageWidgets> m_formWidgets {nullptr};
++	std::unique_ptr<FormPageWidgets> m_formWidgets;
 +#else
  	FormPageWidgets *m_formWidgets {nullptr};
 +#endif