rpm/scribus
SHA256
1
0
Fork 0
forked from pool/scribus
Code Pull Requests Activity

Accepting request 883666 from KDE:Extra

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/883666
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scribus?expand=0&rev=74
This commit is contained in:
Dominique Leuenberger 2021-04-12 10:33:38 +00:00 committed by Git OBS Bridge
commit bf93f3778e
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0003-Page-getFormWidgets-returns-unique_ptr-in-poppler-21.04.0.patch Normal file
View File

@ -0,0 +1,27 @@
From c62844064cd6d85802d21e188b0f479463e22095 Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@libertysurf.fr>
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<FormPageWidgets> m_formWidgets;
+#else
FormPageWidgets *m_formWidgets {nullptr};
+#endif
QHash<QString, QList<int> > m_radioMap;
QHash<int, PageItem*> m_radioButtons;
int m_actPage;

6
scribus.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Apr 7 06:57:25 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>
- 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 <alarrosa@suse.com>

2
scribus.spec
View File

@ -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