Hi ports@, Below is a diff that updates print/scribus to 1.5.8. Tested on amd64. Most patches are removed because they've been upstreamed or don't apply anymore anyway because upstream solved an issue in a different way.
Can active/frequent users of this program test this update and tell me whether the update works for them? I've only started to use this program a week ago so I can't really say whether this update is an improvement, even if it works fine for me. And besides that, feedback and/or OKs? Caspar Index: Makefile =================================================================== RCS file: /cvs/ports/print/scribus/Makefile,v retrieving revision 1.81 diff -u -p -r1.81 Makefile --- Makefile 11 Mar 2022 19:51:08 -0000 1.81 +++ Makefile 14 May 2022 14:27:49 -0000 @@ -1,9 +1,8 @@ DPB_PROPERTIES= parallel COMMENT= desktop publishing program -DISTNAME= scribus-1.5.7 +DISTNAME= scribus-1.5.8 CATEGORIES= print -REVISION= 1 HOMEPAGE= https://www.scribus.net/ Index: distinfo =================================================================== RCS file: /cvs/ports/print/scribus/distinfo,v retrieving revision 1.15 diff -u -p -r1.15 distinfo --- distinfo 4 Oct 2021 11:12:22 -0000 1.15 +++ distinfo 14 May 2022 14:27:49 -0000 @@ -1,2 +1,2 @@ -SHA256 (scribus-1.5.7.tar.xz) = MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4= -SIZE (scribus-1.5.7.tar.xz) = 74490040 +SHA256 (scribus-1.5.8.tar.xz) = R4Fuj89tBXiP8WqkSZ+X/yJDHHd6d4kUmwqItFHha3Q= +SIZE (scribus-1.5.8.tar.xz) = 74543476 Index: patches/patch-scribus_fonts_sfnt_cpp =================================================================== RCS file: patches/patch-scribus_fonts_sfnt_cpp diff -N patches/patch-scribus_fonts_sfnt_cpp --- patches/patch-scribus_fonts_sfnt_cpp 11 Mar 2022 19:51:08 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,45 +0,0 @@ -From 1b546978bc4ea0b2a73fbe4d7cf947887e865162 Mon Sep 17 00:00:00 2001 -From: Jean Ghali <[email protected]> -Date: Sat, 21 Aug 2021 20:05:43 +0000 -Subject: [PATCH] Use new hb-subset api with harfbuzz >= 2.9.0 in order to prepeare for removal of legacy API in 3.0 - -From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001 -From: Jean Ghali <[email protected]> -Date: Sun, 19 Sep 2021 11:59:50 +0000 -Subject: [PATCH] #16635: Replace hb_subset, removed in harfbuzz 3.0, by hb_subset_or_fail - -Index: scribus/fonts/sfnt.cpp ---- scribus/fonts/sfnt.cpp.orig -+++ scribus/fonts/sfnt.cpp -@@ -1256,16 +1256,30 @@ namespace sfnt { - - for (int i = 0; i < cids.count(); ++i) - hb_set_add(glyphSet, cids.at(i)); -- -+ -+#if HB_VERSION_ATLEAST(2, 9, 0) -+ uint32_t subsetFlags = (uint32_t) hb_subset_input_get_flags(hbSubsetInput.get()); -+ subsetFlags |= HB_SUBSET_FLAGS_RETAIN_GIDS; -+ subsetFlags &= ~HB_SUBSET_FLAGS_NO_HINTING; -+ subsetFlags |= HB_SUBSET_FLAGS_NAME_LEGACY; -+ hb_subset_input_set_flags(hbSubsetInput.get(), subsetFlags); -+#else - hb_subset_input_set_retain_gids(hbSubsetInput.get(), true); - hb_subset_input_set_drop_hints(hbSubsetInput.get(), false); - #if HB_VERSION_ATLEAST(2, 6, 5) - hb_subset_input_set_name_legacy(hbSubsetInput.get(), true); - #endif -+#endif - -+#if HB_VERSION_ATLEAST(2, 9, 0) -+ QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get())); -+ if (hbSubsetFace.isNull()) -+ return QByteArray(); -+#else - QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get())); - if (hbSubsetFace.isNull()) - return QByteArray(); -+#endif - - QScopedPointer<hb_blob_t, HbBlobDeleter> hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get())); - if (hbSubsetBlob.isNull()) Index: patches/patch-scribus_third_party_lib2geom_path_h =================================================================== RCS file: patches/patch-scribus_third_party_lib2geom_path_h diff -N patches/patch-scribus_third_party_lib2geom_path_h --- patches/patch-scribus_third_party_lib2geom_path_h 11 Mar 2022 19:51:08 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -Unbreak LLVM10 build - -Index: scribus/third_party/lib2geom/path.h ---- scribus/third_party/lib2geom/path.h.orig -+++ scribus/third_party/lib2geom/path.h -@@ -257,7 +257,7 @@ class BezierCurve : public Curve { (protected) - for(unsigned i = 0; i <= order; i++) { - x[i] = c[i][X]; y[i] = c[i][Y]; - } -- inner = Bezier(x, y); -+ inner = D2<Bezier>(Bezier(x, y), Bezier(x, y)); - } - }; - Index: patches/patch-scribus_ui_colorlistmodel_cpp =================================================================== RCS file: patches/patch-scribus_ui_colorlistmodel_cpp diff -N patches/patch-scribus_ui_colorlistmodel_cpp --- patches/patch-scribus_ui_colorlistmodel_cpp 11 Mar 2022 19:51:08 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -avoid segfault caused by CommonStrings::None by removing m_NoneColor, which is -unused anyways - -Index: scribus/ui/colorlistmodel.cpp ---- scribus/ui/colorlistmodel.cpp.orig -+++ scribus/ui/colorlistmodel.cpp -@@ -31,8 +31,6 @@ ColorPixmapValue::ColorPixmapValue( const ScColor& col - m_name = colName; - } - --ColorPixmapValue ColorListModel::m_NoneColor(ScColor(), nullptr, CommonStrings::None); -- - ColorListModel::ColorListModel(QObject *parent) - : QAbstractItemModel(parent) - { Index: patches/patch-scribus_ui_colorlistmodel_h =================================================================== RCS file: patches/patch-scribus_ui_colorlistmodel_h diff -N patches/patch-scribus_ui_colorlistmodel_h --- patches/patch-scribus_ui_colorlistmodel_h 11 Mar 2022 19:51:08 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -avoid segfault caused by CommonStrings::None by removing m_NoneColor, which is -unused anyways - -Index: scribus/ui/colorlistmodel.h ---- scribus/ui/colorlistmodel.h.orig -+++ scribus/ui/colorlistmodel.h -@@ -103,9 +103,6 @@ class SCRIBUS_API ColorListModel : public QAbstractIte - // SortRule m_sortRule - SortRule m_sortRule; - -- //! Dummy object used to represent None Color -- static ColorPixmapValue m_NoneColor; -- - static bool compareColorNames(const ColorPixmapValue& v1, const ColorPixmapValue& v2); - static bool compareColorValues(const ColorPixmapValue& v1, const ColorPixmapValue& v2); - static bool compareColorTypes(const ColorPixmapValue& v1, const ColorPixmapValue& v2); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/print/scribus/pkg/PLIST,v retrieving revision 1.22 diff -u -p -r1.22 PLIST --- pkg/PLIST 11 Mar 2022 19:51:08 -0000 1.22 +++ pkg/PLIST 14 May 2022 14:27:50 -0000 @@ -3618,6 +3618,7 @@ share/scribus/translations/scribus.mn_MN share/scribus/translations/scribus.ms_MY.qm share/scribus/translations/scribus.nb_NO.qm share/scribus/translations/scribus.nl.qm +share/scribus/translations/scribus.nn_NO.qm share/scribus/translations/scribus.oc.qm share/scribus/translations/scribus.pl_PL.qm share/scribus/translations/scribus.pms.qm
