From 2b3c765ea9b9e9203d599471cd8a3a25b8fced61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valentin=20H=C4=83loiu?= Date: Sun, 26 Mar 2023 21:13:39 +0100 Subject: [PATCH 1/3] Remove no longer used FLUTTER_USE_FONTCONFIG define --- third_party/txt/BUILD.gn | 5 ----- 1 file changed, 5 deletions(-) diff --git a/third_party/txt/BUILD.gn b/third_party/txt/BUILD.gn index ca3d6234f2c5f..423face244a33 100644 --- a/third_party/txt/BUILD.gn +++ b/third_party/txt/BUILD.gn @@ -38,11 +38,6 @@ config("allow_posix_names") { } source_set("txt") { - defines = [] - if (flutter_use_fontconfig) { - defines += [ "FLUTTER_USE_FONTCONFIG" ] - } - sources = [ "src/skia/paragraph_builder_skia.cc", "src/skia/paragraph_builder_skia.h", From 4b111ad3f92eb3e7ab9c9f2977a728d5060959cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valentin=20H=C4=83loiu?= Date: Tue, 28 Mar 2023 22:09:31 +0100 Subject: [PATCH 2/3] Dynamically link against system fontconfig --- third_party/txt/BUILD.gn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/third_party/txt/BUILD.gn b/third_party/txt/BUILD.gn index 423face244a33..6abab7cba017b 100644 --- a/third_party/txt/BUILD.gn +++ b/third_party/txt/BUILD.gn @@ -91,8 +91,9 @@ source_set("txt") { "//third_party/skia/modules/skparagraph", ] + libs = [] if (flutter_use_fontconfig) { - deps += [ "//third_party/fontconfig" ] + libs += [ "fontconfig" ] } if (is_mac || is_ios) { From e33a29a6d87c9c6ba871a9d15093f7e36ab1a340 Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Thu, 25 May 2023 09:39:51 -0700 Subject: [PATCH 3/3] Roll buildroot to e522d38d629d7522f0589e754886ed2b82232d9e --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index b82be73a42b2d..52cde5a2fb30a 100644 --- a/DEPS +++ b/DEPS @@ -256,7 +256,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'aee1094b10465e32972932e23b6799c3f8de244f', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'e522d38d629d7522f0589e754886ed2b82232d9e', # Fuchsia compatibility #