diff options
author | Rene Ladan <rene@FreeBSD.org> | 2016-11-22 19:10:21 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2016-11-22 19:10:21 +0000 |
commit | 9187a6460fc419eec4dc64a4569e306722a83427 (patch) | |
tree | b3d680efe613bd39a30a50f60bcb0ce36a78eab2 /www/chromium/files/patch-content_content__browser.gypi | |
parent | Some aarch64 servers apparently have ACPI. Attempt to build on aarch64 (diff) |
www/chromium: update to 54.0.2840.100
Submitted by: clutton <clutton@zoho.com>
Reviewed by: cpm, rene
Obtained from: https://github.com/paranormal/
MFH: 2016Q4
Security: https://vuxml.freebsd.org/freebsd/769ba449-79e1-11e6-bf75-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/653a8059-7c49-11e6-9242-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/9c135c7e-9fa4-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/9118961b-9fa5-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/ae9cb9b8-a203-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/a3473f5a-a739-11e6-afaa-e8e0b747a45a.html
Differential Revision: https://reviews.freebsd.org/D8517
Notes
Notes:
svn path=/head/; revision=426855
Diffstat (limited to 'www/chromium/files/patch-content_content__browser.gypi')
-rw-r--r-- | www/chromium/files/patch-content_content__browser.gypi | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/www/chromium/files/patch-content_content__browser.gypi b/www/chromium/files/patch-content_content__browser.gypi deleted file mode 100644 index e0c694c2d71b..000000000000 --- a/www/chromium/files/patch-content_content__browser.gypi +++ /dev/null @@ -1,77 +0,0 @@ ---- content/content_browser.gypi.orig 2016-05-11 19:02:21 UTC -+++ content/content_browser.gypi -@@ -843,6 +843,8 @@ - 'browser/geolocation/wifi_data_provider_common_win.cc', - 'browser/geolocation/wifi_data_provider_common_win.h', - 'browser/geolocation/wifi_data_provider_corewlan_mac.mm', -+ 'browser/geolocation/wifi_data_provider_freebsd.cc', -+ 'browser/geolocation/wifi_data_provider_freebsd.h', - 'browser/geolocation/wifi_data_provider_linux.cc', - 'browser/geolocation/wifi_data_provider_linux.h', - 'browser/geolocation/wifi_data_provider_mac.cc', -@@ -1988,7 +1990,7 @@ - }, - }, - }], -- ['OS=="linux" and chromeos==0 and use_x11==1', { -+ ['(os_bsd==1 or OS=="linux") and chromeos==0 and use_x11==1', { - 'dependencies': [ - '../build/linux/system.gyp:atk', - '../build/linux/system.gyp:gconf', -@@ -2014,7 +2016,7 @@ - 'browser/gamepad/gamepad_platform_data_fetcher_linux.cc', - ], - }], -- ['OS=="linux" and use_aura==1', { -+ ['(os_bsd==1 or OS=="linux") and use_aura==1', { - 'dependencies': [ - '../build/linux/system.gyp:fontconfig', - ], -@@ -2109,8 +2111,24 @@ - ], - }], - ['os_bsd==1', { -- 'sources/': [ -- ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'], -+ 'sources!': [ -+ 'public/browser/zygote_host_linux.h', -+ 'browser/zygote_host/zygote_communication_linux.cc', -+ 'browser/zygote_host/zygote_communication_linux.h', -+ 'browser/zygote_host/zygote_handle_linux.cc', -+ 'browser/zygote_host/zygote_host_impl_linux.cc', -+ 'browser/zygote_host/zygote_host_impl_linux.h', -+ 'zygote/zygote_linux.cc', -+ 'zygote/zygote_linux.h', -+ 'zygote/zygote_main_linux.cc', -+ 'browser/device_monitor_linux.cc', -+ 'browser/download/file_metadata_linux.cc', -+ 'browser/gamepad/gamepad_platform_data_fetcher_linux.cc', -+ 'browser/geolocation/wifi_data_provider_linux.cc', -+ 'browser/udev_linux.cc', -+ ], -+ 'dependencies': [ -+ '../build/linux/system.gyp:dbus', - ], - }], - ['use_aura==1', { -@@ -2159,10 +2177,7 @@ - 'browser/geolocation/empty_wifi_data_provider.cc', - ], - }], -- ['OS == "linux" and use_dbus==1', { -- 'sources!': [ -- 'browser/geolocation/empty_wifi_data_provider.cc', -- ], -+ ['(OS == "linux" or os_bsd==1) and use_dbus==1', { - 'dependencies': [ - '../build/linux/system.gyp:dbus', - '../dbus/dbus.gyp:dbus', -@@ -2178,7 +2193,7 @@ - 'browser/media/cdm/browser_cdm_manager.h', - ], - }], -- ['OS == "linux"', { -+ ['(os_bsd==1 or OS == "linux")', { - 'dependencies': [ - '../third_party/boringssl/boringssl.gyp:boringssl', - ], |