diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2015-12-20 09:42:13 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2015-12-20 09:42:13 +0000 |
| commit | 5737b5c117eac1ea71dc32ef167cb9043dfdeee9 (patch) | |
| tree | 7bfa033b13252510f8d1fb0166f45256892a2bf8 /www/chromium/files/patch-skia__skia_chrome.gypi | |
| parent | - Update to version 1.5.1 (diff) | |
www/chromium: update to 47.0.2526.106
Submitted by: Christoph Moench-Tegeder via GitHub
MFH: 2015Q4
Security: http://vuxml.freebsd.org/freebsd/bb7d4791-a5bf-11e5-a0e5-00262d5ed8ee.html
Notes
Notes:
svn path=/head/; revision=404050
Diffstat (limited to 'www/chromium/files/patch-skia__skia_chrome.gypi')
| -rw-r--r-- | www/chromium/files/patch-skia__skia_chrome.gypi | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-skia__skia_chrome.gypi b/www/chromium/files/patch-skia__skia_chrome.gypi index 0a546e31db0b..22651eb2f119 100644 --- a/www/chromium/files/patch-skia__skia_chrome.gypi +++ b/www/chromium/files/patch-skia__skia_chrome.gypi @@ -1,14 +1,14 @@ ---- skia/skia_chrome.gypi.orig 2015-10-13 15:04:33.000000000 -0400 -+++ skia/skia_chrome.gypi 2015-10-14 11:46:34.142959000 -0400 -@@ -55,6 +55,11 @@ - 'ext/skia_utils_win.cc', - ], - 'conditions': [ +--- skia/skia_chrome.gypi.orig 2015-10-14 18:24:42.938769000 +0200 ++++ skia/skia_chrome.gypi 2015-10-14 18:22:24.515306000 +0200 +@@ -60,6 +60,11 @@ + 'ext/platform_canvas.cc', + ], + }], + [ 'use_cairo == 1', { + 'dependencies': [ + '../build/linux/system.gyp:pangocairo', + ], + }], - [ 'OS == "ios"', { + [ 'OS == "android" and ' + 'enable_basic_printing==0 and enable_print_preview==0', { 'sources!': [ - 'ext/platform_canvas.cc', |