gentoo resync : 30.10.2021

3 files changed, 48 insertions, 1 deletions

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 861b9b4fc7d7..dbfc3c0d9439 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -3,6 +3,7 @@ AUX freetype-2.10.4-dont_hardcode_libtool.patch 1312 BLAKE2B 7cd7d9f5284a54a9667
 AUX freetype-2.10.4-slibtool_build_fix.patch 1262 BLAKE2B b2e3fc0565f5b90c00628d44ec3d1633c3ccce0df3effabaf9e36636b78067d03c899c86a100e11df27ca299daf4afdc815924430b04a42bcabb4104d7f4a8b7 SHA512 5fd4fce61c4f1f78fc6e19477e89b8f989ad17a50ff48c49841f6a7499e0843525a489e622db8064799749b53e62f0177bbfde519fe03813eedd7ca6e752f238
 AUX freetype-2.11.0-COLR_missing_blend_mode.patch 2304 BLAKE2B 002fa132591422fc4ef9180dd2ee667d42d57cc5be08e253dec182a345280e42ec15f2dd8d30891e13d168bf0da77279216b4fdc8e56c4e59a11f3f3438525b9 SHA512 4e55f43b86f2d54867dd62558b7a02312e82581a9469395ef24f8b6f0ec2e9ec14776a828c2520970758d8d67cec0c659087e48b8ed3ae30c77a725a92a9ffc1
 AUX freetype-2.11.0-COLR_v1_clipbox_minor_fix.patch 681 BLAKE2B addd6b85be20b48b92af7f21dafab7014fae110163ed7d6a9341d958505d46a76dc131a54b1c954f3157737429b3b4a87ea0c7c621bfb3cb8f4f101ae2ce9398 SHA512 36060458da10c1afeaf3303010235e2b9adfd0273a7b8c0c0b5e4d4c30a3eac79485919613de892a1b0f2637d5f98fd5314477e833b78819421f134d6cdf40a3
+AUX freetype-2.11.0-quiet_noop.patch 1304 BLAKE2B 57276cf6480a4807e8e9704e5a9ea5d3a0d288e8af17f935e2911932fbe517d845b68abb503cfde697f6e6778a14c44334482d8917914817ec4c7f454dc005eb SHA512 f7261da6d457ce1c9ecd49d17a251f349f2786a3d12e42555a605a95b73573fdba90e70855b38e2c79ab6f4dabb8a8e6a3d1abc9fc8ca87d3ba29a04f9ee802f
 AUX ft2demos-2.10.4-install_target.patch 1647 BLAKE2B 4409123fbb089c1312ff90ebbb32c70f3a0025d96b705dd6be24bdf33fa0b1956e512549c39e5b378c2a6f4a4cb8e7708c096c786fbf0bcc3e037f691f9aad21 SHA512 5d77f5892f7ce4ab1bc3dcbfb04cd86f2fc54e347c2b3ce7e701995b0f75efc0164797b18454b645a0cc1cc8b0f41816b5bca19d786a66f3bc145fa0ca2cd8b1
 DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
 DIST freetype-2.11.0-COLR_v1_clipbox.patch.xz 3940 BLAKE2B 45b84b1070a9a9e1e13058ce7200555f4f9e26df4fe25eab4a644869df86f267cc91bfcf2ab10a9f0673be51504f05eec730300dee13ca34bb6f8afdc32ee354 SHA512 bf0cc00b3f27cb3408881cec46654be57b96b099cfd3df06e33b94aa47f35a7c9499a9935837be0f652d4f17ab2b6c78bc1fcef328754cde64f0b139d00ceb29
@@ -13,6 +14,6 @@ DIST ft2demos-2.10.4.tar.xz 236712 BLAKE2B 76883bfc09c42b6092b0b512aff66b4585ac8
 DIST ft2demos-2.11.0.tar.xz 257316 BLAKE2B fa59eeeba502733db940965a1affe8fc9ecefd68d3d31dd8c8a94b769310d53975403f7a7c4c6ca6f381b10f9b3057698bd09fff9adafa26981192478d3ca602 SHA512 9c5727bf479afafc1c765a131875b88b0e656d1db986f95c021b0386f5c4cc6135db7584a5d553363dcf52dfc9c9199cd1f3da2cc6644f58de85848b058fd531
 EBUILD freetype-2.10.4.ebuild 6685 BLAKE2B ff901fcd11233f9c6a985704ff2296d86331618e02097274edc12fa792d9a11de530eb6f761514b4d03e11b00d42c993c73b3936a9b9bfa0cab15c9eea36f501 SHA512 e991118b3868791a4dd4cac750d4a31935766a97cc4998a0561f0a296f54e8bae7da7057226642e83cf61199dbaa463c17f97422edd73f30a65ad9dafd9ce750
 EBUILD freetype-2.11.0-r1.ebuild 7361 BLAKE2B 617d3d832b581786363983e205b03af412d15ae2af7379108a084e6f910d94f92e479da97c737208f099d9ae23bf999964d086149c8870b0e567aca552adb210 SHA512 20eeba7a2ec2afff17bcd6faa0d502c473dbf96b077fd71e1cd461983e2f8d3dc77ab7902049127a5edd40e820e337c3c91818ca2e3a9a33e83d53ebe850e2ea
-EBUILD freetype-2.11.0.ebuild 7145 BLAKE2B f07030afe12ba89b7a67cf9a38e01968f814dcd14411c0917dfee7fec3fb1349b733446ee6f7a279efba38237b39b4293470b3e30a44553bb03411807a726ace SHA512 18d39d3e1eb0e5cc4af16baf26880a30125bc6516fa71d4df16e27291f89591ecbf7659368e7c80ba4d0d352f721d6c456cde3c2147686031bd7017b638d9e33
+EBUILD freetype-2.11.0-r2.ebuild 7413 BLAKE2B 843335107d814566c2d4691b25112feb0764eeaee24aee7e3c057ae81c650546d1605fac8df4c221b60fe650741a53a98178c6b11bb34c929cb2980decd5fa91 SHA512 d660d1f931c66061676af5bc7303410ea6bddb8306e476b43720c855c80eb1183db183199d1ce0271844c0edceb4ed48635c2b97592c98b5189ee58ca58fcaaf
 EBUILD freetype-9999.ebuild 7149 BLAKE2B d9698283807a6799874f8a091e1defce0493d4595b59fe4b9eae558523bcdea09576342dbb5ea4c8c67982a74391e9ac2aa6c6d39f3ae29db752cbf12e5214d5 SHA512 faf5616c0a855be291e1613cc0c2082bda0092e106c053989a333c4b7d3ed2ef7d41094e7e174f516aed831e0701e378ba3bacebbd0a95022bed000b0b1fdc30
 MISC metadata.xml 1614 BLAKE2B 1f7da38175a6bb383328518d7a69a2378a3127fce884c35163b6144afdf21149acd857c6c26d65c1a1962afd370f025f6a3f496581ca28b767ae5960392a9c6c SHA512 ea0ec7da4ea7f2f71c06aea15694e6654808a780fd5a248088cb44af23dcb4c0961d7034d2e09b674d89098c152fd84c7f4c90831c0e275f6ebcd4a15659baa7
diff --git a/media-libs/freetype/files/freetype-2.11.0-quiet_noop.patch b/media-libs/freetype/files/freetype-2.11.0-quiet_noop.patch
new file mode 100644
index 000000000000..46206465ffaf
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.11.0-quiet_noop.patch
@@ -0,0 +1,41 @@
+From 6e9d8d314ff6ab23177b9162c0b96616460bb84e Mon Sep 17 00:00:00 2001
+From: Alexei Podtelezhnikov <apodtele@gmail.com>
+Date: Fri, 20 Aug 2021 16:01:32 -0400
+Subject: [PATCH] [base] Restore quiet no-op rendering of bitmap glyphs.
+
+Fixes #1076.
+
+* src/base/ftobjs.c (FT_Render_Glyph_Internal): Discard an error when
+rendering a bitmap glyph.
+---
+ src/base/ftobjs.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
+index 342ac4a27..7b40c6421 100644
+--- a/src/base/ftobjs.c
++++ b/src/base/ftobjs.c
+@@ -4703,7 +4703,7 @@
+         else
+           renderer = FT_Lookup_Renderer( library, slot->format, &node );
+ 
+-        error = FT_ERR( Unimplemented_Feature );
++        error = FT_ERR( Cannot_Render_Glyph );
+         while ( renderer )
+         {
+           error = renderer->render( renderer, slot, render_mode, NULL );
+@@ -4719,6 +4719,11 @@
+           /* format.                                               */
+           renderer = FT_Lookup_Renderer( library, slot->format, &node );
+         }
++
++        /* it is not an error if we cannot render a bitmat glyph */
++        if ( FT_ERR_EQ( error, Cannot_Render_Glyph ) &&
++             slot->format == FT_GLYPH_FORMAT_BITMAP  )
++          error = FT_Err_Ok;
+       }
+     }
+ 
+-- 
+GitLab
+
diff --git a/media-libs/freetype/freetype-2.11.0.ebuild b/media-libs/freetype/freetype-2.11.0-r2.ebuild
index 7f20a7b5a1dd..658322e92afa 100644
--- a/media-libs/freetype/freetype-2.11.0.ebuild
+++ b/media-libs/freetype/freetype-2.11.0-r2.ebuild
@@ -16,6 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
+	SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${P}-COLR_v1_clipbox.patch.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
@@ -45,6 +46,10 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
+	"${WORKDIR}"/${P}-COLR_v1_clipbox.patch
+	"${FILESDIR}"/${P}-COLR_v1_clipbox_minor_fix.patch
+	"${FILESDIR}"/${P}-COLR_missing_blend_mode.patch
+	"${FILESDIR}"/${P}-quiet_noop.patch #820500
 )
 
 _egit_repo_handler() {