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-ui_base_BUILD.gn | |
| 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
Diffstat (limited to 'www/chromium/files/patch-ui_base_BUILD.gn')
| -rw-r--r-- | www/chromium/files/patch-ui_base_BUILD.gn | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/www/chromium/files/patch-ui_base_BUILD.gn b/www/chromium/files/patch-ui_base_BUILD.gn new file mode 100644 index 000000000000..914e7ef00631 --- /dev/null +++ b/www/chromium/files/patch-ui_base_BUILD.gn @@ -0,0 +1,65 @@ +--- ui/base/BUILD.gn.orig 2016-08-03 22:02:41.000000000 +0300 ++++ ui/base/BUILD.gn 2016-09-28 09:32:40.317599000 +0300 +@@ -341,7 +341,7 @@ + sources += [ "touch/touch_device_android.cc" ] + } else if (is_ios) { + sources += [ "touch/touch_device_ios.cc" ] +- } else if (is_linux) { ++ } else if (is_linux || is_bsd) { + sources += [ "touch/touch_device_linux.cc" ] + } else { + # Empty implementation for all other cases. +@@ -443,7 +443,7 @@ + ] + } + +- if (!use_aura || !is_linux) { ++ if (!use_aura || !(is_linux || is_bsd)) { + sources -= [ "resource/resource_bundle_auralinux.cc" ] + } + +@@ -451,7 +451,7 @@ + sources -= [ "dragdrop/drag_utils_aura.cc" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ "//build/linux:fontconfig" ] + } + +@@ -459,7 +459,7 @@ + configs += [ "//build/config/linux:glib" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (!toolkit_views && !use_aura) { + sources -= [ + "dragdrop/drag_utils.cc", +@@ -794,7 +794,7 @@ + "ime/win/imm32_manager_unittest.cc", + "ime/win/tsf_input_scope_unittest.cc", + ] +- if (is_linux && use_aura && !is_chromeos) { ++ if ((is_linux || is_bsd) && use_aura && !is_chromeos) { + sources += [ "ime/input_method_auralinux_unittest.cc" ] + } + if (is_mac) { +@@ -919,7 +919,7 @@ + ] + } + +- if (is_android || is_linux || is_mac || is_win) { ++ if (is_android || is_linux || is_bsd || is_mac || is_win) { + # TODO(brettw): We should be able to depend on //ui/resources:ui_test_pak + # instead of depending directly on the non-test .pak files, but depending + # on ui_test_pak seems to have no effect. +@@ -932,7 +932,7 @@ + "//third_party/mesa:osmesa", + ] + } +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + data += [ + # TODO(brettw): Remove these two lines. + "$root_out_dir/ui/en-US.pak", |