Date: Wed, 8 Oct 2014 08:41:51 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370423 - in head/www/chromium: . files Message-ID: <201410080841.s988fq88052585@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Wed Oct 8 08:41:51 2014 New Revision: 370423 URL: https://svnweb.freebsd.org/changeset/ports/370423 QAT: https://qat.redports.org/buildarchive/r370423/ Log: www/chromium: Update to 38.0.2125.101 and clean up pkg-plist Thanks to all contributors: "tomek", "pavoropaev", Carlos Medina Obtained from: https://github.com/gliaskos/freebsd-chromium/ MFH: 2014Q4 Security: http://www.vuxml.org/freebsd/d2bbcc01-4ec3-11e4-ab3f-00262d5ed8ee.html Added: head/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc (contents, props changed) head/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc (contents, props changed) head/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc (contents, props changed) head/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc (contents, props changed) head/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc (contents, props changed) head/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h (contents, props changed) head/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc (contents, props changed) head/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc (contents, props changed) head/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc (contents, props changed) head/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h (contents, props changed) head/www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc (contents, props changed) head/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc (contents, props changed) head/www/chromium/files/patch-content__browser__tracing__tracing_ui.cc (contents, props changed) head/www/chromium/files/patch-content__gpu__gpu_child_thread.cc (contents, props changed) head/www/chromium/files/patch-content__gpu__gpu_main.cc (contents, props changed) head/www/chromium/files/patch-content__public__common__content_switches.cc (contents, props changed) head/www/chromium/files/patch-content__public__common__content_switches.h (contents, props changed) head/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc (contents, props changed) head/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc (contents, props changed) head/www/chromium/files/patch-gpu__config__gpu_info_collector.cc (contents, props changed) head/www/chromium/files/patch-gpu__config__gpu_util.cc (contents, props changed) head/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h (contents, props changed) head/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h (contents, props changed) head/www/chromium/files/patch-third_party__pdfium__third_party__logging.h (contents, props changed) head/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc (contents, props changed) head/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h (contents, props changed) head/www/chromium/files/patch-third_party__webrtc__base__linux.cc (contents, props changed) head/www/chromium/files/patch-third_party__webrtc__base__linux.h (contents, props changed) head/www/chromium/files/patch-third_party__webrtc__base__network.h (contents, props changed) head/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc (contents, props changed) head/www/chromium/files/patch-ui__views__window__custom_frame_view.cc (contents, props changed) head/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc (contents, props changed) head/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc (contents, props changed) head/www/chromium/files/patch-v8__src__preparser.h (contents, props changed) Deleted: head/www/chromium/files/extra-patch-fixup-execinfo head/www/chromium/files/patch-chrome__browser__browser_process_impl.cc head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc head/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc head/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc head/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc head/www/chromium/files/patch-third_party__WebKit__Source__config.h head/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp head/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp head/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp head/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc head/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h head/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc head/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h head/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h head/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc head/www/chromium/files/patch-ui__resources__ui_resources.grd head/www/chromium/files/patch-v8__src__platform-freebsd.cc Modified: head/www/chromium/Makefile head/www/chromium/distinfo head/www/chromium/files/chromium-browser.desktop.in head/www/chromium/files/extra-patch-clang head/www/chromium/files/extra-patch-gcc head/www/chromium/files/patch-base__base.gyp head/www/chromium/files/patch-base__base.gypi head/www/chromium/files/patch-base__debug__stack_trace_posix.cc head/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h head/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc head/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc head/www/chromium/files/patch-base__process__internal_linux.h head/www/chromium/files/patch-base__process__launch.cc head/www/chromium/files/patch-base__process__launch.h head/www/chromium/files/patch-base__process__memory_unittest.cc head/www/chromium/files/patch-base__process__process_iterator_freebsd.cc head/www/chromium/files/patch-base__process__process_metrics.h head/www/chromium/files/patch-base__process__process_metrics_freebsd.cc head/www/chromium/files/patch-base__security_unittest.cc head/www/chromium/files/patch-base__strings__safe_sprintf.cc head/www/chromium/files/patch-base__sys_info_freebsd.cc head/www/chromium/files/patch-base__sys_info_posix.cc head/www/chromium/files/patch-base__test__expectations__expectation.cc head/www/chromium/files/patch-base__test__launcher__test_launcher.cc head/www/chromium/files/patch-base__threading__platform_thread_linux.cc head/www/chromium/files/patch-breakpad__breakpad.gyp head/www/chromium/files/patch-build__common.gypi head/www/chromium/files/patch-build__filename_rules.gypi head/www/chromium/files/patch-build__linux__system.gyp head/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp head/www/chromium/files/patch-build__linux__unbundle__openssl.gyp head/www/chromium/files/patch-cc__layers__layer_impl.cc head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h head/www/chromium/files/patch-chrome__app__chromium_strings.grd head/www/chromium/files/patch-chrome__app__resources__locale_settings.grd head/www/chromium/files/patch-chrome__browser__about_flags.cc head/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc head/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.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__diagnostics__diagnostics_writer.cc head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h head/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc head/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc head/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc head/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc head/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc head/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc head/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc head/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc head/www/chromium/files/patch-chrome__browser__memory_details.cc head/www/chromium/files/patch-chrome__browser__net__connection_tester.cc head/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc head/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc head/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc head/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc head/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc head/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.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__web_applications__web_app.cc head/www/chromium/files/patch-chrome__browser__web_applications__web_app.h head/www/chromium/files/patch-chrome__chrome_browser.gypi head/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi head/www/chromium/files/patch-chrome__chrome_browser_ui.gypi 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__pref_names.cc head/www/chromium/files/patch-chrome__common__pref_names.h head/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc head/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h head/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc head/www/chromium/files/patch-chrome__test__base__testing_browser_process.h head/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc head/www/chromium/files/patch-chrome__test__perf__perf_test.cc head/www/chromium/files/patch-chrome__tools__build__linux__sed.sh 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__storage_monitor.gypi head/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h head/www/chromium/files/patch-components__usb_service.gypi head/www/chromium/files/patch-components__usb_service__usb_context.cc head/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc head/www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc head/www/chromium/files/patch-components__usb_service__usb_device_impl.cc head/www/chromium/files/patch-components__usb_service__usb_error.cc head/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc head/www/chromium/files/patch-components__usb_service__usb_service_impl.cc head/www/chromium/files/patch-content__app__content_main_runner.cc head/www/chromium/files/patch-content__browser__browser_main_loop.cc head/www/chromium/files/patch-content__browser__child_process_launcher.cc head/www/chromium/files/patch-content__browser__download__base_file.cc head/www/chromium/files/patch-content__browser__download__base_file_linux.cc head/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h head/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc head/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc head/www/chromium/files/patch-content__common__set_process_title_linux.cc head/www/chromium/files/patch-content__common__set_process_title_linux.h head/www/chromium/files/patch-content__content_browser.gypi head/www/chromium/files/patch-content__content_common.gypi head/www/chromium/files/patch-content__content_tests.gypi head/www/chromium/files/patch-content__public__test__browser_test_base.cc head/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc head/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc head/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc head/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc head/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc head/www/chromium/files/patch-crypto__nss_util.cc head/www/chromium/files/patch-device__hid__hid.gyp head/www/chromium/files/patch-device__serial__serial.gyp head/www/chromium/files/patch-gpu__config__gpu_control_list.cc head/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc head/www/chromium/files/patch-gpu__config__gpu_test_config.cc head/www/chromium/files/patch-gpu__gpu_config.gypi head/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc head/www/chromium/files/patch-media__base__audio_splicer.cc head/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc head/www/chromium/files/patch-media__media.gyp head/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc head/www/chromium/files/patch-native_client__build__common.gypi head/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp head/www/chromium/files/patch-net__base__address_tracker_linux.h head/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc head/www/chromium/files/patch-net__base__dns_reloader.cc head/www/chromium/files/patch-net__base__mime_util_unittest.cc head/www/chromium/files/patch-net__base__net_util.h head/www/chromium/files/patch-net__base__network_change_notifier.cc head/www/chromium/files/patch-net__dns__address_sorter_posix.cc head/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc head/www/chromium/files/patch-net__dns__dns_session.cc head/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc head/www/chromium/files/patch-net__net.gyp head/www/chromium/files/patch-net__net.gypi head/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc head/www/chromium/files/patch-net__proxy__proxy_service.cc head/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc head/www/chromium/files/patch-net__socket__socks5_client_socket.cc head/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h head/www/chromium/files/patch-net__udp__udp_socket_unittest.cc head/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc head/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc head/www/chromium/files/patch-printing__printing.gyp head/www/chromium/files/patch-remoting__remoting_host.gypi head/www/chromium/files/patch-skia__skia_chrome.gypi head/www/chromium/files/patch-skia__skia_common.gypi head/www/chromium/files/patch-sync__util__get_session_name.cc head/www/chromium/files/patch-sync__util__get_session_name_linux.cc head/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h head/www/chromium/files/patch-testing__gtest__src__gtest.cc head/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp head/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp head/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp head/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp head/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h head/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp head/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h head/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c head/www/chromium/files/patch-third_party__khronos__khronos.gyp head/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp head/www/chromium/files/patch-third_party__libexif__libexif.gyp head/www/chromium/files/patch-third_party__libjingle__libjingle.gyp head/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp head/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp head/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh head/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h head/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi head/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp head/www/chromium/files/patch-third_party__pdfium__pdfium.gyp head/www/chromium/files/patch-third_party__sfntly__sfntly.gyp head/www/chromium/files/patch-third_party__sqlite__sqlite.gyp 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__physicalsocketserver.cc head/www/chromium/files/patch-third_party__webrtc__base__stringutils.h head/www/chromium/files/patch-third_party__webrtc__build__common.gypi head/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi head/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi head/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc head/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc head/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h head/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py head/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp head/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp head/www/chromium/files/patch-ui__app_list__app_list_constants.cc head/www/chromium/files/patch-ui__app_list__app_list_constants.h head/www/chromium/files/patch-ui__base__ui_base.gyp 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__gl__gl.gyp head/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc head/www/chromium/files/patch-ui__views__views.gyp head/www/chromium/files/patch-ui__views__views_delegate.cc head/www/chromium/files/patch-ui__views__views_delegate.h head/www/chromium/pkg-plist Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/Makefile Wed Oct 8 08:41:51 2014 (r370423) @@ -2,14 +2,13 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 37.0.2062.124 -PORTREVISION= 1 +PORTVERSION= 38.0.2125.101 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= chromium@FreeBSD.org -COMMENT= Mostly BSD-licensed web browser based on WebKit and Gtk+ +COMMENT= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi @@ -41,7 +40,6 @@ LIB_DEPENDS= libcairo.so:${PORTSDIR}/gra libicuuc.so:${PORTSDIR}/devel/icu \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \ - libminizip.so:${PORTSDIR}/archivers/minizip \ libnspr4.so:${PORTSDIR}/devel/nspr \ libprotobuf.so:${PORTSDIR}/devel/protobuf \ libpng.so:${PORTSDIR}/graphics/png \ @@ -64,7 +62,6 @@ CPE_PRODUCT= chrome USE_PERL5= build USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst USE_GNOME= glib20 gtk20 dconf libxslt -USE_OPENSSL= yes # must be from base to prevent a link failure against cups SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome INSTALLS_ICONS= yes @@ -77,6 +74,7 @@ GYP_DEFINES+= \ linux_strip_binary=1 \ test_isolation_mode=noop \ disable_nacl=1 \ + enable_extensions=1 \ enable_one_click_signin=1 \ enable_openmax=1 \ enable_webrtc=1 \ @@ -106,16 +104,13 @@ GYP_DEFINES+= \ use_system_libwebp=1 \ use_system_libxml=1 \ use_system_libxslt=1 \ - use_system_minizip=1 \ use_system_nspr=1 \ - use_system_openssl=1 \ use_system_protobuf=1 \ use_system_re2=1 \ use_system_snappy=1 \ use_system_speex=1 \ use_system_xdg_utils=1 \ - use_system_yasm=1 \ - use_system_zlib=1 + use_system_yasm=1 # allow removal of third_party/adobe GYP_DEFINES+= flapper_version_h_file='${WRKSRC}/flapper_version.h' @@ -169,9 +164,6 @@ GYP_DEFINES+= disable_sse2=1 .if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libusb-pc .endif -.if ${OSVERSION} >= 1000052 && !exists(${LOCALBASE}/include/execinfo.h) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-execinfo -.endif .if ${PORT_OPTIONS:MTEST} .include "Makefile.tests" @@ -191,13 +183,10 @@ CONFIGURE_ENV+= CC="${CC}" \ GYP_DEFINES="${GYP_DEFINES}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF="${LOCALBASE}/bin/gperf" +MAKE_ARGS= -C out/${BUILDTYPE} .include <bsd.port.pre.mk> -#XXX redefine MAKE_ARGS after bsd.port.pre.mk to avoid OPENSSL flags -# leaking in which confuses ninja -MAKE_ARGS= -C out/${BUILDTYPE} - .if ${CHOSEN_COMPILER_TYPE} == gcc GYP_DEFINES+= gcc_version=${CXX:S/g++//} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc @@ -235,11 +224,6 @@ post-patch: @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \ ${WRKSRC}/chrome/common/chrome_paths.cc \ ${WRKSRC}/base/base.gyp - @${REINPLACE_CMD} -e "s|/usr/bin/gcc|${CC}|" \ - ${WRKSRC}/third_party/WebKit/Source/build/scripts/preprocessor.pm \ - ${WRKSRC}/third_party/WebKit/Source/build/scripts/scripts.gypi - @${REINPLACE_CMD} -e "s|g++|${CXX}|" \ - ${WRKSRC}/tools/compile_test/compile_test.py pre-configure: # phajdan-jr: list of things *not* to remove, so maybe the script @@ -256,6 +240,7 @@ pre-configure: 'base/third_party/xdg_mime' \ 'base/third_party/xdg_user_dirs' \ 'breakpad/src/third_party/curl' \ + 'chrome/third_party/mock4js' \ 'chrome/third_party/mozilla_security_manager' \ 'courgette/third_party' \ 'crypto/third_party/nss' \ @@ -263,11 +248,15 @@ pre-configure: 'net/third_party/nss' \ 'third_party/WebKit' \ 'third_party/angle' \ + 'third_party/angle/src/third_party' \ + 'third_party/blanketjs' \ 'third_party/brotli' \ + 'third_party/boringssl' \ 'third_party/cacheinvalidation' \ 'third_party/cld' \ 'third_party/cros_system_api' \ 'third_party/dom_distiller_js' \ + 'third_party/dom_distiller_js/package/proto_gen/third_party/dom_distiller_js' \ 'third_party/ffmpeg' \ 'third_party/fips181' \ 'third_party/flot' \ @@ -283,6 +272,7 @@ pre-configure: 'third_party/libphonenumber' \ 'third_party/libsrtp' \ 'third_party/libvpx' \ + 'third_party/libvpx/source/libvpx/third_party/x86inc' \ 'third_party/libwebm' \ 'third_party/libxml/chromium' \ 'third_party/libXNVCtrl' \ @@ -297,27 +287,34 @@ pre-configure: 'third_party/opus' \ 'third_party/ots' \ 'third_party/pdfium' \ + 'third_party/pdfium/third_party' \ 'third_party/ply' \ 'third_party/polymer' \ 'third_party/pywebsocket' \ 'third_party/qcms' \ + 'third_party/qunit' \ 'third_party/readability' \ 'third_party/sfntly' \ + 'third_party/sinonjs' \ 'third_party/skia' \ 'third_party/smhasher' \ 'third_party/sqlite' \ 'third_party/tcmalloc' \ 'third_party/tlslite' \ 'third_party/trace-viewer' \ + 'third_party/trace-viewer/third_party' \ + 'third_party/trace-viewer/third_party/tvcm/third_party' \ 'third_party/undoview' \ 'third_party/usrsctp' \ 'third_party/webdriver' \ 'third_party/webrtc' \ 'third_party/widevine' \ 'third_party/x86inc' \ - 'third_party/zlib/google' \ + 'third_party/yasm' \ + 'third_party/zlib' \ 'url/third_party/mozilla' \ 'v8/src/third_party/valgrind' \ + 'v8/third_party/fdlibm' \ --do-remove || ${FALSE} cd ${WRKSRC} && ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gyp_files.py \ Modified: head/www/chromium/distinfo ============================================================================== --- head/www/chromium/distinfo Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/distinfo Wed Oct 8 08:41:51 2014 (r370423) @@ -1,4 +1,4 @@ -SHA256 (chromium-37.0.2062.124.tar.xz) = 5a7ca0b1e9b4c51555cf82d8bebf5a8cc5b5810ccacd1087ba82a17b8ac830d8 -SIZE (chromium-37.0.2062.124.tar.xz) = 223325856 -SHA256 (chromium-37.0.2062.124-testdata.tar.xz) = 08a9febabe4995b88ccb99203057fac2056615e35fe5e8907604a1e07e1a9794 -SIZE (chromium-37.0.2062.124-testdata.tar.xz) = 114485636 +SHA256 (chromium-38.0.2125.101.tar.xz) = d3303519ab471a3bc831e9b366e64dc2fe651894e52ae5d1e74de60ee2a1198a +SIZE (chromium-38.0.2125.101.tar.xz) = 248192100 +SHA256 (chromium-38.0.2125.101-testdata.tar.xz) = aca97e1f3d1e4018ef24d7f53c9273b5efde4496f73dc82622184409e9b3076e +SIZE (chromium-38.0.2125.101-testdata.tar.xz) = 115331828 Modified: head/www/chromium/files/chromium-browser.desktop.in ============================================================================== --- head/www/chromium/files/chromium-browser.desktop.in Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/chromium-browser.desktop.in Wed Oct 8 08:41:51 2014 (r370423) @@ -4,7 +4,7 @@ Version=1.0 Encoding=UTF-8 Name=Chromium Comment=%%COMMENT%% -Icon=chrome +Icon=%%DATADIR%%/product_logo_48.png Exec=chrome %U Categories=Application;Network;WebBrowser; MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp; Modified: head/www/chromium/files/extra-patch-clang ============================================================================== --- head/www/chromium/files/extra-patch-clang Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/extra-patch-clang Wed Oct 8 08:41:51 2014 (r370423) @@ -89,17 +89,6 @@ const TrackedTime kTimePosted = TrackedTime() + Duration::FromMilliseconds(1); const TrackedTime kStartOfRun = TrackedTime() + ---- chrome/browser/metrics/thread_watcher.cc 2013-07-03 23:45:55.000000000 -0400 -+++ chrome/browser/metrics/thread_watcher.cc 2013-07-19 01:38:45.000000000 -0400 -@@ -41,7 +41,7 @@ - MSVC_PUSH_DISABLE_WARNING(4748) - - int* NullPointer() { -- return reinterpret_cast<int*>(NULL); -+ return static_cast<int*>(NULL); - } - - void NullPointerCrash(int line_number) { --- chrome/browser/sync/glue/synced_session_tracker.cc 2013-07-03 23:46:07.000000000 -0400 +++ chrome/browser/sync/glue/synced_session_tracker.cc 2013-07-19 01:50:13.000000000 -0400 @@ -260,7 +260,7 @@ @@ -122,17 +111,17 @@ EXPECT_CALL(callback_, OnError(_)) .Times(2); ---- media/filters/decrypting_video_decoder_unittest.cc.orig 2013-08-30 23:27:39.000000000 +0300 -+++ media/filters/decrypting_video_decoder_unittest.cc 2013-08-30 23:28:27.000000000 +0300 -@@ -417,7 +417,7 @@ - // callback to cancel the |decryptor_ready_cb|. - EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback())) - .WillOnce(ResetAndRunCallback(&decryptor_ready_cb, -- reinterpret_cast<Decryptor*>(NULL))); -+ static_cast<Decryptor*>(NULL))); - Stop(); - } - +--- media/filters/decrypting_video_decoder_unittest.cc.orig 2014-09-04 02:04:17.000000000 +0200 ++++ media/filters/decrypting_video_decoder_unittest.cc 2014-09-08 20:51:21.000000000 +0200 +@@ -420,7 +420,7 @@ + // NULL callback to cancel the |decryptor_ready_cb|. + EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback())).WillOnce( + ResetAndRunCallback(&decryptor_ready_cb, +- reinterpret_cast<Decryptor*>(NULL), ++ static_cast<Decryptor*>(NULL), + base::Bind(&DecryptingVideoDecoderTest::DecryptorSet, + base::Unretained(this)))); + EXPECT_CALL(*this, DecryptorSet(_)).Times(0); --- third_party/hunspell/src/hunspell/affentry.hxx 2013-07-03 23:52:32.000000000 -0400 +++ third_party/hunspell/src/hunspell/affentry.hxx 2013-07-19 01:31:57.000000000 -0400 @@ -27,7 +27,7 @@ @@ -153,17 +142,6 @@ char * check_twosfx_morph(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); ---- third_party/libjingle/source/talk/base/taskrunner.cc 2013-07-03 23:54:05.000000000 -0400 -+++ third_party/libjingle/source/talk/base/taskrunner.cc 2013-07-19 00:46:25.000000000 -0400 -@@ -119,7 +119,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()); - --- third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2013-07-03 23:54:15.000000000 -0400 +++ third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2013-07-19 00:44:09.000000000 -0400 @@ -439,7 +439,7 @@ @@ -278,3 +256,14 @@ tasks_.erase(it, tasks_.end()); +--- v8/src/unique.h.orig 2014-09-04 02:30:24.000000000 +0200 ++++ v8/src/unique.h 2014-09-10 16:19:37.000000000 +0200 +@@ -167,7 +167,7 @@ + + // TODO(titzer): this is a hack to migrate to Unique<T> incrementally. + static PrintableUnique<T> CreateUninitialized(Zone* zone, Handle<T> handle) { +- return PrintableUnique<T>(zone, reinterpret_cast<Address>(NULL), handle); ++ return PrintableUnique<T>(zone, static_cast<Address>(NULL), handle); + } + + static PrintableUnique<T> CreateImmovable(Zone* zone, Handle<T> handle) { Modified: head/www/chromium/files/extra-patch-gcc ============================================================================== --- head/www/chromium/files/extra-patch-gcc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/extra-patch-gcc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,23 +1,3 @@ ---- base/memory/shared_memory.h.orig 2011-04-01 21:54:26.066717848 +0300 -+++ base/memory/shared_memory.h 2011-04-01 21:55:14.292717813 +0300 -@@ -12,6 +12,7 @@ - - #if defined(OS_POSIX) - #include <sys/types.h> -+#include <stdio.h> - #include <semaphore.h> - #include "base/file_descriptor_posix.h" - #endif ---- third_party/libjingle/source/talk/base/stream.h.orig 2011-04-01 22:16:30.129717654 +0300 -+++ third_party/libjingle/source/talk/base/stream.h 2011-04-01 22:16:48.245715495 +0300 -@@ -30,6 +30,7 @@ - #ifndef TALK_BASE_STREAM_H__ - #define TALK_BASE_STREAM_H__ - -+#include <stdio.h> - #include "talk/base/basictypes.h" - #include "talk/base/criticalsection.h" - #include "talk/base/logging.h" --- media/filters/file_data_source.h.orig 2011-09-14 10:01:06.000000000 +0200 +++ media/filters/file_data_source.h 2011-09-26 19:08:17.000000000 +0200 @@ -5,6 +5,7 @@ @@ -27,7 +7,7 @@ +#include <cstdio> #include <string> - #include "base/gtest_prod_util.h" + #include "base/files/file.h" --- content/public/common/child_process_sandbox_support_linux.h.orig 2013-10-11 19:30:28.000000000 +0200 +++ content/public/common/child_process_sandbox_support_linux.h 2013-10-16 15:29:00.000000000 +0200 @@ -7,6 +7,7 @@ @@ -76,18 +56,8 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" ---- ui/gfx/codec/jpeg_codec.cc.orig 2014-02-20 15:27:56.000000000 -0500 -+++ ui/gfx/codec/jpeg_codec.cc 2014-03-03 14:33:42.000000000 -0500 -@@ -15,6 +15,7 @@ - #if defined(USE_SYSTEM_LIBJPEG) - #include <jpeglib.h> - #elif defined(USE_LIBJPEG_TURBO) -+#include <stdio.h> - #include "third_party/libjpeg_turbo/jpeglib.h" - #else - #include "third_party/libjpeg/jpeglib.h" ---- ui/gfx/codec/jpeg_codec.cc.orig 2014-08-12 21:02:29.000000000 +0200 -+++ ui/gfx/codec/jpeg_codec.cc 2014-08-17 19:32:18.000000000 +0200 +--- ui/gfx/codec/jpeg_codec.cc.orig 2014-10-02 19:19:03.000000000 +0200 ++++ ui/gfx/codec/jpeg_codec.cc 2014-10-05 22:38:28.000000000 +0200 @@ -13,6 +13,7 @@ extern "C" { @@ -106,4 +76,3 @@ #include <cstring> #include <utility> - Modified: head/www/chromium/files/patch-base__base.gyp ============================================================================== --- head/www/chromium/files/patch-base__base.gyp Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__base.gyp Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./base/base.gyp.orig 2014-08-20 21:02:42.000000000 +0200 -+++ ./base/base.gyp 2014-08-22 15:06:27.000000000 +0200 +--- base/base.gyp.orig 2014-10-02 21:05:31 UTC ++++ base/base.gyp @@ -129,7 +129,7 @@ ], 'link_settings': { @@ -9,3 +9,15 @@ ], }, }], +@@ -784,6 +784,11 @@ + ['include', '^debug/proc_maps_linux_unittest\\.cc$'], + ], + }], ++ ['OS == "freebsd"', { ++ 'sources!': [ ++ 'debug/proc_maps_linux_unittest.cc', ++ ], ++ }], + ], # target_conditions + }, + { Modified: head/www/chromium/files/patch-base__base.gypi ============================================================================== --- head/www/chromium/files/patch-base__base.gypi Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__base.gypi Wed Oct 8 08:41:51 2014 (r370423) @@ -1,13 +1,13 @@ ---- ./base/base.gypi.orig 2014-08-20 21:02:42.000000000 +0200 -+++ ./base/base.gypi 2014-08-22 18:33:25.000000000 +0200 -@@ -942,11 +942,16 @@ +--- base/base.gypi.orig 2014-10-02 17:39:45 UTC ++++ base/base.gypi +@@ -945,11 +945,16 @@ 'process/memory_stubs.cc', ], 'sources/': [ + ['exclude', '^debug/proc_maps_linux\\.cc$'], ['exclude', '^files/file_path_watcher_linux\\.cc$'], - ['exclude', '^files/file_path_watcher_stub\\.cc$'], - ['exclude', '^file_util_linux\\.cc$'], + ['exclude', '^files/file_util_linux\\.cc$'], + ['exclude', '^process/memory_linux\\.cc$'], ['exclude', '^process/process_linux\\.cc$'], ['exclude', '^sys_info_linux\\.cc$'], Modified: head/www/chromium/files/patch-base__debug__stack_trace_posix.cc ============================================================================== --- head/www/chromium/files/patch-base__debug__stack_trace_posix.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__debug__stack_trace_posix.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,6 +1,6 @@ ---- ./base/debug/stack_trace_posix.cc.orig 2014-08-20 21:02:42.000000000 +0200 -+++ ./base/debug/stack_trace_posix.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -590,6 +590,10 @@ +--- base/debug/stack_trace_posix.cc.orig 2014-10-02 17:18:52 UTC ++++ base/debug/stack_trace_posix.cc +@@ -588,6 +588,10 @@ // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -11,7 +11,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -605,6 +609,7 @@ +@@ -603,6 +607,7 @@ is_initialized_ = true; return true; Modified: head/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h ============================================================================== --- head/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./base/files/file_path_watcher_kqueue.h.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/files/file_path_watcher_kqueue.h 2014-08-23 19:32:36.000000000 +0200 +--- base/files/file_path_watcher_kqueue.h.orig 2014-10-02 17:18:52 UTC ++++ base/files/file_path_watcher_kqueue.h @@ -5,6 +5,10 @@ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ #define BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ Modified: head/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc ============================================================================== --- head/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./base/posix/unix_domain_socket_linux.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/posix/unix_domain_socket_linux.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/posix/unix_domain_socket_linux.cc.orig 2014-10-02 17:18:52 UTC ++++ base/posix/unix_domain_socket_linux.cc @@ -18,6 +18,15 @@ #include "base/posix/eintr_wrapper.h" #include "base/stl_util.h" Modified: head/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc ============================================================================== --- head/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-10-02 17:18:52 UTC ++++ base/posix/unix_domain_socket_linux_unittest.cc @@ -2,8 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. Modified: head/www/chromium/files/patch-base__process__internal_linux.h ============================================================================== --- head/www/chromium/files/patch-base__process__internal_linux.h Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__process__internal_linux.h Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./base/process/internal_linux.h.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/process/internal_linux.h 2014-08-22 15:06:24.000000000 +0200 +--- base/process/internal_linux.h.orig 2014-10-02 17:18:52 UTC ++++ base/process/internal_linux.h @@ -12,6 +12,8 @@ #include "base/files/file_path.h" Modified: head/www/chromium/files/patch-base__process__launch.cc ============================================================================== --- head/www/chromium/files/patch-base__process__launch.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__process__launch.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./base/process/launch.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/process/launch.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/process/launch.cc.orig 2014-10-02 17:18:52 UTC ++++ base/process/launch.cc @@ -24,10 +24,10 @@ fds_to_remap(NULL), maximize_rlimits(NULL), Modified: head/www/chromium/files/patch-base__process__launch.h ============================================================================== --- head/www/chromium/files/patch-base__process__launch.h Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__process__launch.h Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./base/process/launch.h.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/process/launch.h 2014-08-22 15:06:24.000000000 +0200 +--- base/process/launch.h.orig 2014-10-02 17:18:52 UTC ++++ base/process/launch.h @@ -113,14 +113,14 @@ // will be the same as its pid. bool new_process_group; Modified: head/www/chromium/files/patch-base__process__memory_unittest.cc ============================================================================== --- head/www/chromium/files/patch-base__process__memory_unittest.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__process__memory_unittest.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,6 +1,6 @@ ---- ./base/process/memory_unittest.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/process/memory_unittest.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -151,9 +151,9 @@ +--- base/process/memory_unittest.cc.orig 2014-10-02 17:18:52 UTC ++++ base/process/memory_unittest.cc +@@ -160,9 +160,9 @@ // Android doesn't implement set_new_handler, so we can't use the // OutOfMemoryTest cases. @@ -12,7 +12,7 @@ !defined(OS_WIN) #if defined(USE_TCMALLOC) -@@ -425,4 +425,4 @@ +@@ -448,4 +448,4 @@ EXPECT_TRUE(value_ == NULL); } #endif // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) Modified: head/www/chromium/files/patch-base__process__process_iterator_freebsd.cc ============================================================================== --- head/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./base/process/process_iterator_freebsd.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/process/process_iterator_freebsd.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/process/process_iterator_freebsd.cc.orig 2014-10-02 17:18:52 UTC ++++ base/process/process_iterator_freebsd.cc @@ -8,6 +8,10 @@ #include <sys/sysctl.h> #include <unistd.h> Modified: head/www/chromium/files/patch-base__process__process_metrics.h ============================================================================== --- head/www/chromium/files/patch-base__process__process_metrics.h Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__process__process_metrics.h Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./base/process/process_metrics.h.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/process/process_metrics.h 2014-08-22 15:06:24.000000000 +0200 +--- base/process/process_metrics.h.orig 2014-10-02 17:39:45 UTC ++++ base/process/process_metrics.h @@ -17,6 +17,13 @@ #include "base/time/time.h" #include "base/values.h" @@ -14,7 +14,7 @@ #if defined(OS_MACOSX) #include <mach/mach.h> #endif -@@ -246,13 +253,17 @@ +@@ -240,13 +247,17 @@ // 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__process__process_metrics_freebsd.cc ============================================================================== --- head/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./base/process/process_metrics_freebsd.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/process/process_metrics_freebsd.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/process/process_metrics_freebsd.cc.orig 2014-10-02 17:18:52 UTC ++++ base/process/process_metrics_freebsd.cc @@ -10,6 +10,9 @@ #include "base/sys_info.h" Modified: head/www/chromium/files/patch-base__security_unittest.cc ============================================================================== --- head/www/chromium/files/patch-base__security_unittest.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__security_unittest.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./base/security_unittest.cc.orig 2014-08-20 21:02:42.000000000 +0200 -+++ ./base/security_unittest.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/security_unittest.cc.orig 2014-10-02 17:18:52 UTC ++++ base/security_unittest.cc @@ -160,7 +160,7 @@ // FAILS_ is too clunky. void OverflowTestsSoftExpectTrue(bool overflow_detected) { Modified: head/www/chromium/files/patch-base__strings__safe_sprintf.cc ============================================================================== --- head/www/chromium/files/patch-base__strings__safe_sprintf.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__strings__safe_sprintf.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,19 +1,26 @@ ---- ./base/strings/safe_sprintf.cc.orig 2014-08-20 21:02:42.000000000 +0200 -+++ ./base/strings/safe_sprintf.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -107,11 +107,11 @@ +--- base/strings/safe_sprintf.cc.orig 2014-10-02 17:18:52 UTC ++++ base/strings/safe_sprintf.cc +@@ -107,15 +107,16 @@ : buffer_(buffer), size_(size - 1), // Account for trailing NUL byte count_(0) { -// The following assertion does not build on Mac and Android. This is because -// static_assert only works with compile-time constants, but mac uses -// libstdc++4.2 and android uses stlport, which both don't mark --// numeric_limits::max() as constexp. --#if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS) +-// numeric_limits::max() as constexp. Likewise, MSVS2013's standard library +-// also doesn't mark max() as constexpr yet. cl.exe supports static_cast but +-// doesn't really implement constexpr yet so it doesn't complain, but clang +// The following assertion does not build on Mac and Android and older FreeBSD. +// This is because static_assert only works with compile-time constants, but +// mac and FreeBSD < 10 use libstdc++4.2 and android uses stlport, which both -+// don't mark numeric_limits::max() as constexp. -+#if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS) && !(defined(OS_FREEBSD) && __FreeBSD_version > 1000054) ++// don't mark numeric_limits::max() as constexp. Likewise, MSVS2013's standard ++// library also doesn't mark max() as constexpr yet. cl.exe supports static_cast ++// but doesn't really implement constexpr yet so it doesn't complain, but clang + // does. + #if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && \ +- !defined(OS_IOS) && !(defined(__clang__) && defined(OS_WIN)) ++ !defined(OS_IOS) && !(defined(OS_FREEBSD) && __FreeBSD_version > 1000054) \ ++ && !(defined(__clang__) && defined(OS_WIN)) COMPILE_ASSERT(kSSizeMaxConst == \ static_cast<size_t>(std::numeric_limits<ssize_t>::max()), kSSizeMax_is_the_max_value_of_an_ssize_t); Modified: head/www/chromium/files/patch-base__sys_info_freebsd.cc ============================================================================== --- head/www/chromium/files/patch-base__sys_info_freebsd.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__sys_info_freebsd.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./base/sys_info_freebsd.cc.orig 2014-08-20 21:02:42.000000000 +0200 -+++ ./base/sys_info_freebsd.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/sys_info_freebsd.cc.orig 2014-10-02 17:18:52 UTC ++++ base/sys_info_freebsd.cc @@ -4,6 +4,7 @@ #include "base/sys_info.h" Modified: head/www/chromium/files/patch-base__sys_info_posix.cc ============================================================================== --- head/www/chromium/files/patch-base__sys_info_posix.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__sys_info_posix.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./base/sys_info_posix.cc.orig 2014-08-20 21:02:42.000000000 +0200 -+++ ./base/sys_info_posix.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/sys_info_posix.cc.orig 2014-10-02 17:39:45 UTC ++++ base/sys_info_posix.cc @@ -64,7 +64,7 @@ namespace base { Modified: head/www/chromium/files/patch-base__test__expectations__expectation.cc ============================================================================== --- head/www/chromium/files/patch-base__test__expectations__expectation.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__test__expectations__expectation.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./base/test/expectations/expectation.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/test/expectations/expectation.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/test/expectations/expectation.cc.orig 2014-10-02 17:18:52 UTC ++++ base/test/expectations/expectation.cc @@ -60,6 +60,7 @@ variant != "64") { return false; Modified: head/www/chromium/files/patch-base__test__launcher__test_launcher.cc ============================================================================== --- head/www/chromium/files/patch-base__test__launcher__test_launcher.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__test__launcher__test_launcher.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,7 +1,7 @@ ---- ./base/test/launcher/test_launcher.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/test/launcher/test_launcher.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -41,6 +41,10 @@ - #include "base/mac/scoped_nsautorelease_pool.h" +--- base/test/launcher/test_launcher.cc.orig 2014-10-02 17:39:45 UTC ++++ base/test/launcher/test_launcher.cc +@@ -45,6 +45,10 @@ + #include "base/win/windows_version.h" #endif +#if defined(OS_FREEBSD) Modified: head/www/chromium/files/patch-base__threading__platform_thread_linux.cc ============================================================================== --- head/www/chromium/files/patch-base__threading__platform_thread_linux.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-base__threading__platform_thread_linux.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./base/threading/platform_thread_linux.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/threading/platform_thread_linux.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/threading/platform_thread_linux.cc.orig 2014-10-02 17:39:45 UTC ++++ base/threading/platform_thread_linux.cc @@ -16,7 +16,9 @@ #include "base/tracked_objects.h" Modified: head/www/chromium/files/patch-breakpad__breakpad.gyp ============================================================================== --- head/www/chromium/files/patch-breakpad__breakpad.gyp Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-breakpad__breakpad.gyp Wed Oct 8 08:41:51 2014 (r370423) @@ -1,6 +1,6 @@ ---- ./breakpad/breakpad.gyp.orig 2014-08-20 21:02:30.000000000 +0200 -+++ ./breakpad/breakpad.gyp 2014-08-22 15:06:24.000000000 +0200 -@@ -340,7 +340,7 @@ +--- breakpad/breakpad.gyp.orig 2014-10-02 17:39:45 UTC ++++ breakpad/breakpad.gyp +@@ -349,7 +349,7 @@ }, ], }], Modified: head/www/chromium/files/patch-build__common.gypi ============================================================================== --- head/www/chromium/files/patch-build__common.gypi Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-build__common.gypi Wed Oct 8 08:41:51 2014 (r370423) @@ -1,6 +1,6 @@ ---- ./build/common.gypi.orig 2014-08-20 21:02:29.000000000 +0200 -+++ ./build/common.gypi 2014-08-22 15:06:24.000000000 +0200 -@@ -87,7 +87,7 @@ +--- build/common.gypi.orig 2014-10-02 17:39:45 UTC ++++ build/common.gypi +@@ -91,7 +91,7 @@ 'conditions': [ # ChromeOS and Windows use Aura and Ash. @@ -9,7 +9,7 @@ 'use_ash%': 1, 'use_aura%': 1, }], -@@ -645,7 +645,7 @@ +@@ -676,7 +676,7 @@ }], # DBus usage. @@ -18,27 +18,36 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -926,7 +926,7 @@ - # except when building Android WebView. +@@ -931,7 +931,7 @@ + }, { + 'use_openmax_dl_fft%': 0, + }], +- ['OS=="win" or OS=="linux"', { ++ ['OS=="win" or OS=="linux" or OS=="freebsd"', { + 'enable_mdns%' : 1, + }], + +@@ -954,7 +954,7 @@ + # except when building Android WebView or Chromecast. # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). # Set the data reduction proxy origin for Android Webview. -- ['android_webview_build==0', { -+ ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd"', { +- ['android_webview_build==0 and android_webview_telemetry_build==0 and chromecast==0', { ++ ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd" and android_webview_telemetry_build==0 and chromecast==0', { 'icu_use_data_file_flag%' : 1, 'spdy_proxy_auth_origin%': '', 'data_reduction_proxy_probe_url%': '', -@@ -1153,6 +1153,10 @@ +@@ -1193,6 +1193,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, + # XXX(rene) More options, keep them? + 'os_ver%': 0, -+ 'use_system_libjpeg%': 0, ++ 'use_system_libjpeg%': 0, + # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -4150,6 +4154,13 @@ +@@ -4280,6 +4284,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], Modified: head/www/chromium/files/patch-build__filename_rules.gypi ============================================================================== --- head/www/chromium/files/patch-build__filename_rules.gypi Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-build__filename_rules.gypi Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./build/filename_rules.gypi.orig 2014-08-20 21:02:29.000000000 +0200 -+++ ./build/filename_rules.gypi 2014-08-22 15:06:24.000000000 +0200 +--- build/filename_rules.gypi.orig 2014-10-02 17:18:52 UTC ++++ build/filename_rules.gypi @@ -85,7 +85,7 @@ ['<(use_aura)==0 or OS!="win" or >(nacl_untrusted_build)==1', { 'sources/': [ ['exclude', '_aurawin\\.(h|cc)$'] ] Modified: head/www/chromium/files/patch-build__linux__system.gyp ============================================================================== --- head/www/chromium/files/patch-build__linux__system.gyp Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-build__linux__system.gyp Wed Oct 8 08:41:51 2014 (r370423) @@ -1,6 +1,6 @@ ---- ./build/linux/system.gyp.orig 2014-08-20 21:02:29.000000000 +0200 -+++ ./build/linux/system.gyp 2014-08-22 15:06:24.000000000 +0200 -@@ -881,6 +881,13 @@ +--- build/linux/system.gyp.orig 2014-10-02 17:39:45 UTC ++++ build/linux/system.gyp +@@ -890,6 +890,13 @@ 'include_dirs': [ '../..', ], Modified: head/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp ============================================================================== --- head/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./build/linux/unbundle/libwebp.gyp.orig 2014-08-20 21:02:29.000000000 +0200 -+++ ./build/linux/unbundle/libwebp.gyp 2014-08-22 15:06:24.000000000 +0200 +--- build/linux/unbundle/libwebp.gyp.orig 2014-10-02 17:18:52 UTC ++++ build/linux/unbundle/libwebp.gyp @@ -14,13 +14,7 @@ }, 'link_settings': { Modified: head/www/chromium/files/patch-build__linux__unbundle__openssl.gyp ============================================================================== --- head/www/chromium/files/patch-build__linux__unbundle__openssl.gyp Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-build__linux__unbundle__openssl.gyp Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./build/linux/unbundle/openssl.gyp.orig 2014-08-20 21:02:29.000000000 +0200 -+++ ./build/linux/unbundle/openssl.gyp 2014-08-22 15:06:24.000000000 +0200 +--- build/linux/unbundle/openssl.gyp.orig 2014-10-02 17:18:52 UTC ++++ build/linux/unbundle/openssl.gyp @@ -9,15 +9,15 @@ 'type': 'none', 'direct_dependent_settings': { Modified: head/www/chromium/files/patch-cc__layers__layer_impl.cc ============================================================================== --- head/www/chromium/files/patch-cc__layers__layer_impl.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-cc__layers__layer_impl.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,6 +1,6 @@ ---- ./cc/layers/layer_impl.cc.orig 2014-08-20 21:02:36.000000000 +0200 -+++ ./cc/layers/layer_impl.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -1190,21 +1190,23 @@ +--- cc/layers/layer_impl.cc.orig 2014-10-02 17:39:45 UTC ++++ cc/layers/layer_impl.cc +@@ -1201,21 +1201,23 @@ scale_factor * scaled_scroll_bounds.height()); scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds); Modified: head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc ============================================================================== --- head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,6 +1,6 @@ ---- ./chrome/app/chrome_main_delegate.cc.orig 2014-08-20 21:01:26.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -96,7 +96,7 @@ +--- chrome/app/chrome_main_delegate.cc.orig 2014-10-02 17:39:45 UTC ++++ chrome/app/chrome_main_delegate.cc +@@ -94,7 +94,7 @@ #include "ui/base/x/x11_util.h" #endif @@ -9,7 +9,7 @@ #include "components/breakpad/app/breakpad_linux.h" #endif -@@ -122,7 +122,7 @@ +@@ -124,7 +124,7 @@ g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; #endif @@ -18,16 +18,16 @@ base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; #endif -@@ -226,7 +226,7 @@ - // Needed for scrollbar related images. - process_type == switches::kWorkerProcess || +@@ -225,7 +225,7 @@ + // Mac needs them for the plugin process name. + process_type == switches::kPluginProcess || #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -440,7 +440,7 @@ +@@ -441,7 +441,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -36,7 +36,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -491,7 +491,7 @@ +@@ -492,7 +492,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -45,7 +45,7 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -621,7 +621,7 @@ +@@ -632,7 +632,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -54,7 +54,7 @@ breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); #endif -@@ -743,7 +743,7 @@ +@@ -759,7 +759,7 @@ #endif } @@ -63,7 +63,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -755,7 +755,7 @@ +@@ -771,7 +771,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -72,9 +72,9 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -840,7 +840,7 @@ - return process_type == switches::kNaClLoaderProcess || - process_type == switches::kRelauncherProcess; +@@ -863,7 +863,7 @@ + #endif + return process_type == switches::kRelauncherProcess; } -#elif defined(OS_POSIX) && !defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) Modified: head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h ============================================================================== --- head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./chrome/app/chrome_main_delegate.h.orig 2014-08-20 21:01:26.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.h 2014-08-22 15:06:24.000000000 +0200 +--- chrome/app/chrome_main_delegate.h.orig 2014-10-02 17:18:53 UTC ++++ chrome/app/chrome_main_delegate.h @@ -38,7 +38,7 @@ virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; virtual bool DelaySandboxInitialization( Modified: head/www/chromium/files/patch-chrome__app__chromium_strings.grd ============================================================================== --- head/www/chromium/files/patch-chrome__app__chromium_strings.grd Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-chrome__app__chromium_strings.grd Wed Oct 8 08:41:51 2014 (r370423) @@ -1,6 +1,6 @@ ---- ./chrome/app/chromium_strings.grd.orig 2014-08-20 21:01:26.000000000 +0200 -+++ ./chrome/app/chromium_strings.grd 2014-08-22 15:06:24.000000000 +0200 -@@ -1102,7 +1102,7 @@ +--- chrome/app/chromium_strings.grd.orig 2014-10-02 17:39:45 UTC ++++ chrome/app/chromium_strings.grd +@@ -1115,7 +1115,7 @@ </message> <!-- ProcessSingleton --> Modified: head/www/chromium/files/patch-chrome__app__resources__locale_settings.grd ============================================================================== --- head/www/chromium/files/patch-chrome__app__resources__locale_settings.grd Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-chrome__app__resources__locale_settings.grd Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./chrome/app/resources/locale_settings.grd.orig 2014-08-20 21:01:26.000000000 +0200 -+++ ./chrome/app/resources/locale_settings.grd 2014-08-23 15:49:37.000000000 +0200 +--- chrome/app/resources/locale_settings.grd.orig 2014-10-02 17:39:45 UTC ++++ chrome/app/resources/locale_settings.grd @@ -264,7 +264,7 @@ 55 </message> Modified: head/www/chromium/files/patch-chrome__browser__about_flags.cc ============================================================================== --- head/www/chromium/files/patch-chrome__browser__about_flags.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-chrome__browser__about_flags.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,6 +1,6 @@ ---- ./chrome/browser/about_flags.cc.orig 2014-08-20 21:02:13.000000000 +0200 -+++ ./chrome/browser/about_flags.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -2263,7 +2263,7 @@ +--- chrome/browser/about_flags.cc.orig 2014-10-02 17:39:45 UTC ++++ chrome/browser/about_flags.cc +@@ -2278,7 +2278,7 @@ return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; Modified: head/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc ============================================================================== --- head/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,6 +1,6 @@ ---- ./chrome/browser/chrome_browser_main.cc.orig 2014-08-20 21:02:13.000000000 +0200 -+++ ./chrome/browser/chrome_browser_main.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -925,7 +925,7 @@ +--- chrome/browser/chrome_browser_main.cc.orig 2014-10-02 17:39:45 UTC ++++ chrome/browser/chrome_browser_main.cc +@@ -947,7 +947,7 @@ } #endif Modified: head/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc ============================================================================== --- head/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,5 +1,5 @@ ---- ./chrome/browser/chrome_browser_main_posix.cc.orig 2014-08-20 21:02:13.000000000 +0200 -+++ ./chrome/browser/chrome_browser_main_posix.cc 2014-08-22 15:06:24.000000000 +0200 +--- chrome/browser/chrome_browser_main_posix.cc.orig 2014-10-02 17:18:53 UTC ++++ chrome/browser/chrome_browser_main_posix.cc @@ -270,6 +270,11 @@ g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; Modified: head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc ============================================================================== --- head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,34 +1,43 @@ ---- ./chrome/browser/chrome_content_browser_client.cc.orig 2014-08-20 21:02:13.000000000 +0200 -+++ ./chrome/browser/chrome_content_browser_client.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -509,7 +509,7 @@ - } +--- chrome/browser/chrome_content_browser_client.cc.orig 2014-10-02 17:39:45 UTC ++++ chrome/browser/chrome_content_browser_client.cc +@@ -430,7 +430,7 @@ + return false; } --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -566,7 +566,7 @@ +@@ -487,7 +487,7 @@ return -1; } --#endif // defined(OS_POSIX) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - #endif // !defined(OS_ANDROID) +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) #if !defined(OS_CHROMEOS) -@@ -1533,7 +1533,7 @@ + GURL GetEffectiveURLForSignin(const GURL& url) { +@@ -1196,7 +1196,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( CommandLine* command_line, int child_process_id) { -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_BSD) if (breakpad::IsCrashReporterEnabled()) { - std::string enable_crash_reporter; - GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter); -@@ -2683,7 +2683,7 @@ - #endif + scoped_ptr<metrics::ClientInfo> client_info = + GoogleUpdateSettings::LoadMetricsClientInfo(); +@@ -1204,7 +1204,7 @@ + client_info ? client_info->client_id + : std::string()); + } +-#endif // defined(OS_POSIX) ++#endif // defined(OS_POSIX) && !defined(OS_BSD) + + if (logging::DialogsAreSuppressed()) + command_line->AppendSwitch(switches::kNoErrorDialogs); +@@ -2447,7 +2447,7 @@ + } } -#if defined(OS_POSIX) && !defined(OS_MACOSX) @@ -36,7 +45,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const CommandLine& command_line, int child_process_id, -@@ -2749,7 +2749,7 @@ +@@ -2513,7 +2513,7 @@ } #endif // defined(OS_ANDROID) } Modified: head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h ============================================================================== --- head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Wed Oct 8 08:41:51 2014 (r370423) @@ -1,6 +1,6 @@ ---- ./chrome/browser/chrome_content_browser_client.h.orig 2014-08-20 21:02:13.000000000 +0200 -+++ ./chrome/browser/chrome_content_browser_client.h 2014-08-22 15:06:24.000000000 +0200 -@@ -288,7 +288,7 @@ +--- chrome/browser/chrome_content_browser_client.h.orig 2014-10-02 17:39:45 UTC ++++ chrome/browser/chrome_content_browser_client.h +@@ -287,7 +287,7 @@ virtual net::CookieStore* OverrideCookieStoreForRenderProcess( int render_process_id) OVERRIDE; Modified: head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc ============================================================================== --- head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc Wed Oct 8 08:32:04 2014 (r370422) +++ head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc Wed Oct 8 08:41:51 2014 (r370423) @@ -1,6 +1,6 @@ ---- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-08-20 21:02:00.000000000 +0200 -+++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -268,7 +268,7 @@ +--- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-10-02 17:18:53 UTC ++++ chrome/browser/diagnostics/diagnostics_writer.cc +@@ -266,7 +266,7 @@ console_->SetColor(color); console_->Write(base::ASCIIToUTF16(result)); } *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410080841.s988fq88052585>