From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3745E158086 for ; Sat, 9 Oct 2021 19:38:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40ADCE0880; Sat, 9 Oct 2021 19:38:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1FE4BE0880 for ; Sat, 9 Oct 2021 19:38:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2289C342F81 for ; Sat, 9 Oct 2021 19:38:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8F68138 for ; Sat, 9 Oct 2021 19:38:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1633808291.bd3a0a60eb96a95e025ba101430b3ee12c46dc97.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch app-office/scribus/scribus-1.5.7.ebuild X-VCS-Directories: app-office/scribus/files/ app-office/scribus/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bd3a0a60eb96a95e025ba101430b3ee12c46dc97 X-VCS-Branch: master Date: Sat, 9 Oct 2021 19:38:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d99d6ec6-c7f0-4f4b-a91e-041f28be5482 X-Archives-Hash: c598e886042f7ec6006c989d823ed903 commit: bd3a0a60eb96a95e025ba101430b3ee12c46dc97 Author: Sam James gentoo org> AuthorDate: Sat Oct 9 19:37:43 2021 +0000 Commit: Sam James gentoo 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 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 +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 hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get())); ++ if (hbSubsetFace.isNull()) ++ return QByteArray(); ++#else + QScopedPointer hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get())); + if (hbSubsetFace.isNull()) + return QByteArray(); ++#endif + + QScopedPointer 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"