svn commit: r475101 - in head/www/chromium: . files
Carlos J. Puga Medina
cpm at FreeBSD.org
Sun Jul 22 10:28:56 UTC 2018
Author: cpm
Date: Sun Jul 22 10:28:49 2018
New Revision: 475101
URL: https://svnweb.freebsd.org/changeset/ports/475101
Log:
www/chromium: update to 67.0.3396.87
Changelog: https://chromium.googlesource.com/chromium/src/+log/65.0.3325.181..67.0.3396.87?pretty=fuller&n=10000
MFH: 2018Q3
Security: https://vuxml.freebsd.org/freebsd/36ff7a74-47b1-11e8-a7d6-54e1ad544088.html
Security: https://vuxml.freebsd.org/freebsd/006bee4e-4c49-11e8-9c32-54ee754af08e.html
Security: https://vuxml.freebsd.org/freebsd/e457978b-5484-11e8-9b85-54ee754af08e.html
Security: https://vuxml.freebsd.org/freebsd/427b0f58-644c-11e8-9e1b-e8e0b747a45a.html
Security: https://vuxml.freebsd.org/freebsd/4cb49a23-6c89-11e8-8b33-e8e0b747a45a.html
Added:
head/www/chromium/files/patch-base_files_file__path__watcher__stub.cc (contents, props changed)
head/www/chromium/files/patch-base_process_kill.h (contents, props changed)
head/www/chromium/files/patch-base_process_kill_posix.cc (contents, props changed)
head/www/chromium/files/patch-base_process_process__handle.cc (contents, props changed)
head/www/chromium/files/patch-base_process_process__handle.h (contents, props changed)
head/www/chromium/files/patch-build_config_linux_BUILD.gn (contents, props changed)
head/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn (contents, props changed)
head/www/chromium/files/patch-build_linux_unbundle_libusb.gn (contents, props changed)
head/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py (contents, props changed)
head/www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc (contents, props changed)
head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader.cc (contents, props changed)
head/www/chromium/files/patch-components_crash_content_app_crashpad.cc (contents, props changed)
head/www/chromium/files/patch-components_download_quarantine_quarantine_linux.cc (contents, props changed)
head/www/chromium/files/patch-components_services_filesystem_file_system_app.cc (contents, props changed)
head/www/chromium/files/patch-content_browser_memory_swap_metrics_driver_impl_linux.cc (contents, props changed)
head/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.cc (contents, props changed)
head/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.h (contents, props changed)
head/www/chromium/files/patch-content_browser_webui_web_ui_impl.cc (contents, props changed)
head/www/chromium/files/patch-content_browser_webui_web_ui_impl.h (contents, props changed)
head/www/chromium/files/patch-content_browser_zygote_host_zygote_host_impl_linux.cc (contents, props changed)
head/www/chromium/files/patch-content_public_browser_web_ui.h (contents, props changed)
head/www/chromium/files/patch-content_public_browser_web_ui_data_source.h (contents, props changed)
head/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc (contents, props changed)
head/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.h (contents, props changed)
head/www/chromium/files/patch-media_ffmpeg_ffmpeg_common.h (contents, props changed)
head/www/chromium/files/patch-media_filters_ffmpeg_demuxer.cc (contents, props changed)
head/www/chromium/files/patch-media_filters_ffmpeg_demuxer_unittest.cc (contents, props changed)
head/www/chromium/files/patch-net_proxy_resolution_proxy_config_service_linux.cc (contents, props changed)
head/www/chromium/files/patch-net_proxy_resolution_proxy_resolution_service.cc (contents, props changed)
head/www/chromium/files/patch-net_tools_cert_verify_tool_cert_verify_tool.cc (contents, props changed)
head/www/chromium/files/patch-sandbox_linux_services_libc_interceptor.cc (contents, props changed)
head/www/chromium/files/patch-services_network_network_sandbox_hook_linux.cc (contents, props changed)
head/www/chromium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_loader.c (contents, props changed)
head/www/chromium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_vk_loader_platform.h (contents, props changed)
head/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline_opts.h (contents, props changed)
head/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost_Freetype.cpp (contents, props changed)
head/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp (contents, props changed)
head/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp (contents, props changed)
head/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread_types.cc (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_bindings_core_v8_v8_script_runner.cc (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_core_editing_editing_behavior.cc (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_core_html_canvas_canvas_async_blob_creator.cc (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_core_html_forms_internal_popup_menu.cc (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_core_xml_parser_xml_document_parser.cc (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_platform_BUILD.gn (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.cc (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.h (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_metrics.cc (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia.cc (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_platform_heap_stack_frame_depth.cc (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_BUILD.gn (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_assertions.cc (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_atomics.h (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_byte_swap.h (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_container_annotations.h (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_stack_util.cc (contents, props changed)
head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_threading_pthreads.cc (contents, props changed)
head/www/chromium/files/patch-third_party_crashpad_crashpad_build_crashpad_buildconfig.gni (contents, props changed)
head/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_capture_context.h (contents, props changed)
head/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_metrics.cc (contents, props changed)
head/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_uuid.cc (contents, props changed)
head/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_close_multiple.cc (contents, props changed)
head/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_drop_privileges.cc (contents, props changed)
head/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_signals.cc (contents, props changed)
head/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_symbolic_constants_posix.cc (contents, props changed)
head/www/chromium/files/patch-ui_views_widget_desktop_aura_desktop_screen_x11.cc (contents, props changed)
Deleted:
head/www/chromium/files/patch-build_config_compiler_BUILD.gn
head/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc
head/www/chromium/files/patch-chrome_browser_vr_sample_queue.cc
head/www/chromium/files/patch-components_assist_ranker_ranker_example_util.cc
head/www/chromium/files/patch-components_filesystem_file__system__app.cc
head/www/chromium/files/patch-content_browser_download_base__file.cc
head/www/chromium/files/patch-content_network_BUILD.gn
head/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc
head/www/chromium/files/patch-device_sensors_data__fetcher__shared__memory.h
head/www/chromium/files/patch-device_usb_usb__context__unittest.cc
head/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc
head/www/chromium/files/patch-device_usb_usb__device__handle__impl.h
head/www/chromium/files/patch-device_usb_usb__device__impl.cc
head/www/chromium/files/patch-gpu_ipc_client_gpu_memory_buffer_impl.cc
head/www/chromium/files/patch-media_base_decoder__buffer.h
head/www/chromium/files/patch-media_capture_BUILD.gn
head/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc
head/www/chromium/files/patch-net_proxy_proxy__service.cc
head/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc
head/www/chromium/files/patch-net_tools_get__server__time_get__server__time.cc
head/www/chromium/files/patch-storage_browser_quota_quota__settings.cc
head/www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp
head/www/chromium/files/patch-third__party_WebKit_Source_core_editing_EditingBehavior.cpp
head/www/chromium/files/patch-third__party_WebKit_Source_core_html_canvas_CanvasAsyncBlobCreator.cpp
head/www/chromium/files/patch-third__party_WebKit_Source_core_html_forms_InternalPopupMenu.cpp
head/www/chromium/files/patch-third__party_WebKit_Source_platform_BUILD.gn
head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp
head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h
head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontMetrics.cpp
head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp
head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h
head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp
head/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp
head/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp
head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Assertions.cpp
head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Atomics.h
head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_BUILD.gn
head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ByteSwap.h
head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ContainerAnnotations.h
head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_StackUtil.cpp
head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ThreadingPthreads.cpp
head/www/chromium/files/patch-third__party_libusb_BUILD.gn
head/www/chromium/files/patch-third__party_swiftshader_src_Common_Socket.cpp
head/www/chromium/files/patch-third__party_vulkan-validation-layers_src_loader_vk_loader_platform.h
head/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_timestamp_extrapolator.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-BUILD.gn
head/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
head/www/chromium/files/patch-build_config_allocator.gni
head/www/chromium/files/patch-chrome_browser_about__flags.cc
head/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
head/www/chromium/files/patch-chrome_browser_browser__resources.grd
head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
head/www/chromium/files/patch-chrome_browser_download_download__commands.cc
head/www/chromium/files/patch-chrome_browser_download_download__query.cc
head/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc
head/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
head/www/chromium/files/patch-chrome_browser_memory__details__linux.cc
head/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
head/www/chromium/files/patch-chrome_browser_ui_views_profiles_avatar_button.cc
head/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.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-chromecast_browser_cast__content__browser__client.cc
head/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
head/www/chromium/files/patch-components_crash_content_app_BUILD.gn
head/www/chromium/files/patch-components_crash_content_browser_BUILD.gn
head/www/chromium/files/patch-components_gcm__driver_gcm__client.h
head/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc
head/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc
head/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc
head/www/chromium/files/patch-content_app_content__main__runner.cc
head/www/chromium/files/patch-content_browser_browser__main__loop.cc
head/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
head/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
head/www/chromium/files/patch-content_browser_zygote_host_zygote_host_impl_linux.h
head/www/chromium/files/patch-content_common_BUILD.gn
head/www/chromium/files/patch-content_gpu_BUILD.gn
head/www/chromium/files/patch-content_renderer_render__thread__impl.cc
head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
head/www/chromium/files/patch-device_usb_usb__context.cc
head/www/chromium/files/patch-device_usb_usb__error.cc
head/www/chromium/files/patch-device_usb_usb__service__impl.cc
head/www/chromium/files/patch-device_usb_usb__service__impl.h
head/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc
head/www/chromium/files/patch-gpu_config_gpu__info__collector__freebsd.cc
head/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.cc
head/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
head/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc
head/www/chromium/files/patch-net_base_address__tracker__linux.cc
head/www/chromium/files/patch-net_http_http__network__session.cc
head/www/chromium/files/patch-net_socket_udp__socket__posix.cc
head/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
head/www/chromium/files/patch-sandbox_linux_BUILD.gn
head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc
head/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_linux.cc
head/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp
head/www/chromium/files/patch-third__party_sqlite_BUILD.gn
head/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread.cc
head/www/chromium/files/patch-third__party_zlib_BUILD.gn
head/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py
head/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc
head/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
head/www/chromium/files/patch-ui_views_mus_aura__init.cc
head/www/chromium/pkg-plist
Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/Makefile Sun Jul 22 10:28:49 2018 (r475101)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 65.0.3325.181
-PORTREVISION= 6
+PORTVERSION= 67.0.3396.87
CATEGORIES?= www
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -19,7 +18,8 @@ BUILD_DEPENDS= bash:shells/bash \
${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
.if !defined(GN_ONLY)
-BUILD_DEPENDS+= gperf:devel/gperf \
+BUILD_DEPENDS+= git:devel/git \
+ gperf:devel/gperf \
yasm:devel/yasm \
ffmpeg>=3.2.2,1:multimedia/ffmpeg \
flock:sysutils/flock \
@@ -49,7 +49,6 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi
libpng.so:graphics/png \
libwebp.so:graphics/webp \
libavcodec.so:multimedia/ffmpeg \
- libvpx.so:multimedia/libvpx \
libopenh264.so:multimedia/openh264 \
libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz \
@@ -121,7 +120,6 @@ GN_ARGS+= clang_use_chrome_plugins=false \
use_system_freetype=true \
use_system_harfbuzz=true \
use_system_libjpeg=true \
- use_system_sqlite=false \
extra_cxxflags="-I${LOCALBASE}/include" \
extra_ldflags="-L${LOCALBASE}/lib"
# TODO: investigate building with these options:
@@ -243,7 +241,7 @@ pre-configure:
#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
./build/linux/unbundle/replace_gn_files.py --system-libraries \
- ffmpeg flac freetype harfbuzz-ng libdrm libvpx libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE}
+ ffmpeg flac freetype harfbuzz-ng libdrm libusb libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE}
.endif
do-configure:
Modified: head/www/chromium/distinfo
==============================================================================
--- head/www/chromium/distinfo Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/distinfo Sun Jul 22 10:28:49 2018 (r475101)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1521889794
-SHA256 (chromium-65.0.3325.181.tar.xz) = 93666448c6b96ec83e6a35a64cff40db4eb92a154fe1db4e7dab4761d0e38687
-SIZE (chromium-65.0.3325.181.tar.xz) = 570386836
-SHA256 (chromium-65.0.3325.181-testdata.tar.xz) = 03018143ffe8c96ca2710e0c48bb19f1e122cf07394f15b73a814c2f6b2a3cdb
-SIZE (chromium-65.0.3325.181-testdata.tar.xz) = 252462976
+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
Modified: head/www/chromium/files/audio_manager_openbsd.cc
==============================================================================
--- head/www/chromium/files/audio_manager_openbsd.cc Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/files/audio_manager_openbsd.cc Sun Jul 22 10:28:49 2018 (r475101)
@@ -167,10 +167,10 @@ std::unique_ptr<media::AudioManager> CreateAudioManage
DLOG(WARNING) << "CreateAudioManager";
#if defined(USE_SNDIO)
UMA_HISTOGRAM_ENUMERATION("Media.OpenBSDAudioIO", kSndio, kAudioIOMax + 1);
- return base::MakeUnique<AudioManagerOpenBSD>(std::move(audio_thread),
+ return std::make_unique<AudioManagerOpenBSD>(std::move(audio_thread),
audio_log_factory);
#else
- return base::MakeUnique<FakeAudioManager>(std::move(audio_thread),
+ return std::make_unique<FakeAudioManager>(std::move(audio_thread),
audio_log_factory);
#endif
Modified: head/www/chromium/files/extra-patch-llvm-base
==============================================================================
--- head/www/chromium/files/extra-patch-llvm-base Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/files/extra-patch-llvm-base Sun Jul 22 10:28:49 2018 (r475101)
@@ -43,3 +43,79 @@
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 Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/files/extra-patch-llvm-port Sun Jul 22 10:28:49 2018 (r475101)
@@ -1,6 +1,6 @@
---- build/toolchain/gcc_toolchain.gni.orig 2017-06-05 19:03:01 UTC
-+++ build/toolchain/gcc_toolchain.gni
-@@ -19,6 +19,11 @@ analyzer_wrapper =
+--- build/toolchain/gcc_toolchain.gni.orig 2018-06-13 00:10:02.000000000 +0200
++++ build/toolchain/gcc_toolchain.gni 2018-07-21 12:38:45.107087000 +0200
+@@ -25,6 +25,11 @@
rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py",
root_build_dir) + " --mode=clang"
@@ -12,7 +12,22 @@
# This template defines a toolchain for something that works like gcc
# (including clang).
#
-@@ -548,13 +553,22 @@ template("clang_toolchain") {
+@@ -343,12 +348,12 @@
+ # We use slightly different arflags for AIX.
+ extra_arflags = "-r -c -s"
+ } else {
+- extra_arflags = "-r -c -s -D"
++ extra_arflags = "rcsD"
+ }
+
+ # Almost all targets build with //build/config/compiler:thin_archive which
+ # adds -T to arflags.
+- command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" \"{{arflags}} $extra_arflags\" @\"$rspfile\""
++ command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" {{arflags}} $extra_arflags @\"$rspfile\""
+ description = "AR {{output}}"
+ rspfile_content = "{{inputs}}"
+ outputs = [
+@@ -608,13 +613,22 @@
}
gcc_toolchain(target_name) {
@@ -42,3 +57,92 @@
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
Modified: head/www/chromium/files/patch-BUILD.gn
==============================================================================
--- head/www/chromium/files/patch-BUILD.gn Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/files/patch-BUILD.gn Sun Jul 22 10:28:49 2018 (r475101)
@@ -1,6 +1,6 @@
---- BUILD.gn.orig 2018-02-24 16:25:08.000000000 +0100
-+++ BUILD.gn 2018-03-03 19:04:30.972689000 +0100
-@@ -361,7 +361,7 @@
+--- BUILD.gn.orig 2018-06-13 00:09:58.000000000 +0200
++++ BUILD.gn 2018-07-14 12:26:56.482016000 +0200
+@@ -359,7 +359,7 @@
}
}
@@ -9,16 +9,16 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
-@@ -406,8 +406,6 @@
+@@ -401,8 +401,6 @@
"//net:disk_cache_memory_test",
"//net:quic_client",
"//net:quic_server",
- "//sandbox/linux:chrome_sandbox",
- "//sandbox/linux:sandbox_linux_unittests",
+ "//testing:empty_main",
]
- if (use_dbus) {
-@@ -464,10 +462,6 @@
+@@ -460,10 +458,6 @@
"//chrome/test/chromedriver:chromedriver",
"//chrome/test/chromedriver:chromedriver_tests",
"//components/sync:run_sync_testserver",
@@ -29,8 +29,8 @@
"//media/cast:generate_barcode_video",
"//media/cast:generate_timecode_audio",
"//net:crash_cache",
-@@ -522,10 +516,6 @@
- "//mojo/edk/test:mojo_public_system_perftests",
+@@ -519,10 +513,6 @@
+ "//mojo:mojo_perftests",
"//services/service_manager/public/cpp",
"//testing/gmock:gmock_main",
- "//third_party/breakpad:dump_syms($host_toolchain)",
@@ -40,16 +40,16 @@
]
if (!is_android) {
-@@ -593,7 +583,7 @@
- deps +=
- [ "//chrome/installer/mini_installer:next_version_mini_installer" ]
+@@ -598,7 +588,7 @@
+ host_os == "win") {
+ deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
- } else if (!is_android && !is_ios && !is_fuchsia) {
+ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) {
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-@@ -835,7 +825,6 @@
+@@ -818,7 +808,6 @@
"//ppapi/examples/video_decode",
"//sandbox/linux:chrome_sandbox",
"//sandbox/linux:sandbox_linux_unittests",
@@ -57,7 +57,7 @@
# Blocked on https://github.com/catapult-project/catapult/issues/2297
#"//third_party/catapult/telemetry:bitmaptools",
-@@ -939,7 +928,7 @@
+@@ -921,7 +910,7 @@
]
}
@@ -66,7 +66,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -948,7 +937,7 @@
+@@ -930,7 +919,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -75,7 +75,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
-@@ -1064,9 +1053,6 @@
+@@ -1055,9 +1044,6 @@
if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
@@ -84,4 +84,4 @@
- [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
if (is_win || is_android) {
- data_deps += [ "//chrome/test:angle_perftests" ]
+ data_deps += [
Added: head/www/chromium/files/patch-base_files_file__path__watcher__stub.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base_files_file__path__watcher__stub.cc Sun Jul 22 10:28:49 2018 (r475101)
@@ -0,0 +1,51 @@
+--- base/files/file_path_watcher_stub.cc.orig 2018-07-19 23:00:07.807326000 +0200
++++ base/files/file_path_watcher_stub.cc 2018-07-19 23:05:24.785603000 +0200
+@@ -1,14 +1,15 @@
+-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Copyright 2014 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
+-// This file exists for Unix systems which don't have the inotify headers, and
+-// thus cannot build file_watcher_inotify.cc
+
+-#include "base/files/file_path_watcher.h"
++#include <memory>
+
++#include "base/files/file_path_watcher.h"
++#include "base/files/file_path_watcher_kqueue.h"
+ #include "base/macros.h"
+ #include "base/memory/ptr_util.h"
++#include "build/build_config.h"
+
+ namespace base {
+
+@@ -22,12 +23,26 @@
+ bool Watch(const FilePath& path,
+ bool recursive,
+ const FilePathWatcher::Callback& callback) override {
+- return false;
++ DCHECK(!impl_.get());
++ if (recursive) {
++ if (!FilePathWatcher::RecursiveWatchAvailable())
++ return false;
++ } else {
++ impl_ = std::make_unique<FilePathWatcherKQueue>();
++ }
++ DCHECK(impl_.get());
++ return impl_->Watch(path, recursive, callback);
+ }
+
+- void Cancel() override {}
++ void Cancel() override {
++ if (impl_.get())
++ impl_->Cancel();
++ set_cancelled();
++ }
+
+ private:
++ std::unique_ptr<PlatformDelegate> impl_;
++
+ DISALLOW_COPY_AND_ASSIGN(FilePathWatcherImpl);
+ };
+
Added: head/www/chromium/files/patch-base_process_kill.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base_process_kill.h Sun Jul 22 10:28:49 2018 (r475101)
@@ -0,0 +1,11 @@
+--- base/process/kill.h.orig 2018-07-19 22:11:43.638992000 +0200
++++ base/process/kill.h 2018-07-19 22:12:06.613065000 +0200
+@@ -111,7 +111,7 @@
+ BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus(
+ ProcessHandle handle, int* exit_code);
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Spawns a thread to wait asynchronously for the child |process| to exit
+ // and then reaps it.
+ BASE_EXPORT void EnsureProcessGetsReaped(Process process);
Added: head/www/chromium/files/patch-base_process_kill_posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base_process_kill_posix.cc Sun Jul 22 10:28:49 2018 (r475101)
@@ -0,0 +1,11 @@
+--- base/process/kill_posix.cc.orig 2018-07-19 22:11:49.327358000 +0200
++++ base/process/kill_posix.cc 2018-07-19 22:12:22.837132000 +0200
+@@ -167,7 +167,7 @@
+ 0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2)));
+ }
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ void EnsureProcessGetsReaped(Process process) {
+ DCHECK(!process.is_current());
+
Added: head/www/chromium/files/patch-base_process_process__handle.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base_process_process__handle.cc Sun Jul 22 10:28:49 2018 (r475101)
@@ -0,0 +1,11 @@
+--- base/process/process_handle.cc.orig 2018-07-19 22:31:30.212555000 +0200
++++ base/process/process_handle.cc 2018-07-19 22:32:27.185612000 +0200
+@@ -39,7 +39,7 @@
+ return g_unique_id;
+ }
+
+-#if defined(OS_LINUX) || defined(OS_AIX)
++#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+
+ void InitUniqueIdForProcessInPidNamespace(ProcessId pid_outside_of_namespace) {
+ g_unique_id = MangleProcessId(pid_outside_of_namespace);
Added: head/www/chromium/files/patch-base_process_process__handle.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base_process_process__handle.h Sun Jul 22 10:28:49 2018 (r475101)
@@ -0,0 +1,11 @@
+--- base/process/process_handle.h.orig 2018-07-19 22:31:39.988330000 +0200
++++ base/process/process_handle.h 2018-07-19 22:32:06.977544000 +0200
+@@ -64,7 +64,7 @@
+ // a process's PID.
+ BASE_EXPORT uint32_t GetUniqueIdForProcess();
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // When a process is started in a different PID namespace from the browser
+ // process, this function must be called with the process's PID in the browser's
+ // PID namespace in order to initialize its unique ID. Not thread safe.
Modified: head/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
==============================================================================
--- head/www/chromium/files/patch-base_process_process__metrics__freebsd.cc Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/files/patch-base_process_process__metrics__freebsd.cc Sun Jul 22 10:28:49 2018 (r475101)
@@ -1,8 +1,8 @@
---- base/process/process_metrics_freebsd.cc.orig 2018-02-24 16:25:08.000000000 +0100
-+++ base/process/process_metrics_freebsd.cc 2018-03-03 19:25:40.067505000 +0100
-@@ -12,6 +12,10 @@
- #include "base/macros.h"
+--- 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"
+ #include "base/process/process_metrics_iocounters.h"
+#include <unistd.h> /* getpagesize() */
+#include <fcntl.h> /* O_RDONLY */
@@ -11,19 +11,7 @@
namespace base {
ProcessMetrics::ProcessMetrics(ProcessHandle process)
-@@ -25,6 +29,11 @@
- return WrapUnique(new ProcessMetrics(process));
- }
-
-+bool GetVmStatInfo(VmStatInfo* vmstat) {
-+ NOTIMPLEMENTED();
-+ return false;
-+}
-+
- size_t ProcessMetrics::GetPagefileUsage() const {
- struct kinfo_proc info;
- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ };
-@@ -118,6 +127,60 @@
+@@ -61,6 +65,65 @@
pagesize = getpagesize();
return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
@@ -81,6 +69,11 @@
+ meminfo->swap_free = (swap_total - swap_used) * pagesizeKB;
+
+ return true;
++}
++
++uint64_t ProcessMetrics::GetVmSwapBytes() const {
++ NOTIMPLEMENTED();
++ return 0;
}
} // namespace base
Modified: head/www/chromium/files/patch-build_config_allocator.gni
==============================================================================
--- head/www/chromium/files/patch-build_config_allocator.gni Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/files/patch-build_config_allocator.gni Sun Jul 22 10:28:49 2018 (r475101)
@@ -1,15 +1,15 @@
---- build/config/allocator.gni.orig 2017-07-25 21:04:48.000000000 +0200
-+++ build/config/allocator.gni 2017-08-01 23:13:58.535952000 +0200
-@@ -7,7 +7,7 @@
+--- build/config/allocator.gni.orig 2018-06-13 00:10:02.000000000 +0200
++++ build/config/allocator.gni 2018-07-14 13:12:35.947359000 +0200
+@@ -6,7 +6,7 @@
+
# Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors.
- if (is_android || current_cpu == "mipsel" || is_mac || is_ios || is_asan ||
- is_lsan || is_tsan || is_msan || is_win || is_syzyasan || is_fuchsia ||
-- (is_linux && target_cpu == "arm64")) {
-+ (is_linux && target_cpu == "arm64") || is_bsd) {
+ if (is_android || is_mac || is_ios || is_asan || is_lsan || is_tsan ||
+- is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64")) {
++ is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64") || is_bsd) {
_default_allocator = "none"
} else {
_default_allocator = "tcmalloc"
-@@ -18,7 +18,7 @@
+@@ -17,7 +17,7 @@
# against the debug CRT with "is_nacl=false".
if ((is_linux || is_android || is_mac ||
(is_win && !is_component_build && !is_debug)) && !is_asan && !is_lsan &&
Added: head/www/chromium/files/patch-build_config_linux_BUILD.gn
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-build_config_linux_BUILD.gn Sun Jul 22 10:28:49 2018 (r475101)
@@ -0,0 +1,11 @@
+--- build/config/linux/BUILD.gn.orig 2018-07-19 22:09:59.968726000 +0200
++++ build/config/linux/BUILD.gn 2018-07-19 22:10:16.334896000 +0200
+@@ -28,7 +28,7 @@
+ }
+
+ if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") &&
+- (!use_custom_libcxx || current_cpu == "mipsel")) {
++ (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) {
+ libs = [ "atomic" ]
+ }
+ }
Added: head/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn Sun Jul 22 10:28:49 2018 (r475101)
@@ -0,0 +1,22 @@
+--- build/linux/unbundle/ffmpeg.gn.orig 2018-07-20 01:03:59.604084000 +0200
++++ build/linux/unbundle/ffmpeg.gn 2018-07-20 01:04:45.406745000 +0200
+@@ -14,8 +14,8 @@
+ ]
+ }
+
+-buildflag_header("ffmpeg_buildflags") {
+- header = "ffmpeg_buildflags.h"
++buildflag_header("ffmpeg_features") {
++ header = "ffmpeg_features.h"
+ flags = [ "USE_SYSTEM_FFMPEG=true" ]
+ }
+
+@@ -30,7 +30,7 @@
+
+ source_set("ffmpeg") {
+ deps = [
+- ":ffmpeg_buildflags",
++ ":ffmpeg_features",
+ ":ffmpeg_shim",
+ ]
+ public_configs = [ ":system_ffmpeg" ]
Added: head/www/chromium/files/patch-build_linux_unbundle_libusb.gn
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-build_linux_unbundle_libusb.gn Sun Jul 22 10:28:49 2018 (r475101)
@@ -0,0 +1,27 @@
+--- build/linux/unbundle/libusb.gn.orig 2018-07-20 03:07:05.793992000 +0200
++++ build/linux/unbundle/libusb.gn 2018-07-20 03:07:35.792417000 +0200
+@@ -0,0 +1,24 @@
++# Copyright 2016 The Chromium Authors. All rights reserved.
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++import("//build/config/linux/pkg_config.gni")
++import("//build/shim_headers.gni")
++
++pkg_config("system_libusb") {
++ packages = [ "libusb-1.0" ]
++}
++
++shim_headers("libusb_shim") {
++ root_path = "src/libusb"
++ headers = [
++ "libusb.h",
++ ]
++}
++
++source_set("libusb") {
++ deps = [
++ ":libusb_shim",
++ ]
++ public_configs = [ ":system_libusb" ]
++}
Added: head/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py Sun Jul 22 10:28:49 2018 (r475101)
@@ -0,0 +1,10 @@
+--- build/linux/unbundle/replace_gn_files.py.orig 2018-07-20 03:07:59.446131000 +0200
++++ build/linux/unbundle/replace_gn_files.py 2018-07-20 03:08:31.519350000 +0200
+@@ -27,6 +27,7 @@
+ 'libevent': 'base/third_party/libevent/BUILD.gn',
+ 'libjpeg': 'third_party/libjpeg.gni',
+ 'libpng': 'third_party/libpng/BUILD.gn',
++ 'libusb': 'third_party/libusb/BUILD.gn',
+ 'libvpx': 'third_party/libvpx/BUILD.gn',
+ 'libwebp': 'third_party/libwebp/BUILD.gn',
+ 'libxml': 'third_party/libxml/BUILD.gn',
Modified: head/www/chromium/files/patch-chrome_browser_about__flags.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_about__flags.cc Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/files/patch-chrome_browser_about__flags.cc Sun Jul 22 10:28:49 2018 (r475101)
@@ -1,6 +1,15 @@
---- chrome/browser/about_flags.cc.orig 2018-03-20 23:05:16.000000000 +0100
-+++ chrome/browser/about_flags.cc 2018-03-24 13:04:35.001279000 +0100
-@@ -2429,12 +2429,12 @@
+--- 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 @@
flag_descriptions::kEnableMaterialDesignExtensionsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)},
#endif // ENABLE_EXTENSIONS
@@ -15,7 +24,7 @@
{"enable-origin-trials", flag_descriptions::kOriginTrialsName,
flag_descriptions::kOriginTrialsDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kOriginTrials)},
-@@ -3047,7 +3047,7 @@
+@@ -3058,7 +3058,7 @@
flag_descriptions::kLeftToRightUrlsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kLeftToRightUrls)},
@@ -24,7 +33,7 @@
{"omnibox-entity-suggestions",
flag_descriptions::kOmniboxEntitySuggestionsName,
flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop,
-@@ -3066,7 +3066,7 @@
+@@ -3077,7 +3077,7 @@
{"enable-new-app-menu-icon", flag_descriptions::kEnableNewAppMenuIconName,
flag_descriptions::kEnableNewAppMenuIconDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kAnimatedAppMenuIcon)},
Modified: head/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_browser__process__impl.cc Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/files/patch-chrome_browser_browser__process__impl.cc Sun Jul 22 10:28:49 2018 (r475101)
@@ -1,6 +1,6 @@
---- chrome/browser/browser_process_impl.cc.orig 2017-12-15 02:04:08.000000000 +0100
-+++ chrome/browser/browser_process_impl.cc 2017-12-24 00:34:24.918627000 +0100
-@@ -170,7 +170,7 @@
+--- chrome/browser/browser_process_impl.cc.orig 2018-06-13 00:10:04.000000000 +0200
++++ chrome/browser/browser_process_impl.cc 2018-07-14 13:27:02.197056000 +0200
+@@ -180,7 +180,7 @@
#include "chrome/browser/media/webrtc/webrtc_log_uploader.h"
#endif
@@ -9,12 +9,12 @@
#include "chrome/browser/resource_coordinator/tab_manager.h"
#endif
-@@ -813,7 +813,7 @@
+@@ -856,7 +856,7 @@
resource_coordinator::TabManager* BrowserProcessImpl::GetTabManager() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- if (!tab_manager_)
- tab_manager_ = base::MakeUnique<resource_coordinator::TabManager>();
- return tab_manager_.get();
+ if (!tab_manager_) {
+ tab_manager_ = std::make_unique<resource_coordinator::TabManager>();
+ tab_lifecycle_unit_source_ =
Modified: head/www/chromium/files/patch-chrome_browser_browser__resources.grd
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_browser__resources.grd Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/files/patch-chrome_browser_browser__resources.grd Sun Jul 22 10:28:49 2018 (r475101)
@@ -1,24 +1,6 @@
---- chrome/browser/browser_resources.grd.orig 2018-02-24 16:25:09.000000000 +0100
-+++ chrome/browser/browser_resources.grd 2018-03-04 09:28:51.895810000 +0100
-@@ -77,7 +77,7 @@
- </if>
- </structures>
- <includes>
-- <if expr="is_win or is_macosx or is_linux">
-+ <if expr="is_win or is_macosx or is_posix">
- <include name="IDR_ABOUT_DISCARDS_CSS" file="resources\discards\discards.css" type="BINDATA" />
- <include name="IDR_ABOUT_DISCARDS_HTML" file="resources\discards\discards.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
- <include name="IDR_ABOUT_DISCARDS_JS" file="resources\discards\discards.js" type="BINDATA" />
-@@ -369,7 +369,7 @@
- <if expr="chromeos">
- <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
- </if>
-- <if expr="desktop_linux or (is_android and enable_plugins)">
-+ <if expr="desktop_linux or (is_android and enable_plugins) or is_posix">
- <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" />
- </if>
- <if expr="is_android">
-@@ -619,7 +619,7 @@
+--- chrome/browser/browser_resources.grd.orig 2018-06-13 00:10:04.000000000 +0200
++++ chrome/browser/browser_resources.grd 2018-07-14 13:48:09.392254000 +0200
+@@ -634,7 +634,7 @@
<include name="IDR_WELCOME_WIN10_PIN_WEBP" file="resources\welcome\pin.webp" type="BINDATA" />
</if>
<include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" />
Modified: head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc Sun Jul 22 10:28:49 2018 (r475101)
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main.cc.orig 2018-03-20 23:05:16.000000000 +0100
-+++ chrome/browser/chrome_browser_main.cc 2018-03-24 22:37:46.110352000 +0100
-@@ -206,7 +206,7 @@
+--- chrome/browser/chrome_browser_main.cc.orig 2018-06-13 00:10:04.000000000 +0200
++++ chrome/browser/chrome_browser_main.cc 2018-07-14 13:55:52.288113000 +0200
+@@ -211,7 +211,7 @@
#include "chromeos/settings/cros_settings_names.h"
#endif // defined(OS_CHROMEOS)
@@ -9,7 +9,7 @@
#include "chrome/browser/first_run/upgrade_util_linux.h"
#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-@@ -244,7 +244,7 @@
+@@ -251,7 +251,7 @@
#endif // defined(OS_WIN)
#if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -18,25 +18,29 @@
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#endif
-@@ -737,7 +737,7 @@
- field_trial_synchronizer_ = new FieldTrialSynchronizer();
+@@ -1342,10 +1342,10 @@
+ }
+ #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX)
+ // Set the product channel for crash reports.
+ breakpad::SetChannelCrashKey(chrome::GetChannelName());
+-#endif // defined(OS_LINUX) || defined(OS_OPENBSD)
++#endif // defined(OS_LINUX)
+
+ #if defined(OS_MACOSX)
+ // Get the Keychain API to register for distributed notifications on the main
+@@ -1369,7 +1369,7 @@
+ }
+
#if defined(OS_WIN) || defined(OS_MACOSX) || \
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD))
metrics::DesktopSessionDurationTracker::Initialize();
#endif
metrics::RendererUptimeTracker::Initialize();
-@@ -1145,7 +1145,7 @@
- }
- #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
-
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX)
- // Set the product channel for crash reports.
- breakpad::SetChannelCrashKey(chrome::GetChannelString());
- #endif // defined(OS_LINUX) || defined(OS_OPENBSD)
-@@ -1351,7 +1351,7 @@
+@@ -1514,7 +1514,7 @@
// Start the tab manager here so that we give the most amount of time for the
// other services to start up before we start adjusting the oom priority.
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 Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc Sun Jul 22 10:28:49 2018 (r475101)
@@ -1,15 +1,15 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2018-02-24 16:25:09.000000000 +0100
-+++ chrome/browser/chrome_content_browser_client.cc 2018-03-03 20:34:31.799512000 +0100
-@@ -281,7 +281,7 @@
+--- 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 @@
#include "chromeos/chromeos_switches.h"
#include "components/user_manager/user_manager.h"
- #include "services/service_manager/public/interfaces/interface_provider_spec.mojom.h"
+ #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
#include "chrome/browser/chrome_browser_main_linux.h"
#elif defined(OS_ANDROID)
#include "base/android/application_status_listener.h"
-@@ -316,7 +316,7 @@
+@@ -342,7 +342,7 @@
#include "chrome/common/importer/profile_import.mojom.h"
#endif
@@ -18,7 +18,7 @@
#include "chrome/browser/webshare/share_service_impl.h"
#endif
-@@ -330,7 +330,7 @@
+@@ -356,7 +356,7 @@
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
#endif
@@ -27,7 +27,7 @@
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
#endif
-@@ -912,7 +912,7 @@
+@@ -1033,7 +1033,7 @@
main_parts = new ChromeBrowserMainPartsMac(parameters);
#elif defined(OS_CHROMEOS)
main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters);
@@ -36,7 +36,7 @@
main_parts = new ChromeBrowserMainPartsLinux(parameters);
#elif defined(OS_ANDROID)
main_parts = new ChromeBrowserMainPartsAndroid(parameters);
-@@ -928,7 +928,7 @@
+@@ -1049,7 +1049,7 @@
// Construct additional browser parts. Stages are called in the order in
// which they are added.
#if defined(TOOLKIT_VIEWS)
@@ -45,7 +45,7 @@
main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
#else
main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
-@@ -1651,7 +1651,7 @@
+@@ -1789,7 +1789,7 @@
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}
@@ -54,7 +54,7 @@
bool enable_crash_reporter = breakpad::IsCrashReporterEnabled();
#if defined(OS_CHROMEOS)
// Chrome OS uses the OS-level crash_reporter for mash services, so disable
-@@ -2913,7 +2913,7 @@
+@@ -3096,7 +3096,7 @@
}
}
@@ -63,7 +63,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
-@@ -2949,7 +2949,7 @@
+@@ -3132,7 +3132,7 @@
}
#endif // defined(OS_ANDROID)
}
@@ -72,7 +72,7 @@
#if defined(OS_WIN)
base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType(
-@@ -3630,7 +3630,7 @@
+@@ -3806,7 +3806,7 @@
#if defined(OS_ANDROID)
frame_interfaces_parameterized_->AddInterface(base::Bind(
&ForwardToJavaWebContentsRegistry<blink::mojom::ShareService>));
Modified: head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h Sun Jul 22 10:28:49 2018 (r475101)
@@ -1,9 +1,9 @@
---- chrome/browser/chrome_content_browser_client.h.orig 2017-12-15 02:04:08.000000000 +0100
-+++ chrome/browser/chrome_content_browser_client.h 2017-12-24 00:50:35.917227000 +0100
-@@ -291,12 +291,12 @@
+--- chrome/browser/chrome_content_browser_client.h.orig 2018-06-13 00:10:04.000000000 +0200
++++ chrome/browser/chrome_content_browser_client.h 2018-07-14 14:13:02.407023000 +0200
+@@ -299,12 +299,12 @@
+ void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
- blink::WebPageVisibilityState* visibility_state) override;
-
+ blink::mojom::PageVisibilityState* visibility_state) override;
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
void GetAdditionalMappedFilesForChildProcess(
Modified: head/www/chromium/files/patch-chrome_browser_download_download__commands.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_download_download__commands.cc Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/files/patch-chrome_browser_download_download__commands.cc Sun Jul 22 10:28:49 2018 (r475101)
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_commands.cc.orig 2017-06-05 19:03:02 UTC
-+++ chrome/browser/download/download_commands.cc
-@@ -219,7 +219,7 @@ bool DownloadCommands::IsCommandChecked(Command comman
+--- chrome/browser/download/download_commands.cc.orig 2018-06-13 00:10:05.000000000 +0200
++++ chrome/browser/download/download_commands.cc 2018-07-14 14:30:03.853964000 +0200
+@@ -249,7 +249,7 @@
return download_item_->GetOpenWhenComplete() ||
download_crx_util::IsExtensionDownload(*download_item_);
case ALWAYS_OPEN_TYPE:
@@ -8,17 +8,17 @@
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
if (CanOpenPdfInSystemViewer()) {
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
- download_item_->GetBrowserContext());
-@@ -263,7 +263,7 @@ void DownloadCommands::ExecuteCommand(Command command)
+ content::DownloadItemUtils::GetBrowserContext(download_item_));
+@@ -293,7 +293,7 @@
bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE);
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
- download_item_->GetBrowserContext());
+ content::DownloadItemUtils::GetBrowserContext(download_item_));
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
if (CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
DownloadItemModel(download_item_)
-@@ -376,7 +376,7 @@ Browser* DownloadCommands::GetBrowser() const {
+@@ -408,7 +408,7 @@
return browser_displayer.browser();
}
@@ -27,7 +27,7 @@
bool DownloadCommands::IsDownloadPdf() const {
base::FilePath path = download_item_->GetTargetFilePath();
return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
-@@ -393,7 +393,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons
+@@ -425,7 +425,7 @@
return IsDownloadPdf() &&
(IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date
: true);
Modified: head/www/chromium/files/patch-chrome_browser_download_download__query.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_download_download__query.cc Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/files/patch-chrome_browser_download_download__query.cc Sun Jul 22 10:28:49 2018 (r475101)
@@ -1,9 +1,9 @@
---- chrome/browser/download/download_query.cc.orig 2017-04-19 19:06:29 UTC
-+++ chrome/browser/download/download_query.cc
+--- chrome/browser/download/download_query.cc.orig 2018-06-13 00:10:05.000000000 +0200
++++ chrome/browser/download/download_query.cc 2018-07-15 13:01:15.987418000 +0200
@@ -27,7 +27,11 @@
+ #include "components/download/public/common/download_item.h"
#include "components/url_formatter/url_formatter.h"
#include "content/public/browser/content_browser_client.h"
- #include "content/public/browser/download_item.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
@@ -11,4 +11,4 @@
+#endif
#include "url/gurl.h"
- using content::DownloadDangerType;
+ using download::DownloadDangerType;
Modified: head/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc Sun Jul 22 10:15:30 2018 (r475100)
+++ head/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc Sun Jul 22 10:28:49 2018 (r475101)
@@ -1,5 +1,5 @@
---- chrome/browser/download/download_status_updater.cc.orig 2017-06-05 19:03:02 UTC
-+++ chrome/browser/download/download_status_updater.cc
+--- chrome/browser/download/download_status_updater.cc.orig 2018-06-13 00:10:05.000000000 +0200
++++ chrome/browser/download/download_status_updater.cc 2018-07-15 13:07:15.012034000 +0200
@@ -13,7 +13,7 @@
#include "base/memory/ptr_util.h"
#include "build/build_config.h"
@@ -9,10 +9,10 @@
#include "ui/views/linux_ui/linux_ui.h"
#endif
-@@ -136,7 +136,7 @@ void DownloadStatusUpdater::OnDownloadUpdated(
+@@ -136,7 +136,7 @@
#if defined(OS_ANDROID) || (defined(USE_AURA) && !defined(OS_WIN))
void DownloadStatusUpdater::UpdateAppIconDownloadProgress(
- content::DownloadItem* download) {
+ download::DownloadItem* download) {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
const views::LinuxUI* linux_ui = views::LinuxUI::instance();
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list