Skip to content

Commit

Permalink
Update fontconfig to ba206df9b9a7ca300265f650842c1459ff7c634a
Browse files Browse the repository at this point in the history
This fixes settings from ~/.fonts.conf not being respected.

BUG=882577
R=derat

Change-Id: I92a2fad0918ef3f4e5a9758efcc437beb3c20850
Reviewed-on: https://chromium-review.googlesource.com/1222728
Reviewed-by: Dan Erat <derat@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590878}
  • Loading branch information
tanderson-google authored and Commit Bot committed Sep 13, 2018
1 parent a3b71d8 commit d9d67cb
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ deps = {

# Used for embedded builds. CrOS & Linux use the system version.
'src/third_party/fontconfig/src': {
'url': Var('chromium_git') + '/external/fontconfig.git' + '@' + '1451f829e750926cec27855eded71c24ac7ac7c6',
'url': Var('chromium_git') + '/external/fontconfig.git' + '@' + 'ba206df9b9a7ca300265f650842c1459ff7c634a',
'condition': 'checkout_linux',
},

Expand Down
2 changes: 1 addition & 1 deletion third_party/fontconfig/README.chromium
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: fontconfig
URL: http://www.freedesktop.org/wiki/Software/fontconfig/
Version: d1f48f11d5dffa1d954a1b0abe44ce9e4bfc3709
Version: ba206df9b9a7ca300265f650842c1459ff7c634a
License: MIT
License File: src/COPYING
Security Critical: yes
Expand Down
8 changes: 4 additions & 4 deletions third_party/fontconfig/include/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -264,13 +264,13 @@
#define PACKAGE "fontconfig"

/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
#define PACKAGE_BUGREPORT "https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new"

/* Define to the full name of this package. */
#define PACKAGE_NAME "fontconfig"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "fontconfig 2.13.0"
#define PACKAGE_STRING "fontconfig 2.13.1"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "fontconfig"
Expand All @@ -279,7 +279,7 @@
#define PACKAGE_URL ""

/* Define to the version of this package. */
#define PACKAGE_VERSION "2.13.0"
#define PACKAGE_VERSION "2.13.1"

/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
Expand Down Expand Up @@ -332,7 +332,7 @@


/* Version number of package */
#define VERSION "2.13.0"
#define VERSION "2.13.1"

/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
Expand Down
2 changes: 2 additions & 0 deletions third_party/fontconfig/include/src/fcalias.h
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,8 @@ extern __typeof (FcUtf16ToUcs4) IA__FcUtf16ToUcs4 FC_ATTRIBUTE_VISIBILITY_HIDDEN
#define FcUtf16ToUcs4 IA__FcUtf16ToUcs4
extern __typeof (FcUtf16Len) IA__FcUtf16Len FC_ATTRIBUTE_VISIBILITY_HIDDEN;
#define FcUtf16Len IA__FcUtf16Len
extern __typeof (FcStrBuildFilename) IA__FcStrBuildFilename FC_ATTRIBUTE_VISIBILITY_HIDDEN;
#define FcStrBuildFilename IA__FcStrBuildFilename
extern __typeof (FcStrDirname) IA__FcStrDirname FC_ATTRIBUTE_VISIBILITY_HIDDEN;
#define FcStrDirname IA__FcStrDirname
extern __typeof (FcStrBasename) IA__FcStrBasename FC_ATTRIBUTE_VISIBILITY_HIDDEN;
Expand Down
2 changes: 2 additions & 0 deletions third_party/fontconfig/include/src/fcaliastail.h
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,8 @@ extern __typeof (FcUcs4ToUtf8) FcUcs4ToUtf8 __attribute((alias("IA__FcUcs4ToUtf8
extern __typeof (FcUtf16ToUcs4) FcUtf16ToUcs4 __attribute((alias("IA__FcUtf16ToUcs4"))) FC_ATTRIBUTE_VISIBILITY_EXPORT;
# undef FcUtf16Len
extern __typeof (FcUtf16Len) FcUtf16Len __attribute((alias("IA__FcUtf16Len"))) FC_ATTRIBUTE_VISIBILITY_EXPORT;
# undef FcStrBuildFilename
extern __typeof (FcStrBuildFilename) FcStrBuildFilename __attribute((alias("IA__FcStrBuildFilename"))) FC_ATTRIBUTE_VISIBILITY_EXPORT;
# undef FcStrDirname
extern __typeof (FcStrDirname) FcStrDirname __attribute((alias("IA__FcStrDirname"))) FC_ATTRIBUTE_VISIBILITY_EXPORT;
# undef FcStrBasename
Expand Down
4 changes: 2 additions & 2 deletions third_party/fontconfig/include/src/fcstdint.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef _FONTCONFIG_SRC_FCSTDINT_H
#define _FONTCONFIG_SRC_FCSTDINT_H 1
#ifndef _GENERATED_STDINT_H
#define _GENERATED_STDINT_H "fontconfig 2.13.0"
/* generated using gnu compiler gcc (Debian 7.3.0-24) 7.3.0 */
#define _GENERATED_STDINT_H "fontconfig 2.13.1"
/* generated using gnu compiler gcc (Debian 8.2.0-6) 8.2.0 */
#define _STDINT_HAVE_STDINT_H 1
#include <stdint.h>
#endif
Expand Down

0 comments on commit d9d67cb

Please sign in to comment.