this updates scribus to latest version three patches are not needed anymore because they were imported from development branch. Tested on amd64 and works fine for me
Index: Makefile =================================================================== RCS file: /home/reposync/ports/print/scribus/Makefile,v retrieving revision 1.77 diff -u -p -r1.77 Makefile --- Makefile 4 Jul 2021 14:35:41 -0000 1.77 +++ Makefile 24 Sep 2021 14:23:12 -0000 @@ -3,9 +3,8 @@ DPB_PROPERTIES= parallel COMMENT= desktop publishing program -DISTNAME= scribus-1.5.6.1 +DISTNAME= scribus-1.5.7 CATEGORIES= print -REVISION= 0 HOMEPAGE= https://www.scribus.net/ Index: distinfo =================================================================== RCS file: /home/reposync/ports/print/scribus/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- distinfo 7 Apr 2021 14:08:35 -0000 1.14 +++ distinfo 24 Sep 2021 14:24:33 -0000 @@ -1,2 +1,2 @@ -SHA256 (scribus-1.5.6.1.tar.xz) = 1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s= -SIZE (scribus-1.5.6.1.tar.xz) = 74307132 +SHA256 (scribus-1.5.7.tar.xz) = MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4= +SIZE (scribus-1.5.7.tar.xz) = 74490040 Index: patches/patch-scribus_pdf_analyzer_cpp =================================================================== RCS file: patches/patch-scribus_pdf_analyzer_cpp diff -N patches/patch-scribus_pdf_analyzer_cpp --- patches/patch-scribus_pdf_analyzer_cpp 7 Apr 2021 14:08:35 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -$OpenBSD: patch-scribus_pdf_analyzer_cpp,v 1.1 2021/04/07 14:08:35 sthen Exp $ - -http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24392 -#16427: Fix build failure with podofo 0.9.7 - -Index: scribus/pdf_analyzer.cpp ---- scribus/pdf_analyzer.cpp.orig -+++ scribus/pdf_analyzer.cpp -@@ -139,7 +139,9 @@ PDFColorSpace PDFAnalyzer::getCSType(PdfObject* cs) - { - pBase = cs->GetOwner()->GetObject(base.GetReference()); - } -+#if (PODOFO_VERSION < PODOFO_MAKE_VERSION(0, 9, 7)) - pBase->SetOwner(cs->GetOwner()); -+#endif - return getCSType(pBase); - } - if (csTypeName == "Separation") Index: patches/patch-scribus_plugins_import_pdf_slaoutput_cpp =================================================================== RCS file: patches/patch-scribus_plugins_import_pdf_slaoutput_cpp diff -N patches/patch-scribus_plugins_import_pdf_slaoutput_cpp --- patches/patch-scribus_plugins_import_pdf_slaoutput_cpp 7 Apr 2021 14:08:35 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,40 +0,0 @@ -$OpenBSD: patch-scribus_plugins_import_pdf_slaoutput_cpp,v 1.4 2021/04/07 14:08:35 sthen Exp $ - -Fix for poppler-21.03.x from svn r24537 and r24538. - -Index: scribus/plugins/import/pdf/slaoutput.cpp ---- scribus/plugins/import/pdf/slaoutput.cpp.orig -+++ scribus/plugins/import/pdf/slaoutput.cpp -@@ -2291,9 +2291,19 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *stat - return gTrue; - } - --GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) -+bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) -+#else -+GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int /*paintType*/, int /*tilingType*/, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) -+#endif - { - // qDebug() << "SlaOutputDev::tilingPatternFill"; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) -+ const double *bbox = tPat->getBBox(); -+ const double *pmat = tPat->getMatrix(); -+ Dict *resDict = tPat->getResDict(); -+#endif -+ - PDFRectangle box; - Gfx *gfx; - QString id; -@@ -2325,7 +2335,11 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state, - // Unset the clip path as it is unrelated to the pattern's coordinate space. - QPainterPath savedClip = m_currentClipPath; - m_currentClipPath = QPainterPath(); -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) -+ gfx->display(tPat->getContentStream()); -+#else - gfx->display(str); -+#endif - m_currentClipPath = savedClip; - inPattern--; - gElements = m_groupStack.pop(); Index: patches/patch-scribus_plugins_import_pdf_slaoutput_h =================================================================== RCS file: patches/patch-scribus_plugins_import_pdf_slaoutput_h diff -N patches/patch-scribus_plugins_import_pdf_slaoutput_h --- patches/patch-scribus_plugins_import_pdf_slaoutput_h 19 May 2021 19:59:39 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -$OpenBSD: patch-scribus_plugins_import_pdf_slaoutput_h,v 1.5 2021/05/19 19:59:39 kili Exp $ - -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 -@@ -196,7 +196,11 @@ class SlaOutputDev : public OutputDev (public) - void stroke(GfxState *state) override; - void fill(GfxState *state) override; - void eoFill(GfxState *state) override; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) -+ bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) override; -+#else - GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) override; -+#endif - 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; Index: pkg/PLIST =================================================================== RCS file: /home/reposync/ports/print/scribus/pkg/PLIST,v retrieving revision 1.20 diff -u -p -r1.20 PLIST --- pkg/PLIST 7 Apr 2021 14:08:35 -0000 1.20 +++ pkg/PLIST 24 Sep 2021 15:06:47 -0000 @@ -1874,6 +1874,8 @@ share/scribus/editorconfig/200_gnuplot.x share/scribus/editorconfig/300_lilypond.xml share/scribus/editorconfig/400_dot.xml share/scribus/editorconfig/500_povray.xml +share/scribus/editorconfig/600_xelatex.tar +share/scribus/editorconfig/600_xelatex.xml share/scribus/editorconfig/dot.svg share/scribus/editorconfig/gnuplot.png share/scribus/editorconfig/lilypond.png @@ -1949,6 +1951,7 @@ share/scribus/icons/1_5_0/16/draw-triang share/scribus/icons/1_5_0/16/edit-clear.png share/scribus/icons/1_5_0/16/edit-copy.png share/scribus/icons/1_5_0/16/edit-cut.png +share/scribus/icons/1_5_0/16/edit-delete-all.png share/scribus/icons/1_5_0/16/edit-delete.png share/scribus/icons/1_5_0/16/edit-find-replace.png share/scribus/icons/1_5_0/16/edit-guides.png @@ -2489,6 +2492,7 @@ share/scribus/icons/1_5_1/16/draw-triang share/scribus/icons/1_5_1/16/edit-clear.png share/scribus/icons/1_5_1/16/edit-copy.png share/scribus/icons/1_5_1/16/edit-cut.png +share/scribus/icons/1_5_1/16/edit-delete-all.png share/scribus/icons/1_5_1/16/edit-delete.png share/scribus/icons/1_5_1/16/edit-find-replace.png share/scribus/icons/1_5_1/16/edit-guides.png @@ -2580,6 +2584,7 @@ share/scribus/icons/1_5_1/22/align-verti share/scribus/icons/1_5_1/22/align-vertical-top-out.png share/scribus/icons/1_5_1/22/align-vertical-top.png share/scribus/icons/1_5_1/22/annot3d.png +share/scribus/icons/1_5_1/22/character-style.png share/scribus/icons/1_5_1/22/checkbox.png share/scribus/icons/1_5_1/22/close.png share/scribus/icons/1_5_1/22/color-picker.png @@ -2641,9 +2646,12 @@ share/scribus/icons/1_5_1/22/insert-tabl share/scribus/icons/1_5_1/22/insert-table-rows.png share/scribus/icons/1_5_1/22/insert-table.png share/scribus/icons/1_5_1/22/insert-text-frame.png +share/scribus/icons/1_5_1/22/language.png share/scribus/icons/1_5_1/22/list-box.png share/scribus/icons/1_5_1/22/measure.png share/scribus/icons/1_5_1/22/merge-table-cells.png +share/scribus/icons/1_5_1/22/orphan.png +share/scribus/icons/1_5_1/22/paragraph-style.png share/scribus/icons/1_5_1/22/pdf-annotations.png share/scribus/icons/1_5_1/22/pointer.png share/scribus/icons/1_5_1/22/preflight-verifier.png @@ -2652,6 +2660,7 @@ share/scribus/icons/1_5_1/22/split-table share/scribus/icons/1_5_1/22/story-editor.png share/scribus/icons/1_5_1/22/swap-left.png share/scribus/icons/1_5_1/22/swap-right.png +share/scribus/icons/1_5_1/22/text-align.png share/scribus/icons/1_5_1/22/text-field.png share/scribus/icons/1_5_1/22/text-frame-link.png share/scribus/icons/1_5_1/22/text-frame-unlink.png @@ -2661,6 +2670,7 @@ share/scribus/icons/1_5_1/22/transform-s share/scribus/icons/1_5_1/22/transform-shear-left.png share/scribus/icons/1_5_1/22/transform-shear-right.png share/scribus/icons/1_5_1/22/transform-shear-up.png +share/scribus/icons/1_5_1/22/widow.png share/scribus/icons/1_5_1/22/zoom-in.png share/scribus/icons/1_5_1/22/zoom-original.png share/scribus/icons/1_5_1/22/zoom-out.png @@ -2718,6 +2728,7 @@ share/scribus/icons/1_5_1/docattributes_ share/scribus/icons/1_5_1/document2.png share/scribus/icons/1_5_1/documentinfo.png share/scribus/icons/1_5_1/editm.png +share/scribus/icons/1_5_1/ellipsis.png share/scribus/icons/1_5_1/exit.png share/scribus/icons/1_5_1/exit22.png share/scribus/icons/1_5_1/expand.png @@ -2874,6 +2885,7 @@ share/scribus/icons/1_5_1_dark/16/draw-t share/scribus/icons/1_5_1_dark/16/edit-clear.png share/scribus/icons/1_5_1_dark/16/edit-copy.png share/scribus/icons/1_5_1_dark/16/edit-cut.png +share/scribus/icons/1_5_1_dark/16/edit-delete-all.png share/scribus/icons/1_5_1_dark/16/edit-delete.png share/scribus/icons/1_5_1_dark/16/edit-find-replace.png share/scribus/icons/1_5_1_dark/16/edit-guides.png @@ -2965,6 +2977,7 @@ share/scribus/icons/1_5_1_dark/22/align- share/scribus/icons/1_5_1_dark/22/align-vertical-top-out.png share/scribus/icons/1_5_1_dark/22/align-vertical-top.png share/scribus/icons/1_5_1_dark/22/annot3d.png +share/scribus/icons/1_5_1_dark/22/character-style.png share/scribus/icons/1_5_1_dark/22/checkbox.png share/scribus/icons/1_5_1_dark/22/close.png share/scribus/icons/1_5_1_dark/22/color-picker.png @@ -3027,9 +3040,12 @@ share/scribus/icons/1_5_1_dark/22/insert share/scribus/icons/1_5_1_dark/22/insert-table-rows.png share/scribus/icons/1_5_1_dark/22/insert-table.png share/scribus/icons/1_5_1_dark/22/insert-text-frame.png +share/scribus/icons/1_5_1_dark/22/language.png share/scribus/icons/1_5_1_dark/22/list-box.png share/scribus/icons/1_5_1_dark/22/measure.png share/scribus/icons/1_5_1_dark/22/merge-table-cells.png +share/scribus/icons/1_5_1_dark/22/orphan.png +share/scribus/icons/1_5_1_dark/22/paragraph-style.png share/scribus/icons/1_5_1_dark/22/pdf-annotations.png share/scribus/icons/1_5_1_dark/22/pointer.png share/scribus/icons/1_5_1_dark/22/preflight-verifier.png @@ -3038,6 +3054,7 @@ share/scribus/icons/1_5_1_dark/22/split- share/scribus/icons/1_5_1_dark/22/story-editor.png share/scribus/icons/1_5_1_dark/22/swap-left.png share/scribus/icons/1_5_1_dark/22/swap-right.png +share/scribus/icons/1_5_1_dark/22/text-align.png share/scribus/icons/1_5_1_dark/22/text-field.png share/scribus/icons/1_5_1_dark/22/text-frame-link.png share/scribus/icons/1_5_1_dark/22/text-frame-unlink.png @@ -3047,6 +3064,7 @@ share/scribus/icons/1_5_1_dark/22/transf share/scribus/icons/1_5_1_dark/22/transform-shear-left.png share/scribus/icons/1_5_1_dark/22/transform-shear-right.png share/scribus/icons/1_5_1_dark/22/transform-shear-up.png +share/scribus/icons/1_5_1_dark/22/widow.png share/scribus/icons/1_5_1_dark/22/zoom-in.png share/scribus/icons/1_5_1_dark/22/zoom-original.png share/scribus/icons/1_5_1_dark/22/zoom-out.png @@ -3104,6 +3122,7 @@ share/scribus/icons/1_5_1_dark/docattrib share/scribus/icons/1_5_1_dark/document2.png share/scribus/icons/1_5_1_dark/documentinfo.png share/scribus/icons/1_5_1_dark/editm.png +share/scribus/icons/1_5_1_dark/ellipsis.png share/scribus/icons/1_5_1_dark/exit.png share/scribus/icons/1_5_1_dark/exit22.png share/scribus/icons/1_5_1_dark/expand.png @@ -3606,6 +3625,7 @@ share/scribus/translations/scribus.pms.q share/scribus/translations/scribus.pt.qm share/scribus/translations/scribus.pt_BR.qm share/scribus/translations/scribus.pt_PT.qm +share/scribus/translations/scribus.ro.qm share/scribus/translations/scribus.ru.qm share/scribus/translations/scribus.sa.qm share/scribus/translations/scribus.si.qm @@ -3620,6 +3640,7 @@ share/scribus/translations/scribus.te.qm share/scribus/translations/scribus.th_TH.qm share/scribus/translations/scribus.tr.qm share/scribus/translations/scribus.uk.qm +share/scribus/translations/scribus.untranslated.qm share/scribus/translations/scribus.zh_CN.qm share/scribus/translations/scribus.zh_TW.qm share/scribus/unicodenameslist.txt
