Date: Sat, 3 May 2014 10:02:35 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352898 - in branches/2014Q2/www/chromium: . files Message-ID: <201405031002.s43A2ZwW084873@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Sat May 3 10:02:35 2014 New Revision: 352898 URL: http://svnweb.freebsd.org/changeset/ports/352898 QAT: https://qat.redports.org/buildarchive/r352898/ Log: MFH: r352803 Update to 34.0.1847.132 Obtained from: https://github.com/gliaskos/freebsd-chromium/ Security: http://vuxml.org/freebsd/7cf25a0c-d031-11e3-947b-00262d5ed8ee.html http://vuxml.org/freebsd/963413a5-bf50-11e3-a2d6-00262d5ed8ee.html Approved by: portmgr (erwin) Added: branches/2014Q2/www/chromium/files/patch-cc__layers__layer.cc - copied unchanged from r352803, head/www/chromium/files/patch-cc__layers__layer.cc branches/2014Q2/www/chromium/files/patch-cc__layers__layer_impl.cc - copied unchanged from r352803, head/www/chromium/files/patch-cc__layers__layer_impl.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc - copied unchanged from r352803, head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc - copied unchanged from r352803, head/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc branches/2014Q2/www/chromium/files/patch-chrome__common__chrome_paths.h - copied unchanged from r352803, head/www/chromium/files/patch-chrome__common__chrome_paths.h branches/2014Q2/www/chromium/files/patch-components__storage_monitor.gypi - copied unchanged from r352803, head/www/chromium/files/patch-components__storage_monitor.gypi branches/2014Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc - copied unchanged from r352803, head/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc branches/2014Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc - copied unchanged from r352803, head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc branches/2014Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h - copied unchanged from r352803, head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h branches/2014Q2/www/chromium/files/patch-crypto__nss_util.cc - copied unchanged from r352803, head/www/chromium/files/patch-crypto__nss_util.cc branches/2014Q2/www/chromium/files/patch-device__hid__hid.gyp - copied unchanged from r352803, head/www/chromium/files/patch-device__hid__hid.gyp branches/2014Q2/www/chromium/files/patch-device__serial__serial.gyp - copied unchanged from r352803, head/www/chromium/files/patch-device__serial__serial.gyp branches/2014Q2/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc - copied unchanged from r352803, head/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc branches/2014Q2/www/chromium/files/patch-printing__printing.gyp - copied unchanged from r352803, head/www/chromium/files/patch-printing__printing.gyp branches/2014Q2/www/chromium/files/patch-skia__skia_common.gypi - copied unchanged from r352803, head/www/chromium/files/patch-skia__skia_common.gypi branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp - copied unchanged from r352803, head/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp Deleted: branches/2014Q2/www/chromium/files/patch-breakpad__breakpad.gyp branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__operation.h branches/2014Q2/www/chromium/files/patch-chrome__browser__storage_monitor__storage_monitor.cc branches/2014Q2/www/chromium/files/patch-chrome__common__omaha_query_params__omaha_query_params.cc branches/2014Q2/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc branches/2014Q2/www/chromium/files/patch-content__browser__renderer_host__pepper__pepper_file_io_host.cc branches/2014Q2/www/chromium/files/patch-net__spdy__spdy_priority_forest.h branches/2014Q2/www/chromium/files/patch-remoting__remoting.gyp branches/2014Q2/www/chromium/files/patch-skia__skia_library.gypi branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__testing__testing.gyp branches/2014Q2/www/chromium/files/patch-third_party__libvpx__obj_int_extract.sh branches/2014Q2/www/chromium/files/patch-tools__grit__grit__node__base.py branches/2014Q2/www/chromium/files/patch-v8__src__checks.cc Modified: branches/2014Q2/www/chromium/Makefile branches/2014Q2/www/chromium/distinfo branches/2014Q2/www/chromium/files/extra-patch-clang branches/2014Q2/www/chromium/files/extra-patch-fixup-execinfo branches/2014Q2/www/chromium/files/extra-patch-gcc branches/2014Q2/www/chromium/files/patch-base__base.gyp branches/2014Q2/www/chromium/files/patch-base__base.gypi branches/2014Q2/www/chromium/files/patch-base__debug__stack_trace_posix.cc branches/2014Q2/www/chromium/files/patch-base__file_util_posix.cc branches/2014Q2/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc branches/2014Q2/www/chromium/files/patch-base__process__internal_linux.h branches/2014Q2/www/chromium/files/patch-base__process__memory_unittest.cc branches/2014Q2/www/chromium/files/patch-base__process__process_handle_freebsd.cc branches/2014Q2/www/chromium/files/patch-base__process__process_iterator.h branches/2014Q2/www/chromium/files/patch-base__process__process_iterator_freebsd.cc branches/2014Q2/www/chromium/files/patch-base__process__process_metrics.h branches/2014Q2/www/chromium/files/patch-base__process__process_metrics_freebsd.cc branches/2014Q2/www/chromium/files/patch-base__security_unittest.cc branches/2014Q2/www/chromium/files/patch-base__strings__safe_sprintf.cc branches/2014Q2/www/chromium/files/patch-base__sys_info_freebsd.cc branches/2014Q2/www/chromium/files/patch-base__sys_info_posix.cc branches/2014Q2/www/chromium/files/patch-base__test__expectations__expectation.cc branches/2014Q2/www/chromium/files/patch-base__test__launcher__test_launcher.cc branches/2014Q2/www/chromium/files/patch-base__threading__platform_thread_linux.cc branches/2014Q2/www/chromium/files/patch-build__common.gypi branches/2014Q2/www/chromium/files/patch-build__gyp_chromium branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.h branches/2014Q2/www/chromium/files/patch-chrome__browser__about_flags.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__browser_process_impl.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__memory_details.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__net__connection_tester.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h branches/2014Q2/www/chromium/files/patch-chrome__browser__usb__usb_context.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__web_applications__web_app.h branches/2014Q2/www/chromium/files/patch-chrome__chrome_browser.gypi branches/2014Q2/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi branches/2014Q2/www/chromium/files/patch-chrome__common__chrome_paths.cc branches/2014Q2/www/chromium/files/patch-chrome__common__chrome_switches.cc branches/2014Q2/www/chromium/files/patch-chrome__common__chrome_switches.h branches/2014Q2/www/chromium/files/patch-chrome__common__pref_names.cc branches/2014Q2/www/chromium/files/patch-chrome__common__pref_names.h branches/2014Q2/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc branches/2014Q2/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h branches/2014Q2/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc branches/2014Q2/www/chromium/files/patch-chrome__test__base__testing_browser_process.h branches/2014Q2/www/chromium/files/patch-chrome__test__perf__perf_test.cc branches/2014Q2/www/chromium/files/patch-chrome__test__ui__ui_test.cc branches/2014Q2/www/chromium/files/patch-chrome__tools__build__linux__sed.sh branches/2014Q2/www/chromium/files/patch-components__policy__resources__policy_templates.json branches/2014Q2/www/chromium/files/patch-components__policy__tools__generate_policy_source.py branches/2014Q2/www/chromium/files/patch-content__app__content_main_runner.cc branches/2014Q2/www/chromium/files/patch-content__browser__browser_main_loop.cc branches/2014Q2/www/chromium/files/patch-content__browser__child_process_launcher.cc branches/2014Q2/www/chromium/files/patch-content__browser__download__base_file.cc branches/2014Q2/www/chromium/files/patch-content__browser__download__base_file_linux.cc branches/2014Q2/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc branches/2014Q2/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc branches/2014Q2/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h branches/2014Q2/www/chromium/files/patch-content__common__set_process_title_linux.cc branches/2014Q2/www/chromium/files/patch-content__common__set_process_title_linux.h branches/2014Q2/www/chromium/files/patch-content__content_browser.gypi branches/2014Q2/www/chromium/files/patch-content__content_common.gypi branches/2014Q2/www/chromium/files/patch-content__content_tests.gypi branches/2014Q2/www/chromium/files/patch-content__plugin__plugin_main_linux.cc branches/2014Q2/www/chromium/files/patch-content__public__test__browser_test_base.cc branches/2014Q2/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc branches/2014Q2/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc branches/2014Q2/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc branches/2014Q2/www/chromium/files/patch-content__renderer__render_process_impl.cc branches/2014Q2/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc branches/2014Q2/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc branches/2014Q2/www/chromium/files/patch-gpu__config__gpu_control_list.cc branches/2014Q2/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc branches/2014Q2/www/chromium/files/patch-gpu__config__gpu_test_config.cc branches/2014Q2/www/chromium/files/patch-gpu__gpu_config.gypi branches/2014Q2/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc branches/2014Q2/www/chromium/files/patch-media__base__audio_splicer.cc branches/2014Q2/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc branches/2014Q2/www/chromium/files/patch-media__media.gyp branches/2014Q2/www/chromium/files/patch-native_client__build__common.gypi branches/2014Q2/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp branches/2014Q2/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp branches/2014Q2/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp branches/2014Q2/www/chromium/files/patch-net__base__dns_reloader.cc branches/2014Q2/www/chromium/files/patch-net__base__mime_util_unittest.cc branches/2014Q2/www/chromium/files/patch-net__base__net_util.h branches/2014Q2/www/chromium/files/patch-net__base__network_change_notifier.cc branches/2014Q2/www/chromium/files/patch-net__dns__address_sorter_posix.cc branches/2014Q2/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc branches/2014Q2/www/chromium/files/patch-net__dns__dns_session.cc branches/2014Q2/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc branches/2014Q2/www/chromium/files/patch-net__net.gyp branches/2014Q2/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc branches/2014Q2/www/chromium/files/patch-net__proxy__proxy_service.cc branches/2014Q2/www/chromium/files/patch-net__socket__socks5_client_socket.cc branches/2014Q2/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h branches/2014Q2/www/chromium/files/patch-net__udp__udp_socket_unittest.cc branches/2014Q2/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc branches/2014Q2/www/chromium/files/patch-sync__util__get_session_name.cc branches/2014Q2/www/chromium/files/patch-sync__util__get_session_name_linux.cc branches/2014Q2/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h branches/2014Q2/www/chromium/files/patch-testing__gtest__src__gtest.cc branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__config.h branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp branches/2014Q2/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c branches/2014Q2/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp branches/2014Q2/www/chromium/files/patch-third_party__libjingle__libjingle.gyp branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc branches/2014Q2/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp branches/2014Q2/www/chromium/files/patch-third_party__libusb__libusb.gyp branches/2014Q2/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh branches/2014Q2/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h branches/2014Q2/www/chromium/files/patch-third_party__webrtc__build__common.gypi branches/2014Q2/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi branches/2014Q2/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi branches/2014Q2/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc branches/2014Q2/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc branches/2014Q2/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc branches/2014Q2/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc branches/2014Q2/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h branches/2014Q2/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py branches/2014Q2/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp branches/2014Q2/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp branches/2014Q2/www/chromium/files/patch-ui__events__event_switches.cc branches/2014Q2/www/chromium/files/patch-ui__events__event_switches.h branches/2014Q2/www/chromium/files/patch-ui__gl__gl.gyp branches/2014Q2/www/chromium/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/www/chromium/Makefile ============================================================================== --- branches/2014Q2/www/chromium/Makefile Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/Makefile Sat May 3 10:02:35 2014 (r352898) @@ -4,7 +4,7 @@ #TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3 PORTNAME= chromium -PORTVERSION= 33.0.1750.152 +PORTVERSION= 34.0.1847.132 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -21,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${ bash:${PORTSDIR}/shells/bash \ yasm:${PORTSDIR}/devel/yasm \ flock:${PORTSDIR}/sysutils/flock \ - v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat + ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libdbus-1.so:${PORTSDIR}/devel/dbus \ @@ -133,7 +133,6 @@ ALL_TARGET+= ${TEST_TARGETS} DEBUG_MAKE_ENV= V=1 .if ${PORT_OPTIONS:MDEBUG} BUILDTYPE= Debug -GYP_DEFINES+= remove_webcore_debug_symbols=1 .else BUILDTYPE= Release GYP_DEFINES+= buildtype=Official @@ -179,11 +178,7 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \ - ${WRKSRC}/base/base.gypi \ - ${WRKSRC}/build/common.gypi \ ${WRKSRC}/crypto/crypto.gyp \ - ${WRKSRC}/third_party/libvpx/libvpx.gyp \ - ${WRKSRC}/third_party/WebKit/Source/testing/testing.gyp \ ${WRKSRC}/v8/tools/gyp/v8.gyp \ ${WRKSRC}/v8/build/toolchain.gypi @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \ @@ -191,17 +186,6 @@ post-patch: @${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|is_linux|(is_linux or is_bsd)|" \ - ${WRKSRC}/chrome/browser/browser_resources.grd \ - ${WRKSRC}/chrome/app/theme/theme_resources.grd \ - ${WRKSRC}/chrome/browser/resources/task_manager/defines.js \ - ${WRKSRC}/tools/grit/grit/xtb_reader_unittest.py \ - ${WRKSRC}/ui/base/strings/app_locale_settings.grd \ - ${WRKSRC}/ui/base/strings/app_locale_settings_bn.xtb \ - ${WRKSRC}/ui/base/strings/app_locale_settings_ja.xtb \ - ${WRKSRC}/ui/base/strings/app_locale_settings_ko.xtb \ - ${WRKSRC}/ui/base/strings/app_locale_settings_ml.xtb \ - ${WRKSRC}/ui/base/strings/app_locale_settings_th.xtb do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ @@ -219,7 +203,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/product_logo_48.png ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/out/${BUILDTYPE}/chrome-wrapper \ ${WRKSRC}/out/${BUILDTYPE}/xdg-settings ${STAGEDIR}${DATADIR} -.for p in chrome chrome_100_percent content_resources resources +.for p in chrome_100_percent content_resources resources ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak ${STAGEDIR}${DATADIR} .endfor .for f in chrome libffmpegsumo.so protoc Modified: branches/2014Q2/www/chromium/distinfo ============================================================================== --- branches/2014Q2/www/chromium/distinfo Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/distinfo Sat May 3 10:02:35 2014 (r352898) @@ -1,4 +1,4 @@ -SHA256 (chromium-33.0.1750.152.tar.xz) = 9fd462840bee3ae205b0548e8a483f7589beecdb7c6309d4d65425cbf710cc2f -SIZE (chromium-33.0.1750.152.tar.xz) = 185396116 -SHA256 (chromium-33.0.1750.152-testdata.tar.xz) = 0367fba6100a0538769955bad02cc17d3a6919d3dd391777283fb5a2fe4f56b0 -SIZE (chromium-33.0.1750.152-testdata.tar.xz) = 112419292 +SHA256 (chromium-34.0.1847.132.tar.xz) = e8930a43d2cff3cd98d4772f6b7a527b363fa9567afbe86a4c0574dc25886038 +SIZE (chromium-34.0.1847.132.tar.xz) = 190164176 +SHA256 (chromium-34.0.1847.132-testdata.tar.xz) = 0c3c9894cd1a16bfcfc122d40d38bf1c6986087e17d22d86de9d3624c404eb32 +SIZE (chromium-34.0.1847.132-testdata.tar.xz) = 108476892 Modified: branches/2014Q2/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2014Q2/www/chromium/files/extra-patch-clang Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/extra-patch-clang Sat May 3 10:02:35 2014 (r352898) @@ -48,7 +48,7 @@ ASSERT_LT(kFinalTlsValue, *ptr); --- base/tracked_objects.cc 2013-07-03 23:39:54.000000000 -0400 +++ base/tracked_objects.cc 2013-07-19 00:42:10.000000000 -0400 -@@ -346,7 +346,7 @@ +@@ -378,7 +378,7 @@ } // We must NOT do any allocations during this callback. // Using the simple linked lists avoids all allocations. @@ -59,7 +59,7 @@ } --- base/tracked_objects_unittest.cc.orig 2013-08-30 23:09:01.000000000 +0300 +++ base/tracked_objects_unittest.cc 2013-08-30 23:10:14.000000000 +0300 -@@ -50,9 +50,9 @@ +@@ -53,9 +53,9 @@ Births* birth = ThreadData::TallyABirthIfActive(location); if (ThreadData::status() == ThreadData::DEACTIVATED) @@ -71,7 +71,7 @@ } // Helper function to verify the most common test expectations. -@@ -231,7 +231,7 @@ +@@ -234,7 +234,7 @@ return; scoped_ptr<DeathData> data(new DeathData()); @@ -80,7 +80,7 @@ EXPECT_EQ(data->run_duration_sum(), 0); EXPECT_EQ(data->run_duration_sample(), 0); EXPECT_EQ(data->queue_duration_sum(), 0); -@@ -432,7 +432,7 @@ +@@ -435,7 +435,7 @@ Location location(kFunction, kFile, kLineNumber, NULL); // Do not delete |birth|. We don't own it. Births* birth = ThreadData::TallyABirthIfActive(location); @@ -91,7 +91,7 @@ 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 -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ MSVC_PUSH_DISABLE_WARNING(4748) int* NullPointer() { @@ -102,7 +102,7 @@ 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 -@@ -232,7 +232,7 @@ +@@ -260,7 +260,7 @@ } DCHECK(window_ptr); DCHECK_EQ(window_ptr->window_id.id(), window_id); @@ -113,7 +113,7 @@ } --- media/audio/audio_output_proxy_unittest.cc.orig 2013-08-30 23:23:03.000000000 +0300 +++ media/audio/audio_output_proxy_unittest.cc 2013-08-30 23:23:54.000000000 +0300 -@@ -427,7 +427,7 @@ +@@ -392,7 +392,7 @@ // |stream| is closed at this point. Start() should reopen it again. EXPECT_CALL(manager(), MakeAudioOutputStream(_, _)) .Times(2) @@ -124,7 +124,7 @@ .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 -@@ -482,7 +482,7 @@ +@@ -417,7 +417,7 @@ // callback to cancel the |decryptor_ready_cb|. EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback())) .WillOnce(ResetAndRunCallback(&decryptor_ready_cb, @@ -224,7 +224,7 @@ --- v8/src/runtime.cc.orig 2013-11-08 08:01:04.000000000 +0100 +++ v8/src/runtime.cc 2013-11-15 13:17:39.000000000 +0100 -@@ -14028,7 +14028,7 @@ +@@ -14043,7 +14043,7 @@ local_object->SetInternalField(0, reinterpret_cast<Smi*>(break_iterator)); // Make sure that the pointer to adopted text is NULL. @@ -235,7 +235,7 @@ JSObject::SetLocalPropertyIgnoreAttributes( --- base/strings/safe_sprintf_unittest.cc.orig 2013-11-08 07:42:08.000000000 +0100 +++ base/strings/safe_sprintf_unittest.cc 2013-11-15 15:04:45.000000000 +0100 -@@ -733,12 +733,14 @@ +@@ -721,12 +721,14 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wconversion-null" #endif @@ -261,14 +261,20 @@ } static Unique<T> CreateImmovable(Handle<T> handle) { ---- content/browser/renderer_host/render_widget_host_view_guest.cc.orig 2014-01-07 21:02:28.000000000 +0100 -+++ content/browser/renderer_host/render_widget_host_view_guest.cc 2014-01-13 13:48:52.000000000 +0100 -@@ -254,7 +254,7 @@ +--- content/browser/frame_host/render_widget_host_view_guest.cc.orig 2014-03-05 22:24:07.000000000 +0100 ++++ content/browser/frame_host/render_widget_host_view_guest.cc 2014-03-09 20:01:20.000000000 +0100 +@@ -258,11 +258,11 @@ + gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const { - if (guest_->GetEmbedderRenderWidgetHostView()) - return guest_->GetEmbedderRenderWidgetHostView()->GetNativeViewId(); -- return static_cast<gfx::NativeViewId>(NULL); -+ return reinterpret_cast<gfx::NativeViewId>(NULL); + if (!guest_) +- return static_cast<gfx::NativeViewId>(NULL); ++ return reinterpret_cast<gfx::NativeViewId>(NULL); + + RenderWidgetHostView* rwhv = guest_->GetEmbedderRenderWidgetHostView(); + if (!rwhv) +- return static_cast<gfx::NativeViewId>(NULL); ++ return reinterpret_cast<gfx::NativeViewId>(NULL); + return rwhv->GetNativeViewId(); } - gfx::NativeViewAccessible RenderWidgetHostViewGuest::GetNativeViewAccessible() { +- Modified: branches/2014Q2/www/chromium/files/extra-patch-fixup-execinfo ============================================================================== --- branches/2014Q2/www/chromium/files/extra-patch-fixup-execinfo Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/extra-patch-fixup-execinfo Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- v8/src/checks.cc.orig 2014-01-07 21:03:55.000000000 +0100 -+++ v8/src/checks.cc 2014-01-08 01:14:20.000000000 +0100 -@@ -41,7 +41,7 @@ +--- v8/src/checks.cc.orig 2014-03-07 23:57:27.000000000 +0100 ++++ v8/src/checks.cc 2014-03-08 00:04:14.000000000 +0100 +@@ -44,7 +44,7 @@ static V8_INLINE void DumpBacktrace() { #if V8_LIBC_GLIBC || V8_OS_BSD void* trace[100]; Modified: branches/2014Q2/www/chromium/files/extra-patch-gcc ============================================================================== --- branches/2014Q2/www/chromium/files/extra-patch-gcc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/extra-patch-gcc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ --- 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 -@@ -10,6 +10,7 @@ +@@ -12,6 +12,7 @@ #if defined(OS_POSIX) #include <sys/types.h> @@ -10,7 +10,7 @@ #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 -@@ -28,6 +28,7 @@ +@@ -30,6 +30,7 @@ #ifndef TALK_BASE_STREAM_H__ #define TALK_BASE_STREAM_H__ @@ -40,7 +40,7 @@ --- third_party/ffmpeg/libavutil/cpu.c.orig 2013-11-16 01:26:14.000000000 +0100 +++ third_party/ffmpeg/libavutil/cpu.c 2013-11-19 00:24:53.000000000 +0100 -@@ -21,6 +21,9 @@ +@@ -24,6 +24,9 @@ #include "opt.h" #include "common.h" Modified: branches/2014Q2/www/chromium/files/patch-base__base.gyp ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__base.gyp Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__base.gyp Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- base/base.gyp.orig 2013-09-26 02:17:34.000000000 +0300 -+++ base/base.gyp 2013-09-26 03:00:53.000000000 +0300 -@@ -823,6 +823,11 @@ +--- ./base/base.gyp.orig 2014-04-24 22:36:11.000000000 +0200 ++++ ./base/base.gyp 2014-04-24 23:23:41.000000000 +0200 +@@ -820,6 +820,11 @@ ['include', '^debug/proc_maps_linux_unittest\\.cc$'], ], }], Modified: branches/2014Q2/www/chromium/files/patch-base__base.gypi ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__base.gypi Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__base.gypi Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- base/base.gypi.orig 2013-09-28 20:09:58.000000000 +0300 -+++ base/base.gypi 2013-09-26 02:24:27.000000000 +0300 -@@ -872,11 +872,15 @@ +--- ./base/base.gypi.orig 2014-04-24 22:36:11.000000000 +0200 ++++ ./base/base.gypi 2014-04-24 23:23:41.000000000 +0200 +@@ -918,11 +918,15 @@ 'process/memory_stubs.cc', ], 'sources/': [ @@ -15,4 +15,4 @@ + ['exclude', '^process/process_metrics_linux\\.cc$'], ], }], - ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', { + # Remove all unnecessary files for build_nexe.py to avoid exceeding Modified: branches/2014Q2/www/chromium/files/patch-base__debug__stack_trace_posix.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__debug__stack_trace_posix.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__debug__stack_trace_posix.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,28 +1,11 @@ ---- base/debug/stack_trace_posix.cc.orig 2013-02-05 10:02:11.000000000 +0200 -+++ base/debug/stack_trace_posix.cc 2013-02-13 20:27:44.000000000 +0200 -@@ -14,6 +14,9 @@ - #include <sys/stat.h> - #include <sys/types.h> - #include <unistd.h> -+#if defined(OS_FREEBSD) -+#include <ucontext.h> -+#endif +--- ./base/debug/stack_trace_posix.cc.orig 2014-04-24 22:36:11.000000000 +0200 ++++ ./base/debug/stack_trace_posix.cc 2014-04-24 23:23:41.000000000 +0200 +@@ -471,7 +471,7 @@ - #include <ostream> - -@@ -326,9 +329,15 @@ - // NOTE: This code MUST be async-signal safe (it's used by in-process - // stack dumping signal handler). NO malloc or stdio is allowed here. - -+#if defined(OS_FREEBSD) -+ // Disable backtrace for now, libexecinfo crashes in getframeaddr -+ // in release build / i386. -+ count_ = 0; -+#else // Though the backtrace API man page does not list any possible negative // return values, we take no chance. - count_ = std::max(backtrace(trace_, arraysize(trace_)), 0); -+#endif +- count_ = std::max(backtrace(trace_, arraysize(trace_)), 0); ++ count_ = std::max<size_t>(backtrace(trace_, arraysize(trace_)), 0); } - void StackTrace::PrintBacktrace() const { + void StackTrace::Print() const { Modified: branches/2014Q2/www/chromium/files/patch-base__file_util_posix.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__file_util_posix.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__file_util_posix.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- base/file_util_posix.cc.orig 2014-02-20 21:28:47.000000000 +0100 -+++ base/file_util_posix.cc 2014-02-24 15:44:01.000000000 +0100 -@@ -673,7 +673,7 @@ +--- ./base/file_util_posix.cc.orig 2014-04-24 22:36:11.000000000 +0200 ++++ ./base/file_util_posix.cc 2014-04-24 23:23:41.000000000 +0200 +@@ -672,7 +672,7 @@ #endif // defined(OS_ANDROID) results->is_directory = S_ISDIR(file_info.st_mode); results->size = file_info.st_size; Modified: branches/2014Q2/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- base/posix/unix_domain_socket_linux_unittest.cc.orig 2013-08-19 02:53:00.000000000 +0300 -+++ base/posix/unix_domain_socket_linux_unittest.cc 2013-08-30 19:34:24.000000000 +0300 +--- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-04-24 22:36:11.000000000 +0200 ++++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-04-24 23:23:41.000000000 +0200 @@ -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: branches/2014Q2/www/chromium/files/patch-base__process__internal_linux.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__internal_linux.h Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__process__internal_linux.h Sat May 3 10:02:35 2014 (r352898) @@ -1,11 +1,11 @@ ---- ./base/process/internal_linux.h.orig 2013-09-03 09:09:03.000000000 +0200 -+++ ./base/process/internal_linux.h 2013-09-07 21:29:08.000000000 +0200 -@@ -10,6 +10,8 @@ +--- ./base/process/internal_linux.h.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/process/internal_linux.h 2014-04-24 23:23:41.000000000 +0200 +@@ -12,6 +12,8 @@ #include "base/files/file_path.h" +#include <unistd.h> /* pid_t */ + namespace base { - namespace internal { + class Time; Modified: branches/2014Q2/www/chromium/files/patch-base__process__memory_unittest.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__memory_unittest.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__process__memory_unittest.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- base/process/memory_unittest.cc.orig 2013-09-24 23:49:53.000000000 +0300 -+++ base/process/memory_unittest.cc 2013-09-24 23:50:57.000000000 +0300 -@@ -153,12 +153,12 @@ +--- ./base/process/memory_unittest.cc.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/process/memory_unittest.cc 2014-04-24 23:23:41.000000000 +0200 +@@ -151,12 +151,12 @@ // Android doesn't implement set_new_handler, so we can't use the // OutOfMemoryTest cases. @@ -15,7 +15,7 @@ !defined(OS_WIN) && \ !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) -@@ -375,5 +375,5 @@ +@@ -372,5 +372,5 @@ #endif // !ARCH_CPU_64_BITS #endif // OS_MACOSX Modified: branches/2014Q2/www/chromium/files/patch-base__process__process_handle_freebsd.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__process_handle_freebsd.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__process__process_handle_freebsd.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- base/process/process_handle_freebsd.cc.orig 2013-09-20 05:35:17.000000000 +0300 -+++ base/process/process_handle_freebsd.cc 2013-09-24 20:41:45.000000000 +0300 +--- ./base/process/process_handle_freebsd.cc.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/process/process_handle_freebsd.cc 2014-04-24 23:23:41.000000000 +0200 @@ -6,33 +6,35 @@ #include <sys/sysctl.h> Modified: branches/2014Q2/www/chromium/files/patch-base__process__process_iterator.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__process_iterator.h Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__process__process_iterator.h Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- base/process/process_iterator.h.orig 2013-08-16 22:08:02.000000000 +0300 -+++ base/process/process_iterator.h 2013-08-16 22:08:08.000000000 +0300 +--- ./base/process/process_iterator.h.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/process/process_iterator.h 2014-04-24 23:23:41.000000000 +0200 @@ -21,6 +21,11 @@ #include <windows.h> #include <tlhelp32.h> Modified: branches/2014Q2/www/chromium/files/patch-base__process__process_iterator_freebsd.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- ./base/process/process_iterator_freebsd.cc.orig 2013-09-03 09:09:03.000000000 +0200 -+++ ./base/process/process_iterator_freebsd.cc 2013-09-07 21:31:37.000000000 +0200 +--- ./base/process/process_iterator_freebsd.cc.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/process/process_iterator_freebsd.cc 2014-04-24 23:23:41.000000000 +0200 @@ -6,6 +6,10 @@ #include <sys/sysctl.h> Modified: branches/2014Q2/www/chromium/files/patch-base__process__process_metrics.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__process_metrics.h Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__process__process_metrics.h Sat May 3 10:02:35 2014 (r352898) @@ -1,8 +1,8 @@ ---- base/process/process_metrics.h.orig 2013-08-16 22:01:16.000000000 +0300 -+++ base/process/process_metrics.h 2013-08-16 22:04:12.000000000 +0300 -@@ -15,6 +15,13 @@ - #include "base/process.h" - #include "base/time.h" +--- ./base/process/process_metrics.h.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/process/process_metrics.h 2014-04-24 23:23:41.000000000 +0200 +@@ -17,6 +17,13 @@ + #include "base/time/time.h" + #include "base/values.h" +#if defined(OS_BSD) +#include <kvm.h> Modified: branches/2014Q2/www/chromium/files/patch-base__process__process_metrics_freebsd.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- ./base/process/process_metrics_freebsd.cc.orig 2013-09-03 09:09:03.000000000 +0200 -+++ ./base/process/process_metrics_freebsd.cc 2013-09-07 21:30:29.000000000 +0200 +--- ./base/process/process_metrics_freebsd.cc.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/process/process_metrics_freebsd.cc 2014-04-24 23:23:41.000000000 +0200 @@ -4,6 +4,10 @@ #include "base/process/process_metrics.h" Modified: branches/2014Q2/www/chromium/files/patch-base__security_unittest.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__security_unittest.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__security_unittest.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- base/security_unittest.cc.orig 2013-09-01 01:12:36.000000000 +0300 -+++ base/security_unittest.cc 2013-09-01 01:13:35.000000000 +0300 -@@ -161,7 +161,7 @@ +--- ./base/security_unittest.cc.orig 2014-04-24 22:36:11.000000000 +0200 ++++ ./base/security_unittest.cc 2014-04-24 23:23:41.000000000 +0200 +@@ -159,7 +159,7 @@ // FAILS_ is too clunky. void OverflowTestsSoftExpectTrue(bool overflow_detected) { if (!overflow_detected) { Modified: branches/2014Q2/www/chromium/files/patch-base__strings__safe_sprintf.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__strings__safe_sprintf.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__strings__safe_sprintf.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- ./base/strings/safe_sprintf.cc.orig 2014-03-04 03:16:26.000000000 +0100 -+++ ./base/strings/safe_sprintf.cc 2014-03-07 14:14:55.000000000 +0100 +--- ./base/strings/safe_sprintf.cc.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/strings/safe_sprintf.cc 2014-04-24 23:23:41.000000000 +0200 @@ -107,11 +107,11 @@ : buffer_(buffer), size_(size - 1), // Account for trailing NUL byte Modified: branches/2014Q2/www/chromium/files/patch-base__sys_info_freebsd.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__sys_info_freebsd.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__sys_info_freebsd.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- base/sys_info_freebsd.cc.orig 2013-09-28 19:09:58.000000000 +0200 -+++ base/sys_info_freebsd.cc 2013-10-09 17:13:04.000000000 +0200 +--- ./base/sys_info_freebsd.cc.orig 2014-04-24 22:36:11.000000000 +0200 ++++ ./base/sys_info_freebsd.cc 2014-04-24 23:23:41.000000000 +0200 @@ -4,6 +4,7 @@ #include "base/sys_info.h" Modified: branches/2014Q2/www/chromium/files/patch-base__sys_info_posix.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__sys_info_posix.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__sys_info_posix.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,11 +1,11 @@ ---- base/sys_info_posix.cc.orig 2011-02-07 00:36:57.000000000 +0100 -+++ base/sys_info_posix.cc 2011-02-07 00:21:53.000000000 +0100 -@@ -23,7 +23,7 @@ +--- ./base/sys_info_posix.cc.orig 2014-04-24 22:36:11.000000000 +0200 ++++ ./base/sys_info_posix.cc 2014-04-24 23:23:41.000000000 +0200 +@@ -49,7 +49,7 @@ namespace base { -#if !defined(OS_OPENBSD) +#if !defined(OS_OPENBSD) && !defined(OS_FREEBSD) int SysInfo::NumberOfProcessors() { - // It seems that sysconf returns the number of "logical" processors on both - // Mac and Linux. So we get the number of "online logical" processors. + return g_lazy_number_of_processors.Get().value(); + } Modified: branches/2014Q2/www/chromium/files/patch-base__test__expectations__expectation.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__test__expectations__expectation.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__test__expectations__expectation.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- base/test/expectations/expectation.cc.orig 2013-08-31 23:17:45.000000000 +0300 -+++ base/test/expectations/expectation.cc 2013-08-31 23:18:59.000000000 +0300 -@@ -58,6 +58,7 @@ +--- ./base/test/expectations/expectation.cc.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/test/expectations/expectation.cc 2014-04-24 23:23:41.000000000 +0200 +@@ -59,6 +59,7 @@ variant != "64") { return false; } @@ -8,7 +8,7 @@ } else if (name == "ChromeOS") { // TODO(rsesek): Figure out what ChromeOS needs. } else if (name == "iOS") { -@@ -119,6 +120,8 @@ +@@ -122,6 +123,8 @@ platform.variant = "32"; else if (arch == "x86_64") platform.variant = "64"; Modified: branches/2014Q2/www/chromium/files/patch-base__test__launcher__test_launcher.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__test__launcher__test_launcher.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__test__launcher__test_launcher.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2014-01-07 21:01:10.000000000 +0100 -+++ base/test/launcher/test_launcher.cc 2014-01-13 01:36:07.000000000 +0100 -@@ -36,6 +36,10 @@ +--- ./base/test/launcher/test_launcher.cc.orig 2014-04-24 22:36:09.000000000 +0200 ++++ ./base/test/launcher/test_launcher.cc 2014-04-24 23:23:41.000000000 +0200 +@@ -39,6 +39,10 @@ #include "base/mac/scoped_nsautorelease_pool.h" #endif Modified: branches/2014Q2/www/chromium/files/patch-base__threading__platform_thread_linux.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__threading__platform_thread_linux.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__threading__platform_thread_linux.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- base/threading/platform_thread_linux.cc.orig 2013-08-17 20:52:20.000000000 +0300 -+++ base/threading/platform_thread_linux.cc 2013-08-17 20:56:34.000000000 +0300 +--- ./base/threading/platform_thread_linux.cc.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/threading/platform_thread_linux.cc 2014-04-24 23:23:41.000000000 +0200 @@ -16,7 +16,9 @@ #include "base/tracked_objects.h" @@ -10,7 +10,7 @@ #include <sys/resource.h> #include <sys/syscall.h> #include <sys/time.h> -@@ -52,7 +54,7 @@ +@@ -48,7 +50,7 @@ ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); tracked_objects::ThreadData::InitializeThreadContext(name); Modified: branches/2014Q2/www/chromium/files/patch-build__common.gypi ============================================================================== --- branches/2014Q2/www/chromium/files/patch-build__common.gypi Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-build__common.gypi Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- build/common.gypi.orig 2014-02-20 21:28:44.000000000 +0100 -+++ build/common.gypi 2014-02-24 23:02:26.000000000 +0100 -@@ -573,7 +573,7 @@ +--- ./build/common.gypi.orig 2014-04-24 22:36:09.000000000 +0200 ++++ ./build/common.gypi 2014-04-24 23:23:42.000000000 +0200 +@@ -565,7 +565,7 @@ }], # DBus usage. @@ -9,7 +9,7 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -1008,6 +1008,10 @@ +@@ -1002,6 +1002,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, @@ -20,16 +20,16 @@ # 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. -@@ -1283,7 +1287,7 @@ - }], - ['os_posix==1 and OS!="mac" and OS!="ios"', { - # Figure out the python architecture to decide if we build pyauto. -- 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/<(system_libdir)/libpython<(python_ver).so.1.0)', -+ 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)<(prefix_dir)/lib/libpython<(python_ver).so.1)', - 'conditions': [ - ['target_arch=="mipsel"', { - 'werror%': '', -@@ -3610,6 +3614,13 @@ +@@ -1322,7 +1326,7 @@ + # TODO(jungshik): Turn this on on Android. + # For ChromeOS, this should be turned on in chromeos-chrome.ebuild + # file as well by adding icu_use_data_file_flag=1 to BUILD_DEFINES. +- ['OS!="android"', { ++ ['OS!="android" and os_bsd!=1', { + 'icu_use_data_file_flag%': 1, + }], + ], +@@ -3701,6 +3705,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], Modified: branches/2014Q2/www/chromium/files/patch-build__gyp_chromium ============================================================================== --- branches/2014Q2/www/chromium/files/patch-build__gyp_chromium Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-build__gyp_chromium Sat May 3 10:02:35 2014 (r352898) @@ -1,14 +1,14 @@ ---- build/gyp_chromium.orig 2014-02-20 21:28:44.000000000 +0100 -+++ build/gyp_chromium 2014-02-25 21:48:32.000000000 +0100 -@@ -245,8 +245,9 @@ +--- ./build/gyp_chromium.orig 2014-04-24 22:36:09.000000000 +0200 ++++ ./build/gyp_chromium 2014-04-24 23:23:42.000000000 +0200 +@@ -477,8 +477,9 @@ + args.append('--check') supplemental_includes = GetSupplementalFiles() - - if not RunGN(supplemental_includes): - sys.exit(1) + #TODO port GN to FreeBSD + #if not RunGN(supplemental_includes): + # sys.exit(1) - args.extend( ['-I' + i for i in additional_include_files(supplemental_includes, args)]) + Copied: branches/2014Q2/www/chromium/files/patch-cc__layers__layer.cc (from r352803, head/www/chromium/files/patch-cc__layers__layer.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-cc__layers__layer.cc Sat May 3 10:02:35 2014 (r352898, copy of r352803, head/www/chromium/files/patch-cc__layers__layer.cc) @@ -0,0 +1,22 @@ +--- ./cc/layers/layer.cc.orig 2014-04-24 22:35:51.000000000 +0200 ++++ ./cc/layers/layer.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -726,13 +726,15 @@ + DCHECK(current_layer); + DCHECK(current_layer->id() == scroll_clip_layer_id_); + +- gfx::Vector2dF max_offset( ++ // (rene) prevent name collission with /usr/include/vm/vm_map.h on FreeBSD ++ // which also defines max_offset ++ gfx::Vector2dF _max_offset( + scaled_scroll_bounds.width() - current_layer->bounds().width(), + scaled_scroll_bounds.height() - current_layer->bounds().height()); + // We need the final scroll offset to be in CSS coords. +- max_offset.Scale(1.f / scale_factor); +- max_offset.SetToMax(gfx::Vector2dF()); +- return gfx::ToFlooredVector2d(max_offset); ++ _max_offset.Scale(1.f / scale_factor); ++ _max_offset.SetToMax(gfx::Vector2dF()); ++ return gfx::ToFlooredVector2d(_max_offset); + } + + void Layer::SetScrollClipLayerId(int clip_layer_id) { Copied: branches/2014Q2/www/chromium/files/patch-cc__layers__layer_impl.cc (from r352803, head/www/chromium/files/patch-cc__layers__layer_impl.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-cc__layers__layer_impl.cc Sat May 3 10:02:35 2014 (r352898, copy of r352803, head/www/chromium/files/patch-cc__layers__layer_impl.cc) @@ -0,0 +1,32 @@ +--- ./cc/layers/layer_impl.cc.orig 2014-04-24 22:35:51.000000000 +0200 ++++ ./cc/layers/layer_impl.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -1222,21 +1222,23 @@ + scaled_scroll_bounds.SetSize(scale_factor * scaled_scroll_bounds.width(), + scale_factor * scaled_scroll_bounds.height()); + +- gfx::Vector2dF max_offset( ++ // (rene) prevent name collision with /usr/include/vm/vm_map.h on FreeBSD ++ // which also defines max_offset ++ gfx::Vector2dF _max_offset( + scaled_scroll_bounds.width() - scroll_clip_layer_->bounds().width(), + scaled_scroll_bounds.height() - scroll_clip_layer_->bounds().height()); + // We need the final scroll offset to be in CSS coords. +- max_offset.Scale(1 / scale_factor); +- max_offset.SetToMax(gfx::Vector2dF()); +- return gfx::ToFlooredVector2d(max_offset); ++ _max_offset.Scale(1 / scale_factor); ++ _max_offset.SetToMax(gfx::Vector2dF()); ++ return gfx::ToFlooredVector2d(_max_offset); + } + + gfx::Vector2dF LayerImpl::ClampScrollToMaxScrollOffset() { +- gfx::Vector2dF max_offset = MaxScrollOffset(); ++ gfx::Vector2dF _max_offset = MaxScrollOffset(); + gfx::Vector2dF old_offset = TotalScrollOffset(); + gfx::Vector2dF clamped_offset = old_offset; + +- clamped_offset.SetToMin(max_offset); ++ clamped_offset.SetToMin(_max_offset); + clamped_offset.SetToMax(gfx::Vector2d()); + gfx::Vector2dF delta = clamped_offset - old_offset; + if (!delta.IsZero()) Modified: branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2014-02-20 21:27:29.000000000 +0100 -+++ chrome/app/chrome_main_delegate.cc 2014-02-25 01:39:55.000000000 +0100 -@@ -97,7 +97,7 @@ +--- ./chrome/app/chrome_main_delegate.cc.orig 2014-04-24 22:34:55.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -95,7 +95,7 @@ #include "ui/base/x/x11_util.h" #endif @@ -9,7 +9,7 @@ #include "components/breakpad/app/breakpad_linux.h" #endif -@@ -115,7 +115,7 @@ +@@ -121,7 +121,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 -@@ -235,7 +235,7 @@ - // Mac needs them for the plugin process name. - process_type == switches::kPluginProcess || +@@ -243,7 +243,7 @@ + // Needed for scrollbar related images. + process_type == switches::kWorkerProcess || #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 -@@ -392,7 +392,7 @@ +@@ -457,7 +457,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 { -@@ -433,7 +433,7 @@ +@@ -498,7 +498,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 { -@@ -564,7 +564,7 @@ +@@ -629,7 +629,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -54,7 +54,7 @@ breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); #endif -@@ -703,7 +703,7 @@ +@@ -747,7 +747,7 @@ #endif } @@ -63,7 +63,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -715,7 +715,7 @@ +@@ -759,7 +759,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -72,7 +72,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -800,7 +800,7 @@ +@@ -844,7 +844,7 @@ return process_type == switches::kNaClLoaderProcess || process_type == switches::kRelauncherProcess; } Modified: branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- chrome/app/chrome_main_delegate.h.orig 2014-02-20 21:27:29.000000000 +0100 -+++ chrome/app/chrome_main_delegate.h 2014-02-25 01:45:34.000000000 +0100 +--- ./chrome/app/chrome_main_delegate.h.orig 2014-04-24 22:34:55.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.h 2014-04-24 23:23:42.000000000 +0200 @@ -31,7 +31,7 @@ virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; virtual bool DelaySandboxInitialization( Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__about_flags.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__about_flags.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__about_flags.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,11 +1,11 @@ ---- chrome/browser/about_flags.cc.orig 2012-01-18 11:12:44.000000000 +0200 -+++ chrome/browser/about_flags.cc 2012-01-29 14:51:40.000000000 +0200 -@@ -674,7 +674,7 @@ +--- ./chrome/browser/about_flags.cc.orig 2014-04-24 22:35:13.000000000 +0200 ++++ ./chrome/browser/about_flags.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -2320,7 +2320,7 @@ return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) +#elif defined(OS_LINUX) || defined(OS_BSD) return kOsLinux; - #else - #error Unknown platform + #elif defined(OS_ANDROID) + return kOsAndroid; Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__browser_process_impl.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__browser_process_impl.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__browser_process_impl.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,38 +1,11 @@ ---- chrome/browser/browser_process_impl.cc.orig 2013-09-25 23:32:28.000000000 +0300 -+++ chrome/browser/browser_process_impl.cc 2013-09-25 23:34:24.000000000 +0300 -@@ -244,7 +244,7 @@ +--- ./chrome/browser/browser_process_impl.cc.orig 2014-04-24 22:35:13.000000000 +0200 ++++ ./chrome/browser/browser_process_impl.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -261,7 +261,7 @@ ExtensionRendererState::GetInstance()->Shutdown(); -#if !defined(OS_ANDROID) && !defined(OS_IOS) +#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD) media_file_system_registry_.reset(); - // Delete |storage_monitor_| now. Otherwise the FILE thread would be gone - // when we try to release it in the dtor and Valgrind would report a -@@ -618,7 +618,7 @@ - } - - StorageMonitor* BrowserProcessImpl::storage_monitor() { --#if defined(OS_ANDROID) || defined(OS_IOS) -+#if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_BSD) - return NULL; - #else - return storage_monitor_.get(); -@@ -627,7 +627,7 @@ - - void BrowserProcessImpl::set_storage_monitor_for_test( - scoped_ptr<StorageMonitor> monitor) { --#if !defined(OS_ANDROID) && !defined(OS_IOS) -+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD) - storage_monitor_ = monitor.Pass(); - #endif - } -@@ -923,7 +923,7 @@ - } - #endif - --#if !defined(OS_ANDROID) && !defined(OS_IOS) -+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD) - storage_monitor_.reset(StorageMonitor::Create()); - #endif - + // Remove the global instance of the Storage Monitor now. Otherwise the + // FILE thread would be gone when we try to release it in the dtor and Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,11 +1,11 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2012-05-19 23:45:48.797106216 +0300 -+++ chrome/browser/chrome_browser_main.cc 2012-05-19 23:45:56.878106198 +0300 -@@ -1298,7 +1298,7 @@ - // just changed it to include experiments. - child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess()); +--- ./chrome/browser/chrome_browser_main.cc.orig 2014-04-24 22:35:13.000000000 +0200 ++++ ./chrome/browser/chrome_browser_main.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -973,7 +973,7 @@ + } + #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX) // Set the product channel for crash reports. - child_process_logging::SetChannel( + base::debug::SetCrashKeyValue(crash_keys::kChannel, chrome::VersionInfo::GetVersionStringModifier()); Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2013-02-28 10:15:23.000000000 +0200 -+++ chrome/browser/chrome_browser_main_posix.cc 2013-03-06 20:31:24.000000000 +0200 -@@ -310,6 +310,11 @@ +--- ./chrome/browser/chrome_browser_main_posix.cc.orig 2014-04-24 22:35:13.000000000 +0200 ++++ ./chrome/browser/chrome_browser_main_posix.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -314,6 +314,11 @@ g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; g_shutdown_pipe_write_fd = pipefd[1]; @@ -10,9 +10,9 @@ + const size_t kShutdownDetectorThreadStackSize = 0; +#else #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS) - const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN; + const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; #else -@@ -318,6 +323,7 @@ +@@ -322,6 +327,7 @@ // size to avoid hitting the guard page. const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; #endif Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2014-01-07 21:01:57.000000000 +0100 -+++ chrome/browser/chrome_content_browser_client.cc 2014-01-11 01:50:13.000000000 +0100 -@@ -486,7 +486,7 @@ +--- ./chrome/browser/chrome_content_browser_client.cc.orig 2014-04-24 22:35:13.000000000 +0200 ++++ ./chrome/browser/chrome_content_browser_client.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -493,7 +493,7 @@ } } @@ -9,16 +9,16 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -543,7 +543,7 @@ +@@ -549,7 +549,7 @@ return -1; } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) #endif // !defined(OS_ANDROID) - + #if !defined(OS_CHROMEOS) -@@ -1389,7 +1389,7 @@ +@@ -1449,7 +1449,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( CommandLine* command_line, int child_process_id) { @@ -27,8 +27,8 @@ if (breakpad::IsCrashReporterEnabled()) { std::string enable_crash_reporter; GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter); -@@ -2525,7 +2525,7 @@ - Profile::FromBrowserContext(browser_context))); +@@ -2587,7 +2587,7 @@ + } } -#if defined(OS_POSIX) && !defined(OS_MACOSX) @@ -36,7 +36,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const CommandLine& command_line, int child_process_id, -@@ -2580,7 +2580,7 @@ +@@ -2642,7 +2642,7 @@ } #endif // defined(OS_ANDROID) } Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2013-09-25 22:20:01.000000000 +0300 -+++ chrome/browser/chrome_content_browser_client.h 2013-09-25 22:20:17.000000000 +0300 -@@ -248,7 +248,7 @@ +--- ./chrome/browser/chrome_content_browser_client.h.orig 2014-04-24 22:35:13.000000000 +0200 ++++ ./chrome/browser/chrome_content_browser_client.h 2014-04-24 23:23:42.000000000 +0200 +@@ -255,7 +255,7 @@ const base::FilePath& storage_partition_path, ScopedVector<fileapi::FileSystemBackend>* additional_backends) OVERRIDE; Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,8 +1,8 @@ ---- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2013-11-08 07:40:50.000000000 +0100 -+++ chrome/browser/diagnostics/diagnostics_writer.cc 2013-11-16 11:31:52.000000000 +0100 +--- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-04-24 22:35:10.000000000 +0200 ++++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-04-24 23:23:42.000000000 +0200 @@ -268,7 +268,7 @@ console_->SetColor(color); - console_->Write(ASCIIToUTF16(result)); + console_->Write(base::ASCIIToUTF16(result)); } - if (format_ == MACHINE) { + if (format_ == THEMACHINE) { Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- chrome/browser/diagnostics/diagnostics_writer.h.orig 2013-11-08 07:40:50.000000000 +0100 -+++ chrome/browser/diagnostics/diagnostics_writer.h 2013-11-16 11:29:16.000000000 +0100 +--- ./chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-04-24 22:35:10.000000000 +0200 ++++ ./chrome/browser/diagnostics/diagnostics_writer.h 2014-04-24 23:23:42.000000000 +0200 @@ -18,7 +18,7 @@ public: // The type of formatting done by this writer. Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2013-11-16 01:16:39.000000000 +0100 -+++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2013-11-17 23:32:59.000000000 +0100 -@@ -149,10 +149,12 @@ +--- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-04-24 22:35:08.000000000 +0200 ++++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -166,10 +166,12 @@ } bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunImpl() { Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-02-20 21:27:39.000000000 +0100 -+++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-02-28 11:05:01.000000000 +0100 +--- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-04-24 22:35:09.000000000 +0200 ++++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-04-24 23:23:42.000000000 +0200 @@ -4,6 +4,10 @@ #include "chrome/browser/extensions/api/music_manager_private/device_id.h" @@ -11,7 +11,7 @@ #include <sys/socket.h> // Must be included before ifaddrs.h. #include <ifaddrs.h> #include <net/if.h> -@@ -100,11 +104,33 @@ +@@ -102,11 +106,33 @@ const char* prefixes[], size_t prefixes_count) { const int MAC_LENGTH = 6; @@ -46,7 +46,7 @@ int sd = socket(AF_INET, SOCK_DGRAM, 0); int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo); close(sd); -@@ -114,11 +140,17 @@ +@@ -116,11 +142,17 @@ const char* mac_address = static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data); Copied: branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc (from r352803, head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc Sat May 3 10:02:35 2014 (r352898, copy of r352803, head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc) @@ -0,0 +1,19 @@ +--- ./chrome/browser/extensions/api/serial/serial_api.cc.orig 2014-04-24 22:35:08.000000000 +0200 ++++ ./chrome/browser/extensions/api/serial/serial_api.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -83,7 +83,7 @@ + + void SerialGetDevicesFunction::Work() { + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); +- *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405031002.s43A2ZwW084873>