[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/

["Sam James" <sam@gentoo.org>]

commit:     bd3a0a60eb96a95e025ba101430b3ee12c46dc97
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  9 19:37:43 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct  9 19:38:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd3a0a60

app-office/scribus: fix build with Harfbuzz 3

Closes: https://bugs.gentoo.org/813711
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../scribus/files/scribus-1.5.8-harfbuzz-3.patch   | 29 ++++++++++++++++++++++
 app-office/scribus/scribus-1.5.7.ebuild            |  2 ++
 2 files changed, 31 insertions(+)

diff --git a/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch b/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch
new file mode 100644
index 00000000000..11e251866f0
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch
@@ -0,0 +1,29 @@
+https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch
+https://bugs.scribus.net/view.php?id=16635
+https://bugs.gentoo.org/813711
+
+From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+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
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24707 11d20701-8431-0410-a711-e3c959e3b870
+--- a/scribus/fonts/sfnt.cpp
++++ b/scribus/fonts/sfnt.cpp
+@@ -1271,9 +1271,15 @@ namespace sfnt {
+ #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())

diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild
index 67c6ac3aa05..806085da0d1 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -76,6 +76,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
 	"${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch
 	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
+	# upstream
+	"${FILESDIR}"/${PN}-1.5.8-harfbuzz-3.patch
 )
 
 CMAKE_BUILD_TYPE="Release"