Re: fix print/scribus with new poppler

[Greg Steuck]

Matthias Kilian <k...@outback.escape.de> writes:

> Hi,
>
> with poppler-21.04 (and -05), print/scribus needs the patch below.
>
> ok?

OK gnezdo

>
> Ciao,
>       Kili
>
> Index: patches/patch-scribus_plugins_import_pdf_slaoutput_h
> ===================================================================
> RCS file: 
> /cvs/ports/print/scribus/patches/patch-scribus_plugins_import_pdf_slaoutput_h,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-scribus_plugins_import_pdf_slaoutput_h
> --- patches/patch-scribus_plugins_import_pdf_slaoutput_h      7 Apr 2021 
> 14:08:35 -0000       1.4
> +++ patches/patch-scribus_plugins_import_pdf_slaoutput_h      17 May 2021 
> 20:12:53 -0000
> @@ -2,6 +2,8 @@ $OpenBSD: patch-scribus_plugins_import_p
>  
>  Fix for poppler-21.03.x from svn r24537 and r24538.
>  
> +Fix for poppler-21.04.x.
> +
>  Index: scribus/plugins/import/pdf/slaoutput.h
>  --- scribus/plugins/import/pdf/slaoutput.h.orig
>  +++ scribus/plugins/import/pdf/slaoutput.h
> @@ -17,3 +19,12 @@ Index: scribus/plugins/import/pdf/slaout
>       GBool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * 
> /*shading*/) override { qDebug() << "Function Shaded Fill";  return gFalse; }
>       GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double 
> tMin, double tMax) override;
>       GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading 
> *shading)  override { return (shading->getExtend0() == 
> shading->getExtend1()); }
> +@@ -368,7 +372,7 @@ class SlaOutputDev : public OutputDev (public)
> +     Catalog *catalog {nullptr};
> +     SplashFontEngine *m_fontEngine {nullptr};
> +     SplashFont *m_font {nullptr};
> +-    FormPageWidgets *m_formWidgets {nullptr};
> ++    std::unique_ptr<FormPageWidgets> m_formWidgets;
> +     QHash<QString, QList<int> > m_radioMap;
> +     QHash<int, PageItem*> m_radioButtons;
> +     int m_actPage;