Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package scribus for openSUSE:Factory checked
in at 2021-04-12 12:33:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scribus (Old)
and /work/SRC/openSUSE:Factory/.scribus.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scribus"
Mon Apr 12 12:33:38 2021 rev:74 rq:883666 version:1.5.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/scribus/scribus.changes 2021-03-21
23:20:23.668739749 +0100
+++ /work/SRC/openSUSE:Factory/.scribus.new.2401/scribus.changes
2021-04-12 12:33:39.941044854 +0200
@@ -1,0 +2,6 @@
+Wed Apr 7 06:57:25 UTC 2021 - Antonio Larrosa <alarr...@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
+
+-------------------------------------------------------------------
New:
----
0003-Page-getFormWidgets-returns-unique_ptr-in-poppler-21.04.0.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scribus.spec ++++++
--- /var/tmp/diff_new_pack.FGIYGr/_old 2021-04-12 12:33:40.797046179 +0200
+++ /var/tmp/diff_new_pack.FGIYGr/_new 2021-04-12 12:33:40.797046179 +0200
@@ -31,6 +31,8 @@
# 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
++++++ 0003-Page-getFormWidgets-returns-unique_ptr-in-poppler-21.04.0.patch
++++++
>From c62844064cd6d85802d21e188b0f479463e22095 Mon Sep 17 00:00:00 2001
From: Jean Ghali <jgh...@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;
