Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(242)

Side by Side Diff: gyp/fontconfig.gyp

Issue 138843002: Roll fontconfig to 2.11.0 and reenable poppler on mac (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: support 64bit win too Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gyp/common_variables.gypi ('k') | third_party/fontconfig/config/fc-lang/fclang.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # GYP for fontconfig ( 1 # GYP for fontconfig (
2 # 2 #
3 # This has been tested on Windows and Mac. 3 # This has been tested on Windows and Mac.
4 # This library is native to Linux, so build from source is not necessary. 4 # This library is native to Linux, so build from source is not necessary.
5 # 5 #
6 # Additional files for building under Windows are provided here: (LGPL) 6 # Additional files for building under Windows are provided here: (LGPL)
7 # http://comments.gmane.org/gmane.comp.fonts.fontconfig/4438 7 # http://comments.gmane.org/gmane.comp.fonts.fontconfig/4438
8 8
9 { 9 {
10 'variables': { 10 'variables': {
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 'outputs': [ '<(configdir)/fonts.conf', ], 159 'outputs': [ '<(configdir)/fonts.conf', ],
160 'action': [ 160 'action': [
161 'python', '../third_party/fontconfig/process-template.py', 161 'python', '../third_party/fontconfig/process-template.py',
162 '-i', '../third_party/externals/fontconfig/fonts.conf.in', 162 '-i', '../third_party/externals/fontconfig/fonts.conf.in',
163 '-o', '<(configdir)/fonts.conf', 163 '-o', '<(configdir)/fonts.conf',
164 '-p', '@FC_CACHEDIR@', '<(cachedir)', 164 '-p', '@FC_CACHEDIR@', '<(cachedir)',
165 '-k', '@FC_DEFAULT_FONTS@', '/System/Library/Fonts', 165 '-k', '@FC_DEFAULT_FONTS@', '/System/Library/Fonts',
166 '-k', '@FC_FONTPATH@', '<dir>/Library/Fonts</dir>', 166 '-k', '@FC_FONTPATH@', '<dir>/Library/Fonts</dir>',
167 '-p', '@CONFIGDIR@', '<(configdir)/conf.d', 167 '-p', '@CONFIGDIR@', '<(configdir)/conf.d',
168 '-k', '@PACKAGE@', 'fontconfig', 168 '-k', '@PACKAGE@', 'fontconfig',
169 '-k', '@VERSION@', '2.10.93', 169 '-k', '@VERSION@', '2.11.0',
170 ], 170 ],
171 }, { 171 }, {
172 'action_name': 'populate_fontconfig_cache', 172 'action_name': 'populate_fontconfig_cache',
173 'message': 173 'message':
174 'Generating fontconfig cache (this will take a few minutes).', 174 'Generating fontconfig cache (this will take a few minutes).',
175 'inputs': [ 175 'inputs': [
176 '<(PRODUCT_DIR)/fc-cache', 176 '<(PRODUCT_DIR)/fc-cache',
177 '<(configdir)/fonts.conf', 177 '<(configdir)/fonts.conf',
178 ], 178 ],
179 'outputs': [ '<(cachedir)/CACHEDIR.TAG', ], 179 'outputs': [ '<(cachedir)/CACHEDIR.TAG', ],
(...skipping 10 matching lines...) Expand all
190 '$(SDKROOT)/usr/lib/libexpat.dylib', 190 '$(SDKROOT)/usr/lib/libexpat.dylib',
191 ], 191 ],
192 'sources': [ 192 'sources': [
193 '../third_party/externals/fontconfig/fc-cache/fc-cache.c', 193 '../third_party/externals/fontconfig/fc-cache/fc-cache.c',
194 ], 194 ],
195 }, 195 },
196 ], 196 ],
197 }], 197 }],
198 ], 198 ],
199 } 199 }
OLDNEW
« no previous file with comments | « gyp/common_variables.gypi ('k') | third_party/fontconfig/config/fc-lang/fclang.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698