From owner-svn-ports-all@FreeBSD.ORG Thu Aug 14 22:01:48 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 309DF96D; Thu, 14 Aug 2014 22:01:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 634AE43F7; Thu, 14 Aug 2014 21:48:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7ELmePu028334; Thu, 14 Aug 2014 21:48:40 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7ELmXHj028284; Thu, 14 Aug 2014 21:48:33 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201408142148.s7ELmXHj028284@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Thu, 14 Aug 2014 21:48:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364870 - in head/www/chromium: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2014 22:01:48 -0000 Author: rene Date: Thu Aug 14 21:48:32 2014 New Revision: 364870 URL: http://svnweb.freebsd.org/changeset/ports/364870 QAT: https://qat.redports.org/buildarchive/r364870/ Log: - Update to 36.0.1985.143 and unforbid - Use a lot of ports dependencies instead of bundled versions (idea from Gentoo Linux) - Make patches more compatible with OpenBSD - Add note about Python (only relevant for DIY builds) - Install more icons into PREFIX/share/icons/hicolor/XxY/apps/ - Mute mkdir in installation - Install mksnapshot binary - Do not install bundled protoc binary Obtained from: Gentoo, OpenBSD, various contributors in freebsd-chromium@ MFH: 2014Q3 Security: http://www.vuxml.org/freebsd/df7754c0-2294-11e4-b505-000c6e25e3e9.html Added: head/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc (contents, props changed) head/www/chromium/files/patch-base__process__launch.cc (contents, props changed) head/www/chromium/files/patch-base__process__launch.h (contents, props changed) head/www/chromium/files/patch-breakpad__breakpad.gyp (contents, props changed) head/www/chromium/files/patch-build__filename_rules.gypi (contents, props changed) head/www/chromium/files/patch-build__linux__system.gyp (contents, props changed) head/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp (contents, props changed) head/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc (contents, props changed) head/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc (contents, props changed) head/www/chromium/files/patch-chrome__chrome_browser_ui.gypi (contents, props changed) head/www/chromium/files/patch-components__usb_service.gypi (contents, props changed) head/www/chromium/files/patch-components__usb_service__usb_context.cc (contents, props changed) head/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc (contents, props changed) head/www/chromium/files/patch-components__usb_service__usb_device_handle.cc (contents, props changed) head/www/chromium/files/patch-components__usb_service__usb_device_impl.cc (contents, props changed) head/www/chromium/files/patch-components__usb_service__usb_interface.cc (contents, props changed) head/www/chromium/files/patch-components__usb_service__usb_service_impl.cc (contents, props changed) head/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc (contents, props changed) head/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc (contents, props changed) head/www/chromium/files/patch-net__base__address_tracker_linux.h (contents, props changed) head/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc (contents, props changed) head/www/chromium/files/patch-net__net.gypi (contents, props changed) head/www/chromium/files/patch-remoting__remoting_host.gypi (contents, props changed) head/www/chromium/files/patch-skia__skia_chrome.gypi (contents, props changed) head/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp (contents, props changed) head/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp (contents, props changed) head/www/chromium/files/patch-third_party__khronos__khronos.gyp (contents, props changed) head/www/chromium/files/patch-third_party__libexif__libexif.gyp (contents, props changed) head/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp (contents, props changed) head/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp (contents, props changed) head/www/chromium/files/patch-third_party__sfntly__sfntly.gyp (contents, props changed) head/www/chromium/files/patch-third_party__sqlite__sqlite.gyp (contents, props changed) head/www/chromium/files/patch-ui__app_list__app_list_constants.cc (contents, props changed) head/www/chromium/files/patch-ui__app_list__app_list_constants.h (contents, props changed) head/www/chromium/files/patch-ui__base__ui_base.gyp (contents, props changed) head/www/chromium/files/patch-ui__views__views.gyp (contents, props changed) head/www/chromium/files/patch-ui__views__views_delegate.cc (contents, props changed) head/www/chromium/files/patch-ui__views__views_delegate.h (contents, props changed) Deleted: head/www/chromium/files/patch-cc__layers__layer.cc head/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h head/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc head/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h head/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h head/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc head/www/chromium/files/patch-chrome__browser__usb__usb_context.cc head/www/chromium/files/patch-chrome__chrome_tests_unit.gypi head/www/chromium/files/patch-chrome__test__ui__ui_test.cc head/www/chromium/files/patch-content__plugin__plugin_main_linux.cc head/www/chromium/files/patch-content__renderer__render_process_impl.cc head/www/chromium/files/patch-net__quic__congestion_control__inter_arrival_overuse_detector.cc head/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp head/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp head/www/chromium/files/patch-third_party__libusb__libusb.gyp Modified: head/www/chromium/Makefile head/www/chromium/distinfo 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__posix__unix_domain_socket_linux_unittest.cc head/www/chromium/files/patch-base__process__internal_linux.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-build__common.gypi 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__browser__about_flags.cc head/www/chromium/files/patch-chrome__browser__browser_process_impl.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__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__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__omaha_query_params__omaha_query_params.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__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_tests.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-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__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__media__webrtc_audio_capturer.cc head/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.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__cast__rtcp__rtcp.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-native_client__build__common.gypi head/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp head/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp head/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp 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__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-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__config.h 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__web__linux__WebFontRendering.cpp head/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp head/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp head/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h head/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp 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__libXNVCtrl__libXNVCtrl.gyp head/www/chromium/files/patch-third_party__libjingle__libjingle.gyp 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-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__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__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/pkg-plist Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/Makefile Thu Aug 14 21:48:32 2014 (r364870) @@ -1,11 +1,8 @@ # Created by: Florent Thoumie # $FreeBSD$ -#TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3 - PORTNAME= chromium -PORTVERSION= 35.0.1916.153 -PORTREVISION= 3 +PORTVERSION= 36.0.1985.143 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -16,15 +13,15 @@ COMMENT= Mostly BSD-licensed web browser LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi -FORBIDDEN= http://www.vuxml.org/freebsd/3718833e-0d27-11e4-89db-000c6e25e3e9.html - CFLAGS+= -fno-stack-protector BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ bash:${PORTSDIR}/shells/bash \ yasm:${PORTSDIR}/devel/yasm \ flock:${PORTSDIR}/sysutils/flock \ - ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat + ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \ + protoc:${PORTSDIR}/devel/protobuf \ + ${LOCALBASE}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libdbus-1.so:${PORTSDIR}/devel/dbus \ @@ -32,52 +29,95 @@ LIB_DEPENDS= libcairo.so:${PORTSDIR}/gra libasound.so:${PORTSDIR}/audio/alsa-lib \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libnss3.so:${PORTSDIR}/security/nss \ + libFLAC.so:${PORTSDIR}/audio/flac \ libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \ + libharfbuzz.so:${PORTSDIR}/print/harfbuzz \ libcups.so:${PORTSDIR}/print/cups-client \ libevent.so:${PORTSDIR}/devel/libevent2 \ + libexif.so:${PORTSDIR}/graphics/libexif \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libpci.so:${PORTSDIR}/devel/libpci \ - libdrm.so:${PORTSDIR}/graphics/libdrm + libdrm.so:${PORTSDIR}/graphics/libdrm \ + 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 \ + libpng.so:${PORTSDIR}/graphics/png \ + libre2.so:${PORTSDIR}/devel/re2 \ + libsnappy.so:${PORTSDIR}/archivers/snappy \ + libspeechd.so:${PORTSDIR}/accessibility/speech-dispatcher \ + libspeex.so:${PORTSDIR}/audio/speex \ + libxml2.so:${PORTSDIR}/textproc/libxml2 \ + libwebp.so:${PORTSDIR}/graphics/webp RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \ - ${LOCALBASE}/lib/X11/fonts/Droid/fonts.dir:${PORTSDIR}/x11-fonts/droid-fonts-ttf + ${LOCALBASE}/lib/X11/fonts/Droid/fonts.dir:${PORTSDIR}/x11-fonts/droid-fonts-ttf \ + xdg-open:${PORTSDIR}/devel/xdg-utils ONLY_FOR_ARCHS= i386 amd64 USES= bison compiler:c++11-lib cpe desktop-file-utils pkgconfig \ - perl5 shebangfix ninja tar:xz + perl5 shebangfix ninja tar:xz python:2,build execinfo CPE_VENDOR= google CPE_PRODUCT= chrome USE_PERL5= build -USE_PYTHON_BUILD= 2 USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst USE_GNOME= glib20 gtk20 dconf libxslt - +USE_OPENSSL= yes +WITH_OPENSSL_PORT= yes # simplify for pkg-config in configure phase SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome +INSTALLS_ICONS= yes # See build/common.gypi for all the available variables. -GYP_DEFINES+= use_cups=1 \ - use_system_yasm=1 \ - use_system_libxml=1 \ - use_system_ffmpeg=0 \ - use_system_libusb=1 \ - use_system_libevent=1 \ - use_system_libvpx=0 \ +GYP_DEFINES+= \ + clang_use_chrome_plugins=0 \ linux_breakpad=0 \ - linux_strip_binary=1 \ - linux_use_tcmalloc=0 \ linux_use_heapchecker=0 \ + linux_strip_binary=1 \ test_isolation_mode=noop \ - clang_use_chrome_plugins=0 \ disable_nacl=1 \ - enable_webrtc=1 \ - enable_openmax=1 \ enable_one_click_signin=1 \ + enable_openmax=1 \ + enable_webrtc=1 \ werror= \ no_gc_sections=1 \ os_ver=${OSVERSION} \ prefix_dir=${LOCALBASE} \ - python_ver=${PYTHON_VER} + python_ver=${PYTHON_VER} \ + use_allocator=none \ + use_cups=1 \ + linux_link_gsettings=1 \ + linux_link_libpci=1 \ + linux_link_libspeechd=1 \ + libspeechd_h_prefix=speech-dispatcher/ \ + usb_ids_path=${LOCALBASE}/share/usbids/usb.ids \ + want_separate_host_toolset=0 \ + use_system_bzip2=1 \ + use_system_flac=1 \ + use_system_harfbuzz=1 \ + use_system_icu=1 \ + use_system_jsoncpp=1 \ + use_system_libevent=1 \ + use_system_libexif=1 \ + use_system_libjpeg=1 \ + use_system_libpng=1 \ + use_system_libusb=1 \ + 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 +# allow removal of third_party/adobe +GYP_DEFINES+= flapper_version_h_file='${WRKSRC}/flapper_version.h' # FreeBSD Chromium Api Key # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . @@ -110,7 +150,9 @@ GYP_DEFINES+= ffmpeg_branding=Chromium GYP_DEFINES+= proprietary_codecs=0 .endif -.if ! ${PORT_OPTIONS:MGCONF} +.if ${PORT_OPTIONS:MGCONF} +GYP_DEFINES+= use_gconf=1 +.else GYP_DEFINES+= use_gconf=0 .endif @@ -127,9 +169,6 @@ GYP_DEFINES+= disable_sse2=1 .if ${OSVERSION} >= 1000052 && !exists(${LOCALBASE}/include/execinfo.h) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-execinfo .endif -.if ${OSVERSION} < 1000052 -LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo -.endif .if ${PORT_OPTIONS:MTEST} .include "Makefile.tests" @@ -141,11 +180,11 @@ DEBUG_MAKE_ENV= V=1 BUILDTYPE= Debug .else BUILDTYPE= Release -GYP_DEFINES+= buildtype=Official .endif CONFIGURE_ENV+= CC="${CC}" \ CXX="${CXX}" \ + GYP_GENERATORS=ninja \ GYP_DEFINES="${GYP_DEFINES}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF="${LOCALBASE}/bin/gperf" @@ -180,6 +219,8 @@ pre-everything:: @${ECHO_MSG} "and a fair amount of free diskspace (~ 3.7GB)." .endif @${ECHO_MSG} + @${ECHO_MSG} "Make sure you have Python build with the SEM option ON" + @${ECHO_MSG} "(default in python27-2.7.8 since r361735)" post-patch: @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \ @@ -187,10 +228,95 @@ post-patch: ${WRKSRC}/v8/tools/gyp/v8.gyp \ ${WRKSRC}/v8/build/toolchain.gypi @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \ - ${WRKSRC}/chrome/common/chrome_paths.cc + ${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 + # should be called "keep_bundled_libraries.py" + cd ${WRKSRC} && ${PYTHON_CMD} \ + ./build/linux/unbundle/remove_bundled_libraries.py \ + 'base/third_party/dmg_fp' \ + 'base/third_party/dynamic_annotations' \ + 'base/third_party/icu' \ + 'base/third_party/nspr' \ + 'base/third_party/superfasthash' \ + 'base/third_party/symbolize' \ + 'base/third_party/valgrind' \ + 'base/third_party/xdg_mime' \ + 'base/third_party/xdg_user_dirs' \ + 'breakpad/src/third_party/curl' \ + 'chrome/third_party/mozilla_security_manager' \ + 'courgette/third_party' \ + 'crypto/third_party/nss' \ + 'net/third_party/mozilla_security_manager' \ + 'net/third_party/nss' \ + 'third_party/WebKit' \ + 'third_party/angle' \ + 'third_party/brotli' \ + 'third_party/cacheinvalidation' \ + 'third_party/cld' \ + 'third_party/cros_system_api' \ + 'third_party/dom_distiller_js' \ + 'third_party/ffmpeg' \ + 'third_party/flot' \ + 'third_party/hunspell' \ + 'third_party/iccjpeg' \ + 'third_party/icu/icu.isolate' \ + 'third_party/jinja2' \ + 'third_party/jstemplate' \ + 'third_party/khronos' \ + 'third_party/leveldatabase' \ + 'third_party/libaddressinput' \ + 'third_party/libjingle' \ + 'third_party/libphonenumber' \ + 'third_party/libsrtp' \ + 'third_party/libvpx' \ + 'third_party/libwebm' \ + 'third_party/libxml/chromium' \ + 'third_party/libXNVCtrl' \ + 'third_party/libyuv' \ + 'third_party/lss' \ + 'third_party/lzma_sdk' \ + 'third_party/markupsafe' \ + 'third_party/mesa' \ + 'third_party/modp_b64' \ + 'third_party/mt19937ar' \ + 'third_party/npapi' \ + 'third_party/opus' \ + 'third_party/ots' \ + 'third_party/polymer' \ + 'third_party/ply' \ + 'third_party/pywebsocket' \ + 'third_party/qcms' \ + 'third_party/readability' \ + 'third_party/sfntly' \ + 'third_party/skia' \ + 'third_party/smhasher' \ + 'third_party/sqlite' \ + 'third_party/tcmalloc' \ + 'third_party/tlslite' \ + 'third_party/trace-viewer' \ + 'third_party/undoview' \ + 'third_party/usrsctp' \ + 'third_party/webdriver' \ + 'third_party/webrtc' \ + 'third_party/widevine' \ + 'third_party/x86inc' \ + 'third_party/zlib/google' \ + 'url/third_party/mozilla' \ + 'v8/src/third_party/valgrind' \ + --do-remove || ${FALSE} + cd ${WRKSRC} && ${PYTHON_CMD} \ + ./build/linux/unbundle/replace_gyp_files.py \ + ${GYP_DEFINES:C/^/-D/} || ${FALSE} + # allow removal of third_party/adobe + ${ECHO_CMD} > ${WRKSRC}/flapper_version.h do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ @@ -203,21 +329,26 @@ test regression-test: build .endfor do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${STAGEDIR}${MANPREFIX}/man/man1 - ${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_100_percent content_resources resources - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak ${STAGEDIR}${DATADIR} +.for s in 22 24 48 64 128 256 + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps + ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png .endfor -.for f in chrome libffmpegsumo.so protoc - ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ + ${STAGEDIR}${DATADIR} +.for p in chrome_100_percent content_resources keyboard_resources resources + ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak ${STAGEDIR}${DATADIR} .endfor + ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome ${STAGEDIR}${DATADIR} + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libffmpegsumo.so ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} - ${MKDIR} ${STAGEDIR}${DESKTOPDIR} + @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot.${ARCH:S/i386/x86/:S/amd64/x64/} \ + ${STAGEDIR}${DATADIR}/mksnapshot .include Modified: head/www/chromium/distinfo ============================================================================== --- head/www/chromium/distinfo Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/distinfo Thu Aug 14 21:48:32 2014 (r364870) @@ -1,4 +1,4 @@ -SHA256 (chromium-35.0.1916.153.tar.xz) = 280ceb4307ba334918aacd1c5672e6ce6538bf229f90415245ede5b569e5e70e -SIZE (chromium-35.0.1916.153.tar.xz) = 206225052 -SHA256 (chromium-35.0.1916.153-testdata.tar.xz) = b3b977312a7a57f53cd8a02ab59480509ab39ea66130855da16438de888d92f4 -SIZE (chromium-35.0.1916.153-testdata.tar.xz) = 109105000 +SHA256 (chromium-36.0.1985.143.tar.xz) = 0631d7442991f0b4b942477c58a9294e9e3eb21ffd3c8626e4ab663b8345c316 +SIZE (chromium-36.0.1985.143.tar.xz) = 205456928 +SHA256 (chromium-36.0.1985.143-testdata.tar.xz) = 7af27696a1d30a2acd29ffa331c956f58d82080905b73ad9259f7d6ad2784277 +SIZE (chromium-36.0.1985.143-testdata.tar.xz) = 111519392 Modified: head/www/chromium/files/patch-base__base.gyp ============================================================================== --- head/www/chromium/files/patch-base__base.gyp Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-base__base.gyp Thu Aug 14 21:48:32 2014 (r364870) @@ -1,14 +1,11 @@ ---- ./base/base.gyp.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/base.gyp 2014-05-04 14:38:46.000000000 +0200 -@@ -803,6 +803,11 @@ - ['include', '^debug/proc_maps_linux_unittest\\.cc$'], +--- ./base/base.gyp.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/base.gyp 2014-08-13 09:57:00.000000000 +0200 +@@ -129,7 +129,7 @@ ], + 'link_settings': { + 'libraries': [ +- '-L/usr/local/lib -lexecinfo', ++ '-L/usr/local/lib -lexecinfo -lkvm', + ], + }, }], -+ ['<(os_bsd) == 1', { -+ 'sources/': [ -+ ['exclude', '^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 Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-base__base.gypi Thu Aug 14 21:48:32 2014 (r364870) @@ -1,12 +1,12 @@ ---- ./base/base.gypi.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/base.gypi 2014-05-04 14:38:46.000000000 +0200 -@@ -915,11 +915,15 @@ +--- ./base/base.gypi.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/base.gypi 2014-08-13 09:56:56.000000000 +0200 +@@ -912,11 +912,14 @@ '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', '^files/file_path_watcher_stub\\.cc$'], ['exclude', '^file_util_linux\\.cc$'], + ['exclude', '^process/memory_linux\\.cc$'], ['exclude', '^process/process_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 Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-base__debug__stack_trace_posix.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -1,6 +1,6 @@ ---- ./base/debug/stack_trace_posix.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/debug/stack_trace_posix.cc 2014-05-04 15:46:56.000000000 +0200 -@@ -586,6 +586,10 @@ +--- ./base/debug/stack_trace_posix.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/debug/stack_trace_posix.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -590,6 +590,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)) { -@@ -601,6 +605,7 @@ +@@ -605,6 +609,7 @@ is_initialized_ = true; return true; Added: head/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -0,0 +1,44 @@ +--- ./base/posix/unix_domain_socket_linux.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/posix/unix_domain_socket_linux.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -18,6 +18,15 @@ + #include "base/posix/eintr_wrapper.h" + #include "base/stl_util.h" + ++#if defined(__FreeBSD__) ++// Port over Linux ucred structure ++struct ucred { ++ pid_t pid; // process ID of the sending process ++ uid_t uid; // user ID of the sending process ++ gid_t gid; // group ID of the sending process ++}; ++#endif ++ + const size_t UnixDomainSocket::kMaxFileDescriptors = 16; + + // Creates a connected pair of UNIX-domain SOCK_SEQPACKET sockets, and passes +@@ -35,7 +44,13 @@ + // static + bool UnixDomainSocket::EnableReceiveProcessId(int fd) { + const int enable = 1; ++#if defined(__FreeBSD__) ++ // XXX(rene) do this? : ++ // taken from dbus, Academic Free License 2.1 / GPL 2+ ++ return 0; // fake OK ++#else + return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; ++#endif + } + + // static +@@ -131,7 +146,11 @@ + wire_fds_len = payload_len / sizeof(int); + } + if (cmsg->cmsg_level == SOL_SOCKET && ++#if defined(__FreeBSD__) ++ 1) { // XXX(rene) carpet getting full ... ++#else + cmsg->cmsg_type == SCM_CREDENTIALS) { ++#endif + DCHECK(payload_len == sizeof(struct ucred)); + DCHECK(pid == -1); + pid = reinterpret_cast(CMSG_DATA(cmsg))->pid; 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 Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -1,5 +1,5 @@ ---- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-04-30 22:41:41.000000000 +0200 -+++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-08-13 09:56:56.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: head/www/chromium/files/patch-base__process__internal_linux.h ============================================================================== --- head/www/chromium/files/patch-base__process__internal_linux.h Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-base__process__internal_linux.h Thu Aug 14 21:48:32 2014 (r364870) @@ -1,5 +1,5 @@ ---- ./base/process/internal_linux.h.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/process/internal_linux.h 2014-05-04 14:38:46.000000000 +0200 +--- ./base/process/internal_linux.h.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/internal_linux.h 2014-08-13 09:56:56.000000000 +0200 @@ -12,6 +12,8 @@ #include "base/files/file_path.h" Added: head/www/chromium/files/patch-base__process__launch.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base__process__launch.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -0,0 +1,15 @@ +--- ./base/process/launch.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/launch.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -23,10 +23,10 @@ + fds_to_remap(NULL), + maximize_rlimits(NULL), + new_process_group(false) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + , clone_flags(0) + , allow_new_privs(false) +-#endif // OS_LINUX ++#endif // OS_LINUX || OS_FREEBSD + #if defined(OS_CHROMEOS) + , ctrl_terminal_fd(-1) + #endif // OS_CHROMEOS Added: head/www/chromium/files/patch-base__process__launch.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base__process__launch.h Thu Aug 14 21:48:32 2014 (r364870) @@ -0,0 +1,19 @@ +--- ./base/process/launch.h.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/launch.h 2014-08-13 09:56:56.000000000 +0200 +@@ -108,14 +108,14 @@ + // will be the same as its pid. + bool new_process_group; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + // If non-zero, start the process using clone(), using flags as provided. + int clone_flags; + + // By default, child processes will have the PR_SET_NO_NEW_PRIVS bit set. If + // true, then this bit will not be set in the new child process. + bool allow_new_privs; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_FREEBSD) + + #if defined(OS_CHROMEOS) + // If non-negative, the specified file descriptor will be set as the launched Modified: head/www/chromium/files/patch-base__process__memory_unittest.cc ============================================================================== --- head/www/chromium/files/patch-base__process__memory_unittest.cc Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-base__process__memory_unittest.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -1,24 +1,20 @@ ---- ./base/process/memory_unittest.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/process/memory_unittest.cc 2014-05-04 16:09:01.000000000 +0200 -@@ -151,12 +151,12 @@ +--- ./base/process/memory_unittest.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/memory_unittest.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -151,9 +151,9 @@ // Android doesn't implement set_new_handler, so we can't use the // OutOfMemoryTest cases. -// OpenBSD does not support these tests either. -+// OpenBSD and FreeBSD does not support these tests either. - // AddressSanitizer and ThreadSanitizer define the malloc()/free()/etc. - // functions so that they don't crash if the program is out of memory, so the - // OOM tests aren't supposed to work. ++// OpenBSD and FreeBSD do not support these tests either. // TODO(vandebo) make this work on Windows too. -#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && \ +#if !defined(OS_ANDROID) && !defined(OS_BSD) && \ - !defined(OS_WIN) && \ - !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) + !defined(OS_WIN) -@@ -427,5 +427,5 @@ + #if defined(USE_TCMALLOC) +@@ -425,4 +425,4 @@ EXPECT_TRUE(value_ == NULL); } - --#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && -+#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && - // !defined(OS_WIN) && !defined(ADDRESS_SANITIZER) + #endif // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) +-#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(OS_WIN) ++#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(OS_WIN) Modified: head/www/chromium/files/patch-base__process__process_iterator_freebsd.cc ============================================================================== --- head/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -1,5 +1,5 @@ ---- ./base/process/process_iterator_freebsd.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/process/process_iterator_freebsd.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/process/process_iterator_freebsd.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/process_iterator_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 @@ -8,6 +8,10 @@ #include #include Modified: head/www/chromium/files/patch-base__process__process_metrics.h ============================================================================== --- head/www/chromium/files/patch-base__process__process_metrics.h Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-base__process__process_metrics.h Thu Aug 14 21:48:32 2014 (r364870) @@ -1,5 +1,5 @@ ---- ./base/process/process_metrics.h.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/process/process_metrics.h 2014-05-04 14:38:46.000000000 +0200 +--- ./base/process/process_metrics.h.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/process_metrics.h 2014-08-13 09:56:56.000000000 +0200 @@ -17,6 +17,13 @@ #include "base/time/time.h" #include "base/values.h" @@ -14,3 +14,21 @@ #if defined(OS_MACOSX) #include #endif +@@ -242,13 +249,17 @@ + // CPU-related ticks. Returns -1 on parse error. + // Exposed for testing. + BASE_EXPORT int ParseProcStatCPU(const std::string& input); ++#endif + ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) + // Get the number of threads of |process| as available in /proc//stat. + // This should be used with care as no synchronization with running threads is + // done. This is mostly useful to guarantee being single-threaded. + // Returns 0 on failure. + BASE_EXPORT int GetNumberOfThreads(ProcessHandle process); ++#endif + ++#if defined(OS_LINUX) || defined(OS_ANDROID) + // /proc/self/exe refers to the current executable. + BASE_EXPORT extern const char kProcSelfExe[]; + Modified: head/www/chromium/files/patch-base__process__process_metrics_freebsd.cc ============================================================================== --- head/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -1,11 +1,36 @@ ---- ./base/process/process_metrics_freebsd.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/process/process_metrics_freebsd.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -10,6 +10,8 @@ +--- ./base/process/process_metrics_freebsd.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/process_metrics_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -10,6 +10,9 @@ #include "base/sys_info.h" +#include /* getpagesize() */ ++#include /* O_RDONLY */ + namespace base { ProcessMetrics::ProcessMetrics(ProcessHandle process) +@@ -119,4 +122,23 @@ + return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); + } + ++int GetNumberOfThreads(ProcessHandle process) { ++ // Taken from FreeBSD top (usr.bin/top/machine.c) ++ ++ kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open"); ++ if (kd == NULL) ++ return 0; ++ ++ struct kinfo_proc* pbase; ++ int nproc; ++ pbase = kvm_getprocs(kd, KERN_PROC_PID, process, &nproc); ++ if (pbase == NULL) ++ return 0; ++ ++ if (kvm_close(kd) == -1) ++ return 0; ++ ++ return nproc; ++} ++ + } // namespace base Modified: head/www/chromium/files/patch-base__security_unittest.cc ============================================================================== --- head/www/chromium/files/patch-base__security_unittest.cc Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-base__security_unittest.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -1,6 +1,6 @@ ---- ./base/security_unittest.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/security_unittest.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -159,7 +159,7 @@ +--- ./base/security_unittest.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/security_unittest.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -160,7 +160,7 @@ // FAILS_ is too clunky. void OverflowTestsSoftExpectTrue(bool overflow_detected) { if (!overflow_detected) { Modified: head/www/chromium/files/patch-base__strings__safe_sprintf.cc ============================================================================== --- head/www/chromium/files/patch-base__strings__safe_sprintf.cc Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-base__strings__safe_sprintf.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -1,5 +1,5 @@ ---- ./base/strings/safe_sprintf.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/strings/safe_sprintf.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/strings/safe_sprintf.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/strings/safe_sprintf.cc 2014-08-13 09:56:56.000000000 +0200 @@ -107,11 +107,11 @@ : buffer_(buffer), size_(size - 1), // Account for trailing NUL byte Modified: head/www/chromium/files/patch-base__sys_info_freebsd.cc ============================================================================== --- head/www/chromium/files/patch-base__sys_info_freebsd.cc Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-base__sys_info_freebsd.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -1,5 +1,5 @@ ---- ./base/sys_info_freebsd.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/sys_info_freebsd.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/sys_info_freebsd.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/sys_info_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 @@ -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 Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-base__sys_info_posix.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -1,6 +1,6 @@ ---- ./base/sys_info_posix.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/sys_info_posix.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -49,7 +49,7 @@ +--- ./base/sys_info_posix.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/sys_info_posix.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -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 Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-base__test__expectations__expectation.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -1,6 +1,6 @@ ---- ./base/test/expectations/expectation.cc.orig 2014-04-30 22:41:42.000000000 +0200 -+++ ./base/test/expectations/expectation.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -59,6 +59,7 @@ +--- ./base/test/expectations/expectation.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/test/expectations/expectation.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -60,6 +60,7 @@ variant != "64") { return false; } @@ -8,7 +8,7 @@ } else if (name == "ChromeOS") { // TODO(rsesek): Figure out what ChromeOS needs. } else if (name == "iOS") { -@@ -122,6 +123,8 @@ +@@ -125,6 +126,8 @@ platform.variant = "32"; else if (arch == "x86_64") platform.variant = "64"; Modified: head/www/chromium/files/patch-base__test__launcher__test_launcher.cc ============================================================================== --- head/www/chromium/files/patch-base__test__launcher__test_launcher.cc Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-base__test__launcher__test_launcher.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -1,5 +1,5 @@ ---- ./base/test/launcher/test_launcher.cc.orig 2014-04-30 22:41:42.000000000 +0200 -+++ ./base/test/launcher/test_launcher.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/test/launcher/test_launcher.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/test/launcher/test_launcher.cc 2014-08-13 09:56:56.000000000 +0200 @@ -40,6 +40,10 @@ #include "base/mac/scoped_nsautorelease_pool.h" #endif Modified: head/www/chromium/files/patch-base__threading__platform_thread_linux.cc ============================================================================== --- head/www/chromium/files/patch-base__threading__platform_thread_linux.cc Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-base__threading__platform_thread_linux.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -1,5 +1,5 @@ ---- ./base/threading/platform_thread_linux.cc.orig 2014-04-30 22:41:42.000000000 +0200 -+++ ./base/threading/platform_thread_linux.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/threading/platform_thread_linux.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/threading/platform_thread_linux.cc 2014-08-13 09:56:56.000000000 +0200 @@ -16,7 +16,9 @@ #include "base/tracked_objects.h" @@ -10,7 +10,7 @@ #include #include #include -@@ -48,7 +50,7 @@ +@@ -50,7 +52,7 @@ ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); tracked_objects::ThreadData::InitializeThreadContext(name); Added: head/www/chromium/files/patch-breakpad__breakpad.gyp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-breakpad__breakpad.gyp Thu Aug 14 21:48:32 2014 (r364870) @@ -0,0 +1,11 @@ +--- ./breakpad/breakpad.gyp.orig 2014-08-12 21:02:55.000000000 +0200 ++++ ./breakpad/breakpad.gyp 2014-08-13 09:56:56.000000000 +0200 +@@ -340,7 +340,7 @@ + }, + ], + }], +- [ 'OS=="linux" or OS=="android" or OS=="freebsd"', { ++ [ 'OS=="linux" or OS=="android" or os_bsd==1', { + 'conditions': [ + ['OS=="android"', { + 'defines': [ Modified: head/www/chromium/files/patch-build__common.gypi ============================================================================== --- head/www/chromium/files/patch-build__common.gypi Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-build__common.gypi Thu Aug 14 21:48:32 2014 (r364870) @@ -1,6 +1,15 @@ ---- ./build/common.gypi.orig 2014-04-30 22:43:21.000000000 +0200 -+++ ./build/common.gypi 2014-05-04 14:43:03.000000000 +0200 -@@ -615,7 +615,7 @@ +--- ./build/common.gypi.orig 2014-08-12 21:02:52.000000000 +0200 ++++ ./build/common.gypi 2014-08-13 09:56:56.000000000 +0200 +@@ -101,7 +101,7 @@ + # + # TODO(erg): Merge this into the previous block once compiling with + # aura safely implies including ash capabilities. +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="freebsd"', { + 'use_aura%': 1, + }], + +@@ -622,7 +622,7 @@ }], # DBus usage. @@ -9,16 +18,16 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -878,7 +878,7 @@ - # By default, use ICU data file (icudtl.dat) on all platforms +@@ -896,7 +896,7 @@ # except when building Android WebView. # 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"', { 'icu_use_data_file_flag%' : 1, - }, { - 'icu_use_data_file_flag%' : 0, -@@ -1076,6 +1076,9 @@ + 'spdy_proxy_auth_origin%': '', + 'data_reduction_proxy_probe_url%': '', +@@ -1106,6 +1106,9 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, @@ -28,7 +37,7 @@ # 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. -@@ -3894,6 +3897,13 @@ +@@ -3960,6 +3963,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], Added: head/www/chromium/files/patch-build__filename_rules.gypi ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-build__filename_rules.gypi Thu Aug 14 21:48:32 2014 (r364870) @@ -0,0 +1,11 @@ +--- ./build/filename_rules.gypi.orig 2014-08-12 21:02:52.000000000 +0200 ++++ ./build/filename_rules.gypi 2014-08-13 09:56:56.000000000 +0200 +@@ -85,7 +85,7 @@ + ['<(use_aura)==0 or OS!="win" or >(nacl_untrusted_build)==1', { + 'sources/': [ ['exclude', '_aurawin\\.(h|cc)$'] ] + }], +- ['<(use_aura)==0 or OS!="linux" or >(nacl_untrusted_build)==1', { ++ ['<(use_aura)==0 or (OS!="linux" and OS!="openbsd" and OS!="freebsd") or >(nacl_untrusted_build)==1', { + 'sources/': [ ['exclude', '_auralinux\\.(h|cc)$'] ] + }], + ['<(use_ash)==0 or >(nacl_untrusted_build)==1', { Added: head/www/chromium/files/patch-build__linux__system.gyp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-build__linux__system.gyp Thu Aug 14 21:48:32 2014 (r364870) @@ -0,0 +1,16 @@ +--- ./build/linux/system.gyp.orig 2014-08-12 21:02:52.000000000 +0200 ++++ ./build/linux/system.gyp 2014-08-13 09:56:56.000000000 +0200 +@@ -885,6 +885,13 @@ + 'include_dirs': [ + '../..', + ], ++ 'conditions' : [ ++ ['OS=="freebsd"', { ++ 'include_dirs': [ ++ '<(prefix_dir)/include', ++ ], ++ }], ++ ], + 'hard_dependency': 1, + 'actions': [ + { Added: head/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp Thu Aug 14 21:48:32 2014 (r364870) @@ -0,0 +1,17 @@ +--- ./build/linux/unbundle/libwebp.gyp.orig 2014-08-12 21:02:52.000000000 +0200 ++++ ./build/linux/unbundle/libwebp.gyp 2014-08-13 09:56:56.000000000 +0200 +@@ -14,13 +14,7 @@ + }, + 'link_settings': { + 'libraries': [ +- # Check for presence of webpdemux library, use it if present. +- '::Leaky g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; #endif -@@ -243,7 +243,7 @@ +@@ -245,7 +245,7 @@ // Needed for scrollbar related images. process_type == switches::kWorkerProcess || #endif @@ -27,7 +27,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -457,7 +457,7 @@ +@@ -459,7 +459,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 { -@@ -498,7 +498,7 @@ +@@ -500,7 +500,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 { -@@ -630,7 +630,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 -@@ -748,7 +748,7 @@ +@@ -757,7 +757,7 @@ #endif } @@ -63,7 +63,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -760,7 +760,7 @@ +@@ -769,7 +769,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. -@@ -845,7 +845,7 @@ +@@ -854,7 +854,7 @@ return process_type == switches::kNaClLoaderProcess || process_type == switches::kRelauncherProcess; } Modified: head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h ============================================================================== --- head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Thu Aug 14 21:48:32 2014 (r364870) @@ -1,5 +1,5 @@ ---- ./chrome/app/chrome_main_delegate.h.orig 2014-04-30 22:42:53.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.h 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/app/chrome_main_delegate.h.orig 2014-08-12 21:02:25.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.h 2014-08-13 09:56:56.000000000 +0200 @@ -35,7 +35,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 Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-chrome__app__chromium_strings.grd Thu Aug 14 21:48:32 2014 (r364870) @@ -1,11 +1,11 @@ ---- ./chrome/app/chromium_strings.grd.orig 2014-04-30 22:42:53.000000000 +0200 -+++ ./chrome/app/chromium_strings.grd 2014-05-05 13:13:16.000000000 +0200 -@@ -1115,7 +1115,7 @@ +--- ./chrome/app/chromium_strings.grd.orig 2014-08-12 21:02:25.000000000 +0200 ++++ ./chrome/app/chromium_strings.grd 2014-08-13 09:56:56.000000000 +0200 +@@ -1099,7 +1099,7 @@ -- -+ - +- ++ + The profile appears to be in use by another Chromium process ($112345) on another computer ($2example.com). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. Modified: head/www/chromium/files/patch-chrome__browser__about_flags.cc ============================================================================== --- head/www/chromium/files/patch-chrome__browser__about_flags.cc Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-chrome__browser__about_flags.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -1,6 +1,6 @@ ---- ./chrome/browser/about_flags.cc.orig 2014-04-30 22:42:17.000000000 +0200 -+++ ./chrome/browser/about_flags.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -2153,7 +2153,7 @@ +--- ./chrome/browser/about_flags.cc.orig 2014-08-12 21:01:48.000000000 +0200 ++++ ./chrome/browser/about_flags.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -2183,7 +2183,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__browser_process_impl.cc ============================================================================== --- head/www/chromium/files/patch-chrome__browser__browser_process_impl.cc Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-chrome__browser__browser_process_impl.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -1,6 +1,6 @@ ---- ./chrome/browser/browser_process_impl.cc.orig 2014-04-30 22:42:17.000000000 +0200 -+++ ./chrome/browser/browser_process_impl.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -256,7 +256,7 @@ +--- ./chrome/browser/browser_process_impl.cc.orig 2014-08-12 21:01:48.000000000 +0200 ++++ ./chrome/browser/browser_process_impl.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -239,7 +239,7 @@ ExtensionRendererState::GetInstance()->Shutdown(); Modified: head/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc ============================================================================== --- head/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Thu Aug 14 21:26:11 2014 (r364869) +++ head/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Thu Aug 14 21:48:32 2014 (r364870) @@ -1,6 +1,6 @@ ---- ./chrome/browser/chrome_browser_main.cc.orig 2014-04-30 22:42:18.000000000 +0200 -+++ ./chrome/browser/chrome_browser_main.cc 2014-05-04 14:38:46.000000000 +0200 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***