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

[Evangelos Foutras]

    Date: Friday, April 2, 2021 @ 21:35:17
  Author: foutrelis
Revision: 911227

upgpkg: scribus 1.5.6.1-10: poppler 21.04.0 rebuild

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

----------------------+
 PKGBUILD             |    5 ++++-
 poppler-21.4.0.patch |   16 ++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-02 20:49:46 UTC (rev 911226)
+++ PKGBUILD	2021-04-02 21:35:17 UTC (rev 911227)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.6.1
-pkgrel=9
+pkgrel=10
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/"
@@ -21,10 +21,12 @@
             'hyphen-lang: hyphenation patterns for desired languages')
 source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc}
         poppler-21.3.0.patch
+        poppler-21.4.0.patch
         scribus-podofo-0.9.7.patch::https://github.com/scribusproject/scribus/commit/c6182ef92820b422d61c904e40e9fed865458eb5.patch)
 sha256sums=('d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab'
             'SKIP'
             '5d3edce42d3931d786d1f9d59bafb3291c93fd590b2a047f1e4998ec7238f5de'
+            'c746dae91a4c6da0c5d6df8474819ce999d061308b4cef652759b968f21e689c'
             'ef40f58da30e024d85abc20384853b4d3e7ec02ec8db97f3470528c351119d99')
 validpgpkeys=(5086B8D68E70FDDF4C40045AEF7B95E7F60166DA  # Peter Linnell <plinnell at scribus.net>
               757F5E9B13DD648887AD50092D47C099E782504E  # The Scribus Team (www.scribus.net) <the_scribus_team at scribus.net>
@@ -33,6 +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 -Np1 -i ../scribus-podofo-0.9.7.patch
 }
 

Added: poppler-21.4.0.patch
===================================================================
--- poppler-21.4.0.patch	                        (rev 0)
+++ poppler-21.4.0.patch	2021-04-02 21:35:17 UTC (rev 911227)
@@ -0,0 +1,16 @@
+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:
+ 	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};
++#else
+ 	FormPageWidgets *m_formWidgets {nullptr};
++#endif
+ 	QHash<QString, QList<int> > m_radioMap;
+ 	QHash<int, PageItem*> m_radioButtons;
+ 	int m_actPage;