Date: Sat, 18 Sep 2021 22:05:22 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 28469f0bc3fc - main - print/scribus-devel: unbreak after dbc5f433f858 Message-ID: <202109182205.18IM5Mi6011599@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=28469f0bc3fcdd1cc9edf8f64324ffb74fc5f2a3 commit 28469f0bc3fcdd1cc9edf8f64324ffb74fc5f2a3 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-09-18 18:44:55 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-09-18 22:04:57 +0000 print/scribus-devel: unbreak after dbc5f433f858 scribus/fonts/sfnt.cpp: In function 'QByteArray sfnt::subsetFaceWithHB(const QByteArray&, QList<unsigned int>, int, QMap<unsigned int, unsigned int>&)': scribus/fonts/sfnt.cpp:1260:3: error: 'hb_subset_input_set_retain_gids' was not declared in this scope; did you mean 'hb_subset_input_set_flags'? 1260 | hb_subset_input_set_retain_gids(hbSubsetInput.get(), true); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | hb_subset_input_set_flags scribus/fonts/sfnt.cpp:1261:3: error: 'hb_subset_input_set_drop_hints' was not declared in this scope; did you mean 'hb_subset_input_set_user_data'? 1261 | hb_subset_input_set_drop_hints(hbSubsetInput.get(), false); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | hb_subset_input_set_user_data scribus/fonts/sfnt.cpp:1263:3: error: 'hb_subset_input_set_name_legacy' was not declared in this scope; did you mean 'hb_subset_input_set_flags'? 1263 | hb_subset_input_set_name_legacy(hbSubsetInput.get(), true); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | hb_subset_input_set_flags scribus/fonts/sfnt.cpp:1266:57: error: 'hb_subset' was not declared in this scope; did you mean 'hb_set_set'? 1266 | QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get())); | ^~~~~~~~~ | hb_set_set Reported by: pkg-fallout Obtined from: Arch Linux --- print/scribus-devel/Makefile | 2 +- print/scribus-devel/files/patch-harfbuzz-3.0.0 | 30 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index 7122e129c78a..7460cba4b29b 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= scribus PORTVERSION= 1.5.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= print editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \ http://www.scribus.net/downloads/${PORTVERSION}/ diff --git a/print/scribus-devel/files/patch-harfbuzz-3.0.0 b/print/scribus-devel/files/patch-harfbuzz-3.0.0 new file mode 100644 index 000000000000..7045102fa0fd --- /dev/null +++ b/print/scribus-devel/files/patch-harfbuzz-3.0.0 @@ -0,0 +1,30 @@ +https://github.com/scribusproject/scribus/commit/1b546978bc4e +https://bugs.scribus.net/view.php?id=16635 + +--- scribus/fonts/sfnt.cpp.orig 2021-04-25 20:24:48 UTC ++++ scribus/fonts/sfnt.cpp +@@ -1256,14 +1256,22 @@ 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 + +- QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get())); ++ QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get())); + if (hbSubsetFace.isNull()) + return QByteArray(); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109182205.18IM5Mi6011599>