From 26b4c8f71f91d22e081b27814782686edde0c90a Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Fri, 1 Jan 2021 10:11:34 +0000 Subject: Revert r559792 to unbreak INDEX and bulk -a It seems a lot of reverse dependencies were missed With hat: portmgr --- ...patch-base_test_generate__fontconfig__caches.cc | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 devel/electron7/files/patch-base_test_generate__fontconfig__caches.cc (limited to 'devel/electron7/files/patch-base_test_generate__fontconfig__caches.cc') diff --git a/devel/electron7/files/patch-base_test_generate__fontconfig__caches.cc b/devel/electron7/files/patch-base_test_generate__fontconfig__caches.cc new file mode 100644 index 000000000000..164224117f84 --- /dev/null +++ b/devel/electron7/files/patch-base_test_generate__fontconfig__caches.cc @@ -0,0 +1,25 @@ +--- base/test/generate_fontconfig_caches.cc.orig 2019-12-12 12:38:59 UTC ++++ base/test/generate_fontconfig_caches.cc +@@ -52,14 +52,21 @@ int main() { + + // Delete directory before generating fontconfig caches. This will notify + // future fontconfig_caches changes. +- CHECK(base::DeleteFile(fontconfig_caches, /*recursive=*/true)); + ++ CHECK(base::DeleteFile(fontconfig_caches, /*recursive=*/true)); + base::SetUpFontconfig(); + FcInit(); + FcFini(); + + // Check existence of intended fontconfig cache file. ++#if defined(OS_BSD) ++ // Our version of fontconfig is too old to respect .uuid files in font directories, ++ // so we check for the CACHEDIR.TAG file instead + CHECK(base::PathExists( ++ fontconfig_caches.Append("CACHEDIR.TAG"))); ++#else ++ CHECK(base::PathExists( + fontconfig_caches.Append(base::StrCat({uuid, "-le64.cache-7"})))); ++#endif + return 0; + } -- cgit v1.2.3