From f4e9779be3b95febfb407ffb56ed8d9fba68a35ce692897a3c17a6318841c279 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 7 Apr 2021 16:38:23 +0000 Subject: [PATCH] Accepting request 883539 from home:alarrosa:branches:KDE:Extra - Add patch from upstream to build with poppler 21.04.0: * 0003-Page-getFormWidgets-returns-unique_ptr-in-poppler-21.04.0.patch OBS-URL: https://build.opensuse.org/request/show/883539 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=65 --- ...eturns-unique_ptr-in-poppler-21.04.0.patch | 27 +++++++++++++++++++ scribus.changes | 6 +++++ scribus.spec | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 0003-Page-getFormWidgets-returns-unique_ptr-in-poppler-21.04.0.patch diff --git a/0003-Page-getFormWidgets-returns-unique_ptr-in-poppler-21.04.0.patch b/0003-Page-getFormWidgets-returns-unique_ptr-in-poppler-21.04.0.patch new file mode 100644 index 0000000..b7f798d --- /dev/null +++ b/0003-Page-getFormWidgets-returns-unique_ptr-in-poppler-21.04.0.patch @@ -0,0 +1,27 @@ +From c62844064cd6d85802d21e188b0f479463e22095 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Sun, 4 Apr 2021 21:37:04 +0000 +Subject: [PATCH] #16536: Page::getFormWidgets() returns unique_ptr in poppler + 21.04.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@24599 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +index 66c34203ae..cb191b1023 100644 +--- a/scribus/plugins/import/pdf/slaoutput.h ++++ b/scribus/plugins/import/pdf/slaoutput.h +@@ -379,7 +379,11 @@ class SlaOutputDev : public OutputDev + Catalog *catalog {nullptr}; + SplashFontEngine *m_fontEngine {nullptr}; + SplashFont *m_font {nullptr}; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 4, 0) ++ std::unique_ptr m_formWidgets; ++#else + FormPageWidgets *m_formWidgets {nullptr}; ++#endif + QHash > m_radioMap; + QHash m_radioButtons; + int m_actPage; diff --git a/scribus.changes b/scribus.changes index 5d1f54e..2fcc03d 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 7 06:57:25 UTC 2021 - Antonio Larrosa + +- Add patch from upstream to build with poppler 21.04.0: + * 0003-Page-getFormWidgets-returns-unique_ptr-in-poppler-21.04.0.patch + ------------------------------------------------------------------- Fri Mar 19 15:59:13 UTC 2021 - Antonio Larrosa diff --git a/scribus.spec b/scribus.spec index 10fdc60..724de58 100644 --- a/scribus.spec +++ b/scribus.spec @@ -31,6 +31,8 @@ Patch0: 0001-Make-sure-information-displayed-on-the-about-window-.patch # PATCH-FIX-UPSTREAM Patch1: 0001-fix-build-of-pdf-import-plugin-with-poppler-21.03.0.patch Patch2: 0002-fix-build-of-pdf-import-plugin-with-poppler-21.03.0.patch +# PATCH-FIX-UPSTREAM +Patch3: 0003-Page-getFormWidgets-returns-unique_ptr-in-poppler-21.04.0.patch BuildRequires: cmake >= 3.12.0 BuildRequires: cups-devel BuildRequires: dos2unix