diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-15 17:24:22 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-15 17:24:22 +0000 |
| commit | fa190be48ac7ab0ec9d0ea7a51ae125841f67170 (patch) | |
| tree | 51a0a5a6afa7e51ec0121a6f69ed58ffd05eeedc /gyp | |
| parent | 5ccae2c5b134d1b971c188215433305e88491aec (diff) | |
Roll fontconfig to 2.11.0 and reenable poppler on mac
R=mtklein@google.com, epoger@google.com
Author: vandebo@chromium.org
Review URL: https://codereview.chromium.org/138843002
git-svn-id: http://skia.googlecode.com/svn/trunk@13091 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_variables.gypi | 2 | ||||
| -rw-r--r-- | gyp/fontconfig.gyp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 39e37e8bc6..ca5605ecb6 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -57,7 +57,7 @@ }, { 'os_posix%': 1, }], - [ 'skia_os in ["linux", "win"]', { + [ 'skia_os in ["linux", "win", "mac"]', { 'skia_poppler_enabled%': 1, }, { 'skia_poppler_enabled%': 0, diff --git a/gyp/fontconfig.gyp b/gyp/fontconfig.gyp index 0a4a09899a..6575fe2765 100644 --- a/gyp/fontconfig.gyp +++ b/gyp/fontconfig.gyp @@ -166,7 +166,7 @@ '-k', '@FC_FONTPATH@', '<dir>/Library/Fonts</dir>', '-p', '@CONFIGDIR@', '<(configdir)/conf.d', '-k', '@PACKAGE@', 'fontconfig', - '-k', '@VERSION@', '2.10.93', + '-k', '@VERSION@', '2.11.0', ], }, { 'action_name': 'populate_fontconfig_cache', |