Roll src/third_party/fontconfig/src/ 65087ac7c..cd51cb241 (2 commits)

Roll wanted for cd51cb2, which makes changes to FONTCONFIG_SYSROOT that
Chromium uses in testing.

https://chromium.googlesource.com/external/fontconfig.git/+log/65087ac7ce4c..cd51cb241aad

$ git log 65087ac7c..cd51cb241 --date=short --no-merges --format='%ad %ae %s'
2019-10-21 akira Take effect sysroot functionality to the default config file
2019-10-08 akira Warn as well if no directory name for cachedir provided

Created with:
  roll-dep src/third_party/fontconfig/src

R=spang,dnicoara
TBR=thestig

Bug: None
Change-Id: I4e153b770761421695b27726c841bda66904a88a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1871813
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Michael Spang <spang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707959}

DEPS

@@ -939,7 +939,7 @@ deps = {
 
   # Used for embedded builds. CrOS & Linux use the system version.
   'src/third_party/fontconfig/src': {
-      'url': Var('chromium_git') + '/external/fontconfig.git' + '@' + '65087ac7ce4cc5f2109967c1380b474955dcb590',
+      'url': Var('chromium_git') + '/external/fontconfig.git' + '@' + 'cd51cb241aad7b362b793200ca7d42595c14f52b',
       'condition': 'checkout_linux',
   },
 

base/test/fontconfig_util_linux.cc

@@ -21,8 +21,6 @@ void SetUpFontconfig() {
   CHECK(PathService::Get(DIR_MODULE, &dir_module));
 
   std::unique_ptr<Environment> env(Environment::Create());
-  // TODO(thomasanderson): This still stat()'s the real /etc/fonts/fonts.conf.
-  // Prevent fontconfig from doing this.
   CHECK(env->SetVar("FONTCONFIG_SYSROOT", dir_module.value().c_str()));
 }
 

third_party/fontconfig/README.chromium

 Name: fontconfig
 URL: http://www.freedesktop.org/wiki/Software/fontconfig/
-Version: 65087ac7ce4cc5f2109967c1380b474955dcb590
+Version: cd51cb241aad7b362b793200ca7d42595c14f52b
 License: MIT
 License File: src/COPYING
 Security Critical: yes

third_party/fontconfig/include/src/fcalias.h

@@ -28,6 +28,8 @@ extern __typeof (FcConfigHome) IA__FcConfigHome FC_ATTRIBUTE_VISIBILITY_HIDDEN;
 #define FcConfigHome IA__FcConfigHome
 extern __typeof (FcConfigEnableHome) IA__FcConfigEnableHome FC_ATTRIBUTE_VISIBILITY_HIDDEN;
 #define FcConfigEnableHome IA__FcConfigEnableHome
+extern __typeof (FcConfigGetFilename) IA__FcConfigGetFilename FC_ATTRIBUTE_VISIBILITY_HIDDEN;
+#define FcConfigGetFilename IA__FcConfigGetFilename
 extern __typeof (FcConfigFilename) IA__FcConfigFilename FC_ATTRIBUTE_VISIBILITY_HIDDEN;
 #define FcConfigFilename IA__FcConfigFilename
 extern __typeof (FcConfigCreate) IA__FcConfigCreate FC_ATTRIBUTE_VISIBILITY_HIDDEN;

third_party/fontconfig/include/src/fcaliastail.h

@@ -34,6 +34,8 @@ extern __typeof (FcDirCacheDeleteUUID) FcDirCacheDeleteUUID __attribute((alias("
 extern __typeof (FcConfigHome) FcConfigHome __attribute((alias("IA__FcConfigHome"))) FC_ATTRIBUTE_VISIBILITY_EXPORT;
 # undef FcConfigEnableHome
 extern __typeof (FcConfigEnableHome) FcConfigEnableHome __attribute((alias("IA__FcConfigEnableHome"))) FC_ATTRIBUTE_VISIBILITY_EXPORT;
+# undef FcConfigGetFilename
+extern __typeof (FcConfigGetFilename) FcConfigGetFilename __attribute((alias("IA__FcConfigGetFilename"))) FC_ATTRIBUTE_VISIBILITY_EXPORT;
 # undef FcConfigFilename
 extern __typeof (FcConfigFilename) FcConfigFilename __attribute((alias("IA__FcConfigFilename"))) FC_ATTRIBUTE_VISIBILITY_EXPORT;
 # undef FcConfigCreate

third_party/fontconfig/include/src/fcstdint.h

@@ -2,7 +2,7 @@
 #define _FONTCONFIG_SRC_FCSTDINT_H 1
 #ifndef _GENERATED_STDINT_H
 #define _GENERATED_STDINT_H "fontconfig 2.13.91"
-/* generated using gnu compiler gcc (Debian 9.2.1-8) 9.2.1 20190909 */
+/* generated using gnu compiler gcc (Debian 9.2.1-9) 9.2.1 20191008 */
 #define _STDINT_HAVE_STDINT_H 1
 #include <stdint.h>
 #endif