mirror of
https://git.freebsd.org/ports.git
synced 2025-07-15 00:09:15 -04:00
223e08d1be
* Under the hood runs Chromium 83.0.4103.122 with security fixes up to
version 86.0.4240.183 and patches were taken from r540991 of www/chromium.
* Also adjust some patches to avoid hardcoding of ${LOCALBASE} and remove a
redundant blank line.
Changelog:
* [QTBUG-84632] Warn about QtWebengineProcess launching from network share
on Windows.
* [QTBUG-85363] Handle non-ASCII names for PulseAudio
* [QTBUG-85494] Fix regression crash when not handling
QQuickWebEngineNewViewRequest
* [QTBUG-85817] Fix crashes on resize
* [QTBUG-86672] Fix remapped menu key being mapped back to menu key
* [QTBUG-86945] Fix crash when opening a PDF in debug build on windows.
* [QTBUG-87129] Mention node.js build-time dependency
* The QtWebEngineProcess now has a version number
* The old compositor has been removed and can no longer be restored using
command line argument.
Approved by: tcberner (kde)
Differential Revision: https://reviews.freebsd.org/D27587
122 lines
4.2 KiB
Text
122 lines
4.2 KiB
Text
--- src/3rdparty/chromium/base/BUILD.gn.orig 2020-11-07 01:22:36 UTC
|
|
+++ src/3rdparty/chromium/base/BUILD.gn
|
|
@@ -59,7 +59,7 @@ declare_args() {
|
|
# replacement base::Location::Current(). On by default in non-official builds
|
|
# for testing purposes.
|
|
# TODO(https://crbug.com/974061): remove this eventually.
|
|
- from_here_uses_location_builtins = !is_official_build
|
|
+ from_here_uses_location_builtins = !is_official_build && !is_bsd
|
|
|
|
# Unsafe developer build. Has developer-friendly features that may weaken or
|
|
# disable security measures like sandboxing or ASLR.
|
|
@@ -929,7 +929,7 @@ jumbo_component("base") {
|
|
"timer/hi_res_timer_manager_posix.cc",
|
|
]
|
|
|
|
- if (!is_nacl && !is_mac && !is_ios) {
|
|
+ if (!is_nacl && !is_mac && !is_ios && !is_bsd) {
|
|
sources += [
|
|
"profiler/stack_copier_signal.cc",
|
|
"profiler/stack_copier_signal.h",
|
|
@@ -938,6 +938,12 @@ jumbo_component("base") {
|
|
"profiler/thread_delegate_posix.h",
|
|
]
|
|
}
|
|
+
|
|
+ if (is_bsd) {
|
|
+ sources += [
|
|
+ "profiler/stack_sampler_posix.cc",
|
|
+ ]
|
|
+ }
|
|
}
|
|
|
|
jumbo_excluded_sources = []
|
|
@@ -1239,7 +1245,13 @@ jumbo_component("base") {
|
|
"process/process_metrics_linux.cc",
|
|
"threading/platform_thread_linux.cc",
|
|
]
|
|
- jumbo_excluded_sources += [ "process/memory_linux.cc" ]
|
|
+ # Omit this because it will be excluded via "is_bsd" further down in
|
|
+ # this file
|
|
+ # jumbo_excluded_sources += [ "process/memory_linux.cc" ]
|
|
+ # ...but remove the following files from jumbo merge otherwise it will
|
|
+ # emit errors of redefined variables
|
|
+ jumbo_excluded_sources += [ "metrics/histogram.cc" ]
|
|
+ jumbo_excluded_sources += [ "metrics/sparse_histogram.cc" ]
|
|
}
|
|
|
|
if (!is_nacl) {
|
|
@@ -1324,7 +1336,7 @@ jumbo_component("base") {
|
|
# Needed for <atomic> if using newer C++ library than sysroot, except if
|
|
# building inside the cros_sdk environment - use host_toolchain as a
|
|
# more robust check for this.
|
|
- if (!use_sysroot && (is_android || (is_linux && !is_chromecast && !use_qt)) &&
|
|
+ if (!use_sysroot && (is_android || (is_linux && !is_chromecast && !use_qt) && !is_clang) &&
|
|
host_toolchain != "//build/toolchain/cros:host") {
|
|
libs += [ "atomic" ]
|
|
}
|
|
@@ -1350,7 +1362,7 @@ jumbo_component("base") {
|
|
"allocator/allocator_shim_override_glibc_weak_symbols.h",
|
|
]
|
|
deps += [ "//base/allocator:tcmalloc" ]
|
|
- } else if (is_linux && use_allocator == "none") {
|
|
+ } else if ((is_linux && !is_bsd) && use_allocator == "none") {
|
|
sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
|
|
} else if (is_android && use_allocator == "none") {
|
|
sources += [
|
|
@@ -1947,6 +1959,33 @@ jumbo_component("base") {
|
|
}
|
|
}
|
|
|
|
+ if (is_bsd) {
|
|
+ sources -= [
|
|
+ "files/file_path_watcher_linux.cc",
|
|
+ "files/file_util_linux.cc",
|
|
+ "process/memory_linux.cc",
|
|
+ "process/process_handle_linux.cc",
|
|
+ "process/process_iterator_linux.cc",
|
|
+ "process/process_metrics_linux.cc",
|
|
+ "system/sys_info_linux.cc"
|
|
+ ]
|
|
+ sources += [
|
|
+ "files/file_path_watcher_kqueue.cc",
|
|
+ "files/file_path_watcher_kqueue.h",
|
|
+ "files/file_path_watcher_stub.cc",
|
|
+ "process/memory_stubs.cc",
|
|
+ "process/process_handle_freebsd.cc",
|
|
+ "process/process_iterator_freebsd.cc",
|
|
+ "process/process_metrics_freebsd.cc",
|
|
+ "system/sys_info_freebsd.cc",
|
|
+ ]
|
|
+ libs = [
|
|
+ "execinfo", # logging.cc
|
|
+ "kvm", # process_metrics_freebsd
|
|
+ "util" # process_metrics_freebsd
|
|
+ ]
|
|
+ }
|
|
+
|
|
# iOS
|
|
if (is_ios) {
|
|
sources -= [
|
|
@@ -2903,7 +2942,7 @@ test("base_unittests") {
|
|
"posix/unix_domain_socket_unittest.cc",
|
|
"task/thread_pool/task_tracker_posix_unittest.cc",
|
|
]
|
|
- if (!is_nacl && !is_mac && !is_ios) {
|
|
+ if (!is_nacl && !is_mac && !is_ios && !is_bsd) {
|
|
sources += [ "profiler/stack_copier_signal_unittest.cc" ]
|
|
}
|
|
}
|
|
@@ -3092,6 +3131,12 @@ test("base_unittests") {
|
|
|
|
manifest = "//build/config/fuchsia/tests.cmx"
|
|
}
|
|
+
|
|
+ if (is_bsd) {
|
|
+ sources -= [
|
|
+ "debug/proc_maps_linux_unittest.cc",
|
|
+ ]
|
|
+ }
|
|
|
|
if (!is_fuchsia && !is_ios) {
|
|
sources += [ "files/file_locking_unittest.cc" ]
|