diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2015-04-27 11:04:12 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2015-04-27 11:04:12 +0000 |
| commit | a099dbbc1dd60e8d2b594673a00cceec56fc0027 (patch) | |
| tree | d0d70dacc0cffbd1166c13ecad2f4cab9f491503 /www/chromium/files/patch-ui__views__views.gyp | |
| parent | - Update to 1.34 (diff) | |
www/chromium: update to 42.0.2311.90
There were two updates submitted as Github pull requests:
- one for 41.0.2272.118
- one for 42.0.2311.90, based on the first update.
Submitted by: Timothy Vaccarelli <tmvfroid@gmail.com> (41.0.2272.118)
Submitted by: Christoph Moench-Tegeder <cmt@burggraben.net> (42.0.2311.90)
MFH: 2015Q2
Security: http://vuxml.freebsd.org/freebsd/b57f690e-ecc9-11e4-876c-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files/patch-ui__views__views.gyp')
| -rw-r--r-- | www/chromium/files/patch-ui__views__views.gyp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/www/chromium/files/patch-ui__views__views.gyp b/www/chromium/files/patch-ui__views__views.gyp index 889754500a80..fb3e81f9cc5f 100644 --- a/www/chromium/files/patch-ui__views__views.gyp +++ b/www/chromium/files/patch-ui__views__views.gyp @@ -1,6 +1,6 @@ ---- ui/views/views.gyp.orig 2014-10-10 08:54:19 UTC -+++ ui/views/views.gyp -@@ -612,7 +612,7 @@ +--- ui/views/views.gyp.orig 2015-04-15 00:31:23.000000000 +0200 ++++ ui/views/views.gyp 2015-04-20 21:31:06.000000000 +0200 +@@ -631,7 +631,7 @@ '../display/display.gyp:display_util', ], }], @@ -9,3 +9,12 @@ 'dependencies': [ '../shell_dialogs/shell_dialogs.gyp:shell_dialogs', ], +@@ -696,7 +696,7 @@ + ['use_aura and chromeos == 0', { + 'sources': [ '<@(views_desktop_aura_sources)' ], + 'conditions': [ +- ['OS == "linux"', { ++ ['OS == "linux" or os_bsd == 1', { + 'sources': [ '<@(views_desktop_aura_linux_sources)' ], + }], + ['use_x11 == 1', { |