diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2015-01-28 17:01:15 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2015-01-28 17:01:15 +0000 |
| commit | bf2ffcd66e11206bdb89c3d69fc5635cbcf3f77c (patch) | |
| tree | 745e5789e2a3e722ebab5af681f7b9ba9cbe22ff /www/chromium/files/patch-remoting__remoting_host.gypi | |
| parent | New port www/p5-Hijk (diff) | |
www/chromium: update to 40.0.2214.93
Many thanks to Imre Vadasz for porting it to 40.0.2214.91. [1]
Obtained from: https://github.com/gliaskos/freebsd-chromium/ pull request 8,9
MFH: 2015Q1
Security: http://www.vuxml.org/freebsd/e30e0c99-a1b7-11e4-b85c-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files/patch-remoting__remoting_host.gypi')
| -rw-r--r-- | www/chromium/files/patch-remoting__remoting_host.gypi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/www/chromium/files/patch-remoting__remoting_host.gypi b/www/chromium/files/patch-remoting__remoting_host.gypi index 4c07b7bfccaa..688369201f0e 100644 --- a/www/chromium/files/patch-remoting__remoting_host.gypi +++ b/www/chromium/files/patch-remoting__remoting_host.gypi @@ -1,4 +1,4 @@ ---- remoting/remoting_host.gypi.orig 2014-10-10 09:15:31 UTC +--- remoting/remoting_host.gypi.orig 2015-01-21 20:28:17 UTC +++ remoting/remoting_host.gypi @@ -12,7 +12,7 @@ 'variables': { @@ -9,21 +9,21 @@ 'enable_me2me_host': 1, 'enable_it2me_host': 1, 'enable_remoting_host': 1, -@@ -310,7 +310,7 @@ +@@ -317,7 +317,7 @@ ], }, }], -- ['OS=="linux" and chromeos==0', { -+ ['(OS=="linux" and chromeos==0) or os_bsd==1', { +- ['OS=="linux" and chromeos==0 and use_ozone==0', { ++ ['((OS=="linux" and chromeos==0) or os_bsd==1) and use_ozone==0', { 'dependencies' : [ # Always use GTK on Linux, even for Aura builds. '../build/linux/system.gyp:gtk', -@@ -872,7 +872,7 @@ +@@ -910,7 +910,7 @@ 'host/it2me/it2me_native_messaging_host_main.h', ], 'conditions': [ -- ['OS=="linux" and chromeos==0', { -+ ['(OS=="linux" and chromeos==0) or os_bsd==1', { +- ['OS=="linux" and chromeos==0 and use_ozone==0', { ++ ['((OS=="linux" and chromeos==0) or os_bsd==1) and use_ozone==0', { 'dependencies': [ # Always use GTK on Linux, even for Aura builds. '../build/linux/system.gyp:gtk', |