diff options
author | Rene Ladan <rene@FreeBSD.org> | 2014-08-26 17:09:02 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2014-08-26 17:09:02 +0000 |
commit | b88b94b93ed0b3627f1b378dfe8487cc771fc34a (patch) | |
tree | c3ccf772a3d86897da74898d1bbad2b036954bac /www/chromium/files/patch-chrome__chrome_browser_ui.gypi | |
parent | Allow the build to get much farther before it fails. Now it fails on (diff) |
Update www/chromium to 37.0.2062.94
Obtained from: freebsd-chromium@ (especially Carlos Medina)
MFH: 2014Q3
Security: http://www.vuxml.org/freebsd/fd5f305d-2d3d-11e4-aa3d-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files/patch-chrome__chrome_browser_ui.gypi')
-rw-r--r-- | www/chromium/files/patch-chrome__chrome_browser_ui.gypi | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi index 9ce3be250c12..b24cb7627a6d 100644 --- a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi +++ b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi @@ -1,15 +1,15 @@ ---- ./chrome/chrome_browser_ui.gypi.orig 2014-08-12 21:02:25.000000000 +0200 -+++ ./chrome/chrome_browser_ui.gypi 2014-08-13 09:56:57.000000000 +0200 -@@ -2665,7 +2665,7 @@ +--- ./chrome/chrome_browser_ui.gypi.orig 2014-08-20 21:02:14.000000000 +0200 ++++ ./chrome/chrome_browser_ui.gypi 2014-08-22 15:06:25.000000000 +0200 +@@ -2673,7 +2673,7 @@ 'browser/ui/views/message_center/web_notification_tray.cc', ], }], -- ['use_aura==1 and use_ash==0 and use_ozone==0 and OS=="linux"', { -+ ['use_aura==1 and use_ash==0 and use_ozone==0 and (OS=="linux" or os_bsd==1)', { +- ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', { ++ ['use_aura==1 and chromeos==0 and use_ozone==0 and (OS=="linux" or os_bsd==1)', { 'dependencies': [ # gtk2 is the only component that can interact with gtk2 in our new # world. -@@ -2673,7 +2673,7 @@ +@@ -2681,7 +2681,7 @@ '../build/linux/system.gyp:gio', ], }], @@ -18,7 +18,7 @@ 'sources!': [ 'browser/ui/views/first_run_dialog.cc', 'browser/ui/views/first_run_dialog.h', -@@ -3042,7 +3042,7 @@ +@@ -3047,7 +3047,7 @@ }], ], }], @@ -27,7 +27,7 @@ 'conditions': [ ['use_aura==1', { 'dependencies': [ -@@ -3135,7 +3135,7 @@ +@@ -3140,7 +3140,7 @@ 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h', ], }], |