svn commit: r489612 - in head/www/chromium: . files
Carlos J. Puga Medina
cpm at FreeBSD.org
Mon Jan 7 19:47:24 UTC 2019
Author: cpm
Date: Mon Jan 7 19:47:18 2019
New Revision: 489612
URL: https://svnweb.freebsd.org/changeset/ports/489612
Log:
www/chromium: Update to 71.0.3578.98
Changelog: https://chromium.googlesource.com/chromium/src/+log/68.0.3440.106..71.0.3578.98?pretty=fuller&n=10000
PR: 233990
Submitted by: Matthias Wolf <freebsd at rheinwolf.de>
Reported by: nikolaibitinit at gmail.com
Reviewed by: rene, cpm
Approved by: rene, cpm
MFH: 2019Q1
Security: http://vuxml.freebsd.org/freebsd/546d4dd4-10ea-11e9-b407-080027ef1a23.html
Security: http://vuxml.freebsd.org/freebsd/720590df-10eb-11e9-b407-080027ef1a23.html
Added:
head/www/chromium/files/patch-base_posix_can__lower__nice__to.cc (contents, props changed)
head/www/chromium/files/patch-base_task_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc (contents, props changed)
head/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc (contents, props changed)
head/www/chromium/files/patch-build_config_sysroot.gni (contents, props changed)
head/www/chromium/files/patch-build_linux_chrome.map (contents, props changed)
head/www/chromium/files/patch-build_toolchain_gcc_toolchain.gni (contents, props changed)
head/www/chromium/files/patch-chrome_browser_apps_platform_apps_api_music_manager_private_device__id__linux.cc (contents, props changed)
head/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc (contents, props changed)
head/www/chromium/files/patch-chrome_browser_ui_browser__window.h (contents, props changed)
head/www/chromium/files/patch-chrome_browser_web_applications_extensions_web_app_extension_shortcut.cc (contents, props changed)
head/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni (contents, props changed)
head/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h (contents, props changed)
head/www/chromium/files/patch-components_download_quarantine_test_support_linux.cc (contents, props changed)
head/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc (contents, props changed)
head/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h (contents, props changed)
head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc (contents, props changed)
head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h (contents, props changed)
head/www/chromium/files/patch-content_public_common_common__param__traits__macros.h (contents, props changed)
head/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc (contents, props changed)
head/www/chromium/files/patch-media_base_scopedfd__helper.h (contents, props changed)
head/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc (contents, props changed)
head/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc (contents, props changed)
head/www/chromium/files/patch-services_audio_BUILD.gn (contents, props changed)
head/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc (contents, props changed)
head/www/chromium/files/patch-services_network_network__service.cc (contents, props changed)
head/www/chromium/files/patch-services_network_network__service.h (contents, props changed)
head/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c (contents, props changed)
head/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h (contents, props changed)
head/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h (contents, props changed)
head/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__face.cc (contents, props changed)
head/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc (contents, props changed)
head/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h (contents, props changed)
head/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port__test.cc (contents, props changed)
head/www/chromium/files/patch-third__party_pdfium_fxjs_js__define.cpp (contents, props changed)
head/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp (contents, props changed)
head/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_event.h (contents, props changed)
head/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h (contents, props changed)
head/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc (contents, props changed)
head/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc (contents, props changed)
head/www/chromium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h (contents, props changed)
head/www/chromium/files/patch-tools_gn_base_files_file__posix.cc (contents, props changed)
head/www/chromium/files/patch-tools_gn_build_gen.py (contents, props changed)
head/www/chromium/files/patch-tools_gn_tools_gn_args.cc (contents, props changed)
head/www/chromium/files/patch-tools_gn_tools_gn_exec_process.cc (contents, props changed)
head/www/chromium/files/patch-tools_gn_util_exe__path.cc (contents, props changed)
head/www/chromium/files/patch-tools_gn_util_semaphore.cc (contents, props changed)
head/www/chromium/files/patch-tools_gn_util_semaphore.h (contents, props changed)
head/www/chromium/files/patch-tools_gn_util_ticks.cc (contents, props changed)
head/www/chromium/files/patch-ui_base_ui__base__features.cc (contents, props changed)
head/www/chromium/files/patch-ui_base_ui__base__features.h (contents, props changed)
head/www/chromium/files/patch-ui_message_center_public_cpp_message_center_constants.h (contents, props changed)
head/www/chromium/files/patch-ui_message_center_views_message_popup_view.cc (contents, props changed)
head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc (contents, props changed)
Deleted:
head/www/chromium/files/extra-patch-llvm-base
head/www/chromium/files/patch-base_process_process__metrics.cc
head/www/chromium/files/patch-base_process_process__posix.cc
head/www/chromium/files/patch-base_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc
head/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn
head/www/chromium/files/patch-build_linux_unbundle_libwebp.gn
head/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
head/www/chromium/files/patch-chrome_browser_browser__process__impl.h
head/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc
head/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc
head/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc
head/www/chromium/files/patch-chrome_browser_ui_libgtkui_nav_button_provider_gtk3.h
head/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
head/www/chromium/files/patch-chrome_browser_ui_views_profiles_avatar_button.cc
head/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc
head/www/chromium/files/patch-chrome_browser_web__applications_web__app.h
head/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn
head/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc
head/www/chromium/files/patch-components_drive_drive__api__util.cc
head/www/chromium/files/patch-components_json__schema_json__schema__validator.cc
head/www/chromium/files/patch-components_password__manager_core_browser_password_reuse_defines.h
head/www/chromium/files/patch-content_browser_background_fetch_background_fetch_context.cc
head/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.cc
head/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.h
head/www/chromium/files/patch-content_browser_webui_web_ui_impl.cc
head/www/chromium/files/patch-content_browser_webui_web_ui_impl.h
head/www/chromium/files/patch-content_common_view__messages.h
head/www/chromium/files/patch-content_public_browser_web_ui.h
head/www/chromium/files/patch-content_public_browser_web_ui_data_source.h
head/www/chromium/files/patch-content_renderer_input_input_event_prediction.cc
head/www/chromium/files/patch-content_renderer_renderer_main.cc
head/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc
head/www/chromium/files/patch-device_geolocation_location__arbitrator.cc
head/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc
head/www/chromium/files/patch-sandbox_BUILD.gn
head/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.cc
head/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.h
head/www/chromium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_loader.c
head/www/chromium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_vk_loader_platform.h
head/www/chromium/files/patch-third__party_mesa_BUILD.gn
head/www/chromium/files/patch-third__party_pdfium_fxjs_JS_Define.cpp
head/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfgas_fontmgr.cpp
head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp
head/www/chromium/files/patch-third__party_webrtc_rtc_base_httpcommon.cc
head/www/chromium/files/patch-third_party_blink_renderer_bindings_core_v8_v8_script_runner.cc
head/www/chromium/files/patch-third_party_blink_renderer_core_xml_parser_xml_document_parser.cc
head/www/chromium/files/patch-third_party_blink_renderer_platform_image-decoders_jpeg_jpeg_image_decoder.cc
head/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.cc
head/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.h
head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_byte_swap.h
head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_compiler.h
head/www/chromium/files/patch-third_party_googletest_src_googletest_test_gtest-port_test.cc
head/www/chromium/files/patch-third_party_perfetto_src_base_unix_task_runner.cc
head/www/chromium/files/patch-third_party_perfetto_src_tracing_core_service_impl.cc
head/www/chromium/files/patch-tools_gn_args.cc
head/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.cc
head/www/chromium/files/patch-ui_gl_gl_implementation.cc
head/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc
head/www/chromium/files/patch-ui_message__center_views_toast__contents__view.cc
head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc
head/www/chromium/files/patch-ui_views_mus_aura__init.cc
head/www/chromium/files/patch-ui_views_mus_aura__init.h
head/www/chromium/files/patch-ui_views_widget_desktop_aura_desktop_screen_x11.cc
Modified:
head/www/chromium/Makefile
head/www/chromium/Makefile.tests
head/www/chromium/distinfo
head/www/chromium/files/patch-base_BUILD.gn
head/www/chromium/files/patch-base_allocator_partition_allocator_partition_alloc_unittest.cc
head/www/chromium/files/patch-build_config_BUILDCONFIG.gn
head/www/chromium/files/patch-build_config_compiler_BUILD.gn
head/www/chromium/files/patch-cc_BUILD.gn
head/www/chromium/files/patch-chrome_app_chrome__main.cc
head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
head/www/chromium/files/patch-chrome_app_generated__resources.grd
head/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc
head/www/chromium/files/patch-chrome_browser_about__flags.cc
head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
head/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
head/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
head/www/chromium/files/patch-chrome_browser_download_download__commands.cc
head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc
head/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
head/www/chromium/files/patch-chrome_browser_flag__descriptions.h
head/www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc
head/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
head/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.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-chrome_renderer_pepper_pepper__flash__font__file__host.cc
head/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h
head/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc
head/www/chromium/files/patch-components_autofill_strings.grdp
head/www/chromium/files/patch-components_crash_content_app_BUILD.gn
head/www/chromium/files/patch-components_download_quarantine_quarantine_linux.cc
head/www/chromium/files/patch-components_os__crypt_os__crypt.h
head/www/chromium/files/patch-content_app_content_main_runner_impl.cc
head/www/chromium/files/patch-content_browser_BUILD.gn
head/www/chromium/files/patch-content_gpu_gpu__main.cc
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-extensions_common_image__util.cc
head/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc
head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h
head/www/chromium/files/patch-headless_lib_headless__macros.h
head/www/chromium/files/patch-media_base_video__frame.cc
head/www/chromium/files/patch-media_base_video__frame.h
head/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
head/www/chromium/files/patch-net_base_address__tracker__linux.cc
head/www/chromium/files/patch-net_features.gni
head/www/chromium/files/patch-net_socket_udp__socket__posix.cc
head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h
head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc
head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h
head/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc
head/www/chromium/files/patch-services_network_network_sandbox_hook_linux.cc
head/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn
head/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn
head/www/chromium/files/patch-third__party_angle_BUILD.gn
head/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline_opts.h
head/www/chromium/files/patch-third__party_sqlite_BUILD.gn
head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp
head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES_CM_libGLES_CM.hpp
head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp
head/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.cc
head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.cc
head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.h
head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_threading_pthreads.cc
head/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_symbolic_constants_posix.cc
head/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py
head/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py
head/www/chromium/files/patch-ui_gfx_font__list.cc
head/www/chromium/files/patch-ui_gfx_font__render__params.h
head/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.h
head/www/chromium/files/patch-ui_gl_BUILD.gn
head/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.cc
head/www/chromium/files/patch-ui_gl_gl_fence.cc
head/www/chromium/files/patch-ui_views_window_frame_background.cc
head/www/chromium/pkg-plist
Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile Mon Jan 7 19:40:53 2019 (r489611)
+++ head/www/chromium/Makefile Mon Jan 7 19:47:18 2019 (r489612)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 68.0.3440.106
-PORTREVISION= 7
+PORTVERSION= 71.0.3578.98
CATEGORIES?= www
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
LOCAL/cpm/chromium/:fonts
@@ -25,6 +24,7 @@ BUILD_DEPENDS+= gperf:devel/gperf \
ffmpeg>=3.2.2,1:multimedia/ffmpeg \
flock:sysutils/flock \
node:www/node \
+ ${LOCALBASE}/bin/ar:devel/binutils \
${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}
@@ -32,6 +32,7 @@ BUILD_DEPENDS+= gperf:devel/gperf \
.if !defined(GN_ONLY)
LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \
+ libatspi.so:accessibility/at-spi2-core \
libspeechd.so:accessibility/speech-dispatcher \
libsnappy.so:archivers/snappy \
libFLAC.so:audio/flac \
@@ -72,11 +73,12 @@ ONLY_FOR_ARCHS= aarch64 amd64 i386
USES= compiler:c++14-lang localbase:ldflags ninja pkgconfig \
python:2.7,build shebangfix tar:xz
.else
-USES= bison cpe desktop-file-utils gnome jpeg localbase:ldflags \
+USES= bison cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \
ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz
.endif
MAKE_ARGS= -C out/${BUILDTYPE}
BINARY_ALIAS= python=${PYTHON_CMD}
+DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
.if !defined(GN_ONLY)
CPE_VENDOR= google
@@ -107,6 +109,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \
enable_remoting=false \
fieldtrial_testing_like_official_build=true \
is_clang=true \
+ jumbo_file_merge_limit=8 \
toolkit_views=true \
treat_warnings_as_errors=false \
use_allocator="none" \
@@ -115,7 +118,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \
use_bundled_fontconfig=false \
use_custom_libcxx=false \
use_gnome_keyring=false \
- use_gtk3=true \
+ use_jumbo_build=true \
use_lld=true \
use_sysroot=false \
use_system_freetype=true \
@@ -125,7 +128,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \
extra_ldflags="${LDFLAGS}"
# TODO: investigate building with these options:
# use_system_minigbm
-GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild
+GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles
# FreeBSD Chromium Api Key
# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
@@ -206,13 +209,13 @@ TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${
# swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
.if ${ARCH} == aarch64
-PLIST_SUB+= NOT_AARCH64="@comment "
+PLIST_SUB+= NOT_AARCH64="@comment "
.else
PLIST_SUB+= NOT_AARCH64=""
.endif
-BUILD_DEPENDS+= ${LOCALBASE}/bin/ar:devel/binutils
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-llvm-base
+# Allow relocations against read-only segments (override lld default)
+LDFLAGS_i386= -Wl,-znotext
# TODO: -isystem, would be just as ugly as this approach, but more reliably
# build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set.
@@ -266,6 +269,7 @@ do-configure:
.endif
do-test-TEST-on:
+ cd ${WRKSRC}/out/${BUILDTYPE}/gn_build && ./gn_unittests
.for t in ${TEST_TARGETS}
cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
@@ -276,7 +280,6 @@ do-install:
@${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \
${STAGEDIR}${MANPREFIX}/man/man1/chrome.1
- ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.service ${STAGEDIR}${DATADIR}
.for s in 22 24 48 64 128 256
@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \
Modified: head/www/chromium/Makefile.tests
==============================================================================
--- head/www/chromium/Makefile.tests Mon Jan 7 19:40:53 2019 (r489611)
+++ head/www/chromium/Makefile.tests Mon Jan 7 19:47:18 2019 (r489612)
@@ -2,7 +2,6 @@
TEST_TARGETS= base_unittests \
chromedriver_unittests \
crypto_unittests \
- gn_unittests \
headless_unittests \
printing_unittests \
url_unittests
Modified: head/www/chromium/distinfo
==============================================================================
--- head/www/chromium/distinfo Mon Jan 7 19:40:53 2019 (r489611)
+++ head/www/chromium/distinfo Mon Jan 7 19:47:18 2019 (r489612)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1534764533
-SHA256 (chromium-68.0.3440.106.tar.xz) = 7021040635a0a0d47f699bdb22e3ef5c91482e4f51b428d1de3016da95f0e698
-SIZE (chromium-68.0.3440.106.tar.xz) = 630289544
-SHA256 (chromium-68.0.3440.106-testdata.tar.xz) = 2a736b339f7cbf9fd26901666f17f53b51f7191ed2f64ea65fb8afe638a1633b
-SIZE (chromium-68.0.3440.106-testdata.tar.xz) = 310263984
+TIMESTAMP = 1544905827
+SHA256 (chromium-71.0.3578.98.tar.xz) = 1c56a9e30825774c83d568d194e9585625c6e90f81ee0ef09760fcedc86b9d45
+SIZE (chromium-71.0.3578.98.tar.xz) = 633860888
+SHA256 (chromium-71.0.3578.98-testdata.tar.xz) = 5559bc92d6fbf17e88828dbeb94015d2f7998a12e2d0fe27a33096f7c16b434f
+SIZE (chromium-71.0.3578.98-testdata.tar.xz) = 350636612
SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1
SIZE (test_fonts.tar.xz) = 200040
Modified: head/www/chromium/files/patch-base_BUILD.gn
==============================================================================
--- head/www/chromium/files/patch-base_BUILD.gn Mon Jan 7 19:40:53 2019 (r489611)
+++ head/www/chromium/files/patch-base_BUILD.gn Mon Jan 7 19:47:18 2019 (r489612)
@@ -1,15 +1,15 @@
---- base/BUILD.gn.orig 2017-12-15 02:04:05.000000000 +0100
-+++ base/BUILD.gn 2017-12-30 01:18:00.438461000 +0100
-@@ -1125,7 +1125,7 @@
+--- base/BUILD.gn.orig 2018-12-03 21:16:32.000000000 +0100
++++ base/BUILD.gn 2018-12-05 13:50:51.133919000 +0100
+@@ -1182,7 +1182,7 @@
# Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
- if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) &&
+ if (!use_sysroot && (is_android || (is_linux && !is_chromecast) && !is_clang) &&
host_toolchain != "//build/toolchain/cros:host") {
- libs = [ "atomic" ]
+ libs += [ "atomic" ]
}
-@@ -1151,7 +1151,7 @@
+@@ -1208,7 +1208,7 @@
"allocator/allocator_shim_override_glibc_weak_symbols.h",
]
deps += [ "//base/allocator:tcmalloc" ]
@@ -18,16 +18,7 @@
sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
} else if (is_android && use_allocator == "none") {
sources += [
-@@ -1539,7 +1539,7 @@
- "//base/third_party/xdg_user_dirs",
- ]
- } else {
-- # Non-Linux.
-+ # Non-Linux/BSD.
- sources -= [
- "nix/mime_util_xdg.cc",
- "nix/mime_util_xdg.h",
-@@ -1555,6 +1555,33 @@
+@@ -1740,6 +1740,33 @@
}
}
@@ -61,7 +52,7 @@
# iOS
if (is_ios) {
set_sources_assignment_filter([])
-@@ -2389,6 +2416,12 @@
+@@ -2753,6 +2780,12 @@
]
set_sources_assignment_filter(sources_assignment_filter)
}
Modified: head/www/chromium/files/patch-base_allocator_partition_allocator_partition_alloc_unittest.cc
==============================================================================
--- head/www/chromium/files/patch-base_allocator_partition_allocator_partition_alloc_unittest.cc Mon Jan 7 19:40:53 2019 (r489611)
+++ head/www/chromium/files/patch-base_allocator_partition_allocator_partition_alloc_unittest.cc Mon Jan 7 19:47:18 2019 (r489612)
@@ -1,11 +1,11 @@
---- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2018-08-23 19:18:25.616099000 +0200
-+++ base/allocator/partition_allocator/partition_alloc_unittest.cc 2018-08-23 19:34:45.738651000 +0200
-@@ -1297,7 +1297,7 @@
- // not provide a working setrlimit().
- #if !defined(ARCH_CPU_64_BITS) || \
- (defined(OS_POSIX) && \
-- !(defined(OS_FUCHSIA) || defined(OS_MACOSX) || defined(OS_ANDROID)))
-+ !(defined(OS_FUCHSIA) || defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_BSD)))
+--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2018-12-04 10:27:52.648233000 +0100
++++ base/allocator/partition_allocator/partition_alloc_unittest.cc 2018-12-04 10:31:38.008927000 +0100
+@@ -1324,7 +1324,7 @@
+ #if !defined(OS_WIN) && \
+ (!defined(ARCH_CPU_64_BITS) || \
+ (defined(OS_POSIX) && \
+- !(defined(OS_FUCHSIA) || defined(OS_MACOSX) || defined(OS_ANDROID))))
++ !(defined(OS_FUCHSIA) || defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_BSD))))
- // This is defined as a separate test class because RepeatedReturnNull
- // test exhausts the process memory, and breaks any test in the same
+ // The following four tests wrap a called function in an expect death statement
+ // to perform their test, because they are non-hermetic. Specifically they are
Added: head/www/chromium/files/patch-base_posix_can__lower__nice__to.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base_posix_can__lower__nice__to.cc Mon Jan 7 19:47:18 2019 (r489612)
@@ -0,0 +1,20 @@
+--- base/posix/can_lower_nice_to.cc.orig 2018-12-12 22:56:01.000000000 +0100
++++ base/posix/can_lower_nice_to.cc 2018-12-16 00:34:34.602103000 +0100
+@@ -31,6 +31,9 @@
+ if (geteuid() == 0)
+ return true;
+
++#if defined(OS_BSD)
++ return false;
++#else
+ // 2. Skip checking the CAP_SYS_NICE permission because it would require
+ // libcap.so.
+
+@@ -54,6 +57,7 @@
+ // And lowering niceness to |nice_value| is allowed if it is greater than or
+ // equal to the limit:
+ return nice_value >= lowest_nice_allowed;
++#endif
+ }
+
+ } // namespace internal
Added: head/www/chromium/files/patch-base_task_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base_task_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc Mon Jan 7 19:47:18 2019 (r489612)
@@ -0,0 +1,12 @@
+--- base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc.orig 2018-12-12 22:56:01.000000000 +0100
++++ base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc 2018-12-16 01:43:12.295373000 +0100
+@@ -295,6 +295,9 @@
+ EXPECT_EQ(ThreadPriority::NORMAL, thread_priority_normal);
+ }
+
++#if defined(OS_BSD)
++#define ThreadNamesSet DISABLED_ThreadNamesSet
++#endif
+ TEST_P(TaskSchedulerSingleThreadTaskRunnerManagerCommonTest, ThreadNamesSet) {
+ constexpr TaskTraits foo_traits = {TaskPriority::BEST_EFFORT,
+ TaskShutdownBehavior::BLOCK_SHUTDOWN};
Added: head/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc Mon Jan 7 19:47:18 2019 (r489612)
@@ -0,0 +1,17 @@
+--- base/test/generate_fontconfig_caches.cc.orig 2018-12-16 02:19:42.000000000 +0100
++++ base/test/generate_fontconfig_caches.cc 2018-12-16 02:19:45.432130000 +0100
+@@ -57,7 +57,14 @@
+ base::TearDownFontconfig();
+
+ // Check existence of intended fontconfig cache file.
++#if defined(OS_BSD)
++ // Our version of fontconfig is too old to respect .uuid files in font directories,
++ // so we check for the CACHEDIR.TAG file instead
+ CHECK(base::PathExists(
++ fontconfig_caches.Append("CACHEDIR.TAG")));
++#else
++ CHECK(base::PathExists(
+ fontconfig_caches.Append(base::StrCat({uuid, "-le64.cache-7"}))));
++#endif
+ return 0;
+ }
Modified: head/www/chromium/files/patch-build_config_BUILDCONFIG.gn
==============================================================================
--- head/www/chromium/files/patch-build_config_BUILDCONFIG.gn Mon Jan 7 19:40:53 2019 (r489611)
+++ head/www/chromium/files/patch-build_config_BUILDCONFIG.gn Mon Jan 7 19:47:18 2019 (r489612)
@@ -1,5 +1,5 @@
---- 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
+--- build/config/BUILDCONFIG.gn.orig 2018-12-12 22:56:02.000000000 +0100
++++ build/config/BUILDCONFIG.gn 2018-12-15 22:33:58.610110000 +0100
@@ -131,10 +131,10 @@
is_official_build = false
@@ -33,31 +33,31 @@
# See comments in build/toolchain/cros/BUILD.gn about board compiles.
if (is_clang) {
_default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
-@@ -300,6 +300,7 @@
+@@ -301,6 +301,7 @@
is_nacl = false
is_posix = false
is_win = true
+ is_bsd = false
} else if (current_os == "mac") {
+ is_aix = false
is_android = false
- is_chromeos = false
-@@ -310,6 +311,7 @@
+@@ -312,6 +313,7 @@
is_nacl = false
is_posix = true
is_win = false
+ is_bsd = false
} else if (current_os == "android") {
+ is_aix = false
is_android = true
- is_chromeos = false
-@@ -320,6 +322,7 @@
+@@ -323,6 +325,7 @@
is_nacl = false
is_posix = true
is_win = false
+ is_bsd = false
} else if (current_os == "chromeos") {
+ is_aix = false
is_android = false
- is_chromeos = true
-@@ -330,6 +333,7 @@
+@@ -334,6 +337,7 @@
is_nacl = false
is_posix = true
is_win = false
@@ -65,44 +65,45 @@
} 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
-@@ -343,6 +347,7 @@
+@@ -348,6 +352,7 @@
is_nacl = true
is_posix = true
is_win = false
+ is_bsd = false
} else if (current_os == "fuchsia") {
+ is_aix = false
is_android = false
- is_chromeos = false
-@@ -353,6 +358,7 @@
+@@ -359,6 +364,7 @@
is_nacl = false
is_posix = false
is_win = false
+ is_bsd = false
} else if (current_os == "ios") {
+ is_aix = false
is_android = false
- is_chromeos = false
-@@ -363,6 +369,7 @@
+@@ -370,6 +376,7 @@
is_nacl = false
is_posix = true
is_win = false
+ is_bsd = false
} else if (current_os == "linux") {
+ is_aix = false
is_android = false
- is_chromeos = false
-@@ -373,6 +380,7 @@
+@@ -381,6 +388,7 @@
is_nacl = false
is_posix = true
is_win = false
+ is_bsd = false
} else if (current_os == "aix") {
+ is_aix = true
is_android = false
- is_chromeos = false
-@@ -383,6 +391,18 @@
+@@ -392,6 +400,19 @@
is_nacl = false
is_posix = true
is_win = false
+ is_bsd = false
+} else if (current_os == "bsd") {
++ is_aix = false
+ is_android = false
+ is_chromeos = false
+ is_fuchsia = false
Modified: head/www/chromium/files/patch-build_config_compiler_BUILD.gn
==============================================================================
--- head/www/chromium/files/patch-build_config_compiler_BUILD.gn Mon Jan 7 19:40:53 2019 (r489611)
+++ head/www/chromium/files/patch-build_config_compiler_BUILD.gn Mon Jan 7 19:47:18 2019 (r489612)
@@ -1,6 +1,6 @@
---- 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 @@
+--- build/config/compiler/BUILD.gn.orig 2018-12-12 22:56:02.000000000 +0100
++++ build/config/compiler/BUILD.gn 2018-12-16 01:04:15.942884000 +0100
+@@ -53,7 +53,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 =
@@ -9,7 +9,7 @@
(current_cpu == "x64" || current_cpu == "x86")
binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
root_build_dir)
-@@ -266,7 +266,7 @@
+@@ -274,7 +274,7 @@
# Linker warnings.
if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
!(is_android && use_order_profiling) && !is_mac && !is_ios &&
@@ -18,11 +18,14 @@
# 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 @@
+@@ -391,15 +391,6 @@
"-Wl,-z,now",
"-Wl,-z,relro",
]
-- if (!using_sanitizer) {
+-
+- # Compiler instrumentation can introduce dependencies in DSOs to symbols in
+- # the executable they are loaded into, so they are unresolved at link-time.
+- if (!using_sanitizer && !is_safestack) {
- ldflags += [
- "-Wl,-z,defs",
- "-Wl,--as-needed",
@@ -31,16 +34,16 @@
}
# Linux-specific compiler flags setup.
-@@ -489,7 +483,7 @@
+@@ -502,7 +493,7 @@
+ }
}
- if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
-- target_os != "chromeos") {
-+ target_os != "chromeos" && !is_bsd) {
+- if (is_clang && !is_nacl && !use_xcode_clang) {
++ if (is_clang && !is_nacl && !use_xcode_clang && !is_bsd) {
cflags += [
# TODO(hans): Remove this once Clang generates better optimized debug info
# by default. https://crbug.com/765793
-@@ -734,7 +728,7 @@
+@@ -793,7 +784,7 @@
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@@ -49,18 +52,21 @@
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
}
-@@ -1415,10 +1409,6 @@
-
- # TODO(hans): https://crbug.com/766891
- "-Wno-null-pointer-arithmetic",
+@@ -1498,13 +1489,6 @@
+ cflags += [
+ # TODO(thakis): https://crbug.com/753973
+ "-Wno-enum-compare-switch",
-
-- # 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 @@
+- # Ignore warnings about MSVC optimization pragmas.
+- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
+- "-Wno-ignored-pragma-optimize",
+-
+- # TODO(hans): https://crbug.com/890307
+- "-Wno-defaulted-function-deleted",
+ ]
+ }
+ }
+@@ -1691,7 +1675,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).
@@ -69,7 +75,7 @@
arflags = [ "-T" ]
}
}
-@@ -2119,7 +2109,7 @@
+@@ -2264,7 +2248,7 @@
# [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f
cflags += [ "-gdwarf-3" ]
}
@@ -78,10 +84,10 @@
}
if (use_debug_fission && !is_nacl && !is_android) {
# NOTE: Some Chrome OS builds globally set |use_debug_fission| to true,
-@@ -2139,7 +2129,7 @@
+@@ -2284,7 +2268,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" &&
+ if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" &&
- (use_gold || use_lld)) {
+ (use_gold || use_lld) && !is_bsd) {
if (is_clang) {
Added: head/www/chromium/files/patch-build_config_sysroot.gni
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-build_config_sysroot.gni Mon Jan 7 19:47:18 2019 (r489612)
@@ -0,0 +1,15 @@
+--- build/config/sysroot.gni.orig 2018-12-12 22:56:02.000000000 +0100
++++ build/config/sysroot.gni 2018-12-15 22:15:59.771804000 +0100
+@@ -15,9 +15,10 @@
+ # The absolute path to directory containing linux sysroot images
+ target_sysroot_dir = "//build/linux"
+
+- use_sysroot = current_cpu == "x86" || current_cpu == "x64" ||
++ use_sysroot = !is_bsd && (
++ current_cpu == "x86" || current_cpu == "x64" ||
+ current_cpu == "arm" || current_cpu == "arm64" ||
+- current_cpu == "mipsel" || current_cpu == "mips64el"
++ current_cpu == "mipsel" || current_cpu == "mips64el")
+ }
+
+ if (current_os == target_os && current_cpu == target_cpu &&
Added: head/www/chromium/files/patch-build_linux_chrome.map
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-build_linux_chrome.map Mon Jan 7 19:47:18 2019 (r489612)
@@ -0,0 +1,29 @@
+--- build/linux/chrome.map.orig 2018-08-08 19:10:32 UTC
++++ build/linux/chrome.map
+@@ -1,4 +1,7 @@
+ {
++local:
++ *;
++
+ global:
+ __bss_start;
+ __data_start;
+@@ -20,6 +23,10 @@ global:
+ # Program entry point.
+ _start;
+
++ # FreeBSD specific variables.
++ __progname;
++ environ;
++
+ # Memory allocation symbols. We want chrome and any libraries to
+ # share the same heap, so it is correct to export these symbols.
+ calloc;
+@@ -81,7 +88,4 @@ global:
+ localtime64;
+ localtime64_r;
+ localtime_r;
+-
+-local:
+- *;
+ };
Added: head/www/chromium/files/patch-build_toolchain_gcc_toolchain.gni
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-build_toolchain_gcc_toolchain.gni Mon Jan 7 19:47:18 2019 (r489612)
@@ -0,0 +1,45 @@
+--- build/toolchain/gcc_toolchain.gni.orig 2018-03-20 23:05:14.000000000 +0100
++++ build/toolchain/gcc_toolchain.gni 2018-06-18 20:55:17.080248000 +0200
+@@ -25,6 +25,11 @@
+ rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py",
+ root_build_dir) + " --mode=clang"
+
++declare_args() {
++ extra_cxxflags = ""
++ extra_ldflags = ""
++}
++
+ # This template defines a toolchain for something that works like gcc
+ # (including clang).
+ #
+@@ -596,13 +601,23 @@
+ }
+
+ gcc_toolchain(target_name) {
+- prefix = rebase_path("$clang_base_path/bin", root_build_dir)
+- cc = "$prefix/clang"
+- cxx = "$prefix/clang++"
+- ld = cxx
+- readelf = "${toolprefix}readelf"
+- ar = "${prefix}/llvm-ar"
+- nm = "${toolprefix}nm"
++ if (is_bsd) {
++ prefix = "/usr/local/bin"
++ cc = "cc"
++ cxx = "c++"
++ ld = cxx
++ readelf = "readelf"
++ ar = "${prefix}/ar"
++ nm = "${toolprefix}nm"
++ } else {
++ prefix = rebase_path("$clang_base_path/bin", root_build_dir)
++ cc = "$prefix/clang"
++ cxx = "$prefix/clang++"
++ ld = cxx
++ readelf = "${toolprefix}readelf"
++ ar = "${prefix}/llvm-ar"
++ nm = "${toolprefix}nm"
++ }
+
+ forward_variables_from(invoker,
+ [
Modified: head/www/chromium/files/patch-cc_BUILD.gn
==============================================================================
--- head/www/chromium/files/patch-cc_BUILD.gn Mon Jan 7 19:40:53 2019 (r489611)
+++ head/www/chromium/files/patch-cc_BUILD.gn Mon Jan 7 19:47:18 2019 (r489612)
@@ -1,22 +1,21 @@
---- cc/BUILD.gn.orig 2017-12-30 06:26:13.722587000 +0100
-+++ cc/BUILD.gn 2017-12-30 06:26:46.042197000 +0100
-@@ -541,7 +541,7 @@
+--- cc/BUILD.gn.orig 2018-11-19 19:55:02.000000000 +0100
++++ cc/BUILD.gn 2018-12-04 13:07:27.981323000 +0100
+@@ -551,7 +551,7 @@
"//ui/gl:test_support",
"//ui/latency",
]
- if (!is_android) {
+ if (!is_android && !is_bsd) {
data_deps = [
- "//third_party/mesa:osmesa",
+ "//third_party/mesa_headers",
]
-@@ -717,10 +717,6 @@
+@@ -751,9 +751,6 @@
"//ui/gfx/geometry",
"//ui/gl",
"//ui/gl:test_support",
- ]
--
- data_deps = [
-- "//third_party/mesa:osmesa",
+- "//third_party/mesa_headers",
]
}
Modified: head/www/chromium/files/patch-chrome_app_chrome__main.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_app_chrome__main.cc Mon Jan 7 19:40:53 2019 (r489611)
+++ head/www/chromium/files/patch-chrome_app_chrome__main.cc Mon Jan 7 19:47:18 2019 (r489612)
@@ -1,19 +1,16 @@
---- chrome/app/chrome_main.cc.orig 2017-09-05 21:05:12.000000000 +0200
-+++ chrome/app/chrome_main.cc 2017-09-06 17:23:42.720920000 +0200
-@@ -99,14 +99,14 @@
- ALLOW_UNUSED_LOCAL(command_line);
+--- chrome/app/chrome_main.cc.orig 2018-12-03 21:16:35.000000000 +0100
++++ chrome/app/chrome_main.cc 2018-12-05 14:12:24.772160000 +0100
+@@ -93,11 +93,11 @@
+ #endif
// Chrome-specific process modes.
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
if (command_line->HasSwitch(switches::kHeadless)) {
- #if defined(OS_MACOSX)
- SetUpBundleOverrides();
- #endif
return headless::HeadlessShellMain(params);
}
-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- #if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING)
- #if !defined(OS_WIN) || defined(COMPONENT_BUILD) || \
+ int rv = content::ContentMain(params);
+
Modified: head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc Mon Jan 7 19:40:53 2019 (r489611)
+++ head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc Mon Jan 7 19:47:18 2019 (r489612)
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig 2018-02-24 16:25:09.000000000 +0100
-+++ chrome/app/chrome_main_delegate.cc 2018-03-03 20:07:40.484969000 +0100
-@@ -98,7 +98,7 @@
+--- chrome/app/chrome_main_delegate.cc.orig 2018-12-12 22:56:02.000000000 +0100
++++ chrome/app/chrome_main_delegate.cc 2019-01-04 00:08:47.109460000 +0100
+@@ -99,7 +99,7 @@
#include "chrome/app/shutdown_signal_handlers_posix.h"
#endif
@@ -18,7 +18,7 @@
#include "base/environment.h"
#endif
-@@ -238,7 +238,7 @@
+@@ -233,7 +233,7 @@
#endif // defined(OS_WIN)
@@ -27,7 +27,7 @@
void AdjustLinuxOOMScore(const std::string& process_type) {
// Browsers and zygotes should still be killable, but killed last.
const int kZygoteScore = 0;
-@@ -407,7 +407,7 @@
+@@ -401,7 +401,7 @@
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@@ -36,7 +36,7 @@
// On Linux, Chrome does not support running multiple copies under different
// DISPLAYs, so the profile directory can be specified in the environment to
// support the virtual desktop use-case.
-@@ -581,7 +581,7 @@
+@@ -595,7 +595,7 @@
#if defined(OS_CHROMEOS)
chromeos::RegisterPathProvider();
#endif
@@ -45,34 +45,16 @@
nacl::RegisterPathProvider();
#endif
-@@ -603,7 +603,7 @@
- std::string format_str =
- command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
- if (format_str == "machine") {
-- format = diagnostics::DiagnosticsWriter::MACHINE;
-+ format = diagnostics::DiagnosticsWriter::THEMACHINE;
- } else if (format_str == "log") {
- format = diagnostics::DiagnosticsWriter::LOG;
- } else {
-@@ -653,7 +653,7 @@
- std::string format_str =
- command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
- if (format_str == "machine") {
-- format = diagnostics::DiagnosticsWriter::MACHINE;
-+ format = diagnostics::DiagnosticsWriter::THEMACHINE;
- } else if (format_str == "human") {
- format = diagnostics::DiagnosticsWriter::HUMAN;
- } else {
-@@ -915,7 +915,7 @@
+@@ -912,7 +912,7 @@
InitializePDF();
#endif
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
// Zygote needs to call InitCrashReporter() in RunZygote().
- if (process_type != switches::kZygoteProcess) {
+ if (process_type != service_manager::switches::kZygoteProcess) {
#if defined(OS_ANDROID)
-@@ -931,7 +931,7 @@
+@@ -928,7 +928,7 @@
breakpad::InitCrashReporter(process_type);
#endif // defined(OS_ANDROID)
}
@@ -81,7 +63,7 @@
// After all the platform Breakpads have been initialized, store the command
// line for crash reporting.
-@@ -941,7 +941,7 @@
+@@ -938,7 +938,7 @@
void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {
// Note: If you are adding a new process type below, be sure to adjust the
// AdjustLinuxOOMScore function too.
Modified: head/www/chromium/files/patch-chrome_app_generated__resources.grd
==============================================================================
--- head/www/chromium/files/patch-chrome_app_generated__resources.grd Mon Jan 7 19:40:53 2019 (r489611)
+++ head/www/chromium/files/patch-chrome_app_generated__resources.grd Mon Jan 7 19:47:18 2019 (r489612)
@@ -1,24 +1,24 @@
---- chrome/app/generated_resources.grd.orig 2018-02-24 16:25:09.000000000 +0100
-+++ chrome/app/generated_resources.grd 2018-03-03 20:22:12.855371000 +0100
-@@ -6919,7 +6919,7 @@
- Google Payments
- </message>
+--- chrome/app/generated_resources.grd.orig 2018-11-19 19:55:02.000000000 +0100
++++ chrome/app/generated_resources.grd 2018-12-04 14:09:27.327735000 +0100
+@@ -5265,7 +5265,7 @@
+ </message>
+ </if>
-- <if expr="not is_linux or chromeos">
-+ <if expr="not is_posix or chromeos">
- <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group">
- Themes
+- <if expr="is_win or (is_linux and not chromeos)">
++ <if expr="is_win or (is_posix and not chromeos)">
+ <message name="IDS_QUIT_ACCELERATOR_TUTORIAL" desc="Instructions for how the user should quit using keyboard shortcuts.">
+ Press |<ph name="ACCELERATOR1">$1<ex>Ctrl</ex></ph>|+|<ph name="ACCELERATOR2">$2<ex>Shift</ex></ph>| followed by |<ph name="ACCELERATOR3">$3<ex>Q</ex></ph>| to exit
</message>
-@@ -6927,7 +6927,7 @@
- <message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme">
- Reset to default theme
+@@ -6117,7 +6117,7 @@
+ Google Pay
</message>
+
- <if expr="is_linux and not chromeos">
+ <if expr="is_posix and not chromeos">
- <message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme.">
- Use GTK+ theme
+ <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
+ Use system title bar and borders
</message>
-@@ -8076,7 +8076,7 @@
+@@ -6942,7 +6942,7 @@
Set as default
</message>
Modified: head/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc Mon Jan 7 19:40:53 2019 (r489611)
+++ head/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc Mon Jan 7 19:47:18 2019 (r489612)
@@ -1,22 +1,15 @@
---- chrome/app/shutdown_signal_handlers_posix.cc.orig 2017-06-05 19:03:01 UTC
-+++ chrome/app/shutdown_signal_handlers_posix.cc
-@@ -183,6 +183,11 @@ void InstallShutdownSignalHandlers(
+--- chrome/app/shutdown_signal_handlers_posix.cc.orig 2018-12-03 21:16:37.000000000 +0100
++++ chrome/app/shutdown_signal_handlers_posix.cc 2018-12-05 14:20:17.094777000 +0100
+@@ -183,7 +183,11 @@
g_pipe_pid = getpid();
g_shutdown_pipe_read_fd = pipefd[0];
g_shutdown_pipe_write_fd = pipefd[1];
+-#if !defined(ADDRESS_SANITIZER)
+#if defined(OS_BSD)
+ // PTHREAD_STACK_MIN causes chromium to crash under FreeBSD,
+ // we request the default pthread stack size by specifying 0 here.
+ const size_t kShutdownDetectorThreadStackSize = 0;
-+#else
- #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
++#elif !defined(ADDRESS_SANITIZER)
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
#else
-@@ -190,6 +195,7 @@ void InstallShutdownSignalHandlers(
- // shadow stacks) bloat the stack frames, so we need to increase the stack
- // size to avoid hitting the guard page.
- const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
-+#endif
- #endif
- ShutdownDetector* detector = new ShutdownDetector(
- g_shutdown_pipe_read_fd, shutdown_callback, task_runner);
+ // ASan instrumentation bloats the stack frames, so we need to increase the
Modified: head/www/chromium/files/patch-chrome_browser_about__flags.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_about__flags.cc Mon Jan 7 19:40:53 2019 (r489611)
+++ head/www/chromium/files/patch-chrome_browser_about__flags.cc Mon Jan 7 19:47:18 2019 (r489612)
@@ -1,15 +1,45 @@
---- 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
+--- chrome/browser/about_flags.cc.orig 2018-12-12 22:56:02.000000000 +0100
++++ chrome/browser/about_flags.cc 2018-12-28 16:40:37.628497000 +0100
+@@ -884,7 +884,7 @@
+ {"(Black on GoogleYellow050)", kAutofillPreviewStyleBlackOnYellow050,
+ base::size(kAutofillPreviewStyleBlackOnYellow050), nullptr}};
+
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ const FeatureEntry::FeatureParam kAutofillPrimaryInfoStyleMedium[] = {
+ {autofill::kAutofillForcedFontWeightParameterName,
+ autofill::kAutofillForcedFontWeightParameterMedium},
+@@ -2609,12 +2609,12 @@
+ {"force-text-direction", flag_descriptions::kForceTextDirectionName,
+ flag_descriptions::kForceTextDirectionDescription, kOsAll,
+ MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
{"enable-input-ime-api", flag_descriptions::kEnableInputImeApiName,
flag_descriptions::kEnableInputImeApiDescription, kOsWin | kOsLinux,
ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI,
-@@ -3024,7 +3024,7 @@
+ 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)},
+@@ -2813,12 +2813,12 @@
+ FEATURE_VALUE_TYPE(
+ password_manager::features::kPasswordsKeyboardAccessory)},
+ #endif // OS_ANDROID
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ {"passwords-migrate-linux-to-login-db",
+ flag_descriptions::kPasswordsMigrateLinuxToLoginDBName,
+ flag_descriptions::kPasswordsMigrateLinuxToLoginDBDescription, kOsLinux,
+ FEATURE_VALUE_TYPE(password_manager::features::kMigrateLinuxToLoginDB)},
+-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ #if defined(OS_CHROMEOS)
+ {"enable-experimental-accessibility-features",
+ flag_descriptions::kExperimentalAccessibilityFeaturesName,
+@@ -3225,7 +3225,7 @@
flag_descriptions::kLeftToRightUrlsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kLeftToRightUrls)},
@@ -18,3 +48,64 @@
{"omnibox-new-answer-layout",
flag_descriptions::kOmniboxNewAnswerLayoutName,
flag_descriptions::kOmniboxNewAnswerLayoutDescription, kOsDesktop,
+@@ -3257,7 +3257,7 @@
+ flag_descriptions::kOmniboxDriveSuggestionsName,
+ flag_descriptions::kOmniboxDriveSuggestionsDescriptions, kOsDesktop,
+ FEATURE_VALUE_TYPE(omnibox::kDocumentProvider)},
+-#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",
+@@ -3566,13 +3566,13 @@
+ flag_descriptions::kClickToOpenPDFDescription, kOsAll,
+ FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
+
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ {"direct-manipulation-stylus",
+ flag_descriptions::kDirectManipulationStylusName,
+ flag_descriptions::kDirectManipulationStylusDescription,
+ kOsWin | kOsMac | kOsLinux,
+ FEATURE_VALUE_TYPE(features::kDirectManipulationStylus)},
+-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+
+ #if defined(OS_ANDROID)
+ {"third-party-doodles", flag_descriptions::kThirdPartyDoodlesName,
+@@ -4021,7 +4021,7 @@
+ flag_descriptions::kAutofillCacheQueryResponsesDescription, kOsAll,
+ FEATURE_VALUE_TYPE(autofill::features::kAutofillCacheQueryResponses)},
+
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ {"autofill-primary-info-style",
+ flag_descriptions::kAutofillPrimaryInfoStyleExperimentName,
+ flag_descriptions::kAutofillPrimaryInfoStyleExperimentDescription,
+@@ -4030,7 +4030,7 @@
+ autofill::kAutofillPrimaryInfoStyleExperiment,
+ kAutofillPrimaryInfoStyleVariations,
+ "AutofillPrimaryInfoStyleExperiment")},
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+
+ {"autofill-enable-company-name",
+ flag_descriptions::kAutofillEnableCompanyNameName,
+@@ -4082,7 +4082,7 @@
+ FEATURE_VALUE_TYPE(ash::features::kOverviewSwipeToClose)},
+ #endif // OS_CHROMEOS
+
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ {"ntp-backgrounds", flag_descriptions::kNtpBackgroundsName,
+ flag_descriptions::kNtpBackgroundsDescription, kOsDesktop,
+ FEATURE_VALUE_TYPE(features::kNtpBackgrounds)},
+@@ -4098,7 +4098,7 @@
+ {"ntp-ui-md", flag_descriptions::kNtpUIMdName,
+ flag_descriptions::kNtpUIMdDescription, kOsDesktop,
+ FEATURE_VALUE_TYPE(features::kNtpUIMd)},
+-#endif // OS_WIN || OS_MACOSX || OS_LINUX
++#endif // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD)
+
+ #if defined(OS_ANDROID)
+ {"enable-display-cutout-api", flag_descriptions::kDisplayCutoutAPIName,
Added: head/www/chromium/files/patch-chrome_browser_apps_platform_apps_api_music_manager_private_device__id__linux.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_apps_platform_apps_api_music_manager_private_device__id__linux.cc Mon Jan 7 19:47:18 2019 (r489612)
@@ -0,0 +1,70 @@
+--- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2018-12-05 14:44:06.182927000 +0100
++++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc 2018-12-05 15:28:09.650594000 +0100
+@@ -4,6 +4,11 @@
+
+ #include "chrome/browser/apps/platform_apps/api/music_manager_private/device_id.h"
+
++#if defined(OS_FREEBSD)
++#include <sys/types.h>
++#include <net/if_dl.h>
++#endif
++
+ #include <ifaddrs.h>
+ #include <net/if.h>
+ #include <stddef.h>
+@@ -104,9 +109,36 @@
+ const char* const prefixes[],
+ size_t prefixes_count) {
+ const int MAC_LENGTH = 6;
++#if defined(OS_FREEBSD)
++ struct ifaddrs *ifap, *ifinfo;
++#else
+ struct ifreq ifinfo;
++#endif
+
+ memset(&ifinfo, 0, sizeof(ifinfo));
++
++#if defined(OS_FREEBSD)
++ int result = getifaddrs(&ifap);
++
++ if (result != 0)
++ return true;
++
++ result = 1; // no MAC found yet
++
++ for (ifinfo = ifap; ifinfo != NULL; ifinfo = ifinfo->ifa_next) {
++ struct sockaddr* sa = ifinfo->ifa_addr;
++ if (sa->sa_family == AF_LINK &&
++ !strncmp(ifinfo->ifa_name, ifaddr->ifa_name,
++ sizeof(ifinfo->ifa_name) - 1)) {
++ result = 0;
++ break;
++ }
++ }
++
++ char mac_address[6];
++
++ strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), sizeof(mac_address));
++#else
+ strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
+
+ int sd = socket(AF_INET, SOCK_DGRAM, 0);
+@@ -118,11 +150,18 @@
+
+ const char* mac_address =
+ static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data);
++#endif
++
+ if (!is_valid_mac_address_.Run(mac_address, MAC_LENGTH))
+ return true;
+
++#if defined(OS_FREEBSD)
++ if (!IsValidPrefix(ifinfo->ifa_name, prefixes, prefixes_count))
++ return true;
++#else
+ if (!IsValidPrefix(ifinfo.ifr_name, prefixes, prefixes_count))
+ return true;
++#endif
+
+ // Got one!
+ found_mac_address_ =
Modified: head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc Mon Jan 7 19:40:53 2019 (r489611)
+++ head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc Mon Jan 7 19:47:18 2019 (r489612)
@@ -1,6 +1,6 @@
---- 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 @@
+--- chrome/browser/chrome_browser_main.cc.orig 2018-11-19 19:55:03.000000000 +0100
++++ chrome/browser/chrome_browser_main.cc 2018-12-04 14:28:26.209004000 +0100
+@@ -214,7 +214,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"
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list