Date: Sun, 17 Sep 2017 13:20:34 +0200 From: "Carlos J. Puga Medina" <cpm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r449991 - in head/www/chromium: . files Message-ID: <1505647234.87385.1.camel@FreeBSD.org> In-Reply-To: <201709171110.v8HBAhXB006905@repo.freebsd.org> References: <201709171110.v8HBAhXB006905@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-4E2RiO9sZIsGpP1FXXM6 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, 2017-09-17 at 11:10 +0000, Carlos J. Puga Medina wrote: > Author: cpm > Date: Sun Sep 17 11:10:43 2017 > New Revision: 449991 > URL: https://svnweb.freebsd.org/changeset/ports/449991 >=20 > Log: > www/chromium: update to 61.0.3163.79 > =20 > - Add arm64 support [1] > - Fix segfault on i386 [2] > - Switch to USES=3Dcompiler:c++14-lang for devel/chromium-gn because > chromium > needs __builtin_add_overflow and friends to build. > =20 > Changelog: https://chromium.googlesource.com/chromium/src/+log/60.0 > .3112.113..61.0.3163.79?pretty=3Dfuller&n=3D10000 > =20 > PR: 220291 [1], 221266 [2] > Submitted by: Andrew [1] > Reported by: Patrick <doctorwhoguy@gmail.com> [2] > MFH: 2017Q3 >=20 Previously I forgot to add explicitly:=20 Security: https://vuxml.freebsd.org/freebsd/e1100e63-92f7-11e7-b d95-e8e0b747a45a.html > Added: > head/www/chromium/files/extra-patch-libc++-new (contents, props > changed) > head/www/chromium/files/extra-patch-libc++-old (contents, props > changed) > head/www/chromium/files/patch- > base_process_process__metrics__posix.cc (contents, props changed) > head/www/chromium/files/patch- > build_toolchain_linux_BUILD.gn (contents, props changed) > head/www/chromium/files/patch- > chrome_app_theme_chrome_unscaled_resources.grd (contents, props > changed) > head/www/chromium/files/patch- > chrome_browser_background_background_mode_optimizer.cc (contents, > props changed) > head/www/chromium/files/patch- > chrome_browser_media_router_discovery_discovery_network_list_posix.cc > (contents, props changed) > head/www/chromium/files/patch- > chrome_browser_media_router_discovery_discovery_network_list_wifi_lin > ux.cc (contents, props changed) > head/www/chromium/files/patch- > chrome_browser_prefs_browser_prefs.cc (contents, props changed) > head/www/chromium/files/patch- > chrome_browser_profiles_chrome_browser_main_extra_parts_profiles.cc =20 > (contents, props changed) > head/www/chromium/files/patch- > chrome_browser_ui_views_tabs_new_tab_button.cc (contents, props > changed) > head/www/chromium/files/patch- > chrome_common_chrome__features.cc (contents, props changed) > head/www/chromium/files/patch- > chrome_common_chrome__features.h (contents, props changed) > head/www/chromium/files/patch- > components_password__manager_core_browser_BUILD.gn (contents, props > changed) > head/www/chromium/files/patch- > components_password__manager_core_browser_password_manager_metrics_ut > il.cc (contents, props changed) > head/www/chromium/files/patch- > components_password__manager_core_browser_password_manager_metrics_ut > il.h (contents, props changed) > head/www/chromium/files/patch- > components_password__manager_core_browser_password_reuse_defines.h =20 > (contents, props changed) > head/www/chromium/files/patch- > content_browser_accessibility_browser_accessibility_auralinux.cc (c > ontents, props changed) > head/www/chromium/files/patch- > content_browser_zygote_host_zygote_host_impl_linux.h (contents, > props changed) > head/www/chromium/files/patch- > content_public_browser_zygote_host_linux.h (contents, props > changed) > head/www/chromium/files/patch- > content_renderer_renderer_main.cc (contents, props changed) > head/www/chromium/files/patch-device_gamepad_BUILD.gn (contents, > props changed) > head/www/chromium/files/patch-net_features.gni (contents, props > changed) > head/www/chromium/files/patch- > printing_backend_print_backend_cups.h (contents, props changed) > head/www/chromium/files/patch- > services_resource_coordinator_public_cpp_memory_instrumentation_os_me > trics.h (contents, props changed) > head/www/chromium/files/patch- > services_resource_coordinator_public_cpp_memory_instrumentation_os_me > trics_linux.cc (contents, props changed) > head/www/chromium/files/patch- > third__party_WebKit_Source_core_editing_EditingBehavior.cpp (conten > ts, props changed) > head/www/chromium/files/patch- > third__party_WebKit_Source_core_html_forms_InternalPopupMenu.cpp (c > ontents, props changed) > head/www/chromium/files/patch- > third__party_angle_src_gpu_info_util_SystemInfo_internal.h (content > s, props changed) > head/www/chromium/files/patch- > third__party_angle_src_gpu_info_util_SystemInfo_linux.cpp (contents > , props changed) > head/www/chromium/files/patch- > third__party_angle_src_gpu_info_util_SystemInfo_x11.cpp (contents, > props changed) > head/www/chromium/files/patch- > third__party_boringssl_src_crypto_cpu-aarch64-linux.c (contents, > props changed) > head/www/chromium/files/patch- > third__party_ffmpeg_chromium_scripts_generate_gn.py (contents, > props changed) > head/www/chromium/files/patch- > third__party_fontconfig_fontconfig.gni (contents, props changed) > head/www/chromium/files/patch- > third__party_pdfium_core_fxge_fx_ge_linux.cpp (contents, props > changed) > head/www/chromium/files/patch- > third__party_pdfium_xfa_fgas_font_cfgas_fontmgr.cpp (contents, > props changed) > head/www/chromium/files/patch- > third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp (contents, > props changed) > head/www/chromium/files/patch- > third__party_webrtc_rtc_base_BUILD.gn (contents, props changed) > head/www/chromium/files/patch- > third__party_webrtc_rtc_base_byteorder.h (contents, props changed) > head/www/chromium/files/patch- > third__party_webrtc_rtc_base_httpcommon.cc (contents, props > changed) > head/www/chromium/files/patch- > third__party_webrtc_rtc_base_ifaddrs__converter.h (contents, props > changed) > head/www/chromium/files/patch- > third__party_webrtc_rtc_base_ipaddress.h (contents, props changed) > head/www/chromium/files/patch- > third__party_webrtc_rtc_base_network.cc (contents, props changed) > head/www/chromium/files/patch- > third__party_webrtc_rtc_base_network.h (contents, props changed) > head/www/chromium/files/patch- > third__party_webrtc_rtc_base_physicalsocketserver.cc (contents, > props changed) > head/www/chromium/files/patch- > third__party_webrtc_rtc_base_physicalsocketserver.h (contents, > props changed) > head/www/chromium/files/patch- > third__party_webrtc_rtc_base_platform_thread.cc (contents, props > changed) > head/www/chromium/files/patch- > third__party_webrtc_rtc_base_stringutils.h (contents, props > changed) > head/www/chromium/files/patch- > ui_base_resource_resource__bundle__freebsd.cc (contents, props > changed) > head/www/chromium/files/patch- > ui_gl_generate_bindings.py (contents, props changed) > head/www/chromium/files/patch- > ui_native_theme_native_theme.h (contents, props changed) > head/www/chromium/files/patch- > ui_native_theme_native_theme_base.cc (contents, props changed) > head/www/chromium/files/patch- > ui_strings_app_locale_settings.grd (contents, props changed) > head/www/chromium/files/patch- > ui_views_window_frame_background.cc (contents, props changed) > head/www/chromium/files/patch-v8_src_base_cpu.cc (contents, props > changed) > Deleted: > head/www/chromium/files/patch- > base_task_scheduler_delayed_task_manager.cc > head/www/chromium/files/patch- > chrome_browser_ui_browser__view__prefs.cc > head/www/chromium/files/patch- > chrome_browser_ui_views_tabs_tab__strip.cc > head/www/chromium/files/patch- > components_content__settings_core_browser_website__settings__registry > .h > head/www/chromium/files/patch-components_policy_BUILD.gn > head/www/chromium/files/patch- > components_storage__monitor_storage__monitor.cc > head/www/chromium/files/patch- > components_tracing_common_process__metrics__memory__dump__provider.cc > head/www/chromium/files/patch- > components_tracing_common_process__metrics__memory__dump__provider.h > head/www/chromium/files/patch- > components_variations_proto_study.proto > head/www/chromium/files/patch- > content_browser_accessibility_browser__accessibility.h > head/www/chromium/files/patch- > content_browser_accessibility_browser__accessibility__manager.h > head/www/chromium/files/patch-crypto_nss__util.cc > head/www/chromium/files/patch- > remoting_host_setup_me2me_native_messaging_host_main.cc > head/www/chromium/files/patch- > third__party_WebKit_Source_web_PopupMenuImpl.cpp > head/www/chromium/files/patch- > third__party_libxml_chromium_libxml__utils.cc > head/www/chromium/files/patch- > third__party_swiftshader_src_OpenGL_libEGL_EGLSurface.cpp > head/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn > head/www/chromium/files/patch-third__party_webrtc_base_byteorder.h > head/www/chromium/files/patch- > third__party_webrtc_base_httpcommon.cc > head/www/chromium/files/patch- > third__party_webrtc_base_ifaddrs__converter.h > head/www/chromium/files/patch-third__party_webrtc_base_ipaddress.h > 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_base_platform__thread.cc > head/www/chromium/files/patch- > third__party_webrtc_base_stringutils.h > head/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py > head/www/chromium/files/patch-tools_grit_grit__rule.gni > head/www/chromium/files/patch-ui_gfx_BUILD.gn > head/www/chromium/files/patch-ui_views_views__switches.cc > Modified: > head/www/chromium/Makefile > head/www/chromium/distinfo > head/www/chromium/files/patch-base_i18n_icu__util.cc > head/www/chromium/files/patch-base_process_memory__unittest.cc > head/www/chromium/files/patch-base_sys__info__posix.cc > head/www/chromium/files/patch-base_test_test__file__util__posix.cc > head/www/chromium/files/patch-breakpad_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-chrome_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_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_browser_browser__process__impl.cc > head/www/chromium/files/patch-chrome_browser_browser__resources.grd > head/www/chromium/files/patch- > chrome_browser_chrome__content__browser__client.cc > head/www/chromium/files/patch- > chrome_browser_download_download__commands.h > head/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn > head/www/chromium/files/patch- > chrome_browser_extensions_browser__context__keyed__service__factories > .cc > head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc > head/www/chromium/files/patch- > chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.c > c > head/www/chromium/files/patch- > chrome_browser_password__manager_chrome__password__manager__client.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_profiles_avatar_button.cc > head/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc > head/www/chromium/files/patch-chrome_common_features.gni > 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- > components_autofill_content_renderer_password__form__conversion__util > s.cc > head/www/chromium/files/patch- > components_content__settings_core_browser_website__settings__registry > .cc > head/www/chromium/files/patch-components_os__crypt_os__crypt.h > 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-content_browser_BUILD.gn > head/www/chromium/files/patch- > content_renderer_render__thread__impl.cc > head/www/chromium/files/patch-content_shell_BUILD.gn > head/www/chromium/files/patch- > headless_lib_browser_headless__content__browser__client.h > head/www/chromium/files/patch-ipc_ipc__message__utils.cc > head/www/chromium/files/patch-ipc_ipc__message__utils.h > head/www/chromium/files/patch-net_dns_host__resolver__proc.cc > head/www/chromium/files/patch-sdch_BUILD.gn > head/www/chromium/files/patch- > services_catalog_public_cpp_manifest__parsing__util.cc > head/www/chromium/files/patch-services_catalog_store.cc > head/www/chromium/files/patch-services_catalog_store.h > head/www/chromium/files/patch- > services_device_time__zone__monitor_time__zone__monitor.cc > head/www/chromium/files/patch- > third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp > head/www/chromium/files/patch- > third__party_WebKit_Source_platform_fonts_FontCache.cpp > head/www/chromium/files/patch- > third__party_WebKit_Source_platform_fonts_FontCache.h > head/www/chromium/files/patch- > third__party_WebKit_Source_platform_fonts_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_SimpleFontData.cpp > 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_platform_wtf_Assertions.cpp > head/www/chromium/files/patch- > third__party_WebKit_Source_platform_wtf_Atomics.h > head/www/chromium/files/patch- > third__party_WebKit_Source_platform_wtf_ContainerAnnotations.h > head/www/chromium/files/patch- > third__party_WebKit_Source_platform_wtf_StackUtil.cpp > head/www/chromium/files/patch- > third__party_WebKit_Source_platform_wtf_ThreadingPthreads.cpp > head/www/chromium/files/patch-third__party_angle_BUILD.gn > head/www/chromium/files/patch-third__party_boringssl_BUILD.gn > head/www/chromium/files/patch- > third__party_ffmpeg_ffmpeg__generated.gni > head/www/chromium/files/patch-third__party_fontconfig_BUILD.gn > head/www/chromium/files/patch- > third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp > head/www/chromium/files/patch- > third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp > head/www/chromium/files/patch-ui_base_BUILD.gn > head/www/chromium/files/patch- > ui_gfx_mojo_buffer_types_struct_traits.cc > head/www/chromium/files/patch-ui_gl_BUILD.gn > head/www/chromium/files/patch-ui_resources_ui__resources.grd > head/www/chromium/files/patch-ui_views_BUILD.gn > head/www/chromium/files/patch-ui_views_mus_aura__init.cc > head/www/chromium/pkg-plist >=20 > Modified: head/www/chromium/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/Makefile Sun Sep 17 10:56:44 2017=09 > (r449990) > +++ head/www/chromium/Makefile Sun Sep 17 11:10:43 2017=09 > (r449991) > @@ -2,8 +2,7 @@ > # $FreeBSD$ > =20 > PORTNAME=3D chromium > -PORTVERSION=3D 60.0.3112.113 > -PORTREVISION=3D 1 > +PORTVERSION=3D 61.0.3163.79 > CATEGORIES?=3D www > MASTER_SITES=3D https://commondatastorage.googleapis.com/chromi > um-browser-official/ > DISTFILES=3D ${DISTNAME}${EXTRACT_SUFX} > @@ -62,11 +61,11 @@ LIB_DEPENDS=3D libspeechd.so:accessibility/s > peech-dispat > RUN_DEPENDS=3D xdg-open:devel/xdg-utils \ > droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf > =20 > -ONLY_FOR_ARCHS=3D amd64 i386 > +ONLY_FOR_ARCHS=3D aarch64 amd64 i386 > .endif > =20 > .if defined(GN_ONLY) > -USES=3D compiler:c++11-lib ninja pkgconfig > python:2,build shebangfix tar:xz > +USES=3D compiler:c++14-lang ninja pkgconfig > python:2,build shebangfix tar:xz > .else > USES=3D bison cpe desktop-file-utils execinfo jpeg > ninja perl5 pkgconfig \ > python:2,build shebangfix tar:xz > @@ -201,6 +200,13 @@ MAKE_ENV+=3D C_INCLUDE_PATH=3D${LOCALBASE}/in > clude \ > # Work around base r261801 > .if ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} < 1100508 > GN_ARGS+=3D extra_cxxflags=3D"-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=3D1" > +EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-libc++-old > +.else > +EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-libc++-new > +.endif > + > +.if ${ARCH} =3D=3D aarch64 > +GN_ARGS+=3D use_vulcanize=3Dfalse > .endif > =20 > .if !defined(GN_ONLY) >=20 > Modified: head/www/chromium/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/distinfo Sun Sep 17 10:56:44 2017=09 > (r449990) > +++ head/www/chromium/distinfo Sun Sep 17 11:10:43 2017=09 > (r449991) > @@ -1,5 +1,5 @@ > -TIMESTAMP =3D 1504288636 > -SHA256 (chromium-60.0.3112.113.tar.xz) =3D > ebfce706a1ea02a92e35f360c7364d1184dacf040b59eade4cb51aa61a4fec59 > -SIZE (chromium-60.0.3112.113.tar.xz) =3D 537527628 > -SHA256 (chromium-60.0.3112.113-testdata.tar.xz) =3D > 09b778c339f40d83bf0b66bad7de116277204f079b56569ddfd46899b5f76e66 > -SIZE (chromium-60.0.3112.113-testdata.tar.xz) =3D 124651664 > +TIMESTAMP =3D 1504708783 > +SHA256 (chromium-61.0.3163.79.tar.xz) =3D > bdbc139ed86f3b5d1ec3c3b00caeaef4f9ac2c363438f03dded56e217ad10727 > +SIZE (chromium-61.0.3163.79.tar.xz) =3D 556218140 > +SHA256 (chromium-61.0.3163.79-testdata.tar.xz) =3D > fdef32059ce9f2c9f122207b8a2e165e7f961d3b175eca9ac59a3f1469984b27 > +SIZE (chromium-61.0.3163.79-testdata.tar.xz) =3D 126580816 >=20 > Added: head/www/chromium/files/extra-patch-libc++-new > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is > newly added) > +++ head/www/chromium/files/extra-patch-libc++-new Sun Sep 17 > 11:10:43 2017 (r449991) > @@ -0,0 +1,116 @@ > +--- tools/gn/bootstrap/bootstrap.py.orig 2017-09-05 > 21:05:47.000000000 +0200 > ++++ tools/gn/bootstrap/bootstrap.py 2017-09-10 > 22:43:57.996797000 +0200 > +@@ -23,6 +23,7 @@ > + import shutil > + import subprocess > + import sys > ++import platform > + import tempfile > +=20 > + BOOTSTRAP_DIR =3D os.path.dirname(os.path.abspath(__file__)) > +@@ -31,9 +32,10 @@ > +=20 > + is_win =3D sys.platform.startswith('win') > + is_linux =3D sys.platform.startswith('linux') > ++is_bsd =3D platform.system().lower().endswith('bsd') > + is_mac =3D sys.platform.startswith('darwin') > + is_aix =3D sys.platform.startswith('aix') > +-is_posix =3D is_linux or is_mac or is_aix > ++is_posix =3D is_linux or is_mac or is_aix or is_bsd > +=20 > + def check_call(cmd, **kwargs): > + logging.debug('Running: %s', ' '.join(cmd)) > +@@ -449,6 +451,7 @@ > + 'base/metrics/histogram_base.cc', > + 'base/metrics/histogram_functions.cc', > + 'base/metrics/histogram_samples.cc', > ++ 'base/metrics/histogram_snapshot_manager.cc', > + 'base/metrics/metrics_hashes.cc', > + 'base/metrics/persistent_histogram_allocator.cc', > + 'base/metrics/persistent_memory_allocator.cc', > +@@ -534,7 +537,7 @@ > + 'base/trace_event/heap_profiler_allocation_context_tracker.cc > ', > + 'base/trace_event/heap_profiler_allocation_register.cc', > + 'base/trace_event/heap_profiler_event_filter.cc', > +- 'base/trace_event/heap_profiler_event_writer.cc', > ++ 'base/trace_event/heap_profiler_heap_dump_writer.cc', > + 'base/trace_event/heap_profiler_serialization_state.cc', > + 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc', > + 'base/trace_event/heap_profiler_type_name_deduplicator.cc', > +@@ -627,7 +630,7 @@ > + 'cflags': cflags + ['-DHAVE_CONFIG_H'], > + } > +=20 > +- if is_linux or is_aix: > ++ if is_linux or is_aix or is_bsd: > + ldflags.extend(['-pthread']) > +=20 > + static_libraries['xdg_user_dirs'] =3D { > +@@ -642,16 +645,44 @@ > + 'base/memory/shared_memory_tracker.cc', > + 'base/nix/xdg_util.cc', > + 'base/process/internal_linux.cc', > +- 'base/process/memory_linux.cc', > ++ #'base/process/memory_linux.cc', > + 'base/process/process_handle_linux.cc', > + 'base/process/process_info_linux.cc', > +- 'base/process/process_iterator_linux.cc', > +- 'base/process/process_linux.cc', > +- 'base/process/process_metrics_linux.cc', > ++ #'base/process/process_iterator_linux.cc', > ++ #'base/process/process_linux.cc', > ++ #'base/process/process_metrics_linux.cc', > + 'base/strings/sys_string_conversions_posix.cc', > +- 'base/sys_info_linux.cc', > ++ #'base/sys_info_linux.cc', > + 'base/threading/platform_thread_linux.cc', > + ]) > ++ if is_bsd: > ++ libs.extend(['-lexecinfo', '-lkvm']) > ++ ldflags.extend(['-pthread']) > ++ =20 > ++ static_libraries['xdg_user_dirs'] =3D { > ++ 'sources': [ > ++ 'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc' > , > ++ ], > ++ 'tool': 'cxx', > ++ } > ++ static_libraries['base']['sources'].extend([ > ++ 'base/allocator/allocator_shim.cc', > ++ 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc > ', > ++ 'base/process/process_handle_' + platform.system().lower() > + '.cc', > ++ 'base/process/process_iterator_' + > platform.system().lower() + '.cc', > ++ 'base/process/process_metrics_'+ platform.system().lower() > + '.cc', > ++ 'base/sys_info_' + platform.system().lower() + '.cc', > ++ ]) > ++ static_libraries['libevent']['include_dirs'].extend([ > ++ os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', > 'freebsd') > ++ ]) > ++ static_libraries['libevent']['sources'].extend([ > ++ 'base/third_party/libevent/kqueue.c', > ++ ]) > ++ > ++ # Suppressing warnings > ++ cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses- > equality']) > ++ > + if is_linux: > + static_libraries['base']['sources'].extend([ > + 'base/allocator/allocator_shim.cc', > +@@ -663,17 +694,6 @@ > + ]) > + static_libraries['libevent']['sources'].extend([ > + 'base/third_party/libevent/epoll.c', > +- ]) > +- else: > +- libs.extend(['-lrt']) > +- static_libraries['base']['sources'].extend([ > +- 'base/process/internal_aix.cc' > +- ]) > +- static_libraries['libevent']['include_dirs'].extend([ > +- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', > 'aix') > +- ]) > +- static_libraries['libevent']['include_dirs'].extend([ > +- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', > 'compat') > + ]) > +=20 > + if is_mac: >=20 > Added: head/www/chromium/files/extra-patch-libc++-old > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is > newly added) > +++ head/www/chromium/files/extra-patch-libc++-old Sun Sep 17 > 11:10:43 2017 (r449991) > @@ -0,0 +1,117 @@ > +--- tools/gn/bootstrap/bootstrap.py.orig 2017-09-05 > 21:05:47.000000000 +0200 > ++++ tools/gn/bootstrap/bootstrap.py 2017-09-10 > 19:20:25.156037000 +0200 > +@@ -23,6 +23,7 @@ > + import shutil > + import subprocess > + import sys > ++import platform > + import tempfile > +=20 > + BOOTSTRAP_DIR =3D os.path.dirname(os.path.abspath(__file__)) > +@@ -31,9 +32,10 @@ > +=20 > + is_win =3D sys.platform.startswith('win') > + is_linux =3D sys.platform.startswith('linux') > ++is_bsd =3D platform.system().lower().endswith('bsd') > + is_mac =3D sys.platform.startswith('darwin') > + is_aix =3D sys.platform.startswith('aix') > +-is_posix =3D is_linux or is_mac or is_aix > ++is_posix =3D is_linux or is_mac or is_aix or is_bsd > +=20 > + def check_call(cmd, **kwargs): > + logging.debug('Running: %s', ' '.join(cmd)) > +@@ -449,6 +451,7 @@ > + 'base/metrics/histogram_base.cc', > + 'base/metrics/histogram_functions.cc', > + 'base/metrics/histogram_samples.cc', > ++ 'base/metrics/histogram_snapshot_manager.cc', > + 'base/metrics/metrics_hashes.cc', > + 'base/metrics/persistent_histogram_allocator.cc', > + 'base/metrics/persistent_memory_allocator.cc', > +@@ -534,7 +537,7 @@ > + 'base/trace_event/heap_profiler_allocation_context_tracker.cc > ', > + 'base/trace_event/heap_profiler_allocation_register.cc', > + 'base/trace_event/heap_profiler_event_filter.cc', > +- 'base/trace_event/heap_profiler_event_writer.cc', > ++ 'base/trace_event/heap_profiler_heap_dump_writer.cc', > + 'base/trace_event/heap_profiler_serialization_state.cc', > + 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc', > + 'base/trace_event/heap_profiler_type_name_deduplicator.cc', > +@@ -627,7 +630,7 @@ > + 'cflags': cflags + ['-DHAVE_CONFIG_H'], > + } > +=20 > +- if is_linux or is_aix: > ++ if is_linux or is_aix or is_bsd: > + ldflags.extend(['-pthread']) > +=20 > + static_libraries['xdg_user_dirs'] =3D { > +@@ -642,16 +645,45 @@ > + 'base/memory/shared_memory_tracker.cc', > + 'base/nix/xdg_util.cc', > + 'base/process/internal_linux.cc', > +- 'base/process/memory_linux.cc', > ++ #'base/process/memory_linux.cc', > + 'base/process/process_handle_linux.cc', > + 'base/process/process_info_linux.cc', > +- 'base/process/process_iterator_linux.cc', > +- 'base/process/process_linux.cc', > +- 'base/process/process_metrics_linux.cc', > ++ #'base/process/process_iterator_linux.cc', > ++ #'base/process/process_linux.cc', > ++ #'base/process/process_metrics_linux.cc', > + 'base/strings/sys_string_conversions_posix.cc', > +- 'base/sys_info_linux.cc', > ++ #'base/sys_info_linux.cc', > + 'base/threading/platform_thread_linux.cc', > + ]) > ++ if is_bsd: > ++ libs.extend(['-lexecinfo', '-lkvm']) > ++ ldflags.extend(['-pthread']) > ++ =20 > ++ static_libraries['xdg_user_dirs'] =3D { > ++ 'sources': [ > ++ 'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc' > , > ++ ], > ++ 'tool': 'cxx', > ++ } > ++ static_libraries['base']['sources'].extend([ > ++ 'base/allocator/allocator_shim.cc', > ++ 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc > ', > ++ 'base/process/process_handle_' + platform.system().lower() > + '.cc', > ++ 'base/process/process_iterator_' + > platform.system().lower() + '.cc', > ++ 'base/process/process_metrics_'+ platform.system().lower() > + '.cc', > ++ 'base/sys_info_' + platform.system().lower() + '.cc', > ++ ]) > ++ static_libraries['libevent']['include_dirs'].extend([ > ++ os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', > 'freebsd') > ++ ]) > ++ static_libraries['libevent']['sources'].extend([ > ++ 'base/third_party/libevent/kqueue.c', > ++ ]) > ++ > ++ # Suppressing warnings > ++ cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses- > equality']) > ++ cflags_cc.extend(['-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=3D1']) > ++ > + if is_linux: > + static_libraries['base']['sources'].extend([ > + 'base/allocator/allocator_shim.cc', > +@@ -663,17 +695,6 @@ > + ]) > + static_libraries['libevent']['sources'].extend([ > + 'base/third_party/libevent/epoll.c', > +- ]) > +- else: > +- libs.extend(['-lrt']) > +- static_libraries['base']['sources'].extend([ > +- 'base/process/internal_aix.cc' > +- ]) > +- static_libraries['libevent']['include_dirs'].extend([ > +- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', > 'aix') > +- ]) > +- static_libraries['libevent']['include_dirs'].extend([ > +- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', > 'compat') > + ]) > +=20 > + if is_mac: >=20 > Modified: head/www/chromium/files/patch-base_i18n_icu__util.cc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/files/patch-base_i18n_icu__util.cc Sun > Sep 17 10:56:44 2017 (r449990) > +++ head/www/chromium/files/patch-base_i18n_icu__util.cc Sun > Sep 17 11:10:43 2017 (r449991) > @@ -1,15 +1,15 @@ > ---- base/i18n/icu_util.cc.orig 2017-06-09 16:50:47.670684000 > +0200 > -+++ base/i18n/icu_util.cc 2017-06-09 16:52:10.911955000 +0200 > +--- base/i18n/icu_util.cc.orig 2017-09-05 21:05:11.000000000 > +0200 > ++++ base/i18n/icu_util.cc 2017-09-06 16:47:26.158180000 +0200 > @@ -20,7 +20,7 @@ > #include "build/build_config.h" > #include "third_party/icu/source/common/unicode/putil.h" > #include "third_party/icu/source/common/unicode/udata.h" > --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) > -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) > +-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || > defined(OS_ANDROID) > ++#if (defined(OS_LINUX) || defined(OS_BSD) && !defined(OS_CHROMEOS)) > || defined(OS_ANDROID) > #include "third_party/icu/source/i18n/unicode/timezone.h" > #endif > =20 > -@@ -298,7 +298,7 @@ > +@@ -312,7 +312,7 @@ > // TODO(jungshik): Some callers do not care about tz at all. If > necessary, > // add a boolean argument to this function to init'd the default tz > only > // when requested. >=20 > Modified: head/www/chromium/files/patch- > base_process_memory__unittest.cc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/files/patch-base_process_memory__unittest.cc=09 > Sun Sep 17 10:56:44 2017 (r449990) > +++ head/www/chromium/files/patch-base_process_memory__unittest.cc=09 > Sun Sep 17 11:10:43 2017 (r449991) > @@ -1,19 +1,15 @@ > ---- base/process/memory_unittest.cc.orig 2017-06-05 19:03:00 > UTC > -+++ base/process/memory_unittest.cc > -@@ -101,10 +101,10 @@ TEST(MemoryTest, AllocatorShimWorking) { > - #endif > - } > -=20 > --// OpenBSD does not support these tests. Don't test these on > ASan/TSan/MSan > -+// BSD does not support these tests. Don't test these on > ASan/TSan/MSan > +--- base/process/memory_unittest.cc.orig 2017-09-05 > 21:05:11.000000000 +0200 > ++++ base/process/memory_unittest.cc 2017-09-06 > 16:53:33.919374000 +0200 > +@@ -104,7 +104,7 @@ > + // OpenBSD does not support these tests. Don't test these on > ASan/TSan/MSan > // configurations: only test the real allocator. > // Windows only supports these tests with the allocator shim in > place. > --#if !defined(OS_OPENBSD) && \ > -+#if !defined(OS_BSD) && \ > - BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && \ > +-#if !defined(OS_OPENBSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \ > ++#if !defined(OS_BSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \ > !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) > =20 > -@@ -508,5 +508,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) > { > + namespace { > +@@ -507,5 +507,5 @@ > EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_)); > EXPECT_TRUE(value_ =3D=3D NULL); > } >=20 > Added: head/www/chromium/files/patch- > base_process_process__metrics__posix.cc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is > newly added) > +++ head/www/chromium/files/patch- > base_process_process__metrics__posix.cc Sun Sep 17 11:10:43 > 2017 (r449991) > @@ -0,0 +1,22 @@ > +--- base/process/process_metrics_posix.cc.orig 2017-09-05 > 21:05:11.000000000 +0200 > ++++ base/process/process_metrics_posix.cc 2017-09-11 > 19:41:06.103369000 +0200 > +@@ -16,6 +16,8 @@ > +=20 > + #if defined(OS_MACOSX) > + #include <malloc/malloc.h> > ++#elif defined(OS_BSD) > ++#include <stdlib.h> > + #else > + #include <malloc.h> > + #endif > +@@ -103,8 +105,9 @@ > + #endif > + #elif defined(OS_FUCHSIA) > + // TODO(fuchsia): Not currently exposed. https://crbug.com/735087 > . > +- return 0; > ++ NOTIMPLEMENTED(); > + #endif > ++ return 0; > + } > +=20 > + } // namespace base >=20 > Modified: head/www/chromium/files/patch-base_sys__info__posix.cc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/files/patch-base_sys__info__posix.cc Sun > Sep 17 10:56:44 2017 (r449990) > +++ head/www/chromium/files/patch-base_sys__info__posix.cc Sun > Sep 17 11:10:43 2017 (r449991) > @@ -1,5 +1,5 @@ > ---- base/sys_info_posix.cc.orig 2017-07-25 21:04:48.000000000 > +0200 > -+++ base/sys_info_posix.cc 2017-08-02 21:19:06.172695000 > +0200 > +--- base/sys_info_posix.cc.orig 2017-09-05 21:05:11.000000000 > +0200 > ++++ base/sys_info_posix.cc 2017-09-11 02:55:59.022874000 > +0200 > @@ -35,7 +35,7 @@ > =20 > namespace { > @@ -18,3 +18,12 @@ > int SysInfo::NumberOfProcessors() { > return g_lazy_number_of_processors.Get().value(); > } > +@@ -219,6 +219,8 @@ > + arch =3D "x86"; > + } else if (arch =3D=3D "amd64") { > + arch =3D "x86_64"; > ++ } else if (arch =3D=3D "arm64") { > ++ arch =3D "aarch64"; > + } else if (std::string(info.sysname) =3D=3D "AIX") { > + arch =3D "ppc64"; > + } >=20 > Modified: head/www/chromium/files/patch- > base_test_test__file__util__posix.cc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/files/patch- > base_test_test__file__util__posix.cc Sun Sep 17 10:56:44 2017=09 > (r449990) > +++ head/www/chromium/files/patch- > base_test_test__file__util__posix.cc Sun Sep 17 11:10:43 2017=09 > (r449991) > @@ -1,11 +1,11 @@ > ---- base/test/test_file_util_posix.cc.orig 2017-06-05 > 19:03:00 UTC > -+++ base/test/test_file_util_posix.cc > -@@ -79,7 +79,7 @@ bool DieFileDie(const FilePath& file, bool > recurse) { > +--- base/test/test_file_util_posix.cc.orig 2017-09-05 > 21:05:11.000000000 +0200 > ++++ base/test/test_file_util_posix.cc 2017-09-06 > 16:59:12.993711000 +0200 > +@@ -79,7 +79,7 @@ > return DeleteFile(file, recurse); > } > =20 > --#if !defined(OS_LINUX) && !defined(OS_MACOSX) > -+#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_BSD) > +-#if !defined(OS_LINUX) && !defined(OS_MACOSX) && > !defined(OS_ANDROID) > ++#if !defined(OS_LINUX) && !defined(OS_MACOSX) && > !defined(OS_ANDROID) && !defined(OS_BSD) > bool EvictFileFromSystemCache(const FilePath& file) { > // There doesn't seem to be a POSIX way to cool the disk cache. > NOTIMPLEMENTED(); >=20 > Modified: head/www/chromium/files/patch-breakpad_BUILD.gn > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/files/patch-breakpad_BUILD.gn Sun Sep 17 > 10:56:44 2017 (r449990) > +++ head/www/chromium/files/patch-breakpad_BUILD.gn Sun Sep 17 > 11:10:43 2017 (r449991) > @@ -1,6 +1,6 @@ > ---- breakpad/BUILD.gn.orig 2017-06-05 19:03:01 UTC > -+++ breakpad/BUILD.gn > -@@ -472,7 +472,7 @@ if (is_mac) { > +--- breakpad/BUILD.gn.orig 2017-09-07 03:01:37.610794000 > +0200 > ++++ breakpad/BUILD.gn 2017-09-07 03:02:03.521046000 +0200 > +@@ -472,7 +472,7 @@ > } > } > =20 >=20 > Modified: head/www/chromium/files/patch-build_config_BUILDCONFIG.gn > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/files/patch-build_config_BUILDCONFIG.gn=09 > Sun Sep 17 10:56:44 2017 (r449990) > +++ head/www/chromium/files/patch-build_config_BUILDCONFIG.gn=09 > Sun Sep 17 11:10:43 2017 (r449991) > @@ -1,5 +1,5 @@ > ---- build/config/BUILDCONFIG.gn.orig 2017-08-03 > 00:05:04.000000000 +0200 > -+++ build/config/BUILDCONFIG.gn 2017-08-09 23:42:27.032065000 > +0200 > +--- build/config/BUILDCONFIG.gn.orig 2017-09-05 > 21:05:11.000000000 +0200 > ++++ build/config/BUILDCONFIG.gn 2017-09-06 17:04:08.044575000 > +0200 > @@ -131,13 +131,13 @@ > is_official_build =3D false > =20 > @@ -11,12 +11,12 @@ > # to configure warnings. > is_clang =3D > current_os =3D=3D "mac" || current_os =3D=3D "ios" || current_os = =3D=3D > "chromeos" || > -- current_os =3D=3D "fuchsia" || > -+ current_os =3D=3D "fuchsia" || current_os =3D=3D "bsd" || > +- current_os =3D=3D "fuchsia" || current_os =3D=3D "android" || > ++ current_os =3D=3D "fuchsia" || current_os =3D=3D "android" || > current_os =3D=3D "bsd" || > (current_os =3D=3D "linux" && current_cpu !=3D "s390x" && > - current_cpu !=3D "s390" && current_cpu !=3D "ppc64" && > current_cpu !=3D "ppc") > -=20 > -@@ -189,8 +189,8 @@ > + current_cpu !=3D "s390" && current_cpu !=3D "ppc64" && > + current_cpu !=3D "ppc" && current_cpu !=3D "mips" && current_cpu > !=3D "mips64") > +@@ -190,8 +190,8 @@ > # TODO(dpranke): Add some sort of assert here that verifies that > # no toolchain omitted host_toolchain from its toolchain_args(). > =20 > @@ -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 > -@@ -228,7 +228,7 @@ > +@@ -229,7 +229,7 @@ > } else { > _default_toolchain =3D > "//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 =3D > "//build/toolchain/linux:clang_$target_cpu" > -@@ -378,8 +378,18 @@ > +@@ -379,8 +379,18 @@ > is_nacl =3D false > is_posix =3D true > is_win =3D false > @@ -56,7 +56,7 @@ > # > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D > # SOURCES FILTERS > # > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D > -@@ -449,7 +459,7 @@ > +@@ -450,7 +460,7 @@ > if (!is_mac && !is_ios) { > sources_assignment_filter +=3D [ "*.mm" ] > } >=20 > Modified: head/www/chromium/files/patch- > build_config_compiler_BUILD.gn > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/files/patch-build_config_compiler_BUILD.gn=09 > Sun Sep 17 10:56:44 2017 (r449990) > +++ head/www/chromium/files/patch-build_config_compiler_BUILD.gn=09 > Sun Sep 17 11:10:43 2017 (r449991) > @@ -1,6 +1,6 @@ > ---- build/config/compiler/BUILD.gn.orig 2017-08-03 > 00:05:04.000000000 +0200 > -+++ build/config/compiler/BUILD.gn 2017-08-10 > 00:34:22.540754000 +0200 > -@@ -45,7 +45,7 @@ > +--- build/config/compiler/BUILD.gn.orig 2017-09-05 > 21:05:11.000000000 +0200 > ++++ build/config/compiler/BUILD.gn 2017-09-11 > 02:57:48.188641000 +0200 > +@@ -46,7 +46,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 =3D > @@ -9,7 +9,7 @@ > (current_cpu =3D=3D "x64" || current_cpu =3D=3D "x86") > binutils_path =3D > rebase_path("//third_party/binutils/Linux_x64/Release/bin", > root_build_dir) > -@@ -166,7 +166,7 @@ > +@@ -167,7 +167,7 @@ > configs +=3D [ "//build/config/win:compiler" ] > } else if (is_android) { > configs +=3D [ "//build/config/android:compiler" ] > @@ -18,7 +18,7 @@ > configs +=3D [ "//build/config/linux:compiler" ] > } else if (is_nacl) { > configs +=3D [ "//build/config/nacl:compiler" ] > -@@ -219,7 +219,7 @@ > +@@ -222,7 +222,7 @@ > # Linker warnings. > if (fatal_linker_warnings && !(is_chromeos && current_cpu =3D=3D > "arm") && > !(is_android && use_order_profiling) && !is_mac && !is_ios > && > @@ -27,7 +27,7 @@ > # TODO(jochen): Enable this on chromeos on arm. http://crbug. > com/356580 > # TODO(lizeb,pasko): Fix link errors when linking with > order_profiling=3D1 > # crbug.com/485542 > -@@ -316,7 +316,7 @@ > +@@ -319,7 +319,7 @@ > =20 > # Linux/Android common flags setup. > # --------------------------------- > @@ -36,7 +36,7 @@ > if (use_pic) { > cflags +=3D [ "-fPIC" ] > ldflags +=3D [ "-fPIC" ] > -@@ -493,7 +493,7 @@ > +@@ -509,7 +509,7 @@ > ldflags +=3D [ "-flto" ] > =20 > # Apply a lower LTO optimization level as the default is too > slow. > @@ -45,7 +45,7 @@ > if (use_lld) { > ldflags +=3D [ "-Wl,--lto-O1" ] > } else { > -@@ -516,7 +516,7 @@ > +@@ -532,7 +532,7 @@ > # Also, when 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). > @@ -54,16 +54,30 @@ > if (use_lld) { > ldflags +=3D [ > "-Wl,-mllvm,-function-sections", > -@@ -794,7 +794,7 @@ > +@@ -603,7 +603,7 @@ > + cflags +=3D [ "-mtune=3D$arm_tune" ] > + } > + } else if (current_cpu =3D=3D "arm64") { > +- if (is_clang && !is_android && !is_nacl) { > ++ if (is_clang && !is_android && !is_nacl && !is_bsd) { > + cflags +=3D [ "--target=3Daarch64-linux-gnu" ] > + ldflags +=3D [ "--target=3Daarch64-linux-gnu" ] > + } > +@@ -854,11 +854,11 @@ > # configs -=3D [ "//build/config/compiler:clang_stackrealign" ] > # See https://crbug.com/556393 for details of where it must be > avoided. > config("clang_stackrealign") { > -- if (is_clang && current_cpu =3D=3D "x86" && is_linux) { > -+ if (is_clang && current_cpu =3D=3D "x86" && (is_linux || is_bsd)) { > - cflags =3D [ > +- if (is_clang && current_cpu =3D=3D "x86" && (is_android || is_linux)) > { > ++ if (is_clang && current_cpu =3D=3D "x86" && (is_android || is_linux > || is_bsd)) { > + # Android needs -mstackrealign due to a bug on ia32 Jelly Bean. > + # See crbug.com/521527 > + cflags =3D [ "-mstackrealign" ] > +- if (is_linux) { > ++ if (is_linux || is_bsd) { > # Align the stack on 16-byte boundaries, http://crbug.com/418 > 554. > - "-mstack-alignment=3D16", > -@@ -848,7 +848,7 @@ > + cflags +=3D [ "-mstack-alignment=3D16" ] > + } > +@@ -910,7 +910,7 @@ > # smaller. > if (is_win) { > configs +=3D [ "//build/config/win:runtime_library" ] > @@ -72,7 +86,7 @@ > configs +=3D [ "//build/config/linux:runtime_library" ] > } else if (is_ios) { > configs +=3D [ "//build/config/ios:runtime_library" ] > -@@ -1111,7 +1111,7 @@ > +@@ -1164,7 +1164,7 @@ > "-Wno-address-of-packed-member", > =20 > # TODO(hans): https://crbug.com/681136 > @@ -81,21 +95,21 @@ > =20 > # TODO(thakis ): https://crbug.com/683349 > "-Wno-user-defined-warnings", > -@@ -1162,7 +1162,7 @@ > +@@ -1214,7 +1214,7 @@ > ] > =20 > if (!is_debug && !using_sanitizer && > - (!is_linux || !is_clang || is_official_build) && > + (!is_linux || !is_bsd || !is_clang || is_official_build) && > current_cpu !=3D "s390x" && current_cpu !=3D "s390" && > - current_cpu !=3D "ppc64" && current_cpu !=3D "ppc64") { > - # _FORTIFY_SOURCE isn't really supported by Clang now, see > -@@ -1669,7 +1669,7 @@ > - "-g2", > - ] > - } else { > -- cflags =3D [ "-g2" ] > -+ cflags =3D [ "-g0" ] > + current_cpu !=3D "ppc64" && current_cpu !=3D "ppc64" && > + current_cpu !=3D "mips" && current_cpu !=3D "mips64") { > +@@ -1734,7 +1734,7 @@ > + # "-gdwarf-3" doesn't work with dump_syms in Chrome OS. > + cflags +=3D [ "-gdwarf-3" ] > + } > +- cflags +=3D [ "-g2" ] > ++ cflags +=3D [ "-g0" ] > } > if (use_debug_fission) { > cflags +=3D [ "-gsplit-dwarf" ] >=20 > Added: head/www/chromium/files/patch-build_toolchain_linux_BUILD.gn > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is > newly added) > +++ head/www/chromium/files/patch-build_toolchain_linux_BUILD.gn=09 > Sun Sep 17 11:10:43 2017 (r449991) > @@ -0,0 +1,10 @@ > +--- build/toolchain/linux/BUILD.gn.orig 2017-09-11 > 02:58:56.145741000 +0200 > ++++ build/toolchain/linux/BUILD.gn 2017-09-11 > 02:59:18.322655000 +0200 > +@@ -14,7 +14,6 @@ > + } > +=20 > + clang_toolchain("clang_arm64") { > +- toolprefix =3D "aarch64-linux-gnu-" > + toolchain_args =3D { > + current_cpu =3D "arm64" > + current_os =3D "linux" >=20 > Modified: head/www/chromium/files/patch-chrome_BUILD.gn > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/files/patch-chrome_BUILD.gn Sun Sep 17 > 10:56:44 2017 (r449990) > +++ head/www/chromium/files/patch-chrome_BUILD.gn Sun Sep 17 > 11:10:43 2017 (r449991) > @@ -1,24 +1,24 @@ > ---- chrome/BUILD.gn.orig 2017-06-05 19:03:01 UTC > -+++ chrome/BUILD.gn > -@@ -143,7 +143,7 @@ if (!is_android && !is_mac) { > - data =3D [ > - "$root_out_dir/resources.pak", > - ] > -- if (is_linux || is_win) { > -+ if (is_linux || is_bsd || is_win) { > - data +=3D [ > - "$root_out_dir/chrome_100_percent.pak", > - "$root_out_dir/locales/en-US.pak", > -@@ -225,7 +225,7 @@ if (!is_android && !is_mac) { > - sources +=3D [ "app/chrome_exe_main_aura.cc" ] > - } > +--- chrome/BUILD.gn.orig 2017-09-05 21:05:11.000000000 +0200 > ++++ chrome/BUILD.gn 2017-09-06 17:18:59.694120000 +0200 > +@@ -165,7 +165,7 @@ > + ] > =20 > -- if (is_linux) { > -+ if (is_linux || is_bsd) { > - sources +=3D [ > - "app/chrome_dll_resource.h", > - "app/chrome_main.cc", > -@@ -1655,7 +1655,7 @@ if (enable_resource_whitelist_generation) { > + data +=3D [ "$root_out_dir/resources.pak" ] > +- if (is_linux || is_win) { > ++ if (is_linux || is_bsd || is_win) { > + data +=3D [ > + "$root_out_dir/chrome_100_percent.pak", > + "$root_out_dir/locales/en-US.pak", > +@@ -245,7 +245,7 @@ > + } > + } > +=20 > +- if (is_linux) { > ++ if (is_linux || is_bsd) { > + sources +=3D [ > + "app/chrome_dll_resource.h", > + "app/chrome_main.cc", > +@@ -1783,7 +1783,7 @@ > } > } > =20 >=20 > Modified: head/www/chromium/files/patch-chrome_app_chrome__main.cc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/files/patch-chrome_app_chrome__main.cc S > un Sep 17 10:56:44 2017 (r449990) > +++ head/www/chromium/files/patch-chrome_app_chrome__main.cc S > un Sep 17 11:10:43 2017 (r449991) > @@ -1,11 +1,19 @@ > ---- chrome/app/chrome_main.cc.orig 2017-07-25 > 21:04:49.000000000 +0200 > -+++ chrome/app/chrome_main.cc 2017-08-01 23:35:54.553290000 > +0200 > -@@ -92,7 +92,7 @@ > - const base::CommandLine* > command_line(base::CommandLine::ForCurrentProcess()); > +--- 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); > =20 > + // 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) > +=20 > + #if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING) > + #if !defined(OS_WIN) || defined(COMPONENT_BUILD) || \ >=20 > Modified: head/www/chromium/files/patch- > chrome_app_chrome__main__delegate.cc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/files/patch- > chrome_app_chrome__main__delegate.cc Sun Sep 17 10:56:44 2017=09 > (r449990) > +++ head/www/chromium/files/patch- > chrome_app_chrome__main__delegate.cc Sun Sep 17 11:10:43 2017=09 > (r449991) > @@ -1,7 +1,7 @@ > ---- chrome/app/chrome_main_delegate.cc.orig 2017-06-05 > 19:03:01 UTC > -+++ chrome/app/chrome_main_delegate.cc > -@@ -89,7 +89,7 @@ > - #include "chrome/app/chrome_crash_reporter_client.h" > +--- chrome/app/chrome_main_delegate.cc.orig 2017-09-05 > 21:05:12.000000000 +0200 > ++++ chrome/app/chrome_main_delegate.cc 2017-09-06 > 17:38:27.122172000 +0200 > +@@ -94,7 +94,7 @@ > + #include "chrome/app/shutdown_signal_handlers_posix.h" > #endif > =20 > -#if !defined(DISABLE_NACL) && defined(OS_LINUX) > @@ -9,21 +9,16 @@ > #include "components/nacl/common/nacl_paths.h" > #include "components/nacl/zygote/nacl_fork_delegate_linux.h" > #endif > -@@ -117,11 +117,11 @@ > - #include "ui/base/x/x11_util.h" // nogncheck > +@@ -140,7 +140,7 @@ > + #include "v8/include/v8.h" > #endif > =20 > --#if defined(OS_POSIX) && !defined(OS_MACOSX) > -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) > - #include "components/crash/content/app/breakpad_linux.h" > - #endif > -=20 > -#if defined(OS_LINUX) > +#if defined(OS_LINUX) || defined(OS_BSD) > #include "base/environment.h" > #endif > =20 > -@@ -164,7 +164,7 @@ > base::LazyInstance<ChromeContentBrowserClient>::Destru > +@@ -183,7 +183,7 @@ > g_chrome_content_browser_client =3D LAZY_INSTANCE_INITIALIZER; > #endif > =20 > @@ -32,7 +27,7 @@ > base::LazyInstance<ChromeCrashReporterClient>::Leaky > g_chrome_crash_client =3D > LAZY_INSTANCE_INITIALIZER; > #endif > -@@ -284,7 +284,7 @@ void AdjustLinuxOOMScore(const std::string& > process_ty > +@@ -309,7 +309,7 @@ > // and resources loaded. > bool SubprocessNeedsResourceBundle(const std::string& process_type) > { > return > @@ -41,7 +36,7 @@ > // The zygote process opens the resources for the renderers. > process_type =3D=3D switches::kZygoteProcess || > #endif > -@@ -336,7 +336,7 @@ void HandleHelpSwitches(const base::CommandLine& > comma > +@@ -361,7 +361,7 @@ > } > #endif > =20 > @@ -50,7 +45,7 @@ > void SIGTERMProfilingShutdown(int signal) { > Profiling::Stop(); > struct sigaction sigact; > -@@ -403,7 +403,7 @@ void InitializeUserDataDir(base::CommandLine* > command_ > +@@ -428,7 +428,7 @@ > std::string process_type =3D > command_line->GetSwitchValueASCII(switches::kProcessType); > =20 > @@ -59,7 +54,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. > -@@ -596,7 +596,7 @@ bool > ChromeMainDelegate::BasicStartupComplete(int* exi > +@@ -630,7 +630,7 @@ > std::string format_str =3D > command_line.GetSwitchValueASCII(switches::kDiagnosticsFo > rmat); > if (format_str =3D=3D "machine") { > @@ -68,7 +63,7 @@ > } else if (format_str =3D=3D "log") { > format =3D diagnostics::DiagnosticsWriter::LOG; > } else { > -@@ -646,7 +646,7 @@ bool > ChromeMainDelegate::BasicStartupComplete(int* exi > +@@ -680,7 +680,7 @@ > std::string format_str =3D > command_line.GetSwitchValueASCII(switches::kDiagnosticsFo > rmat); > if (format_str =3D=3D "machine") { > @@ -77,7 +72,7 @@ > } else if (format_str =3D=3D "human") { > format =3D diagnostics::DiagnosticsWriter::HUMAN; > } else { > -@@ -758,7 +758,7 @@ void ChromeMainDelegate::PreSandboxStartup() { > +@@ -792,7 +792,7 @@ > std::string process_type =3D > command_line.GetSwitchValueASCII(switches::kProcessType); > =20 > @@ -86,7 +81,7 @@ > crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Poin > ter()); > #endif > =20 > -@@ -888,7 +888,7 @@ void ChromeMainDelegate::PreSandboxStartup() { > +@@ -932,7 +932,7 @@ > chrome::InitializePDF(); > #endif > =20 > @@ -95,7 +90,7 @@ > // Zygote needs to call InitCrashReporter() in RunZygote(). > if (process_type !=3D switches::kZygoteProcess) { > #if defined(OS_ANDROID) > -@@ -903,7 +903,7 @@ void ChromeMainDelegate::PreSandboxStartup() { > +@@ -947,7 +947,7 @@ > breakpad::InitCrashReporter(process_type); > #endif // defined(OS_ANDROID) > } > @@ -104,7 +99,7 @@ > =20 > // After all the platform Breakpads have been initialized, store > the command > // line for crash reporting. > -@@ -1009,7 +1009,7 @@ bool > ChromeMainDelegate::DelaySandboxInitialization( > +@@ -1053,7 +1053,7 @@ > #endif > return process_type =3D=3D switches::kRelauncherProcess; > } >=20 > Modified: head/www/chromium/files/patch- > chrome_app_chromium__strings.grd > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/files/patch-chrome_app_chromium__strings.grd=09 > Sun Sep 17 10:56:44 2017 (r449990) > +++ head/www/chromium/files/patch-chrome_app_chromium__strings.grd=09 > Sun Sep 17 11:10:43 2017 (r449991) > @@ -1,11 +1,11 @@ > ---- chrome/app/chromium_strings.grd.orig 2017-06-05 19:03:01 > UTC > -+++ chrome/app/chromium_strings.grd > -@@ -886,7 +886,7 @@ Signing in anyway will merge Chromium > information like > +--- chrome/app/chromium_strings.grd.orig 2017-09-05 > 21:05:12.000000000 +0200 > ++++ chrome/app/chromium_strings.grd 2017-09-07 > 19:17:30.228682000 +0200 > +@@ -913,7 +913,7 @@ > </message> > =20 > <!-- ProcessSingleton --> > - <if expr=3D"is_linux or is_macosx"> > -+ <if expr=3D"is_linux or is_macosx or is_bsd"> > ++ <if expr=3D"is_linux or is_macosx or is_posix"> > <message name=3D"IDS_PROFILE_IN_USE_POSIX" desc=3D"Message > shown when the browser cannot start because the profile is in use on > a different host."> > The profile appears to be in use by another Chromium > process (<ph name=3D"PROCESS_ID">$1<ex>12345</ex></ph>) on another > computer (<ph name=3D"HOST_NAME">$2<ex>example.com</ex></ph>). Chromium > has locked the profile so that it doesn't get corrupted. If you are > sure no other processes are using this profile, you can unlock the > profile and relaunch Chromium. > </message> >=20 > Modified: head/www/chromium/files/patch- > chrome_app_generated__resources.grd > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/files/patch-chrome_app_generated__resources.grd > Sun Sep 17 10:56:44 2017 (r449990) > +++ head/www/chromium/files/patch-chrome_app_generated__resources.grd > Sun Sep 17 11:10:43 2017 (r449991) > @@ -1,29 +1,29 @@ > ---- chrome/app/generated_resources.grd.orig 2017-06-05 > 19:03:01 UTC > -+++ chrome/app/generated_resources.grd > -@@ -8084,7 +8084,7 @@ I don't think this site should be blocked! > +--- chrome/app/generated_resources.grd.orig 2017-09-05 > 21:05:12.000000000 +0200 > ++++ chrome/app/generated_resources.grd 2017-09-07 > 19:12:11.757513000 +0200 > +@@ -7906,7 +7906,7 @@ > <message name=3D"IDS_APPEARANCE_GROUP_NAME" desc=3D"The title of > the appearance group"> > Appearance > </message> > - <if expr=3D"not is_linux or chromeos"> > -+ <if expr=3D"not is_linux or not is_bsd or chromeos"> > ++ <if expr=3D"not is_posix or chromeos"> > <message name=3D"IDS_THEMES_GROUP_NAME" desc=3D"The title of > the themes group"> > Themes > </message> > -@@ -8092,7 +8092,7 @@ I don't think this site should be blocked! > +@@ -7914,7 +7914,7 @@ > <message name=3D"IDS_THEMES_RESET_BUTTON" desc=3D"The button to > reset your theme"> > Reset to default theme > </message> > - <if expr=3D"is_linux and not chromeos"> > -+ <if expr=3D"is_linux or is_bsd and not chromeos"> > ++ <if expr=3D"is_posix and not chromeos"> > <message name=3D"IDS_THEMES_GTK_BUTTON" desc=3D"The button to > choose GTK colors and icons as the current theme."> > Use GTK+ theme > </message> > -@@ -9347,7 +9347,7 @@ Tell us what happened exactly before you got > the profi > +@@ -9183,7 +9183,7 @@ > Set as default > </message> > =20 > - <if expr=3D"is_linux and not chromeos"> > -+ <if expr=3D"is_linux or is_bsd and not chromeos"> > ++ <if expr=3D"is_posix and not chromeos"> > <message name=3D"IDS_SHOW_WINDOW_DECORATIONS_MENU" desc=3D"The > menu entry text in the tab strip context menu. This toggles the > system title bar and window borders (window decorations) on linux."> > Use system title bar and borders > </message> >=20 > Modified: head/www/chromium/files/patch- > chrome_app_google__chrome__strings.grd > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/files/patch- > chrome_app_google__chrome__strings.grd Sun Sep 17 10:56:44 > 2017 (r449990) > +++ head/www/chromium/files/patch- > chrome_app_google__chrome__strings.grd Sun Sep 17 11:10:43 > 2017 (r449991) > @@ -1,11 +1,11 @@ > ---- chrome/app/google_chrome_strings.grd.orig 2017-06-05 > 19:03:01 UTC > -+++ chrome/app/google_chrome_strings.grd > -@@ -887,7 +887,7 @@ Signing in anyway will merge Chrome information > like b > +--- chrome/app/google_chrome_strings.grd.orig 2017-09-05 > 21:05:12.000000000 +0200 > ++++ chrome/app/google_chrome_strings.grd 2017-09-07 > 19:16:11.038110000 +0200 > +@@ -917,7 +917,7 @@ > </message> > =20 > <!-- ProcessSingleton --> > - <if expr=3D"is_linux or is_macosx"> > -+ <if expr=3D"is_linux or is_macosx or is_bsd"> > ++ <if expr=3D"is_linux or is_macosx or is_posix"> > <message name=3D"IDS_PROFILE_IN_USE_POSIX" desc=3D"Message > shown when the browser cannot start because the profile is in use on > a different host."> > The profile appears to be in use by another Google Chrome > process (<ph name=3D"PROCESS_ID">$1<ex>12345</ex></ph>) on another > computer (<ph name=3D"HOST_NAME">$2<ex>example.com</ex></ph>). Chrome > has locked the profile so that it doesn't get corrupted. If you are > sure no other processes are using this profile, you can unlock the > profile and relaunch Chrome. > </message> >=20 > Added: head/www/chromium/files/patch- > chrome_app_theme_chrome_unscaled_resources.grd > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is > newly added) > +++ head/www/chromium/files/patch- > chrome_app_theme_chrome_unscaled_resources.grd Sun Sep 17 > 11:10:43 2017 (r449991) > @@ -0,0 +1,11 @@ > +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2017- > 09-07 19:07:10.298267000 +0200 > ++++ chrome/app/theme/chrome_unscaled_resources.grd 2017-09-07=20 > 19:07:26.024168000 +0200 > +@@ -80,7 +80,7 @@ > + <include name=3D"IDR_PROFILE_AVATAR_2X_25" > file=3D"default_200_percent/common/profile_avatar_sun_cloud.png" > type=3D"BINDATA" /> > + <include name=3D"IDR_PROFILE_AVATAR_2X_26" > file=3D"default_200_percent/common/profile_avatar_placeholder.png" > type=3D"BINDATA" /> > + </if> > +- <if expr=3D"is_linux and enable_app_list"> > ++ <if expr=3D"is_posix and enable_app_list"> > + <!-- App Launcher icons for desktop icon. --> > + <if expr=3D"_google_chrome"> > + <then> >=20 > Added: head/www/chromium/files/patch- > chrome_browser_background_background_mode_optimizer.cc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is > newly added) > +++ head/www/chromium/files/patch- > chrome_browser_background_background_mode_optimizer.cc Sun Sep > 17 11:10:43 2017 (r449991) > @@ -0,0 +1,15 @@ > +--- chrome/browser/background/background_mode_optimizer.cc.orig=09 > 2017-09-07 23:33:41.430876000 +0200 > ++++ chrome/browser/background/background_mode_optimizer.cc 20 > 17-09-07 23:34:04.189439000 +0200 > +@@ -30,10 +30,10 @@ > + switches::kKeepAliveForTest)) > + return nullptr; > +=20 > +-#if defined(OS_WIN) || defined(OS_LINUX) > ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) > + if > (base::FeatureList::IsEnabled(features::kBackgroundModeAllowRestart)) > + return base::WrapUnique(new BackgroundModeOptimizer()); > +-#endif // defined(OS_WIN) || defined(OS_LINUX) > ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) > +=20 > + return nullptr; > + } >=20 > Modified: head/www/chromium/files/patch- > chrome_browser_browser__process__impl.cc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/files/patch- > chrome_browser_browser__process__impl.cc Sun Sep 17 10:56:44 > 2017 (r449990) > +++ head/www/chromium/files/patch- > chrome_browser_browser__process__impl.cc Sun Sep 17 11:10:43 > 2017 (r449991) > @@ -1,20 +1,20 @@ > ---- chrome/browser/browser_process_impl.cc.orig 2017-06-05 > 19:03:02 UTC > -+++ chrome/browser/browser_process_impl.cc > -@@ -171,7 +171,7 @@ > +--- chrome/browser/browser_process_impl.cc.orig 2017-09-05 > 21:05:12.000000000 +0200 > ++++ chrome/browser/browser_process_impl.cc 2017-09-06 > 17:46:42.465787000 +0200 > +@@ -173,7 +173,7 @@ > #include "chrome/browser/media/webrtc/webrtc_log_uploader.h" > #endif > =20 > -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) > +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || > defined(OS_BSD) > - #include "chrome/browser/memory/tab_manager.h" > + #include "chrome/browser/resource_coordinator/tab_manager.h" > #endif > =20 > -@@ -810,7 +810,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_driver() > { > +@@ -796,7 +796,7 @@ > =20 > - memory::TabManager* BrowserProcessImpl::GetTabManager() { > - DCHECK(CalledOnValidThread()); > + resource_coordinator::TabManager* > BrowserProcessImpl::GetTabManager() { > + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); > -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) > +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || > defined(OS_BSD) > if (!tab_manager_.get()) > - tab_manager_.reset(new memory::TabManager()); > + tab_manager_.reset(new resource_coordinator::TabManager()); > return tab_manager_.get(); >=20 > Modified: head/www/chromium/files/patch- > chrome_browser_browser__resources.grd > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/files/patch- > chrome_browser_browser__resources.grd Sun Sep 17 10:56:44 2017 > (r449990) > +++ head/www/chromium/files/patch- > chrome_browser_browser__resources.grd Sun Sep 17 11:10:43 2017 > (r449991) > @@ -1,11 +1,20 @@ > ---- chrome/browser/browser_resources.grd.orig 2017-06-05 > 19:03:02 UTC > -+++ chrome/browser/browser_resources.grd > -@@ -404,7 +404,7 @@ > +--- chrome/browser/browser_resources.grd.orig 2017-09-05 > 21:05:12.000000000 +0200 > ++++ chrome/browser/browser_resources.grd 2017-09-07 > 19:30:41.365751000 +0200 > +@@ -424,7 +424,7 @@ > <include name=3D"IDR_ABOUT_VOICESEARCH_JS" > file=3D"resources\about_voicesearch.js" type=3D"BINDATA" /> > <include name=3D"IDR_PLUGIN_DB_JSON" > file=3D"resources\plugin_metadata\plugins_chromeos.json" type=3D"BINDATA" > /> > </if> > - <if expr=3D"desktop_linux or (is_android and enable_plugins)"> > -+ <if expr=3D"desktop_linux or (is_android and enable_plugins) or > is_bsd"> > ++ <if expr=3D"desktop_linux or (is_android and enable_plugins) or > is_posix"> > <include name=3D"IDR_PLUGIN_DB_JSON" > file=3D"resources\plugin_metadata\plugins_linux.json" type=3D"BINDATA" /> > </if> > <if expr=3D"is_android"> > +@@ -674,7 +674,7 @@ > + <if expr=3D"not is_android and not is_ios"> > + <include name=3D"IDR_SSL_ERROR_ASSISTANT_PB" > file=3D"${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistan > t/ssl_error_assistant.pb" use_base_dir=3D"false" type=3D"BINDATA" /> > + </if> > +- <if expr=3D"is_android or is_linux"> > ++ <if expr=3D"is_android or is_posix"> > + <include name=3D"IDR_SANDBOX_INTERNALS_HTML" > file=3D"resources\sandbox_internals\sandbox_internals.html" > flattenhtml=3D"true" allowexternalscript=3D"true" type=3D"BINDATA" > compress=3D"gzip" /> > + <include name=3D"IDR_SANDBOX_INTERNALS_JS" > file=3D"resources\sandbox_internals\sandbox_internals.js" > type=3D"BINDATA" compress=3D"gzip" /> > + </if> >=20 > Modified: head/www/chromium/files/patch- > chrome_browser_chrome__content__browser__client.cc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/www/chromium/files/patch- > chrome_browser_chrome__content__browser__client.cc Sun Sep 17 > 10:56:44 2017 (r449990) > +++ head/www/chromium/files/patch- > chrome_browser_chrome__content__browser__client.cc Sun Sep 17 > 11:10:43 2017 (r449991) > @@ -1,15 +1,15 @@ > ---- chrome/browser/chrome_content_browser_client.cc.orig 2017 > -06-15 21:03:01.000000000 +0200 > -+++ chrome/browser/chrome_content_browser_client.cc 2017-06- > 18 04:59:41.793684000 +0200 > -@@ -249,7 +249,7 @@ > - #include "mash/public/interfaces/launchable.mojom.h" > - #include "services/service_manager/public/cpp/interface_factory.h" > +--- chrome/browser/chrome_content_browser_client.cc.orig 2017 > -09-05 21:05:12.000000000 +0200 > ++++ chrome/browser/chrome_content_browser_client.cc 2017-09- > 06 17:56:29.888034000 +0200 > +@@ -258,7 +258,7 @@ > + #include "chromeos/chromeos_switches.h" > + #include "components/user_manager/user_manager.h" > #include > "services/service_manager/public/interfaces/interface_provider_spec.m > ojom.h" > -#elif defined(OS_LINUX) >=20 > *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** >=20 --=20 Carlos Jacobo Puga Medina <cpm@FreeBSD.org> PGP fingerprint =3D C60E 9497 5302 793B CC2D BB89 A1F3 5D66 E6D0 5453 --=-4E2RiO9sZIsGpP1FXXM6 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQGTBAABCgB9FiEExg6Ul1MCeTvMLbuJofNdZubQVFMFAlm+WoNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2 MEU5NDk3NTMwMjc5M0JDQzJEQkI4OUExRjM1RDY2RTZEMDU0NTMACgkQofNdZubQ VFN1rQf9GtoUgtMhhAvG2qm/b33Q4my4naJQHWZ6q7Pk6o7M+Yrz7bsvzCEV+T9m 3KV6U6HsltJj3E7V3YOrfld3y4AuvRv52YJ7ARDCadHgTtz9ILMKeOGxL9AGgp6A KQPc1ovlXiSPE+YPIV+lmQJld/nx7SnayNbhVVw0hd8PkxAl6i+gFBnvDWDIaibM wpF887FnJIxW3u52gZpMk9j4QSsKysDKjSWoPlZJksBsnj0Zc0lehcbPEXUs1kt1 putziCtwV6Z4vwIdSqhKBdSfFT9T+HMi85416Nu6+webu1npfXI4dHsbUBrdFZfY GMidrHlO1h0xGFDF71oJ5zyi4EYM7A== =EGRd -----END PGP SIGNATURE----- --=-4E2RiO9sZIsGpP1FXXM6--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1505647234.87385.1.camel>