diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-09 10:32:24 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-09 11:48:06 +0100 |
| commit | 4b619a20fda6891f0512946ac87cc85c34f13d7e (patch) | |
| tree | 9e101a305478855c76a8d9a49e3850a5404ba9fd | |
| parent | 40f8d76a8eafe608013a75f4dfc138b17b4692f2 (diff) | |
| download | qtwebengine-chromium-4b619a20fda6891f0512946ac87cc85c34f13d7e.tar.gz | |
Find fontconfig using pkg-config
We already verify that it can be found like that during configure
Pick-to: 94-based 90-based
Task-number: QTBUG-61158
Change-Id: I569590e96a490c4ed6e6dc560fbd110d86d77956
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | chromium/components/services/font/BUILD.gn | 1 | ||||
| -rw-r--r-- | chromium/third_party/fontconfig/BUILD.gn | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chromium/components/services/font/BUILD.gn b/chromium/components/services/font/BUILD.gn index a7ca2590290..b086ef5c864 100644 --- a/chromium/components/services/font/BUILD.gn +++ b/chromium/components/services/font/BUILD.gn @@ -36,6 +36,7 @@ source_set("lib") { deps += [ "//third_party/blink/public:blink_headers", "//third_party/pdfium:pdfium_public_headers", + "//third_party/fontconfig", ] } } diff --git a/chromium/third_party/fontconfig/BUILD.gn b/chromium/third_party/fontconfig/BUILD.gn index 1bee7acb6b9..4cc32d62774 100644 --- a/chromium/third_party/fontconfig/BUILD.gn +++ b/chromium/third_party/fontconfig/BUILD.gn @@ -3,6 +3,7 @@ # found in the LICENSE file. import("//build/config/sanitizers/sanitizers.gni") +import("//build/config/linux/pkg_config.gni") import("//third_party/fontconfig/fontconfig.gni") assert(is_linux || is_chromeos) @@ -110,8 +111,8 @@ if (use_bundled_fontconfig) { } } } else { - config("fontconfig_config") { - libs = [ "fontconfig" ] + pkg_config("fontconfig_config") { + packages = [ "fontconfig" ] } group("fontconfig") { |