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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E5708158087 for ; Wed, 29 Dec 2021 15:42:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD2132BC054; Wed, 29 Dec 2021 15:42:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B30BA2BC024 for ; Wed, 29 Dec 2021 15:42:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F3D50342E9E for ; Wed, 29 Dec 2021 15:42:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 92682268 for ; Wed, 29 Dec 2021 15:42:00 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1640792481.276052ffa3b61771cd7a07549c24148ff1659789.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphite2/, media-gfx/graphite2/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/graphite2/Manifest media-gfx/graphite2/files/graphite2-1.3.14-fix-inaccurate-slice-range-calc.patch media-gfx/graphite2/graphite2-1.3.14-r2.ebuild media-gfx/graphite2/graphite2-1.3.14_p20210810.ebuild X-VCS-Directories: media-gfx/graphite2/ media-gfx/graphite2/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 276052ffa3b61771cd7a07549c24148ff1659789 X-VCS-Branch: master Date: Wed, 29 Dec 2021 15:42:00 +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: f3ad0d09-5a9b-46c4-beeb-8fa668d729f4 X-Archives-Hash: 79b879c157948a3694cf3eeb78f49414 commit: 276052ffa3b61771cd7a07549c24148ff1659789 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Dec 28 16:57:51 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 29 15:41:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=276052ff media-gfx/graphite2: Add 1.3.14_p20210810 snapshot The only relevant change is commit 5c181c316ee0399d720efe1e75be702f1ca95b66 but requires further patches to fix tests subsequently, which does involve at least one binary patch. A snapshot is the cleaner way to to then. Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/graphite2/Manifest | 1 + ...e2-1.3.14-fix-inaccurate-slice-range-calc.patch | 34 ---------------------- ...r2.ebuild => graphite2-1.3.14_p20210810.ebuild} | 9 +++--- 3 files changed, 5 insertions(+), 39 deletions(-) diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest index ae90df1b9678..c8a6a1cb288e 100644 --- a/media-gfx/graphite2/Manifest +++ b/media-gfx/graphite2/Manifest @@ -1 +1,2 @@ DIST graphite2-1.3.14.tgz 6630061 BLAKE2B 72bf6736aaa8476a89e44ef53c5b6c94f45d815fe1a451ba6b3696bfe023971210975dee4a9c8cb3042f36442e4efecf5baf171ef4230ad2b10694a89865f918 SHA512 14b5eb2ba8158b8b62ffa7fb142100a0af1de0f0c45b2673801b636714a106b46fcd423b05c722d963c9543fafcf10fec811975308211a54f20a3ba322d7b295 +DIST graphite2-1.3.14_p20210810.tar.gz 6656693 BLAKE2B 63a7d96b58f2779d8a4a353e1a986212b884fdf780fedcb83b22dcef2f7678d44c88c14ece2d09dc745df505a4a3825ce61d7c84bd05fd4e98c23d6e86e9326d SHA512 be54c1386578970cf65c1860336a113268181753c1e2a139e37ceeafcfa76e3162086879c54094d70cd0d36ad5852a95390aaa69572d875921e9481f1ae508ff diff --git a/media-gfx/graphite2/files/graphite2-1.3.14-fix-inaccurate-slice-range-calc.patch b/media-gfx/graphite2/files/graphite2-1.3.14-fix-inaccurate-slice-range-calc.patch deleted file mode 100644 index 32e01535838f..000000000000 --- a/media-gfx/graphite2/files/graphite2-1.3.14-fix-inaccurate-slice-range-calc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5c181c316ee0399d720efe1e75be702f1ca95b66 Mon Sep 17 00:00:00 2001 -From: Martin Hosken -Date: Thu, 20 May 2021 13:53:29 +0700 -Subject: [PATCH] Fix inaccurate slice range calculation for bases with - diacritics - ---- - src/Pass.cpp | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/Pass.cpp b/src/Pass.cpp -index db31c22d..47ae2064 100644 ---- a/src/Pass.cpp -+++ b/src/Pass.cpp -@@ -1056,12 +1056,17 @@ float Pass::resolveKern(Segment *seg, Slot *slotFix, GR_MAYBE_UNUSED Slot *start - ymin = min(by + bbb.bl.y, ymin); - for (nbor = slotFix->next(); nbor; nbor = nbor->next()) - { -- if (nbor->isChildOf(base)) -- continue; - if (!gc.check(nbor->gid())) - return 0.; - const Rect &bb = seg->theGlyphBBoxTemporary(nbor->gid()); - SlotCollision *cNbor = seg->collisionInfo(nbor); -+ const float nby = nbor->origin().y + cNbor->shift().y; -+ if (nbor->isChildOf(base)) -+ { -+ ymax = max(nby + bb.tr.y, ymax); -+ ymin = min(nby + bb.bl.y, ymin); -+ continue; -+ } - if ((bb.bl.y == 0.f && bb.tr.y == 0.f) || (cNbor->flags() & SlotCollision::COLL_ISSPACE)) - { - if (m_kernColls == InWord) diff --git a/media-gfx/graphite2/graphite2-1.3.14-r2.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810.ebuild similarity index 92% rename from media-gfx/graphite2/graphite2-1.3.14-r2.ebuild rename to media-gfx/graphite2/graphite2-1.3.14_p20210810.ebuild index 5fcd5521f24a..47a0ef22b350 100644 --- a/media-gfx/graphite2/graphite2-1.3.14-r2.ebuild +++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810.ebuild @@ -3,13 +3,15 @@ EAPI=8 +COMMIT=80c52493ef42e6fe605a69dcddd2a691cd8a1380 GENTOO_DEPEND_ON_PERL="no" PYTHON_COMPAT=( python3_{8..10} ) inherit perl-module python-any-r1 cmake-multilib DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems" HOMEPAGE="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_home" -SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz" +SRC_URI="https://github.com/silnrsi/graphite/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/graphite-${COMMIT}" LICENSE="LGPL-2.1" SLOT="0" @@ -36,13 +38,10 @@ BDEPEND=" " PATCHES=( - # downstream: "${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch" "${FILESDIR}/${PN}-1.35-fix-gcc-linking.patch" "${FILESDIR}/${PN}-1.3.14-fix-cmake-files-libdir.patch" - "${FILESDIR}/${P}-no-libtool-file.patch" - # git master: - "${FILESDIR}/${P}-fix-inaccurate-slice-range-calc.patch" + "${FILESDIR}/${PN}-1.3.14-no-libtool-file.patch" ) pkg_setup() {