commit: cdccf09cb37bce1cdb93797ab54ce474d0fff0b3 Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> AuthorDate: Sun Oct 10 11:14:58 2021 +0000 Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> CommitDate: Sun Oct 10 11:15:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdccf09c
www-client/chromium: fix building with harfbuzz-3 (M95) Bug: https://bugs.gentoo.org/813705 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> www-client/chromium/chromium-95.0.4638.40.ebuild | 1 + .../chromium/files/chromium-95-harfbuzz-3.patch | 31 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/www-client/chromium/chromium-95.0.4638.40.ebuild b/www-client/chromium/chromium-95.0.4638.40.ebuild index 5053fd82ccc..377ba36b7e9 100644 --- a/www-client/chromium/chromium-95.0.4638.40.ebuild +++ b/www-client/chromium/chromium-95.0.4638.40.ebuild @@ -237,6 +237,7 @@ src_prepare() { "${FILESDIR}/chromium-95-eigen-avx-1.patch" "${FILESDIR}/chromium-95-eigen-avx-2.patch" "${FILESDIR}/chromium-95-eigen-avx-3.patch" + "${FILESDIR}/chromium-95-harfbuzz-3.patch" "${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch" "${FILESDIR}/chromium-shim_headers.patch" ) diff --git a/www-client/chromium/files/chromium-95-harfbuzz-3.patch b/www-client/chromium/files/chromium-95-harfbuzz-3.patch new file mode 100644 index 00000000000..33fe9556aaf --- /dev/null +++ b/www-client/chromium/files/chromium-95-harfbuzz-3.patch @@ -0,0 +1,31 @@ +From 9e00e702633c47c590a869bc66b5c2ceec09da50 Mon Sep 17 00:00:00 2001 +From: Dominik Röttsches <dr...@chromium.org> +Date: Tue, 28 Sep 2021 15:31:50 +0000 +Subject: [PATCH] Roll src/third_party/harfbuzz-ng/src/ 6602cbb70..a52c6df38 (80 commits) + +Fixed: 1252284 +Change-Id: Ie2ff99da5e41ca97b8881e1bd3e158881f4d5a8e +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3190252 +Commit-Queue: Dominik Röttsches <dr...@chromium.org> +Commit-Queue: Calder Kitagawa <ckitag...@chromium.org> +Auto-Submit: Dominik Röttsches <dr...@chromium.org> +Reviewed-by: Calder Kitagawa <ckitag...@chromium.org> +Reviewed-by: Anders Hartvoll Ruud <andr...@chromium.org> +Cr-Commit-Position: refs/heads/main@{#925776} + +(only components/paint_preview/common/subset_font.cc) +--- + +diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc +index 45daea7b1..43a448e 100644 +--- a/components/paint_preview/common/subset_font.cc ++++ b/components/paint_preview/common/subset_font.cc +@@ -79,7 +79,7 @@ + // Retain all variation information for OpenType variation fonts. See: + // https://docs.microsoft.com/en-us/typography/opentype/spec/otvaroverview + hb_set_t* skip_subset = +- hb_subset_input_no_subset_tables_set(input.get()); // Owned by |input|. ++ hb_subset_input_set(input.get(), HB_SUBSET_SETS_NO_SUBSET_TABLE_TAG); + hb_set_add(skip_subset, HB_TAG('a', 'v', 'a', 'r')); + hb_set_add(skip_subset, HB_TAG('c', 'v', 'a', 'r')); + hb_set_add(skip_subset, HB_TAG('f', 'v', 'a', 'r'));
