From a099dbbc1dd60e8d2b594673a00cceec56fc0027 Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Mon, 27 Apr 2015 11:04:12 +0000 Subject: 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 (41.0.2272.118) Submitted by: Christoph Moench-Tegeder (42.0.2311.90) MFH: 2015Q2 Security: http://vuxml.freebsd.org/freebsd/b57f690e-ecc9-11e4-876c-00262d5ed8ee.html --- .../files/patch-remoting__remoting_host.gypi | 68 +++++++++++++--------- 1 file changed, 42 insertions(+), 26 deletions(-) (limited to 'www/chromium/files/patch-remoting__remoting_host.gypi') diff --git a/www/chromium/files/patch-remoting__remoting_host.gypi b/www/chromium/files/patch-remoting__remoting_host.gypi index 688369201f0e..ba65add232c4 100644 --- a/www/chromium/files/patch-remoting__remoting_host.gypi +++ b/www/chromium/files/patch-remoting__remoting_host.gypi @@ -1,29 +1,45 @@ ---- remoting/remoting_host.gypi.orig 2015-01-21 20:28:17 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 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, -@@ -317,7 +317,7 @@ - ], - }, - }], -- ['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', -@@ -910,7 +910,7 @@ - 'host/it2me/it2me_native_messaging_host_main.h', +--- remoting/remoting_host.gypi.orig 2015-04-19 16:56:09.000000000 +0200 ++++ remoting/remoting_host.gypi 2015-04-19 16:55:50.000000000 +0200 +@@ -18,7 +18,7 @@ + 'remoting_host_win.gypi', + ], + }], +- ['OS=="linux"', { ++ ['OS=="linux" or os_bsd==1', { + 'includes': [ + 'remoting_host_linux.gypi', + ], +@@ -56,7 +56,7 @@ + '<@(remoting_host_sources)', ], 'conditions': [ -- ['OS=="linux" and chromeos==0 and use_ozone==0', { -+ ['((OS=="linux" and chromeos==0) or os_bsd==1) and use_ozone==0', { +- ['OS=="linux"', { ++ ['OS=="linux" or os_bsd==1', { + 'conditions': [ + ['use_x11==1', { + 'dependencies': [ +@@ -535,7 +535,7 @@ + }], # mac_breakpad==1 + ], # conditions + }], # OS=mac +- ['OS=="linux" and use_allocator!="none"', { ++ ['(OS=="linux" or os_bsd==1) and use_allocator!="none"', { 'dependencies': [ - # Always use GTK on Linux, even for Aura builds. - '../build/linux/system.gyp:gtk', + '../base/allocator/allocator.gyp:allocator', + ], +@@ -657,13 +657,13 @@ + 'host/it2me/it2me_native_messaging_host_main.h', + ], + 'conditions': [ +- ['OS=="linux" and chromeos==0 and use_ozone==0', { ++ ['(OS=="linux" or os_bsd==1) and chromeos==0 and use_ozone==0', { + 'dependencies': [ + # Always use GTK on Linux, even for Aura builds. + '../build/linux/system.gyp:gtk', + ], + }], +- ['OS=="linux" and use_allocator!="none"', { ++ ['(OS=="linux" or os_bsd==1) and use_allocator!="none"', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], -- cgit v1.2.3