Skip to content

Commit 3711d7f

Browse files
shr-projectRaphael Kubo da Costa
authored andcommitted
chromium: use bundled freetype
* Fixes #569 * because the current skia codebase expects freetype newer than latest 2.11 release from freetype upstream * chromium-ozone-wayland as well as chromium-x11 with honister based builds: ../../third_party/skia/src/ports/SkFontHost_FreeType.cpp:1110:13: error: unknown type name 'FT_ClipBox' FT_ClipBox colrGlyphBbox; ^ and ../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp:438:14: error: use of undeclared identifier 'FT_COLR_COMPOSITE_PLUS' ../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp:1009:5: error: unknown type name 'FT_ClipBox' FT_COLR_COMPOSITE_PLUS is defined in bundled freetype: ./third_party/freetype/src/include/freetype/ftcolor.h: FT_COLR_COMPOSITE_PLUS = 12, and added to upstream freetype in: freetype/freetype@e40ae75#diff-81347c1a5d4e3ac2906ad0df93738046c8c139135e2b3c1fbfe0ae22f9de929c but isn't included in 2.11 version currently in oe-core: https://github.com/freetype/freetype/blob/VER-2-11-0/include/freetype/ftcolor.h Similarly FT_ClipBox was added after 2.11 in freetype/freetype@47cf8eb#diff-81347c1a5d4e3ac2906ad0df93738046c8c139135e2b3c1fbfe0ae22f9de929c Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 parent 8e58856 commit 3711d7f

File tree

2 files changed

+4
-55
lines changed

2 files changed

+4
-55
lines changed

meta-chromium/recipes-browser/chromium/chromium-gn.inc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ SRC_URI += " \
2020
file://0009-nomerge-attribute-on-declaration-is-only-available-s.patch \
2121
file://0010-fix-ruy-numeric-limits-error.patch \
2222
file://0011-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch \
23-
file://0012-chromium-freetype-2.11.patch \
2423
file://0013-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch \
2524
file://0014-ozone-wayland-don-t-build-xcb-for-pure-wayland-build.patch \
2625
"
@@ -64,7 +63,6 @@ DEPENDS += " \
6463
curl \
6564
expat \
6665
flac \
67-
freetype \
6866
glib-2.0 \
6967
gn-native \
7068
gperf-native \
@@ -140,9 +138,12 @@ GN_ARGS = " \
140138
use_gnome_keyring=false \
141139
use_kerberos=false \
142140
use_pulseaudio=${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'true', 'false', d)} \
143-
use_system_freetype=true \
144141
use_system_libjpeg=true \
145142
"
143+
# Not enabled by default, because the freetype version from oe-core
144+
# often isn't compatible, e.g. freetype-2.11 isn't compatible with
145+
# chromium-94
146+
GN_ARGS += "use_system_freetype=false"
146147

147148
# Closure_compile needs to be disabled to avoid pulling in java dependencies,
148149
# which are typicaly not wanted. It started to happen after https://crrev.com/c/1278470

meta-chromium/recipes-browser/chromium/files/0012-chromium-freetype-2.11.patch

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)