From owner-svn-ports-all@freebsd.org Tue Aug 7 13:56:34 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 09D8C105F661; Tue, 7 Aug 2018 13:56:34 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AD26F70503; Tue, 7 Aug 2018 13:56:33 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8D5F71CB63; Tue, 7 Aug 2018 13:56:33 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w77DuXrS043963; Tue, 7 Aug 2018 13:56:33 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w77DuS9n043937; Tue, 7 Aug 2018 13:56:28 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201808071356.w77DuS9n043937@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Tue, 7 Aug 2018 13:56:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r476599 - in head/www/chromium: . files X-SVN-Group: ports-head X-SVN-Commit-Author: cpm X-SVN-Commit-Paths: in head/www/chromium: . files X-SVN-Commit-Revision: 476599 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Aug 2018 13:56:34 -0000 Author: cpm Date: Tue Aug 7 13:56:28 2018 New Revision: 476599 URL: https://svnweb.freebsd.org/changeset/ports/476599 Log: www/chromium: Update to 68.0.3440.84 Changelog: https://chromium.googlesource.com/chromium/src/+log/67.0.3396.87..68.0.3440.84?pretty=fuller&n=10000 At the moment pkg-message says that in order to work around the hanging tabs problem the user may wish to run the following commands: # [ -d ~{user}/.cache/chromium ] || mkdir ~{user}/.cache/chromium # echo "md $(echo ~{user})/.cache/chromium mfs rw,late,-w{user}:{group},-s300m 2 0" >> /etc/fstab # mount ~{user}/.cache/chromium Add fix-hanging-tabs.sh script to the DATADIR [1], which simplifies the process to just running /usr/local/share/chromium/fix-hanging-tabs.sh $user $group PR: 230264 [1] Submitted by: 0mp [1] MFH: 2018Q3 Security: http://vuxml.freebsd.org/freebsd/b9c525d9-9198-11e8-beba-080027ef1a23.html Added: head/www/chromium/files/fix-hanging-tabs.sh (contents, props changed) head/www/chromium/files/patch-base_debug_elf_reader_linux.cc (contents, props changed) head/www/chromium/files/patch-base_trace__event_process__memory__dump.h (contents, props changed) head/www/chromium/files/patch-build_config_compiler_BUILD.gn (contents, props changed) head/www/chromium/files/patch-content_app_content_main_runner_impl.cc (contents, props changed) head/www/chromium/files/patch-content_browser_background_fetch_background_fetch_context.cc (contents, props changed) head/www/chromium/files/patch-content_common_common_sandbox_support_linux.cc (contents, props changed) head/www/chromium/files/patch-content_renderer_input_input_event_prediction.cc (contents, props changed) head/www/chromium/files/patch-net_third_party_quic_platform_impl_quic_ip_address_impl.cc (contents, props changed) head/www/chromium/files/patch-sandbox_linux_services_init_process_reaper.cc (contents, props changed) head/www/chromium/files/patch-services_network_BUILD.gn (contents, props changed) head/www/chromium/files/patch-services_service__manager_zygote_common_zygote_features.gni (contents, props changed) head/www/chromium/files/patch-services_service__manager_zygote_host_zygote_host_impl_linux.cc (contents, props changed) head/www/chromium/files/patch-services_service__manager_zygote_host_zygote_host_impl_linux.h (contents, props changed) head/www/chromium/files/patch-services_service__manager_zygote_zygote_host_linux.h (contents, props changed) head/www/chromium/files/patch-services_service__manager_zygote_zygote_linux.cc (contents, props changed) head/www/chromium/files/patch-services_service__manager_zygote_zygote_main_linux.cc (contents, props changed) head/www/chromium/files/patch-third_party_perfetto_include_perfetto_base_build_config.h (contents, props changed) head/www/chromium/files/patch-third_party_perfetto_include_perfetto_base_watchdog_posix.h (contents, props changed) head/www/chromium/files/patch-third_party_perfetto_src_base_unix_task_runner.cc (contents, props changed) head/www/chromium/files/patch-third_party_perfetto_src_tracing_core_service_impl.cc (contents, props changed) head/www/chromium/files/patch-ui_gfx_BUILD.gn (contents, props changed) head/www/chromium/files/patch-ui_gl_gl_fence.cc (contents, props changed) Deleted: head/www/chromium/files/patch-base__trace_event__process_memory_dump.h head/www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc head/www/chromium/files/patch-content_app_content__main__runner.cc head/www/chromium/files/patch-content_browser_zygote_host_zygote_host_impl_linux.cc head/www/chromium/files/patch-content_browser_zygote_host_zygote_host_impl_linux.h head/www/chromium/files/patch-content_public_browser_zygote_host_linux.h head/www/chromium/files/patch-content_public_common_zygote_features.gni head/www/chromium/files/patch-media_ffmpeg_ffmpeg_common.h head/www/chromium/files/patch-media_filters_ffmpeg_demuxer.cc head/www/chromium/files/patch-media_filters_ffmpeg_demuxer_unittest.cc head/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc head/www/chromium/files/patch-v8_src_globals.h head/www/chromium/files/patch-v8_src_trap-handler_handler-inside.cc Modified: head/www/chromium/Makefile head/www/chromium/distinfo head/www/chromium/files/audio_manager_openbsd.cc head/www/chromium/files/extra-patch-llvm-base head/www/chromium/files/extra-patch-llvm-port head/www/chromium/files/patch-base_process_process__metrics__freebsd.cc head/www/chromium/files/patch-base_process_process__metrics__posix.cc head/www/chromium/files/patch-base_trace__event_process__memory__dump.cc head/www/chromium/files/patch-build_config_BUILD.gn head/www/chromium/files/patch-build_config_BUILDCONFIG.gn head/www/chromium/files/patch-build_config_compiler_compiler.gni head/www/chromium/files/patch-chrome_browser_about__flags.cc head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc head/www/chromium/files/patch-chrome_browser_memory__details.cc head/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc head/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc head/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc head/www/chromium/files/patch-chrome_common_chrome__features.cc head/www/chromium/files/patch-chrome_common_chrome__features.h head/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc head/www/chromium/files/patch-components_autofill_strings.grdp head/www/chromium/files/patch-components_crash_content_app_crashpad.cc head/www/chromium/files/patch-components_crash_core_common_BUILD.gn head/www/chromium/files/patch-components_services_filesystem_file_system_app.cc head/www/chromium/files/patch-content_browser_BUILD.gn head/www/chromium/files/patch-content_browser_browser__main__loop.cc head/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc head/www/chromium/files/patch-content_renderer_render__thread__impl.cc head/www/chromium/files/patch-content_renderer_renderer_main.cc head/www/chromium/files/patch-net_base_address__tracker__linux.cc head/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc head/www/chromium/files/patch-sandbox_linux_BUILD.gn head/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_linux.cc head/www/chromium/files/patch-third__party_angle_BUILD.gn head/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_capture_context.h head/www/chromium/files/patch-ui_gl_BUILD.gn head/www/chromium/files/patch-ui_gl_gl_implementation.cc head/www/chromium/files/patch-v8_BUILD.gn head/www/chromium/files/sndio_input.cc head/www/chromium/files/sndio_input.h head/www/chromium/files/sndio_output.cc head/www/chromium/pkg-message head/www/chromium/pkg-plist Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/Makefile Tue Aug 7 13:56:28 2018 (r476599) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 67.0.3396.87 -PORTREVISION= 1 +PORTVERSION= 68.0.3440.84 CATEGORIES?= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -103,7 +102,6 @@ GN_ARGS+= clang_use_chrome_plugins=false \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ - enable_webrtc=true \ fieldtrial_testing_like_official_build=true \ is_clang=true \ toolkit_views=true \ @@ -299,6 +297,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \ ${STAGEDIR}${DATADIR}/swiftshader .endfor + ${INSTALL_SCRIPT} ${FILESDIR}/fix-hanging-tabs.sh ${STAGEDIR}${DATADIR} post-install-DEBUG-on: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ Modified: head/www/chromium/distinfo ============================================================================== --- head/www/chromium/distinfo Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/distinfo Tue Aug 7 13:56:28 2018 (r476599) @@ -1,5 +1,5 @@ -TIMESTAMP = 1531563535 -SHA256 (chromium-67.0.3396.87.tar.xz) = 5d27a72f0cb8247343034f63fdd9747ff388c05b9fceb541668dd04fb372db1d -SIZE (chromium-67.0.3396.87.tar.xz) = 591491608 -SHA256 (chromium-67.0.3396.87-testdata.tar.xz) = 091923fca8baca0e949d1d8e490cabdec0a536c3af3d67d398c6465b67c5fb3c -SIZE (chromium-67.0.3396.87-testdata.tar.xz) = 261857908 +TIMESTAMP = 1533378824 +SHA256 (chromium-68.0.3440.84.tar.xz) = 1031d167ae18d8a37f9291ff0e9a3dca2337c0fc1031f2c243d0327b14ecc9d9 +SIZE (chromium-68.0.3440.84.tar.xz) = 630259488 +SHA256 (chromium-68.0.3440.84-testdata.tar.xz) = bdd6906154d7c4a8477da2e8fd25b08eebe472104256e62ec2ab63050218ddd3 +SIZE (chromium-68.0.3440.84-testdata.tar.xz) = 310285796 Modified: head/www/chromium/files/audio_manager_openbsd.cc ============================================================================== --- head/www/chromium/files/audio_manager_openbsd.cc Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/files/audio_manager_openbsd.cc Tue Aug 7 13:56:28 2018 (r476599) @@ -73,7 +73,7 @@ AudioParameters AudioManagerOpenBSD::GetInputStreamPar return AudioParameters( AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, - kDefaultSampleRate, 16, buffer_size); + kDefaultSampleRate, buffer_size); } AudioManagerOpenBSD::AudioManagerOpenBSD(std::unique_ptr audio_thread, @@ -130,10 +130,8 @@ AudioParameters AudioManagerOpenBSD::GetPreferredOutpu ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO; int sample_rate = kDefaultSampleRate; int buffer_size = kDefaultOutputBufferSize; - int bits_per_sample = 16; if (input_params.IsValid()) { sample_rate = input_params.sample_rate(); - bits_per_sample = input_params.bits_per_sample(); channel_layout = input_params.channel_layout(); buffer_size = std::min(buffer_size, input_params.frames_per_buffer()); } @@ -144,7 +142,7 @@ AudioParameters AudioManagerOpenBSD::GetPreferredOutpu return AudioParameters( AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, - sample_rate, bits_per_sample, buffer_size); + sample_rate, buffer_size); } AudioInputStream* AudioManagerOpenBSD::MakeInputStream( Modified: head/www/chromium/files/extra-patch-llvm-base ============================================================================== --- head/www/chromium/files/extra-patch-llvm-base Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/files/extra-patch-llvm-base Tue Aug 7 13:56:28 2018 (r476599) @@ -43,79 +43,3 @@ forward_variables_from(invoker, [ ---- build/config/compiler/BUILD.gn.orig 2018-06-13 00:10:02.000000000 +0200 -+++ build/config/compiler/BUILD.gn 2018-07-21 13:05:54.418405000 +0200 -@@ -51,7 +51,7 @@ - # only two architectures that are currently checked in). Turn this off when - # you are using a custom toolchain and need to control -B in cflags. - linux_use_bundled_binutils = -- linux_use_bundled_binutils_override && is_linux && -+ linux_use_bundled_binutils_override && (is_linux && !is_bsd) && - (current_cpu == "x64" || current_cpu == "x86") - binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", - root_build_dir) -@@ -375,8 +375,6 @@ - "-Wl,-z,relro", - ] - if (!using_sanitizer) { -- ldflags += [ "-Wl,-z,defs" ] -- - # Functions interposed by the sanitizers can make ld think - # that some libraries aren't needed when they actually are, - # http://crbug.com/234010. As workaround, disable --as-needed. -@@ -467,7 +465,7 @@ - # TODO(hans): Remove this once Clang generates better optimized debug info by - # default. https://crbug.com/765793 - if (is_clang && !is_nacl && current_toolchain == host_toolchain && -- target_os != "chromeos") { -+ target_os != "chromeos" && !is_bsd) { - cflags += [ - "-Xclang", - "-mllvm", -@@ -708,7 +706,7 @@ - cflags += [ "-mtune=$arm_tune" ] - } - } else if (current_cpu == "arm64") { -- if (is_clang && !is_android && !is_nacl && !is_fuchsia) { -+ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) { - cflags += [ "--target=aarch64-linux-gnu" ] - ldflags += [ "--target=aarch64-linux-gnu" ] - } -@@ -1387,10 +1385,6 @@ - - # TODO(hans): https://crbug.com/766891 - "-Wno-null-pointer-arithmetic", -- -- # Ignore warnings about MSVC optimization pragmas. -- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 -- "-Wno-ignored-pragma-optimize", - ] - if (llvm_force_head_revision) { - cflags += [ -@@ -2096,7 +2090,7 @@ - # [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f - cflags += [ "-gdwarf-3" ] - } -- cflags += [ "-g2" ] -+ cflags += [ "-g0" ] - } - if (use_debug_fission && !is_nacl) { - cflags += [ "-gsplit-dwarf" ] -@@ -2110,7 +2104,7 @@ - # DWARF info may be corrupt; offsets in a range list entry are in different - # sections" there. Maybe just a bug in nacl_switch_32.S. - if (!is_mac && !is_ios && !is_nacl && target_cpu != "x86" && -- (use_gold || use_lld)) { -+ (use_gold || use_lld) && !is_bsd) { - if (is_clang) { - # This flag enables the GNU-format pubnames and pubtypes sections, - # which lld needs in order to generate a correct GDB index. -@@ -2207,7 +2201,7 @@ - if (!is_win && fatal_linker_warnings && - !(is_chromeos && current_cpu == "arm") && - !(is_android && use_order_profiling) && !is_mac && !is_ios && -- current_os != "aix") { -+ current_os != "aix" && !is_bsd) { - # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 - # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 - # crbug.com/485542 Modified: head/www/chromium/files/extra-patch-llvm-port ============================================================================== --- head/www/chromium/files/extra-patch-llvm-port Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/files/extra-patch-llvm-port Tue Aug 7 13:56:28 2018 (r476599) @@ -57,92 +57,3 @@ forward_variables_from(invoker, [ ---- build/config/compiler/BUILD.gn.orig 2018-06-13 00:10:02.000000000 +0200 -+++ build/config/compiler/BUILD.gn 2018-07-21 12:57:03.823912000 +0200 -@@ -51,7 +51,7 @@ - # only two architectures that are currently checked in). Turn this off when - # you are using a custom toolchain and need to control -B in cflags. - linux_use_bundled_binutils = -- linux_use_bundled_binutils_override && is_linux && -+ linux_use_bundled_binutils_override && (is_linux && !is_bsd) && - (current_cpu == "x64" || current_cpu == "x86") - binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", - root_build_dir) -@@ -375,8 +375,6 @@ - "-Wl,-z,relro", - ] - if (!using_sanitizer) { -- ldflags += [ "-Wl,-z,defs" ] -- - # Functions interposed by the sanitizers can make ld think - # that some libraries aren't needed when they actually are, - # http://crbug.com/234010. As workaround, disable --as-needed. -@@ -467,7 +465,7 @@ - # TODO(hans): Remove this once Clang generates better optimized debug info by - # default. https://crbug.com/765793 - if (is_clang && !is_nacl && current_toolchain == host_toolchain && -- target_os != "chromeos") { -+ target_os != "chromeos" && !is_bsd) { - cflags += [ - "-Xclang", - "-mllvm", -@@ -708,7 +706,7 @@ - cflags += [ "-mtune=$arm_tune" ] - } - } else if (current_cpu == "arm64") { -- if (is_clang && !is_android && !is_nacl && !is_fuchsia) { -+ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) { - cflags += [ "--target=aarch64-linux-gnu" ] - ldflags += [ "--target=aarch64-linux-gnu" ] - } -@@ -1387,10 +1385,6 @@ - - # TODO(hans): https://crbug.com/766891 - "-Wno-null-pointer-arithmetic", -- -- # Ignore warnings about MSVC optimization pragmas. -- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 -- "-Wno-ignored-pragma-optimize", - ] - if (llvm_force_head_revision) { - cflags += [ -@@ -1572,9 +1566,9 @@ - if ((is_posix && !is_nacl) || is_fuchsia) { - # TODO(thomasanderson): Enable on ChromeOS builds once - # https://crbug.com/829956 is fixed. -- if (default_toolchain != "//build/toolchain/cros:target") { -- arflags = [ "-T" ] -- } -+ # if (default_toolchain != "//build/toolchain/cros:target") { -+ # arflags = [ "-T" ] -+ # } - } - } - -@@ -2096,7 +2090,7 @@ - # [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f - cflags += [ "-gdwarf-3" ] - } -- cflags += [ "-g2" ] -+ cflags += [ "-g0" ] - } - if (use_debug_fission && !is_nacl) { - cflags += [ "-gsplit-dwarf" ] -@@ -2110,7 +2104,7 @@ - # DWARF info may be corrupt; offsets in a range list entry are in different - # sections" there. Maybe just a bug in nacl_switch_32.S. - if (!is_mac && !is_ios && !is_nacl && target_cpu != "x86" && -- (use_gold || use_lld)) { -+ (use_gold || use_lld) && !is_bsd) { - if (is_clang) { - # This flag enables the GNU-format pubnames and pubtypes sections, - # which lld needs in order to generate a correct GDB index. -@@ -2207,7 +2201,7 @@ - if (!is_win && fatal_linker_warnings && - !(is_chromeos && current_cpu == "arm") && - !(is_android && use_order_profiling) && !is_mac && !is_ios && -- current_os != "aix") { -+ current_os != "aix" && !is_bsd) { - # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 - # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 - # crbug.com/485542 Added: head/www/chromium/files/fix-hanging-tabs.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/fix-hanging-tabs.sh Tue Aug 7 13:56:28 2018 (r476599) @@ -0,0 +1,45 @@ +#! /bin/sh - +# +# Chromium has a known problem of hanging tabs. The workaround for this +# problem is to mount ~/.cache/chromium as memory-fs. In order to do this, +# before you run Chromium, please run this script as root once for each user +# who uses Chromium. +# +# $FreeBSD$ + +set -e + +# Make sure that the user specified both the user and the group. +if [ ${#} -ne 2 ]; then + printf 'Usage: %s user group\n' "${0}" >&2 + exit 1 +fi + +user="${1}" +group="${2}" +home="$(awk -F: -v user="${user}" '{if ($1==user) print $6}' /etc/passwd)" +cachedir="${home}/.cache/chromium" +fstabrecord="md ${cachedir} mfs rw,late,-w${user}:${group},-s300m 2 0" + +# Make sure that the provided user and group are valid. +if ! id "${user}" >/dev/null 2>&1; then + printf 'Invalid user "%s"\n' "${user}" >&2 + exit 1 +elif [ ! -d "${home}" ]; then + printf 'Cannot locate home directory of user "%s"\n' "${user}" >&2 + exit 1 +elif ! grep "^${group}:" /etc/group >/dev/null; then + printf 'Invalid group "%s"\n' "${group}" >&2 + exit 1 +fi + +if grep "${fstabrecord}" /etc/fstab >/dev/null; then + printf 'Workaround already configured for user "%s"\n' "${user}" >&2 + exit 1 +fi + +if [ ! -d "${cachedir}" ]; then + su -l "${user}" -c 'mkdir "${cachedir}"' +fi +printf '%s\n' "${fstabrecord}" >> /etc/fstab +mount "${cachedir}" Added: head/www/chromium/files/patch-base_debug_elf_reader_linux.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base_debug_elf_reader_linux.cc Tue Aug 7 13:56:28 2018 (r476599) @@ -0,0 +1,13 @@ +--- base/debug/elf_reader_linux.cc.orig 2018-08-04 13:15:46.374048000 +0200 ++++ base/debug/elf_reader_linux.cc 2018-08-04 13:16:14.292901000 +0200 +@@ -41,8 +41,10 @@ + const void* section_end = segment.data() + segment.size_bytes(); + const Nhdr* note_header = reinterpret_cast(segment.data()); + while (note_header < section_end) { ++#if !defined(OS_BSD) + if (note_header->n_type == NT_GNU_BUILD_ID) + break; ++#endif + note_header = reinterpret_cast( + reinterpret_cast(note_header) + sizeof(Nhdr) + + bits::Align(note_header->n_namesz, 4) + Modified: head/www/chromium/files/patch-base_process_process__metrics__freebsd.cc ============================================================================== --- head/www/chromium/files/patch-base_process_process__metrics__freebsd.cc Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/files/patch-base_process_process__metrics__freebsd.cc Tue Aug 7 13:56:28 2018 (r476599) @@ -1,8 +1,8 @@ ---- base/process/process_metrics_freebsd.cc.orig 2018-06-13 00:10:01.000000000 +0200 -+++ base/process/process_metrics_freebsd.cc 2018-07-20 00:07:42.005261000 +0200 -@@ -13,6 +13,10 @@ - #include "base/memory/ptr_util.h" +--- base/process/process_metrics_freebsd.cc.orig 2018-08-01 00:08:25.000000000 +0200 ++++ base/process/process_metrics_freebsd.cc 2018-08-04 21:48:06.554728000 +0200 +@@ -14,11 +14,14 @@ #include "base/process/process_metrics_iocounters.h" + #include "base/stl_util.h" +#include /* getpagesize() */ +#include /* O_RDONLY */ @@ -11,7 +11,13 @@ namespace base { ProcessMetrics::ProcessMetrics(ProcessHandle process) -@@ -61,6 +65,65 @@ +- : process_(process), +- last_cpu_(0) {} ++ : process_(process) {} + + // static + std::unique_ptr ProcessMetrics::CreateProcessMetrics( +@@ -67,6 +70,65 @@ pagesize = getpagesize(); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); Modified: head/www/chromium/files/patch-base_process_process__metrics__posix.cc ============================================================================== --- head/www/chromium/files/patch-base_process_process__metrics__posix.cc Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/files/patch-base_process_process__metrics__posix.cc Tue Aug 7 13:56:28 2018 (r476599) @@ -1,22 +1,20 @@ ---- base/process/process_metrics_posix.cc.orig 2017-09-05 21:05:11.000000000 +0200 -+++ base/process/process_metrics_posix.cc 2017-09-11 19:41:06.103369000 +0200 -@@ -16,6 +16,8 @@ +--- base/process/process_metrics_posix.cc.orig 2018-08-01 00:08:25.000000000 +0200 ++++ base/process/process_metrics_posix.cc 2018-08-05 00:53:58.559513000 +0200 +@@ -19,6 +19,8 @@ #if defined(OS_MACOSX) #include -+#elif defined(OS_BSD) ++#elif defined(OS_FREEBSD) +#include #else #include #endif -@@ -103,8 +105,9 @@ +@@ -107,7 +109,7 @@ + #else + return minfo.hblkhd + minfo.arena; #endif - #elif defined(OS_FUCHSIA) +-#elif defined(OS_FUCHSIA) ++#elif defined(OS_FUCHSIA) || defined(OS_BSD) // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. -- return 0; -+ NOTIMPLEMENTED(); + return 0; #endif -+ return 0; - } - - } // namespace base Modified: head/www/chromium/files/patch-base_trace__event_process__memory__dump.cc ============================================================================== --- head/www/chromium/files/patch-base_trace__event_process__memory__dump.cc Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/files/patch-base_trace__event_process__memory__dump.cc Tue Aug 7 13:56:28 2018 (r476599) @@ -1,11 +1,11 @@ ---- base/trace_event/process_memory_dump.cc.orig 2017-12-15 02:04:05.000000000 +0100 -+++ base/trace_event/process_memory_dump.cc 2017-12-23 21:58:59.977492000 +0100 -@@ -86,7 +86,7 @@ - const size_t kMaxChunkSize = 8 * 1024 * 1024; - size_t max_vec_size = - GetSystemPageCount(std::min(mapped_size, kMaxChunkSize), page_size); --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - std::unique_ptr vec(new char[max_vec_size]); - #elif defined(OS_WIN) +--- base/trace_event/process_memory_dump.cc.orig 2018-08-01 00:08:26.000000000 +0200 ++++ base/trace_event/process_memory_dump.cc 2018-08-04 13:42:42.870211000 +0200 +@@ -95,7 +95,7 @@ + #if defined(OS_WIN) std::unique_ptr vec( + new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); +-#elif defined(OS_MACOSX) ++#elif defined(OS_MACOSX) || defined(OS_BSD) + std::unique_ptr vec(new char[max_vec_size]); + #elif defined(OS_POSIX) || defined(OS_FUCHSIA) + std::unique_ptr vec(new unsigned char[max_vec_size]); Added: head/www/chromium/files/patch-base_trace__event_process__memory__dump.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base_trace__event_process__memory__dump.h Tue Aug 7 13:56:28 2018 (r476599) @@ -0,0 +1,11 @@ +--- base/trace_event/process_memory_dump.h.orig 2018-08-01 00:08:26.000000000 +0200 ++++ base/trace_event/process_memory_dump.h 2018-08-04 13:49:22.487126000 +0200 +@@ -22,7 +22,7 @@ + + // Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the + // resident memory. +-#if !defined(OS_NACL) ++#if !defined(OS_NACL) && !defined(OS_BSD) + #define COUNT_RESIDENT_BYTES_SUPPORTED + #endif + Modified: head/www/chromium/files/patch-build_config_BUILD.gn ============================================================================== --- head/www/chromium/files/patch-build_config_BUILD.gn Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/files/patch-build_config_BUILD.gn Tue Aug 7 13:56:28 2018 (r476599) @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2017-07-25 21:04:48.000000000 +0200 -+++ build/config/BUILD.gn 2017-08-02 23:31:08.597825000 +0200 -@@ -166,7 +166,7 @@ +--- build/config/BUILD.gn.orig 2018-08-01 00:08:26.000000000 +0200 ++++ build/config/BUILD.gn 2018-08-05 13:59:34.648903000 +0200 +@@ -167,7 +167,7 @@ # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } @@ -9,16 +9,17 @@ # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -255,7 +255,7 @@ - "CoreText.framework", - "Foundation.framework", +@@ -269,9 +269,7 @@ ] -- } else if (is_linux) { -+ } else if (is_linux && !is_bsd) { + } else if (is_linux) { libs = [ - "dl", - "rt", -@@ -302,7 +302,7 @@ +- "dl", + "pthread", +- "rt", + ] + } + } +@@ -320,7 +318,7 @@ "//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_executable_flags", ] Modified: head/www/chromium/files/patch-build_config_BUILDCONFIG.gn ============================================================================== --- head/www/chromium/files/patch-build_config_BUILDCONFIG.gn Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/files/patch-build_config_BUILDCONFIG.gn Tue Aug 7 13:56:28 2018 (r476599) @@ -1,23 +1,19 @@ ---- build/config/BUILDCONFIG.gn.orig 2018-02-24 16:25:08.000000000 +0100 -+++ build/config/BUILDCONFIG.gn 2018-03-03 19:33:34.562749000 +0100 -@@ -131,14 +131,14 @@ +--- build/config/BUILDCONFIG.gn.orig 2018-08-01 00:08:26.000000000 +0200 ++++ build/config/BUILDCONFIG.gn 2018-08-04 13:56:21.383564000 +0200 +@@ -131,10 +131,10 @@ is_official_build = false # Whether we're a traditional desktop unix. - is_desktop_linux = current_os == "linux" + is_desktop_linux = current_os == "linux" || current_os == "bsd" - # Set to true when compiling with the Clang compiler. Typically this is used - # to configure warnings. - is_clang = - current_os == "mac" || current_os == "ios" || current_os == "chromeos" || - current_os == "fuchsia" || current_os == "android" || -- current_os == "win" || -+ current_os == "win" || current_os == "bsd" || - (current_os == "linux" && current_cpu != "s390x" && - current_cpu != "s390" && current_cpu != "ppc64" && - current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64") -@@ -191,8 +191,8 @@ + # Set to true when compiling with the Clang compiler. +- is_clang = current_os != "linux" || ++ is_clang = current_os != "linux" || current_os == "bsd" || + (current_cpu != "s390x" && current_cpu != "s390" && + current_cpu != "ppc64" && current_cpu != "ppc" && + current_cpu != "mips" && current_cpu != "mips64") +@@ -186,8 +186,8 @@ # TODO(dpranke): Add some sort of assert here that verifies that # no toolchain omitted host_toolchain from its toolchain_args(). @@ -28,7 +24,7 @@ # TODO(dpranke) - is_clang normally applies only to the target # build, and there is no way to indicate that you want to override # it for both the target build *and* the host build. Do we need to -@@ -226,7 +226,7 @@ +@@ -227,7 +227,7 @@ assert(host_os == "linux" || host_os == "mac", "Android builds are only supported on Linux and Mac hosts.") _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu" @@ -37,7 +33,7 @@ # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -296,6 +296,7 @@ +@@ -300,6 +300,7 @@ is_nacl = false is_posix = false is_win = true @@ -45,7 +41,7 @@ } else if (current_os == "mac") { is_android = false is_chromeos = false -@@ -306,6 +307,7 @@ +@@ -310,6 +311,7 @@ is_nacl = false is_posix = true is_win = false @@ -53,7 +49,7 @@ } else if (current_os == "android") { is_android = true is_chromeos = false -@@ -316,6 +318,7 @@ +@@ -320,6 +322,7 @@ is_nacl = false is_posix = true is_win = false @@ -61,7 +57,7 @@ } else if (current_os == "chromeos") { is_android = false is_chromeos = true -@@ -326,6 +329,7 @@ +@@ -330,6 +333,7 @@ is_nacl = false is_posix = true is_win = false @@ -69,7 +65,7 @@ } else if (current_os == "nacl") { # current_os == "nacl" will be passed by the nacl toolchain definition. # It is not set by default or on the command line. We treat is as a -@@ -339,6 +343,7 @@ +@@ -343,6 +347,7 @@ is_nacl = true is_posix = true is_win = false @@ -77,15 +73,15 @@ } else if (current_os == "fuchsia") { is_android = false is_chromeos = false -@@ -349,6 +354,7 @@ +@@ -353,6 +358,7 @@ is_nacl = false - is_posix = true + is_posix = false is_win = false + is_bsd = false } else if (current_os == "ios") { is_android = false is_chromeos = false -@@ -359,6 +365,7 @@ +@@ -363,6 +369,7 @@ is_nacl = false is_posix = true is_win = false @@ -93,7 +89,7 @@ } else if (current_os == "linux") { is_android = false is_chromeos = false -@@ -369,6 +376,7 @@ +@@ -373,6 +380,7 @@ is_nacl = false is_posix = true is_win = false @@ -101,7 +97,7 @@ } else if (current_os == "aix") { is_android = false is_chromeos = false -@@ -378,6 +386,18 @@ +@@ -383,6 +391,18 @@ is_nacl = false is_posix = true is_win = false Added: head/www/chromium/files/patch-build_config_compiler_BUILD.gn ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-build_config_compiler_BUILD.gn Tue Aug 7 13:56:28 2018 (r476599) @@ -0,0 +1,89 @@ +--- build/config/compiler/BUILD.gn.orig 2018-08-01 00:08:26.000000000 +0200 ++++ build/config/compiler/BUILD.gn 2018-08-05 04:12:50.165240000 +0200 +@@ -51,7 +51,7 @@ + # only two architectures that are currently checked in). Turn this off when + # you are using a custom toolchain and need to control -B in cflags. + linux_use_bundled_binutils = +- linux_use_bundled_binutils_override && is_linux && ++ linux_use_bundled_binutils_override && (is_linux && !is_bsd) && + (current_cpu == "x64" || current_cpu == "x86") + binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", + root_build_dir) +@@ -266,7 +266,7 @@ + # Linker warnings. + if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && + !(is_android && use_order_profiling) && !is_mac && !is_ios && +- current_os != "aix") { ++ current_os != "aix" && !is_bsd) { + # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 + # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 + # crbug.com/485542 +@@ -380,12 +380,6 @@ + "-Wl,-z,now", + "-Wl,-z,relro", + ] +- if (!using_sanitizer) { +- ldflags += [ +- "-Wl,-z,defs", +- "-Wl,--as-needed", +- ] +- } + } + + # Linux-specific compiler flags setup. +@@ -489,7 +483,7 @@ + } + + if (is_clang && !is_nacl && current_toolchain == host_toolchain && +- target_os != "chromeos") { ++ target_os != "chromeos" && !is_bsd) { + cflags += [ + # TODO(hans): Remove this once Clang generates better optimized debug info + # by default. https://crbug.com/765793 +@@ -734,7 +728,7 @@ + cflags += [ "-mtune=$arm_tune" ] + } + } else if (current_cpu == "arm64") { +- if (is_clang && !is_android && !is_nacl && !is_fuchsia) { ++ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) { + cflags += [ "--target=aarch64-linux-gnu" ] + ldflags += [ "--target=aarch64-linux-gnu" ] + } +@@ -1415,10 +1409,6 @@ + + # TODO(hans): https://crbug.com/766891 + "-Wno-null-pointer-arithmetic", +- +- # Ignore warnings about MSVC optimization pragmas. +- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 +- "-Wno-ignored-pragma-optimize", + ] + } else if (use_xcode_clang) { + cflags += [ +@@ -1594,7 +1584,7 @@ + # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't + # have a "thin archive" mode (it does accept -T, but it means truncating + # archive names to 16 characters, which is not what we want). +- if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) { ++ if ((is_posix && !is_nacl && !is_mac && !is_ios && !is_bsd) || is_fuchsia) { + arflags = [ "-T" ] + } + } +@@ -2119,7 +2109,7 @@ + # [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f + cflags += [ "-gdwarf-3" ] + } +- cflags += [ "-g2" ] ++ cflags += [ "-g0" ] + } + if (use_debug_fission && !is_nacl && !is_android) { + # NOTE: Some Chrome OS builds globally set |use_debug_fission| to true, +@@ -2139,7 +2129,7 @@ + # DWARF info may be corrupt; offsets in a range list entry are in different + # sections" there. Maybe just a bug in nacl_switch_32.S. + if (!is_mac && !is_ios && !is_nacl && target_cpu != "x86" && +- (use_gold || use_lld)) { ++ (use_gold || use_lld) && !is_bsd) { + if (is_clang) { + # This flag enables the GNU-format pubnames and pubtypes sections, + # which lld needs in order to generate a correct GDB index. Modified: head/www/chromium/files/patch-build_config_compiler_compiler.gni ============================================================================== --- head/www/chromium/files/patch-build_config_compiler_compiler.gni Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/files/patch-build_config_compiler_compiler.gni Tue Aug 7 13:56:28 2018 (r476599) @@ -1,11 +1,11 @@ ---- build/config/compiler/compiler.gni.orig 2018-06-19 18:20:54.692104000 +0200 -+++ build/config/compiler/compiler.gni 2018-06-19 18:21:18.098165000 +0200 -@@ -164,7 +164,7 @@ +--- build/config/compiler/compiler.gni.orig 2018-08-01 00:08:26.000000000 +0200 ++++ build/config/compiler/compiler.gni 2018-08-04 14:04:44.799794000 +0200 +@@ -172,7 +172,7 @@ declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. -- use_gold = -+ use_gold = !is_bsd && - (!use_lld && !(is_chromecast && is_linux && - (current_cpu == "arm" || current_cpu == "mipsel")) && - (is_linux && (current_cpu == "x64" || current_cpu == "x86" || +- use_gold = !use_lld && !(is_chromecast && is_linux && ++ use_gold = !is_bsd && !use_lld && !(is_chromecast && is_linux && + (current_cpu == "arm" || current_cpu == "mipsel")) && + ((is_linux && (current_cpu == "x64" || current_cpu == "x86" || + current_cpu == "arm" || current_cpu == "mipsel" || Modified: head/www/chromium/files/patch-chrome_browser_about__flags.cc ============================================================================== --- head/www/chromium/files/patch-chrome_browser_about__flags.cc Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/files/patch-chrome_browser_about__flags.cc Tue Aug 7 13:56:28 2018 (r476599) @@ -1,15 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2018-06-13 00:10:04.000000000 +0200 -+++ chrome/browser/about_flags.cc 2018-07-20 16:41:11.196156000 +0200 -@@ -593,7 +593,7 @@ - switches::kForceDirectionRTL}, - }; - --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - // Feature used to enable the identification of open tabs given URLs in - // suggestions, and converting those suggestions to ones that allow switching to - // the tab if found. Currently only on the desktop. Includes button option -@@ -2441,12 +2441,12 @@ +--- chrome/browser/about_flags.cc.orig 2018-08-01 00:08:29.000000000 +0200 ++++ chrome/browser/about_flags.cc 2018-08-04 14:12:27.193526000 +0200 +@@ -2408,7 +2408,7 @@ flag_descriptions::kEnableMaterialDesignExtensionsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)}, #endif // ENABLE_EXTENSIONS @@ -18,27 +9,12 @@ {"enable-input-ime-api", flag_descriptions::kEnableInputImeApiName, flag_descriptions::kEnableInputImeApiDescription, kOsWin | kOsLinux, ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, - switches::kDisableInputImeAPI)}, --#endif // OS_WIN || OS_LINUX -+#endif // OS_WIN || OS_LINUX || OS_BSD - {"enable-origin-trials", flag_descriptions::kOriginTrialsName, - flag_descriptions::kOriginTrialsDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kOriginTrials)}, -@@ -3058,7 +3058,7 @@ +@@ -3024,7 +3024,7 @@ flag_descriptions::kLeftToRightUrlsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kLeftToRightUrls)}, -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - {"omnibox-entity-suggestions", - flag_descriptions::kOmniboxEntitySuggestionsName, - flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop, -@@ -3077,7 +3077,7 @@ - {"enable-new-app-menu-icon", flag_descriptions::kEnableNewAppMenuIconName, - flag_descriptions::kEnableNewAppMenuIconDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kAnimatedAppMenuIcon)}, --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - - #if defined(OS_ANDROID) - {"enable-custom-feedback-ui", + {"omnibox-new-answer-layout", + flag_descriptions::kOmniboxNewAnswerLayoutName, + flag_descriptions::kOmniboxNewAnswerLayoutDescription, kOsDesktop, Modified: head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc ============================================================================== --- head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc Tue Aug 7 13:56:28 2018 (r476599) @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2018-06-13 00:10:04.000000000 +0200 -+++ chrome/browser/chrome_content_browser_client.cc 2018-07-14 14:04:47.872292000 +0200 -@@ -305,7 +305,7 @@ +--- chrome/browser/chrome_content_browser_client.cc.orig 2018-08-01 00:08:29.000000000 +0200 ++++ chrome/browser/chrome_content_browser_client.cc 2018-08-04 14:22:56.785429000 +0200 +@@ -309,7 +309,7 @@ #include "chromeos/chromeos_switches.h" #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -342,7 +342,7 @@ +@@ -347,7 +347,7 @@ #include "chrome/common/importer/profile_import.mojom.h" #endif @@ -18,7 +18,7 @@ #include "chrome/browser/webshare/share_service_impl.h" #endif -@@ -356,7 +356,7 @@ +@@ -361,7 +361,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -27,34 +27,34 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -1033,7 +1033,7 @@ - main_parts = new ChromeBrowserMainPartsMac(parameters); +@@ -1061,7 +1061,7 @@ #elif defined(OS_CHROMEOS) - main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters); + main_parts = new chromeos::ChromeBrowserMainPartsChromeos( + parameters, std::move(service_manifest_data_pack_)); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - main_parts = new ChromeBrowserMainPartsLinux(parameters); + main_parts = new ChromeBrowserMainPartsLinux( + parameters, std::move(service_manifest_data_pack_)); #elif defined(OS_ANDROID) - main_parts = new ChromeBrowserMainPartsAndroid(parameters); -@@ -1049,7 +1049,7 @@ +@@ -1081,7 +1081,7 @@ // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1789,7 +1789,7 @@ +@@ -1823,7 +1823,7 @@ command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } -#elif defined(OS_POSIX) +#elif defined(OS_POSIX) && !defined(OS_BSD) - bool enable_crash_reporter = breakpad::IsCrashReporterEnabled(); - #if defined(OS_CHROMEOS) - // Chrome OS uses the OS-level crash_reporter for mash services, so disable -@@ -3096,7 +3096,7 @@ + if (breakpad::IsCrashReporterEnabled()) { + std::string switch_value; + std::unique_ptr client_info = +@@ -3177,7 +3177,7 @@ } } @@ -63,16 +63,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -3132,7 +3132,7 @@ - } - #endif // defined(OS_ANDROID) - } --#endif // defined(OS_POSIX) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - - #if defined(OS_WIN) - base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( -@@ -3806,7 +3806,7 @@ +@@ -3892,7 +3892,7 @@ #if defined(OS_ANDROID) frame_interfaces_parameterized_->AddInterface(base::Bind( &ForwardToJavaWebContentsRegistry)); Modified: head/www/chromium/files/patch-chrome_browser_memory__details.cc ============================================================================== --- head/www/chromium/files/patch-chrome_browser_memory__details.cc Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/files/patch-chrome_browser_memory__details.cc Tue Aug 7 13:56:28 2018 (r476599) @@ -1,20 +1,20 @@ ---- chrome/browser/memory_details.cc.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/memory_details.cc -@@ -35,7 +35,7 @@ - #include "extensions/features/features.h" +--- chrome/browser/memory_details.cc.orig 2018-08-01 00:08:30.000000000 +0200 ++++ chrome/browser/memory_details.cc 2018-08-04 14:30:27.145764000 +0200 +@@ -36,7 +36,7 @@ + #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - #include "content/public/browser/zygote_host_linux.h" + #include "services/service_manager/zygote/zygote_host_linux.h" #endif -@@ -344,7 +344,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { +@@ -341,7 +341,7 @@ process.titles.push_back(title); } -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - if (content::ZygoteHost::GetInstance()->IsZygotePid(process.pid)) { + if (service_manager::ZygoteHost::GetInstance()->IsZygotePid(process.pid)) { process.process_type = content::PROCESS_TYPE_ZYGOTE; } Modified: head/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc ============================================================================== --- head/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc Tue Aug 7 13:56:28 2018 (r476599) @@ -1,9 +1,9 @@ ---- chrome/browser/tracing/crash_service_uploader.cc.orig 2017-06-05 19:03:03 UTC -+++ chrome/browser/tracing/crash_service_uploader.cc -@@ -157,6 +157,8 @@ void TraceCrashServiceUploader::DoUploadOnFileThread( +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2018-08-01 00:08:32.000000000 +0200 ++++ chrome/browser/tracing/crash_service_uploader.cc 2018-08-04 14:37:55.834228000 +0200 +@@ -158,6 +158,8 @@ + const char product[] = "Chrome_Linux"; + #elif defined(OS_ANDROID) const char product[] = "Chrome_Android"; - #elif defined(OS_CHROMEOS) - const char product[] = "Chrome_ChromeOS"; +#elif defined(OS_FREEBSD) + const char product[] = "Chrome_FreeBSD"; #else Modified: head/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc ============================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc Tue Aug 7 13:56:28 2018 (r476599) @@ -1,29 +1,29 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2017-06-05 19:03:03 UTC -+++ chrome/browser/ui/views/accelerator_table.cc -@@ -54,7 +54,7 @@ const AcceleratorMapping kAcceleratorMap[] = { - { ui::VKEY_S, kPlatformModifier, IDC_SAVE_PAGE }, - { ui::VKEY_9, kPlatformModifier, IDC_SELECT_LAST_TAB }, - { ui::VKEY_NUMPAD9, kPlatformModifier, IDC_SELECT_LAST_TAB }, +--- chrome/browser/ui/views/accelerator_table.cc.orig 2018-08-01 00:08:32.000000000 +0200 ++++ chrome/browser/ui/views/accelerator_table.cc 2018-08-04 17:21:33.552862000 +0200 +@@ -44,7 +44,7 @@ + {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, + {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, + {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - { ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, - { ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, - { ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT }, -@@ -84,7 +84,7 @@ const AcceleratorMapping kAcceleratorMap[] = { - { ui::VKEY_NUMPAD7, kPlatformModifier, IDC_SELECT_TAB_6 }, - { ui::VKEY_8, kPlatformModifier, IDC_SELECT_TAB_7 }, - { ui::VKEY_NUMPAD8, kPlatformModifier, IDC_SELECT_TAB_7 }, + {ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, + {ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, + {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, +@@ -74,7 +74,7 @@ + {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6}, + {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, + {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - { ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0 }, - { ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0 }, - { ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1 }, -@@ -129,7 +129,7 @@ const AcceleratorMapping kAcceleratorMap[] = { + {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, + {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, + {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, +@@ -119,7 +119,7 @@ #endif // !OS_MACOSX // Platform-specific key maps. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - { ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK }, - { ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD }, - { ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME }, + {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, + {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, + {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, Modified: head/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc ============================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc Tue Aug 7 13:56:28 2018 (r476599) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2017-04-19 19:06:30 UTC -+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc -@@ -20,7 +20,7 @@ namespace { +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2018-08-01 00:08:32.000000000 +0200 ++++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc 2018-08-04 17:27:55.912686000 +0200 +@@ -21,7 +21,7 @@ - const int kCaptionButtonHeight = 18; + constexpr int kCaptionButtonHeight = 18; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) - // Default extra space between the top of the frame and the top of the window - // caption buttons. - const int kExtraCaption = 2; ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // Default spacing around window caption buttons. + constexpr int kCaptionButtonSpacing = 2; + #else Modified: head/www/chromium/files/patch-chrome_common_chrome__features.cc ============================================================================== --- head/www/chromium/files/patch-chrome_common_chrome__features.cc Tue Aug 7 13:56:18 2018 (r476598) +++ head/www/chromium/files/patch-chrome_common_chrome__features.cc Tue Aug 7 13:56:28 2018 (r476599) @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.cc.orig 2018-06-13 00:10:09.000000000 +0200 -+++ chrome/common/chrome_features.cc 2018-07-20 16:33:58.698475000 +0200 -@@ -85,13 +85,13 @@ +--- chrome/common/chrome_features.cc.orig 2018-08-01 00:08:33.000000000 +0200 ++++ chrome/common/chrome_features.cc 2018-08-05 16:46:49.046411000 +0200 +@@ -85,7 +85,7 @@ base::FEATURE_ENABLED_BY_DEFAULT}; #endif // defined(OS_WIN) || defined(OS_MACOSX) @@ -9,13 +9,6 @@ // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. - const base::Feature kBackgroundModeAllowRestart{ - "BackgroundModeAllowRestart", base::FEATURE_DISABLED_BY_DEFAULT}; --#endif // defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - - // Enables or disables whether permission prompts are automatically blocked - // after the user has explicitly dismissed them too many times. @@ -142,7 +142,7 @@ base::FEATURE_ENABLED_BY_DEFAULT}; #endif @@ -25,3 +18,12 @@ // Enables the dual certificate verification trial feature. // https://crbug.com/649026 const base::Feature kCertDualVerificationTrialFeature{ +@@ -367,7 +367,7 @@ + "AcknowledgeNtpOverrideOnDeactivate", base::FEATURE_DISABLED_BY_DEFAULT}; + #endif + +-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_WIN) || ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***