diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2014-11-20 06:55:14 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2014-11-20 06:55:14 +0000 |
| commit | 347e2bc55f9baf2b44a6b265c5ce110d2ed4b9b8 (patch) | |
| tree | 9225b2ce830d701121dcc56dc30db0eb6bf6af71 /www/chromium/files/patch-remoting__remoting_host.gypi | |
| parent | - Upgrade to 0.010002. (diff) | |
www/chromium: update to 39.0.2171.65
MFH: 2014Q4
Security: d395e44f-6f4f-11e4-a444-00262d5ed8ee
Notes
Notes:
svn path=/head/; revision=372849
Diffstat (limited to 'www/chromium/files/patch-remoting__remoting_host.gypi')
| -rw-r--r-- | www/chromium/files/patch-remoting__remoting_host.gypi | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/www/chromium/files/patch-remoting__remoting_host.gypi b/www/chromium/files/patch-remoting__remoting_host.gypi index 831098b76bb4..4c07b7bfccaa 100644 --- a/www/chromium/files/patch-remoting__remoting_host.gypi +++ b/www/chromium/files/patch-remoting__remoting_host.gypi @@ -1,20 +1,29 @@ ---- remoting/remoting_host.gypi.orig 2014-10-02 17:39:48 UTC +--- remoting/remoting_host.gypi.orig 2014-10-10 09:15:31 UTC +++ remoting/remoting_host.gypi @@ -12,7 +12,7 @@ 'variables': { 'conditions': [ # Remoting host is supported only on Windows, OSX and Linux (with X11). -- ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', { -+ ['OS=="win" or OS=="mac" or os_bsd==1 or (OS=="linux" and chromeos==0 and use_x11==1)', { +- ['OS=="win" or OS=="mac" or (OS=="linux" and use_x11==1)', { ++ ['OS=="win" or OS=="mac" or ((OS=="linux" or os_bsd==1) and use_x11==1)', { + 'enable_me2me_host': 1, + 'enable_it2me_host': 1, 'enable_remoting_host': 1, - }, { - 'enable_remoting_host': 0, -@@ -285,7 +285,7 @@ - 'host/win/wts_terminal_observer.h', +@@ -310,7 +310,7 @@ + ], + }, + }], +- ['OS=="linux" and chromeos==0', { ++ ['(OS=="linux" and chromeos==0) or os_bsd==1', { + 'dependencies' : [ + # Always use GTK on Linux, even for Aura builds. + '../build/linux/system.gyp:gtk', +@@ -872,7 +872,7 @@ + 'host/it2me/it2me_native_messaging_host_main.h', ], 'conditions': [ -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { +- ['OS=="linux" and chromeos==0', { ++ ['(OS=="linux" and chromeos==0) or os_bsd==1', { 'dependencies': [ # Always use GTK on Linux, even for Aura builds. '../build/linux/system.gyp:gtk', |