Date: Fri, 17 Mar 2017 23:42:52 +0000 (UTC) From: "Carlos J. Puga Medina" <cpm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436365 - in head/www/chromium: . files Message-ID: <201703172342.v2HNgqjm001888@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cpm Date: Fri Mar 17 23:42:52 2017 New Revision: 436365 URL: https://svnweb.freebsd.org/changeset/ports/436365 Log: www/chromium: update to 57.0.2987.110 MFH: 2017Q1 Security: https://vuxml.freebsd.org/freebsd/a505d397-0758-11e7-8d8b-e8e0b747a45a.html Added: head/www/chromium/files/patch-build_config_linux_gtk_BUILD.gn (contents, props changed) head/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc (contents, props changed) head/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc (contents, props changed) head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc (contents, props changed) head/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc (contents, props changed) head/www/chromium/files/patch-sandbox_features.gni (contents, props changed) head/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn (contents, props changed) head/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc (contents, props changed) head/www/chromium/files/patch-third__party_WebKit_Source_wtf_StackUtil.cpp (contents, props changed) Deleted: head/www/chromium/files/extra-patch-libc++-new head/www/chromium/files/extra-patch-libc++-old head/www/chromium/files/patch-ash_shell.cc head/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc head/www/chromium/files/patch-chrome_browser_ui_views_app__list_linux_app__list__linux.cc head/www/chromium/files/patch-content_browser_child__process__launcher.cc head/www/chromium/files/patch-content_renderer_pepper_pepper__media__device__manager.cc head/www/chromium/files/patch-services_ui_public_cpp_gles2__context.cc head/www/chromium/files/patch-services_ui_surfaces_surfaces__context__provider.cc head/www/chromium/files/patch-third__party_webrtc_base_linux.cc head/www/chromium/files/patch-third__party_webrtc_base_linux.h head/www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc head/www/chromium/files/patch-ui_app__list_views_app__list__view.cc Modified: head/www/chromium/Makefile head/www/chromium/distinfo head/www/chromium/files/extra-patch-clang head/www/chromium/files/patch-BUILD.gn head/www/chromium/files/patch-base_BUILD.gn head/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc head/www/chromium/files/patch-base_debug_stack__trace__posix.cc head/www/chromium/files/patch-base_process_process__metrics.h head/www/chromium/files/patch-base_test_BUILD.gn head/www/chromium/files/patch-base_test_launcher_test__launcher.cc head/www/chromium/files/patch-base_third__party_libevent_BUILD.gn head/www/chromium/files/patch-build_config_BUILD.gn head/www/chromium/files/patch-build_config_BUILDCONFIG.gn head/www/chromium/files/patch-build_config_compiler_BUILD.gn head/www/chromium/files/patch-build_config_features.gni head/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn head/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn head/www/chromium/files/patch-build_config_sanitizers_BUILD.gn head/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni head/www/chromium/files/patch-build_config_ui.gni head/www/chromium/files/patch-cc_trees_property__tree.cc head/www/chromium/files/patch-chrome_BUILD.gn head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc head/www/chromium/files/patch-chrome_app_chromium__strings.grd head/www/chromium/files/patch-chrome_app_generated__resources.grd head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd head/www/chromium/files/patch-chrome_app_mash_mash__runner.cc head/www/chromium/files/patch-chrome_app_settings__strings.grdp head/www/chromium/files/patch-chrome_browser_BUILD.gn 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__process__impl.h 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_chrome__download__manager__delegate.cc head/www/chromium/files/patch-chrome_browser_download_download__commands.cc head/www/chromium/files/patch-chrome_browser_download_download__prefs.cc head/www/chromium/files/patch-chrome_browser_download_download__prefs.h head/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn head/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc head/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc head/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc head/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc head/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc head/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc head/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc head/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc head/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py head/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc head/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h head/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc head/www/chromium/files/patch-chrome_browser_ui_BUILD.gn head/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc head/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc head/www/chromium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn head/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc head/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc head/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc head/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc 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_chrome__browser__main__extra__parts__views.cc head/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc head/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc head/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc head/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h head/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc head/www/chromium/files/patch-chrome_common_BUILD.gn head/www/chromium/files/patch-chrome_common_chrome__paths.cc head/www/chromium/files/patch-chrome_common_chrome__paths.h head/www/chromium/files/patch-chrome_common_chrome__switches.cc head/www/chromium/files/patch-chrome_common_chrome__switches.h head/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc head/www/chromium/files/patch-chrome_common_features.gni head/www/chromium/files/patch-chrome_common_pref__names.cc head/www/chromium/files/patch-chrome_common_pref__names.h head/www/chromium/files/patch-chrome_common_url__constants.cc head/www/chromium/files/patch-chrome_common_url__constants.h head/www/chromium/files/patch-chrome_test_BUILD.gn head/www/chromium/files/patch-chromecast_browser_BUILD.gn head/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc head/www/chromium/files/patch-components_BUILD.gn head/www/chromium/files/patch-components_crash_content_app_BUILD.gn head/www/chromium/files/patch-components_gcm__driver_gcm__client.h head/www/chromium/files/patch-components_metrics_BUILD.gn head/www/chromium/files/patch-components_neterror_resources_neterror.js head/www/chromium/files/patch-components_plugins_renderer_BUILD.gn head/www/chromium/files/patch-components_policy_BUILD.gn head/www/chromium/files/patch-components_policy_resources_policy__templates.json head/www/chromium/files/patch-components_policy_tools_generate__policy__source.py head/www/chromium/files/patch-components_update__client_update__query__params.cc head/www/chromium/files/patch-components_variations_proto_study.proto head/www/chromium/files/patch-content_app_BUILD.gn head/www/chromium/files/patch-content_app_content__main__runner.cc head/www/chromium/files/patch-content_browser_BUILD.gn head/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h head/www/chromium/files/patch-content_browser_browser__main__loop.cc head/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc head/www/chromium/files/patch-content_browser_download_base__file.cc head/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc head/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc head/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc head/www/chromium/files/patch-content_browser_media_media__internals.cc head/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc head/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.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_renderer__host_render__process__host__impl.cc head/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc head/www/chromium/files/patch-content_browser_utility__process__host__impl.cc head/www/chromium/files/patch-content_child_child__process.cc head/www/chromium/files/patch-content_child_child__thread__impl.cc head/www/chromium/files/patch-content_child_child__thread__impl.h head/www/chromium/files/patch-content_common_BUILD.gn head/www/chromium/files/patch-content_common_child__process__messages.h head/www/chromium/files/patch-content_common_content__switches__internal.cc head/www/chromium/files/patch-content_common_view__messages.h head/www/chromium/files/patch-content_gpu_BUILD.gn head/www/chromium/files/patch-content_gpu_gpu__child__thread.cc head/www/chromium/files/patch-content_gpu_gpu__main.cc head/www/chromium/files/patch-content_public_common_content__switches.h 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-content_renderer_renderer__blink__platform__impl.h head/www/chromium/files/patch-content_shell_BUILD.gn head/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc head/www/chromium/files/patch-content_test_BUILD.gn head/www/chromium/files/patch-device_BUILD.gn head/www/chromium/files/patch-device_bluetooth_BUILD.gn head/www/chromium/files/patch-device_gamepad_gamepad__provider.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_serial_serial__api.cc head/www/chromium/files/patch-gpu_ipc_client_BUILD.gn head/www/chromium/files/patch-gpu_ipc_service_BUILD.gn head/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc head/www/chromium/files/patch-ipc_ipc__message__utils.h head/www/chromium/files/patch-mash_package_mash__packaged__service.cc head/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc head/www/chromium/files/patch-media_audio_BUILD.gn head/www/chromium/files/patch-media_audio_audio__manager.cc head/www/chromium/files/patch-media_base_BUILD.gn head/www/chromium/files/patch-media_base_video__frame.cc head/www/chromium/files/patch-media_capture_BUILD.gn head/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc head/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc head/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc head/www/chromium/files/patch-media_cast_BUILD.gn head/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc head/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc head/www/chromium/files/patch-mojo_edk_test_BUILD.gn head/www/chromium/files/patch-net_BUILD.gn head/www/chromium/files/patch-net_http_http__auth__gssapi__posix.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_tools_cert__verify__tool_verify__using__path__builder.cc head/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc head/www/chromium/files/patch-printing_BUILD.gn head/www/chromium/files/patch-remoting_host_BUILD.gn head/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn head/www/chromium/files/patch-services_service__manager_standalone_context.cc head/www/chromium/files/patch-services_ui_BUILD.gn head/www/chromium/files/patch-services_ui_gpu_gpu__main.cc head/www/chromium/files/patch-skia_BUILD.gn head/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn 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_StackFrameDepth.cpp head/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp head/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn head/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp head/www/chromium/files/patch-third__party_angle_BUILD.gn head/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn head/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni head/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn head/www/chromium/files/patch-third__party_pdfium_BUILD.gn head/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp head/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h head/www/chromium/files/patch-third__party_sqlite_BUILD.gn head/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn head/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc head/www/chromium/files/patch-third__party_webrtc_base_network.cc head/www/chromium/files/patch-third__party_webrtc_base_network.h head/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc head/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn head/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn head/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn head/www/chromium/files/patch-tools_gn_args.cc head/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py head/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn head/www/chromium/files/patch-ui_aura_BUILD.gn head/www/chromium/files/patch-ui_base_BUILD.gn head/www/chromium/files/patch-ui_base_ime_BUILD.gn head/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h head/www/chromium/files/patch-ui_base_ime_input__method__factory.cc head/www/chromium/files/patch-ui_base_resource_resource__bundle.cc head/www/chromium/files/patch-ui_base_ui__features.gni head/www/chromium/files/patch-ui_compositor_BUILD.gn head/www/chromium/files/patch-ui_events_event__switches.cc head/www/chromium/files/patch-ui_events_event__switches.h head/www/chromium/files/patch-ui_gfx_BUILD.gn head/www/chromium/files/patch-ui_gfx_canvas__skia.cc head/www/chromium/files/patch-ui_gfx_render__text.cc head/www/chromium/files/patch-ui_gl_BUILD.gn head/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc head/www/chromium/files/patch-ui_views_BUILD.gn head/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc head/www/chromium/files/patch-ui_views_controls_label.cc head/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc head/www/chromium/files/patch-ui_views_mus_BUILD.gn 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_style_platform__style.cc head/www/chromium/files/patch-ui_views_window_custom__frame__view.cc head/www/chromium/files/patch-ui_views_window_dialog__delegate.cc head/www/chromium/files/patch-v8_BUILD.gn head/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc head/www/chromium/files/patch-v8_src_globals.h head/www/chromium/pkg-plist Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/Makefile Fri Mar 17 23:42:52 2017 (r436365) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 56.0.2924.87 -PORTREVISION= 2 +PORTVERSION= 57.0.2987.110 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on @@ -85,6 +84,7 @@ GN_ARGS+= is_clang=true \ enable_one_click_signin=true \ enable_remoting=false \ enable_webrtc=false \ + fieldtrial_testing_like_official_build=true \ toolkit_views=true \ use_allocator="none" \ use_aura=true \ @@ -201,10 +201,9 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10 .endif -.if ${OSVERSION} >= 1200017 || (${OSVERSION} >= 1100508 && ${OSVERSION} < 1200000) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new -.else -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old +# Work around base r261801 +.if ${OSVERSION} < 1100508 +GN_ARGS+= extra_cxxflags="-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1" .endif .endif @@ -248,6 +247,10 @@ test regression-test: build do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${STAGEDIR}${MANPREFIX}/man/man1 +.for t in font_service ui + ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${t}.service \ + ${STAGEDIR}${DATADIR} +.endfor .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 \ @@ -255,8 +258,8 @@ do-install: .endfor ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${STAGEDIR}${DATADIR} -.for p in chrome_100_percent chrome_200_percent keyboard_resources resources \ - mus_app_resources_100 mus_app_resources_200 mus_app_resources_strings \ +.for p in chrome_100_percent chrome_200_percent headless_lib keyboard_resources \ + resources mus_app_resources_100 mus_app_resources_200 mus_app_resources_strings \ views_mus_resources ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak \ ${STAGEDIR}${DATADIR} Modified: head/www/chromium/distinfo ============================================================================== --- head/www/chromium/distinfo Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/distinfo Fri Mar 17 23:42:52 2017 (r436365) @@ -1,5 +1,5 @@ -TIMESTAMP = 1486036781 -SHA256 (chromium-56.0.2924.87.tar.xz) = 9aac081ffccaae6497068100477a4e6ac7086bd15ad3c3cd009b9a760b7a53e0 -SIZE (chromium-56.0.2924.87.tar.xz) = 514429808 -SHA256 (chromium-56.0.2924.87-testdata.tar.xz) = 2dea413379e4eccd351bb50cede549e9a8c4fbd897f6a8b03442c7a9b57d6b55 -SIZE (chromium-56.0.2924.87-testdata.tar.xz) = 123553884 +TIMESTAMP = 1489743061 +SHA256 (chromium-57.0.2987.110.tar.xz) = 6a03a290b313c5d8bb89891bfc816c61c798e6c96eaa62fb254d77ce9c2b89e4 +SIZE (chromium-57.0.2987.110.tar.xz) = 525293172 +SHA256 (chromium-57.0.2987.110-testdata.tar.xz) = 8f8b768190da7cea9365816443b0b98811cf7da939eed0752092d30b2d51752e +SIZE (chromium-57.0.2987.110-testdata.tar.xz) = 124084508 Modified: head/www/chromium/files/extra-patch-clang ============================================================================== --- head/www/chromium/files/extra-patch-clang Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/extra-patch-clang Fri Mar 17 23:42:52 2017 (r436365) @@ -27,17 +27,6 @@ if (*ptr == kFinalTlsValue) return; // We've been called enough times. ASSERT_LT(kFinalTlsValue, *ptr); ---- base/tracked_objects.cc 2015-04-15 00:31:20.000000000 +0200 -+++ base/tracked_objects.cc 2015-04-18 21:57:33.000000000 +0200 -@@ -425,7 +425,7 @@ - } - // We must NOT do any allocations during this callback. - // Using the simple linked lists avoids all allocations. -- DCHECK_EQ(this->next_retired_worker_, reinterpret_cast<ThreadData*>(NULL)); -+ DCHECK_EQ(this->next_retired_worker_, static_cast<ThreadData*>(NULL)); - this->next_retired_worker_ = first_retired_worker_; - first_retired_worker_ = this; - } --- base/tracked_objects_unittest.cc.orig 2015-08-22 15:01:51.000000000 -0400 +++ base/tracked_objects_unittest.cc 2015-09-03 09:20:53.370191000 -0400 @@ -58,9 +58,9 @@ @@ -63,26 +52,6 @@ EXPECT_CALL(callback_, OnError(_)) .Times(2); ---- third_party/hunspell/src/hunspell/affentry.hxx.orig 2015-07-21 18:46:37.322427000 -0400 -+++ third_party/hunspell/src/hunspell/affentry.hxx 2015-07-21 18:48:02.034251000 -0400 -@@ -27,7 +27,7 @@ - struct hentry * checkword(const char * word, int len, char in_compound, - const FLAG needflag = FLAG_NULL); - -- struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL); -+ struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = 0); - - char * check_morph(const char * word, int len, char in_compound, - const FLAG needflag = FLAG_NULL); -@@ -90,7 +90,7 @@ - // const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT); - const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0); - -- struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL); -+ struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = 0); - - char * check_twosfx_morph(const char * word, int len, int optflags, - PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); --- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200 +++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200 @@ -439,7 +439,7 @@ @@ -130,14 +99,13 @@ CMapFormat::kFormat4, cmap_id) { } ---- third_party/webrtc/base/taskrunner.cc 2015-04-15 00:32:17.000000000 +0200 -+++ third_party/webrtc/base/taskrunner.cc 2015-04-18 22:10:53.000000000 +0200 -@@ -102,7 +102,7 @@ +--- third_party/webrtc/base/taskrunner.cc.orig 2017-03-09 21:05:29.000000000 +0100 ++++ third_party/webrtc/base/taskrunner.cc 2017-03-10 13:19:54.203141000 +0100 +@@ -96,7 +96,7 @@ std::vector<Task *>::iterator it; it = std::remove(tasks_.begin(), tasks_.end(), - reinterpret_cast<Task *>(NULL)); + static_cast<Task *>(NULL)); - + tasks_.erase(it, tasks_.end()); - Modified: head/www/chromium/files/patch-BUILD.gn ============================================================================== --- head/www/chromium/files/patch-BUILD.gn Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-BUILD.gn Fri Mar 17 23:42:52 2017 (r436365) @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2017-01-26 00:49:06 UTC +--- BUILD.gn.orig 2017-03-09 20:04:26 UTC +++ BUILD.gn -@@ -217,7 +217,7 @@ group("both_gn_and_gyp") { +@@ -221,7 +221,7 @@ group("both_gn_and_gyp") { ] } @@ -9,7 +9,7 @@ deps += [ "//chrome", "//chrome/test:browser_tests", -@@ -277,7 +277,7 @@ group("both_gn_and_gyp") { +@@ -281,7 +281,7 @@ group("both_gn_and_gyp") { ] } @@ -18,7 +18,7 @@ # TODO(GYP): Figure out which of these should actually build on iOS, # and whether there should be other targets that are iOS-only and missing. deps += [ -@@ -320,7 +320,7 @@ group("both_gn_and_gyp") { +@@ -325,7 +325,7 @@ group("both_gn_and_gyp") { "//ui/touch_selection:ui_touch_selection_unittests", "//url/ipc:url_ipc_unittests", ] @@ -27,7 +27,7 @@ deps += [ "//ios:all" ] } -@@ -488,7 +488,7 @@ group("both_gn_and_gyp") { +@@ -495,7 +495,7 @@ group("both_gn_and_gyp") { ] } @@ -36,7 +36,7 @@ # The following are definitely linux-only. deps += [ "//chrome:manpage", -@@ -515,9 +515,16 @@ group("both_gn_and_gyp") { +@@ -518,9 +518,16 @@ group("both_gn_and_gyp") { # TODO(dpranke): add the linux_dump_symbols flag? deps += [ "//chrome:linux_symbols" ] } @@ -54,7 +54,7 @@ deps += [ "//base:base_i18n_perftests", "//base:base_perftests", -@@ -588,7 +595,7 @@ group("both_gn_and_gyp") { +@@ -592,7 +599,7 @@ group("both_gn_and_gyp") { if (enable_nacl) { deps += [ "//components/nacl/loader:nacl_loader_unittests" ] @@ -63,7 +63,7 @@ # TODO(dpranke): Figure out what platforms should actually have this. deps += [ "//components/nacl/loader:nacl_helper" ] -@@ -698,7 +705,7 @@ group("both_gn_and_gyp") { +@@ -700,7 +707,7 @@ group("both_gn_and_gyp") { deps += [ "//chrome/installer/mini_installer:next_version_mini_installer" ] } @@ -72,7 +72,7 @@ deps += [ "//breakpad:symupload($host_toolchain)" ] } -@@ -743,7 +750,7 @@ group("gn_only") { +@@ -745,7 +752,7 @@ group("gn_only") { deps += [ "//components/proximity_auth:proximity_auth_unittests" ] } @@ -80,8 +80,8 @@ + if (is_win || is_linux || is_bsd) { deps += [ "//mash:all", - "//media/mojo/services:media_mojo_shell_unittests", -@@ -763,7 +770,7 @@ group("gn_only") { + "//media/mojo/services:media_service_unittests", +@@ -771,7 +778,7 @@ group("gn_only") { } } @@ -90,8 +90,8 @@ # TODO(GYP): Figure out if any of these should be in gn_all # and figure out how cross-platform they are deps += [ -@@ -816,7 +823,7 @@ group("gn_only") { - ] +@@ -826,7 +833,7 @@ group("gn_only") { + } if (target_cpu == "x86" || target_cpu == "x64") { - if (!is_android) { @@ -99,7 +99,7 @@ deps += [ "//chrome/test:load_library_perf_tests" ] } deps += [ -@@ -824,7 +831,7 @@ group("gn_only") { +@@ -834,7 +841,7 @@ group("gn_only") { "//third_party/libjpeg_turbo:simd_asm", ] } @@ -108,7 +108,7 @@ deps += [ "//v8:v8_shell" ] } } -@@ -834,7 +841,7 @@ group("gn_only") { +@@ -844,7 +851,7 @@ group("gn_only") { } if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) || @@ -117,7 +117,7 @@ deps += [ "//testing/libfuzzer/fuzzers", "//testing/libfuzzer/tests:libfuzzer_tests", -@@ -877,7 +884,7 @@ group("gn_only") { +@@ -876,7 +883,7 @@ group("gn_only") { group("gn_mojo_targets") { testonly = true @@ -126,7 +126,7 @@ # TODO(GYP): Figure out if any of these should be in gn_all # and figure out how cross-platform they are deps = [ -@@ -903,7 +910,7 @@ group("gn_visibility") { +@@ -902,7 +909,7 @@ group("gn_visibility") { } } @@ -135,7 +135,7 @@ # This group includes all of the targets needed to build and test Blink, # including running the layout tests (see below). group("blink_tests") { -@@ -949,7 +956,7 @@ if (!is_ios) { +@@ -948,7 +955,7 @@ if (!is_ios) { data_deps += [ "//content/shell:content_shell_crash_service" ] } @@ -144,7 +144,7 @@ data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -957,7 +964,7 @@ if (!is_ios) { +@@ -956,7 +963,7 @@ if (!is_ios) { data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] } @@ -153,7 +153,7 @@ data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] } -@@ -979,7 +986,7 @@ group("chromium_swarm_tests") { +@@ -978,7 +985,7 @@ group("chromium_swarm_tests") { group("chromium_builder_perf") { testonly = true @@ -162,7 +162,7 @@ data_deps = [ "//cc:cc_perftests", "//chrome/test:load_library_perf_tests", -@@ -1009,7 +1016,7 @@ group("chromium_builder_perf") { +@@ -1008,7 +1015,7 @@ group("chromium_builder_perf") { "//chrome/installer/mini_installer:mini_installer", "//chrome/test:angle_perftests", ] Modified: head/www/chromium/files/patch-base_BUILD.gn ============================================================================== --- head/www/chromium/files/patch-base_BUILD.gn Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-base_BUILD.gn Fri Mar 17 23:42:52 2017 (r436365) @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- base/BUILD.gn.orig 2017-03-09 20:04:26 UTC +++ base/BUILD.gn -@@ -1076,6 +1076,35 @@ component("base") { +@@ -1116,6 +1116,35 @@ component("base") { public_deps += [ "//base/allocator:unified_allocator_shim" ] } @@ -36,7 +36,7 @@ # Allow more direct string conversions on platforms with native utf8 # strings if (is_mac || is_ios || is_chromeos || is_chromecast) { -@@ -1347,7 +1376,7 @@ component("base") { +@@ -1416,7 +1445,7 @@ component("base") { } # Linux. @@ -45,7 +45,7 @@ if (is_asan || is_lsan || is_msan || is_tsan) { # For llvm-sanitizer. data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ] -@@ -1372,7 +1401,7 @@ component("base") { +@@ -1441,7 +1470,7 @@ component("base") { "//base/third_party/xdg_user_dirs", ] } else { @@ -54,7 +54,7 @@ sources -= [ "nix/mime_util_xdg.cc", "nix/mime_util_xdg.h", -@@ -1388,6 +1417,13 @@ component("base") { +@@ -1457,6 +1486,13 @@ component("base") { } } @@ -68,7 +68,7 @@ # iOS if (is_ios) { set_sources_assignment_filter([]) -@@ -2154,6 +2190,12 @@ test("base_unittests") { +@@ -2245,6 +2281,12 @@ test("base_unittests") { set_sources_assignment_filter(sources_assignment_filter) } Modified: head/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc ============================================================================== --- head/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc Fri Mar 17 23:42:52 2017 (r436365) @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2017-01-26 00:49:07 UTC +--- base/allocator/allocator_shim_unittest.cc.orig 2017-03-09 20:04:26 UTC +++ base/allocator/allocator_shim_unittest.cc @@ -4,7 +4,6 @@ @@ -8,7 +8,7 @@ #include <stdlib.h> #include <string.h> -@@ -193,11 +192,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS +@@ -196,11 +195,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS ASSERT_GE(zero_allocs_intercepted_by_size[2 * 23], 1u); #if !defined(OS_WIN) @@ -22,7 +22,7 @@ void* posix_memalign_ptr = nullptr; int res = posix_memalign(&posix_memalign_ptr, 256, 59); -@@ -214,12 +215,14 @@ TEST_F(AllocatorShimTest, InterceptLibcS +@@ -217,12 +218,14 @@ TEST_F(AllocatorShimTest, InterceptLibcS ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u); ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u); @@ -37,7 +37,7 @@ #endif // OS_WIN char* realloc_ptr = static_cast<char*>(realloc(nullptr, 71)); -@@ -240,8 +243,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS +@@ -243,8 +246,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u); #if !defined(OS_WIN) @@ -48,7 +48,7 @@ free(posix_memalign_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(posix_memalign_ptr)], 1u); -@@ -249,8 +254,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS +@@ -252,8 +257,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS free(valloc_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(valloc_ptr)], 1u); Modified: head/www/chromium/files/patch-base_debug_stack__trace__posix.cc ============================================================================== --- head/www/chromium/files/patch-base_debug_stack__trace__posix.cc Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-base_debug_stack__trace__posix.cc Fri Mar 17 23:42:52 2017 (r436365) @@ -1,6 +1,15 @@ ---- base/debug/stack_trace_posix.cc.orig 2017-01-26 00:49:07 UTC +--- base/debug/stack_trace_posix.cc.orig 2017-03-09 20:04:26 UTC +++ base/debug/stack_trace_posix.cc -@@ -571,6 +571,10 @@ class SandboxSymbolizeHelper { +@@ -33,7 +33,7 @@ + #include <AvailabilityMacros.h> + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/debug/proc_maps_linux.h" + #endif + +@@ -574,6 +574,10 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -11,7 +20,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -586,6 +590,7 @@ class SandboxSymbolizeHelper { +@@ -589,6 +593,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; Modified: head/www/chromium/files/patch-base_process_process__metrics.h ============================================================================== --- head/www/chromium/files/patch-base_process_process__metrics.h Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-base_process_process__metrics.h Fri Mar 17 23:42:52 2017 (r436365) @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2017-01-26 00:49:07 UTC +--- base/process/process_metrics.h.orig 2017-03-09 20:04:26 UTC +++ base/process/process_metrics.h @@ -22,6 +22,12 @@ #include "base/values.h" @@ -13,7 +13,7 @@ #if defined(OS_MACOSX) #include <mach/mach.h> #include "base/process/port_provider_mac.h" -@@ -326,13 +332,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys +@@ -329,13 +335,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. BASE_EXPORT int ParseProcStatCPU(const std::string& input); Modified: head/www/chromium/files/patch-base_test_BUILD.gn ============================================================================== --- head/www/chromium/files/patch-base_test_BUILD.gn Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-base_test_BUILD.gn Fri Mar 17 23:42:52 2017 (r436365) @@ -1,6 +1,6 @@ ---- base/test/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- base/test/BUILD.gn.orig 2017-03-09 20:04:26 UTC +++ base/test/BUILD.gn -@@ -303,7 +303,7 @@ static_library("run_all_base_unittests") +@@ -312,7 +312,7 @@ static_library("run_all_base_unittests") ] } Modified: head/www/chromium/files/patch-base_test_launcher_test__launcher.cc ============================================================================== --- head/www/chromium/files/patch-base_test_launcher_test__launcher.cc Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-base_test_launcher_test__launcher.cc Fri Mar 17 23:42:52 2017 (r436365) @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2017-01-26 00:49:07 UTC +--- base/test/launcher/test_launcher.cc.orig 2017-03-09 20:04:26 UTC +++ base/test/launcher/test_launcher.cc -@@ -59,6 +59,10 @@ +@@ -60,6 +60,10 @@ #include "base/win/windows_version.h" #endif Modified: head/www/chromium/files/patch-base_third__party_libevent_BUILD.gn ============================================================================== --- head/www/chromium/files/patch-base_third__party_libevent_BUILD.gn Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-base_third__party_libevent_BUILD.gn Fri Mar 17 23:42:52 2017 (r436365) @@ -1,12 +1,12 @@ ---- base/third_party/libevent/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- base/third_party/libevent/BUILD.gn.orig 2017-03-09 20:04:26 UTC +++ base/third_party/libevent/BUILD.gn -@@ -29,6 +29,9 @@ static_library("libevent") { - } else if (is_linux) { - sources += [ "epoll.c" ] +@@ -50,6 +50,9 @@ static_library("libevent") { + "linux/event-config.h", + ] include_dirs = [ "linux" ] + } else if (is_bsd) { + sources += [ "kqueue.c" ] + include_dirs = [ "freebsd" ] } else if (is_android) { - sources += [ "epoll.c" ] - include_dirs = [ "android" ] + sources += [ + "android/config.h", Modified: head/www/chromium/files/patch-build_config_BUILD.gn ============================================================================== --- head/www/chromium/files/patch-build_config_BUILD.gn Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-build_config_BUILD.gn Fri Mar 17 23:42:52 2017 (r436365) @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- build/config/BUILD.gn.orig 2017-03-09 20:04:27 UTC +++ build/config/BUILD.gn -@@ -224,7 +224,7 @@ config("debug") { +@@ -196,7 +196,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } @@ -9,7 +9,16 @@ # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -338,7 +338,7 @@ config("executable_config") { +@@ -279,7 +279,7 @@ config("default_libs") { + "CoreText.framework", + "Foundation.framework", + ] +- } else if (is_linux) { ++ } else if (is_linux && !is_bsd) { + libs = [ + "dl", + "rt", +@@ -310,7 +310,7 @@ config("executable_config") { ] } else if (is_ios) { configs += [ "//build/config/ios:ios_dynamic_flags" ] Modified: head/www/chromium/files/patch-build_config_BUILDCONFIG.gn ============================================================================== --- head/www/chromium/files/patch-build_config_BUILDCONFIG.gn Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-build_config_BUILDCONFIG.gn Fri Mar 17 23:42:52 2017 (r436365) @@ -1,7 +1,7 @@ ---- build/config/BUILDCONFIG.gn.orig 2017-01-26 00:49:07 UTC +--- build/config/BUILDCONFIG.gn.orig 2017-03-09 20:04:27 UTC +++ build/config/BUILDCONFIG.gn -@@ -134,12 +134,13 @@ declare_args() { - is_debug = !is_official_build +@@ -131,12 +131,13 @@ declare_args() { + is_official_build = false # Whether we're a traditional desktop unix. - is_desktop_linux = current_os == "linux" @@ -16,7 +16,7 @@ # Allows the path to a custom target toolchain to be injected as a single # argument, and set as the default toolchain. -@@ -183,8 +184,8 @@ if (host_toolchain == "") { +@@ -185,8 +186,8 @@ if (host_toolchain == "") { # TODO(dpranke): Add some sort of assert here that verifies that # no toolchain omitted host_toolchain from its toolchain_args(). @@ -27,7 +27,7 @@ # TODO(dpranke) - is_clang normally applies only to the target # build, and there is no way to indicate that you want to override # it for both the target build *and* the host build. Do we need to -@@ -220,7 +221,7 @@ if (target_os == "android") { +@@ -222,7 +223,7 @@ if (target_os == "android") { } else { _default_toolchain = "//build/toolchain/android:android_$target_cpu" } @@ -36,7 +36,7 @@ # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -340,8 +341,17 @@ if (current_os == "win" || current_os == +@@ -342,8 +343,17 @@ if (current_os == "win" || current_os == is_nacl = false is_posix = true is_win = false @@ -55,7 +55,7 @@ # ============================================================================= # SOURCES FILTERS # ============================================================================= -@@ -410,7 +420,7 @@ if (!is_ios) { +@@ -412,7 +422,7 @@ if (!is_ios) { if (!is_mac && !is_ios) { sources_assignment_filter += [ "*.mm" ] } Modified: head/www/chromium/files/patch-build_config_compiler_BUILD.gn ============================================================================== --- head/www/chromium/files/patch-build_config_compiler_BUILD.gn Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-build_config_compiler_BUILD.gn Fri Mar 17 23:42:52 2017 (r436365) @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- build/config/compiler/BUILD.gn.orig 2017-03-09 20:04:27 UTC +++ build/config/compiler/BUILD.gn -@@ -150,7 +150,7 @@ config("compiler") { +@@ -155,7 +155,7 @@ config("compiler") { configs += [ "//build/config/win:compiler" ] } else if (is_android) { configs += [ "//build/config/android:compiler" ] @@ -9,7 +9,7 @@ configs += [ "//build/config/linux:compiler" ] } else if (is_nacl) { configs += [ "//build/config/nacl:compiler" ] -@@ -277,7 +277,7 @@ config("compiler") { +@@ -282,7 +282,7 @@ config("compiler") { # Linux/Android common flags setup. # --------------------------------- @@ -18,7 +18,7 @@ cflags += [ "-fPIC", "-pipe", # Use pipes for communicating between sub-processes. Faster. -@@ -401,14 +401,14 @@ config("compiler") { +@@ -409,14 +409,14 @@ config("compiler") { # clang-cl (used if is_win) doesn't expose this flag. # Currently disabled for nacl since its toolchain lacks this flag (too old). # TODO(zforman): Once nacl's toolchain is updated, remove check. @@ -35,7 +35,7 @@ # gnu++11 instead of c++11 is needed because some code uses typeof() (a # GNU extension). # TODO(thakis): Eventually switch this to c++11 instead, -@@ -458,7 +458,7 @@ config("compiler") { +@@ -469,7 +469,7 @@ config("compiler") { ] # Apply a lower LTO optimization level as the default is too slow. @@ -44,7 +44,7 @@ if (use_lld) { ldflags += [ "-Wl,--lto-O1" ] } else { -@@ -478,7 +478,7 @@ config("compiler") { +@@ -489,7 +489,7 @@ config("compiler") { # targeting ARM, without this flag, LTO produces a .text section that is # larger than the maximum call displacement, preventing the linker from # relocating calls (http://llvm.org/PR22999). @@ -53,7 +53,7 @@ ldflags += [ "-Wl,-plugin-opt,-function-sections" ] } } -@@ -742,7 +742,7 @@ config("compiler_codegen") { +@@ -757,7 +757,7 @@ config("compiler_codegen") { # configs -= [ "//build/config/compiler:clang_stackrealign" ] # See https://crbug.com/556393 for details of where it must be avoided. config("clang_stackrealign") { @@ -62,7 +62,7 @@ cflags = [ # Align the stack on 16-byte boundaries, http://crbug.com/418554. "-mstack-alignment=16", -@@ -788,7 +788,7 @@ config("runtime_library") { +@@ -811,7 +811,7 @@ config("runtime_library") { # smaller. if (is_win) { configs += [ "//build/config/win:runtime_library" ] @@ -71,16 +71,16 @@ configs += [ "//build/config/linux:runtime_library" ] } else if (is_ios) { configs += [ "//build/config/ios:runtime_library" ] -@@ -1038,7 +1038,7 @@ config("default_warnings") { +@@ -1076,7 +1076,7 @@ config("default_warnings") { "-Wno-nonportable-include-path", # TODO(hans): https://crbug.com/637306 - "-Wno-address-of-packed-member", + # "-Wno-address-of-packed-member", ] - } - } -@@ -1070,7 +1070,7 @@ config("chromium_code") { + if (llvm_force_head_revision) { + cflags += [ +@@ -1119,7 +1119,7 @@ config("chromium_code") { ] if (!is_debug && !using_sanitizer && @@ -89,7 +89,7 @@ # _FORTIFY_SOURCE isn't really supported by Clang now, see # http://llvm.org/bugs/show_bug.cgi?id=16821. # It seems to work fine with Ubuntu 12 headers though, so use it in -@@ -1128,7 +1128,7 @@ config("no_chromium_code") { +@@ -1178,7 +1178,7 @@ config("no_chromium_code") { ] } Modified: head/www/chromium/files/patch-build_config_features.gni ============================================================================== --- head/www/chromium/files/patch-build_config_features.gni Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-build_config_features.gni Fri Mar 17 23:42:52 2017 (r436365) @@ -1,6 +1,6 @@ ---- build/config/features.gni.orig 2017-01-26 00:49:07 UTC +--- build/config/features.gni.orig 2017-03-09 20:04:27 UTC +++ build/config/features.gni -@@ -67,13 +67,13 @@ declare_args() { +@@ -57,13 +57,13 @@ declare_args() { # libudev usage. This currently only affects the content layer. use_udev = is_linux && !is_chromecast Modified: head/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn ============================================================================== --- head/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn Fri Mar 17 23:42:52 2017 (r436365) @@ -1,4 +1,4 @@ ---- build/config/linux/gtk2/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- build/config/linux/gtk2/BUILD.gn.orig 2017-03-09 20:04:27 UTC +++ build/config/linux/gtk2/BUILD.gn @@ -4,7 +4,7 @@ @@ -7,5 +7,5 @@ -assert(is_linux, "This file should only be referenced on Linux") +assert(is_linux || is_bsd, "This file should only be referenced on Linux") - # Depend on //build/config/linux/gtk2 to use GTKv2. - # + # Depend on //build/config/linux/gtk2 to use GTKv2. Depend on + # //build/config/linux/gtk to get GTK 2 or 3 depending on the build flags. Modified: head/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn ============================================================================== --- head/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn Fri Mar 17 23:42:52 2017 (r436365) @@ -1,4 +1,4 @@ ---- build/config/linux/gtk3/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- build/config/linux/gtk3/BUILD.gn.orig 2017-03-09 20:04:27 UTC +++ build/config/linux/gtk3/BUILD.gn @@ -4,7 +4,7 @@ @@ -7,5 +7,5 @@ -assert(is_linux, "This file should only be referenced on Linux") +assert(is_linux || is_bsd, "This file should only be referenced on Linux") - # Depend on //build/config/linux/gtk3 to use GTKv3. - # + # Depend on //build/config/linux/gtk3 to use GTKv3. Depend on + # //build/config/linux/gtk to get GTK 2 or 3 depending on the build flags. Added: head/www/chromium/files/patch-build_config_linux_gtk_BUILD.gn ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-build_config_linux_gtk_BUILD.gn Fri Mar 17 23:42:52 2017 (r436365) @@ -0,0 +1,11 @@ +--- build/config/linux/gtk/BUILD.gn.orig 2017-03-09 20:04:27 UTC ++++ build/config/linux/gtk/BUILD.gn +@@ -5,7 +5,7 @@ + import("//build/config/linux/gtk/gtk.gni") + import("//build/config/linux/pkg_config.gni") + +-assert(is_linux, "This file should only be referenced on Linux") ++assert(is_linux || is_bsd, "This file should only be referenced on Linux") + + # The target in this file will automatically reference GTK2 or GTK3 depending + # on the state of the build flag. Some builds reference both 2 and 3, and some Modified: head/www/chromium/files/patch-build_config_sanitizers_BUILD.gn ============================================================================== --- head/www/chromium/files/patch-build_config_sanitizers_BUILD.gn Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-build_config_sanitizers_BUILD.gn Fri Mar 17 23:42:52 2017 (r436365) @@ -1,20 +1,20 @@ ---- build/config/sanitizers/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- build/config/sanitizers/BUILD.gn.orig 2017-03-09 20:04:27 UTC +++ build/config/sanitizers/BUILD.gn -@@ -405,7 +405,7 @@ config("lsan_flags") { +@@ -420,7 +420,7 @@ config("lsan_flags") { config("msan_flags") { if (is_msan) { - assert(is_linux, "msan only supported on linux x86_64") + assert(is_linux || is_bsd, "msan only supported on linux x86_64") - msan_blacklist_path = - rebase_path("//tools/msan/blacklist.txt", root_build_dir) - cflags = [ -@@ -418,7 +418,7 @@ config("msan_flags") { + if (!defined(msan_blacklist_path)) { + msan_blacklist_path = + rebase_path("//tools/msan/blacklist.txt", root_build_dir) +@@ -435,7 +435,7 @@ config("msan_flags") { config("tsan_flags") { if (is_tsan) { - assert(is_linux, "tsan only supported on linux x86_64") + assert(is_linux || is_bsd, "tsan only supported on linux x86_64") - tsan_blacklist_path = - rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir) - cflags = [ + if (!defined(tsan_blacklist_path)) { + tsan_blacklist_path = + rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir) Modified: head/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni ============================================================================== --- head/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni Fri Mar 17 23:42:52 2017 (r436365) @@ -1,14 +1,13 @@ ---- build/config/sanitizers/sanitizers.gni.orig 2017-01-26 00:49:07 UTC +--- build/config/sanitizers/sanitizers.gni.orig 2017-03-09 20:04:27 UTC +++ build/config/sanitizers/sanitizers.gni -@@ -54,8 +54,9 @@ declare_args() { +@@ -54,8 +54,8 @@ declare_args() { # See http://clang.llvm.org/docs/ControlFlowIntegrity.html # # TODO(pcc): Remove this flag if/when CFI is enabled in all official builds. - is_cfi = target_os == "linux" && !is_chromeos && target_cpu == "x64" && -- is_chrome_branded && is_official_build && allow_posix_link_time_opt +- is_official_build && allow_posix_link_time_opt + is_cfi = (target_os == "linux" || target_os == "bsd") && !is_chromeos && -+ target_cpu == "x64" && is_chrome_branded && is_official_build && -+ allow_posix_link_time_opt ++ target_cpu == "x64" && is_official_build && allow_posix_link_time_opt # Enable checks for bad casts: derived cast and unrelated cast. # TODO(krasin): remove this, when we're ready to add these checks by default. Modified: head/www/chromium/files/patch-build_config_ui.gni ============================================================================== --- head/www/chromium/files/patch-build_config_ui.gni Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-build_config_ui.gni Fri Mar 17 23:42:52 2017 (r436365) @@ -1,24 +1,19 @@ ---- build/config/ui.gni.orig 2017-01-26 00:49:07 UTC +--- build/config/ui.gni.orig 2017-03-09 20:04:27 UTC +++ build/config/ui.gni -@@ -31,7 +31,7 @@ declare_args() { +@@ -31,10 +31,10 @@ declare_args() { # Indicates if Aura is enabled. Aura is a low-level windowing library, sort # of a replacement for GDI or GTK. - use_aura = is_win || is_linux + use_aura = is_win || is_linux || is_bsd - # True means the UI is built using the "views" framework. - toolkit_views = -@@ -47,7 +47,7 @@ declare_args() { - use_xkbcommon = false - # Whether we should use glib, a low level C utility library. - use_glib = is_linux + use_glib = is_linux || is_bsd # Indicates if Wayland display server support is enabled. enable_wayland_server = is_chromeos -@@ -62,17 +62,17 @@ declare_args() { +@@ -55,17 +55,17 @@ declare_args() { # Use GPU accelerated cross process image transport by default on linux builds # with the Aura window manager. Modified: head/www/chromium/files/patch-cc_trees_property__tree.cc ============================================================================== --- head/www/chromium/files/patch-cc_trees_property__tree.cc Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-cc_trees_property__tree.cc Fri Mar 17 23:42:52 2017 (r436365) @@ -1,6 +1,6 @@ ---- cc/trees/property_tree.cc.orig 2017-01-26 00:49:07 UTC +--- cc/trees/property_tree.cc.orig 2017-03-09 20:04:27 UTC +++ cc/trees/property_tree.cc -@@ -1113,13 +1113,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO +@@ -1196,13 +1196,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id); Modified: head/www/chromium/files/patch-chrome_BUILD.gn ============================================================================== --- head/www/chromium/files/patch-chrome_BUILD.gn Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-chrome_BUILD.gn Fri Mar 17 23:42:52 2017 (r436365) @@ -1,6 +1,6 @@ ---- chrome/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- chrome/BUILD.gn.orig 2017-03-09 20:04:27 UTC +++ chrome/BUILD.gn -@@ -132,7 +132,7 @@ if (!is_android && !is_mac) { +@@ -143,7 +143,7 @@ if (!is_android && !is_mac) { data = [ "$root_out_dir/resources.pak", ] @@ -9,7 +9,7 @@ data += [ "$root_out_dir/chrome_100_percent.pak", "$root_out_dir/locales/en-US.pak", -@@ -212,7 +212,7 @@ if (!is_android && !is_mac) { +@@ -222,7 +222,7 @@ if (!is_android && !is_mac) { sources += [ "app/chrome_exe_main_aura.cc" ] } @@ -18,7 +18,7 @@ sources += [ "app/chrome_dll_resource.h", "app/chrome_main.cc", -@@ -1539,7 +1539,7 @@ if (enable_resource_whitelist_generation +@@ -1521,7 +1521,7 @@ if (enable_resource_whitelist_generation } } Modified: head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc ============================================================================== --- head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc Fri Mar 17 23:42:52 2017 (r436365) @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2017-02-02 02:02:48 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2017-03-09 20:04:27 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -86,7 +86,7 @@ +@@ -89,7 +89,7 @@ #include "chrome/app/chrome_crash_reporter_client.h" #endif @@ -50,7 +50,7 @@ void SIGTERMProfilingShutdown(int signal) { Profiling::Stop(); struct sigaction sigact; -@@ -366,7 +366,7 @@ void InitializeUserDataDir() { +@@ -399,7 +399,7 @@ void InitializeUserDataDir(base::Command std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -59,7 +59,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. -@@ -560,7 +560,7 @@ bool ChromeMainDelegate::BasicStartupCom +@@ -592,7 +592,7 @@ bool ChromeMainDelegate::BasicStartupCom std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -68,7 +68,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -610,7 +610,7 @@ bool ChromeMainDelegate::BasicStartupCom +@@ -642,7 +642,7 @@ bool ChromeMainDelegate::BasicStartupCom std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -77,7 +77,7 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -722,7 +722,7 @@ void ChromeMainDelegate::PreSandboxStart +@@ -754,7 +754,7 @@ void ChromeMainDelegate::PreSandboxStart std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -86,7 +86,7 @@ crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer()); #endif -@@ -852,7 +852,7 @@ void ChromeMainDelegate::PreSandboxStart +@@ -884,7 +884,7 @@ void ChromeMainDelegate::PreSandboxStart chrome::InitializePDF(); #endif @@ -95,7 +95,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -870,7 +870,7 @@ void ChromeMainDelegate::PreSandboxStart +@@ -898,7 +898,7 @@ void ChromeMainDelegate::PreSandboxStart breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -104,7 +104,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -980,7 +980,7 @@ bool ChromeMainDelegate::DelaySandboxIni +@@ -1008,7 +1008,7 @@ bool ChromeMainDelegate::DelaySandboxIni #endif return process_type == switches::kRelauncherProcess; } Modified: head/www/chromium/files/patch-chrome_app_chromium__strings.grd ============================================================================== --- head/www/chromium/files/patch-chrome_app_chromium__strings.grd Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-chrome_app_chromium__strings.grd Fri Mar 17 23:42:52 2017 (r436365) @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2017-01-26 00:49:07 UTC +--- chrome/app/chromium_strings.grd.orig 2017-03-09 20:04:27 UTC +++ chrome/app/chromium_strings.grd -@@ -939,7 +939,7 @@ Signing in anyway will merge Chromium in +@@ -887,7 +887,7 @@ Signing in anyway will merge Chromium in </message> <!-- ProcessSingleton --> Modified: head/www/chromium/files/patch-chrome_app_generated__resources.grd ============================================================================== --- head/www/chromium/files/patch-chrome_app_generated__resources.grd Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-chrome_app_generated__resources.grd Fri Mar 17 23:42:52 2017 (r436365) @@ -1,6 +1,6 @@ ---- chrome/app/generated_resources.grd.orig 2017-01-26 00:49:07 UTC +--- chrome/app/generated_resources.grd.orig 2017-03-09 20:04:27 UTC +++ chrome/app/generated_resources.grd -@@ -6939,7 +6939,7 @@ Keep your key file in a safe place. You +@@ -6868,7 +6868,7 @@ Keep your key file in a safe place. You <message name="IDS_FLAGS_FORCE_UI_DIRECTION_RTL" desc="Name for the option to force right-to-left UI direction mode."> Right-to-left </message> @@ -9,7 +9,7 @@ <message name="IDS_FLAGS_ENABLE_INPUT_IME_API_NAME" desc="Name of the flag to enable che chrome.input.ime API."> Enable Input IME API </message> -@@ -10334,7 +10334,7 @@ I don't think this site should be blocke +@@ -10122,7 +10122,7 @@ I don't think this site should be blocke <message name="IDS_APPEARANCE_GROUP_NAME" desc="The title of the appearance group"> Appearance </message> @@ -18,7 +18,7 @@ <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group"> Themes </message> -@@ -10342,7 +10342,7 @@ I don't think this site should be blocke +@@ -10130,7 +10130,7 @@ I don't think this site should be blocke <message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme"> Reset to default theme </message> @@ -27,7 +27,7 @@ <message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme."> Use GTK+ theme </message> -@@ -11663,7 +11663,7 @@ Tell us what happened exactly before you +@@ -11455,7 +11455,7 @@ Tell us what happened exactly before you Set as default </message> Modified: head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd ============================================================================== --- head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd Fri Mar 17 23:42:52 2017 (r436365) @@ -1,6 +1,6 @@ ---- chrome/app/google_chrome_strings.grd.orig 2017-02-02 02:02:48 UTC +--- chrome/app/google_chrome_strings.grd.orig 2017-03-09 20:04:27 UTC +++ chrome/app/google_chrome_strings.grd -@@ -940,7 +940,7 @@ Signing in anyway will merge Chrome info +@@ -888,7 +888,7 @@ Signing in anyway will merge Chrome info </message> <!-- ProcessSingleton --> Modified: head/www/chromium/files/patch-chrome_app_mash_mash__runner.cc ============================================================================== --- head/www/chromium/files/patch-chrome_app_mash_mash__runner.cc Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-chrome_app_mash_mash__runner.cc Fri Mar 17 23:42:52 2017 (r436365) @@ -1,11 +1,11 @@ ---- chrome/app/mash/mash_runner.cc.orig 2017-02-02 02:02:48 UTC +--- chrome/app/mash/mash_runner.cc.orig 2017-03-09 20:04:27 UTC +++ chrome/app/mash/mash_runner.cc -@@ -207,7 +207,7 @@ int MashMain() { +@@ -249,7 +249,7 @@ int MashMain() { + // TODO(sky): wire this up correctly. service_manager::InitializeLogging(); - std::unique_ptr<base::MessageLoop> message_loop; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) base::AtExitManager exit_manager; #endif - if (!IsChild()) + Modified: head/www/chromium/files/patch-chrome_app_settings__strings.grdp ============================================================================== --- head/www/chromium/files/patch-chrome_app_settings__strings.grdp Fri Mar 17 23:42:17 2017 (r436364) +++ head/www/chromium/files/patch-chrome_app_settings__strings.grdp Fri Mar 17 23:42:52 2017 (r436365) @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2017-02-02 02:02:48 UTC +--- chrome/app/settings_strings.grdp.orig 2017-03-09 20:04:27 UTC +++ chrome/app/settings_strings.grdp -@@ -178,7 +178,7 @@ +@@ -225,7 +225,7 @@ <message name="IDS_SETTINGS_THEMES" desc="Name of the control which allows the user to get a theme for the browser."> Themes </message> @@ -9,7 +9,7 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703172342.v2HNgqjm001888>