[Midnightbsd-cvs] mports [16110] trunk/www/chromium: chromium 33.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Mar 23 15:32:04 EDT 2014
Revision: 16110
http://svnweb.midnightbsd.org/mports/?rev=16110
Author: laffer1
Date: 2014-03-23 15:32:03 -0400 (Sun, 23 Mar 2014)
Log Message:
-----------
chromium 33. Note that SSL isnt working right currently.
Modified Paths:
--------------
trunk/www/chromium/Makefile
trunk/www/chromium/distinfo
trunk/www/chromium/files/extra-patch-gcc
trunk/www/chromium/files/patch-base__base.gyp
trunk/www/chromium/files/patch-base__debug__stack_trace_posix.cc
trunk/www/chromium/files/patch-base__sys_info_freebsd.cc
trunk/www/chromium/files/patch-build__common.gypi
trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
trunk/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
trunk/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
trunk/www/chromium/files/patch-chrome__chrome_browser.gypi
trunk/www/chromium/files/patch-chrome__common__chrome_paths.cc
trunk/www/chromium/files/patch-content__app__content_main_runner.cc
trunk/www/chromium/files/patch-content__browser__browser_main_loop.cc
trunk/www/chromium/files/patch-content__browser__child_process_launcher.cc
trunk/www/chromium/files/patch-content__content_browser.gypi
trunk/www/chromium/files/patch-content__content_common.gypi
trunk/www/chromium/files/patch-content__plugin__plugin_main_linux.cc
trunk/www/chromium/files/patch-content__renderer__render_process_impl.cc
trunk/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
trunk/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc
trunk/www/chromium/files/patch-media__media.gyp
trunk/www/chromium/files/patch-net__net.gyp
trunk/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
trunk/www/chromium/files/patch-net__proxy__proxy_service.cc
trunk/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
trunk/www/chromium/files/patch-third_party__libusb__libusb.gyp
trunk/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
trunk/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
trunk/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp
trunk/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp
trunk/www/chromium/pkg-plist
Added Paths:
-----------
trunk/www/chromium/files/chrome.in
trunk/www/chromium/files/chromium-browser.desktop.in
trunk/www/chromium/files/extra-patch-clang
trunk/www/chromium/files/extra-patch-fixup-execinfo
trunk/www/chromium/files/patch-base__base.gypi
trunk/www/chromium/files/patch-base__file_util_posix.cc
trunk/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
trunk/www/chromium/files/patch-base__process__internal_linux.h
trunk/www/chromium/files/patch-base__process__memory_unittest.cc
trunk/www/chromium/files/patch-base__process__process_handle_freebsd.cc
trunk/www/chromium/files/patch-base__process__process_iterator.h
trunk/www/chromium/files/patch-base__process__process_iterator_freebsd.cc
trunk/www/chromium/files/patch-base__process__process_metrics.h
trunk/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
trunk/www/chromium/files/patch-base__security_unittest.cc
trunk/www/chromium/files/patch-base__test__expectations__expectation.cc
trunk/www/chromium/files/patch-base__test__launcher__test_launcher.cc
trunk/www/chromium/files/patch-base__threading__platform_thread_linux.cc
trunk/www/chromium/files/patch-breakpad__breakpad.gyp
trunk/www/chromium/files/patch-build__gyp_chromium
trunk/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
trunk/www/chromium/files/patch-chrome__app__chrome_main_delegate.h
trunk/www/chromium/files/patch-chrome__browser__browser_process_impl.cc
trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
trunk/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
trunk/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
trunk/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
trunk/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__operation.h
trunk/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
trunk/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc
trunk/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc
trunk/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc
trunk/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc
trunk/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
trunk/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
trunk/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
trunk/www/chromium/files/patch-chrome__browser__storage_monitor__storage_monitor.cc
trunk/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h
trunk/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc
trunk/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc
trunk/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
trunk/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
trunk/www/chromium/files/patch-chrome__browser__usb__usb_context.cc
trunk/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
trunk/www/chromium/files/patch-chrome__browser__web_applications__web_app.h
trunk/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
trunk/www/chromium/files/patch-chrome__common__chrome_switches.cc
trunk/www/chromium/files/patch-chrome__common__chrome_switches.h
trunk/www/chromium/files/patch-chrome__common__omaha_query_params__omaha_query_params.cc
trunk/www/chromium/files/patch-chrome__common__pref_names.cc
trunk/www/chromium/files/patch-chrome__common__pref_names.h
trunk/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
trunk/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h
trunk/www/chromium/files/patch-chrome__test__perf__perf_test.cc
trunk/www/chromium/files/patch-components__policy__resources__policy_templates.json
trunk/www/chromium/files/patch-components__policy__tools__generate_policy_source.py
trunk/www/chromium/files/patch-content__browser__download__base_file.cc
trunk/www/chromium/files/patch-content__browser__download__base_file_linux.cc
trunk/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc
trunk/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc
trunk/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
trunk/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h
trunk/www/chromium/files/patch-content__browser__renderer_host__pepper__pepper_file_io_host.cc
trunk/www/chromium/files/patch-content__content_tests.gypi
trunk/www/chromium/files/patch-content__public__test__browser_test_base.cc
trunk/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
trunk/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc
trunk/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc
trunk/www/chromium/files/patch-gpu__config__gpu_control_list.cc
trunk/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc
trunk/www/chromium/files/patch-gpu__config__gpu_test_config.cc
trunk/www/chromium/files/patch-gpu__gpu_config.gypi
trunk/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc
trunk/www/chromium/files/patch-media__base__audio_splicer.cc
trunk/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
trunk/www/chromium/files/patch-net__base__mime_util_unittest.cc
trunk/www/chromium/files/patch-net__base__net_util.h
trunk/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc
trunk/www/chromium/files/patch-net__dns__dns_session.cc
trunk/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
trunk/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h
trunk/www/chromium/files/patch-net__spdy__spdy_priority_forest.h
trunk/www/chromium/files/patch-net__udp__udp_socket_unittest.cc
trunk/www/chromium/files/patch-remoting__remoting.gyp
trunk/www/chromium/files/patch-skia__skia_library.gypi
trunk/www/chromium/files/patch-sync__util__get_session_name.cc
trunk/www/chromium/files/patch-sync__util__get_session_name_linux.cc
trunk/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi
trunk/www/chromium/files/patch-third_party__WebKit__Source__config.h
trunk/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
trunk/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp
trunk/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp
trunk/www/chromium/files/patch-third_party__WebKit__Source__testing__testing.gyp
trunk/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp
trunk/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp
trunk/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp
trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp
trunk/www/chromium/files/patch-third_party__libjingle__libjingle.gyp
trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc
trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc
trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h
trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h
trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc
trunk/www/chromium/files/patch-third_party__webrtc__build__common.gypi
trunk/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi
trunk/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi
trunk/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc
trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc
trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc
trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc
trunk/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h
trunk/www/chromium/files/patch-tools__grit__grit__node__base.py
trunk/www/chromium/files/patch-ui__events__event_switches.cc
trunk/www/chromium/files/patch-ui__events__event_switches.h
trunk/www/chromium/files/patch-ui__gl__gl.gyp
trunk/www/chromium/files/patch-v8__src__checks.cc
Property Changed:
----------------
trunk/www/chromium/files/extra-patch-gcc
trunk/www/chromium/files/patch-base__base.gyp
trunk/www/chromium/files/patch-base__debug__stack_trace_posix.cc
trunk/www/chromium/files/patch-base__sys_info_freebsd.cc
trunk/www/chromium/files/patch-base__sys_info_posix.cc
trunk/www/chromium/files/patch-build__common.gypi
trunk/www/chromium/files/patch-chrome__browser__about_flags.cc
trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
trunk/www/chromium/files/patch-chrome__browser__memory_details.cc
trunk/www/chromium/files/patch-chrome__browser__net__connection_tester.cc
trunk/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
trunk/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
trunk/www/chromium/files/patch-chrome__chrome_browser.gypi
trunk/www/chromium/files/patch-chrome__common__chrome_paths.cc
trunk/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
trunk/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
trunk/www/chromium/files/patch-chrome__test__ui__ui_test.cc
trunk/www/chromium/files/patch-chrome__tools__build__linux__sed.sh
trunk/www/chromium/files/patch-content__app__content_main_runner.cc
trunk/www/chromium/files/patch-content__browser__browser_main_loop.cc
trunk/www/chromium/files/patch-content__browser__child_process_launcher.cc
trunk/www/chromium/files/patch-content__common__set_process_title_linux.cc
trunk/www/chromium/files/patch-content__common__set_process_title_linux.h
trunk/www/chromium/files/patch-content__content_browser.gypi
trunk/www/chromium/files/patch-content__content_common.gypi
trunk/www/chromium/files/patch-content__plugin__plugin_main_linux.cc
trunk/www/chromium/files/patch-content__renderer__render_process_impl.cc
trunk/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
trunk/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc
trunk/www/chromium/files/patch-media__media.gyp
trunk/www/chromium/files/patch-native_client__build__common.gypi
trunk/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp
trunk/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp
trunk/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp
trunk/www/chromium/files/patch-net__base__dns_reloader.cc
trunk/www/chromium/files/patch-net__base__network_change_notifier.cc
trunk/www/chromium/files/patch-net__dns__address_sorter_posix.cc
trunk/www/chromium/files/patch-net__net.gyp
trunk/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
trunk/www/chromium/files/patch-net__proxy__proxy_service.cc
trunk/www/chromium/files/patch-net__socket__socks5_client_socket.cc
trunk/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc
trunk/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
trunk/www/chromium/files/patch-testing__gtest__src__gtest.cc
trunk/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c
trunk/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h
trunk/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
trunk/www/chromium/files/patch-third_party__libusb__libusb.gyp
trunk/www/chromium/files/patch-third_party__libvpx__obj_int_extract.sh
trunk/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
trunk/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h
trunk/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
trunk/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp
trunk/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp
Modified: trunk/www/chromium/Makefile
===================================================================
--- trunk/www/chromium/Makefile 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/Makefile 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,21 +1,19 @@
-# $MidnightBSD$
+# $MidnightBSD$
PORTNAME= chromium
-DISTVERSIONPREFIX= courgette-redacted-
-DISTVERSION= 23.0.1271.97
+PORTVERSION= 33.0.1750.146
CATEGORIES= www
-MASTER_SITES= http://download.goodking.org/downloads/ \
- ftp://rene-ladan.nl/pub/distfiles/ \
- http://files.etoilebsd.net/goodking/ \
- http://distfiles.cybertron.gr/
+MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports at MidnightBSD.org
-COMMENT= A mostly BSD-licensed web browser based on WebKit and Gtk+
-LICENSE= agg
-# lgpl, mit, bsd
+COMMENT= Mostly BSD-licensed web browser based on WebKit and Gtk+
-CFLAGS+= -Wno-error
+LICENSE= bsd3 lgpl2.1 mpl
+LICENSE_COMB= multi
+CFLAGS+= -fno-stack-protector
+
BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
bash:${PORTSDIR}/shells/bash \
yasm:${PORTSDIR}/devel/yasm \
@@ -22,138 +20,207 @@
flock:${PORTSDIR}/sysutils/flock \
v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \
- cairo:${PORTSDIR}/graphics/cairo \
- dbus-1:${PORTSDIR}/devel/dbus \
- dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
- asound:${PORTSDIR}/audio/alsa-lib \
- freetype:${PORTSDIR}/print/freetype2 \
- nss3:${PORTSDIR}/security/nss \
- gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
- cups:${PORTSDIR}/print/cups-client \
- event-1:${PORTSDIR}/devel/libevent \
- gcrypt:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \
+ libdbus-1.so:${PORTSDIR}/devel/dbus \
+ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+ libasound.so:${PORTSDIR}/audio/alsa-lib \
+ libfreetype.so:${PORTSDIR}/print/freetype2 \
+ libnss3.so:${PORTSDIR}/security/nss \
+ libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
+ libcups.so:${PORTSDIR}/print/cups-client \
+ libevent-1.4.so:${PORTSDIR}/devel/libevent \
+ libgcrypt.so:${PORTSDIR}/security/libgcrypt \
+ libpci.so:${PORTSDIR}/devel/libpci
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
-ONLY_FOR_ARCHS= i386 amd64
+USE_OPENSSL= yes
USE_XZ= yes
-USE_BISON= build
-USE_GMAKE= yes
-USE_PERL5_BUILD= yes
-USE_PYTHON_BUILD= 2.6+
+USE_GCC= 4.6
+USES= bison desktop-file-utils pkgconfig \
+ perl5 shebangfix ninja
+USE_PERL5= build
+USE_PYTHON_BUILD= 2
USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst
USE_GNOME= glib20 gtk20 dconf libxslt
-USE_PKGCONFIG= build
-MAN1= chrome.1
-DESKTOP_ENTRIES="Chromium" "${COMMENT}" "${DATADIR}/product_logo_48.png" \
- "chrome" "Application;Network;WebBrowser;" true
-
+SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper
ALL_TARGET= chrome
# See build/common.gypi for all the available variables.
GYP_DEFINES+= use_cups=1 \
+ use_nss=0 \
+ use_openssl=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 \
+ use_system_nss=1 \
+ use_system_gperf=0 \
+ linux_breakpad=0 \
linux_strip_binary=1 \
linux_use_tcmalloc=0 \
linux_use_heapchecker=0 \
+ test_isolation_mode=noop \
clang_use_chrome_plugins=0 \
disable_nacl=1 \
- enable_webrtc=0 \
+ enable_webrtc=1 \
enable_openmax=1 \
enable_one_click_signin=1 \
- os_ver=900100 \
- os=freebsd \
+ werror= \
+ no_gc_sections=1 \
+ OS=freebsd \
+ os_ver=901000 \
+ os_bsd=1 \
prefix_dir=${LOCALBASE} \
- python_ver=${PYTHON_VER} \
- OS=freebsd
+ python_ver=${PYTHON_VER}
-OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO CLANG DEBUG
+# FreeBSD Chromium Api Key
+# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+# Note: these are for FreeBSD use ONLY. For your own distribution,
+# please get your own set of keys.
+#GYP_DEFINES+= google_api_key=AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8 \
+# google_default_client_id=996322985003.apps.googleusercontent.com \
+# google_default_client_secret=IR1za9-1VK0zZ0f_O8MVFicn
+SUB_FILES= chromium-browser.desktop chrome
+SUB_LIST+= COMMENT="${COMMENT}"
+
+OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO TEST DEBUG
CODECS_DESC= Compile and enable patented codecs like H.264
-CLANG_DESC= Build Chromium with Clang instead of GCC 4.6+
OPTIONS_DEFAULT= CODECS GCONF
+GCONF_USE= GNOME=gconf2
+PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio
+
+TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
+
.include <bsd.mport.options.mk>
-#.if ${OSVERSION} < 900033 || ! ${PORT_OPTIONS:MCLANG}
-#BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-#CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
-#MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
-#.endif
-
-#.if ${PORT_OPTIONS:MCODECS}
-#GYP_DEFINES+= ffmpeg_branding=Chrome
-#GYP_DEFINES+= proprietary_codecs=1
-#.else
+.if ${PORT_OPTIONS:MCODECS}
+GYP_DEFINES+= ffmpeg_branding=Chrome
+GYP_DEFINES+= proprietary_codecs=1
+.else
GYP_DEFINES+= ffmpeg_branding=Chromium
GYP_DEFINES+= proprietary_codecs=0
-#.endif
+.endif
-#.if ${PORT_OPTIONS:MGCONF}
-#USE_GNOME+= gconf2
-#.else
+.if ! ${PORT_OPTIONS:MGCONF}
GYP_DEFINES+= use_gconf=0
-#.endif
+.endif
-#.if ${PORT_OPTIONS:MPULSEAUDIO}
-#LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio
-#GYP_DEFINES+= use_pulseaudio=1
-#.else
+.if ${PORT_OPTIONS:MPULSEAUDIO}
+GYP_DEFINES+= use_pulseaudio=1
+.else
GYP_DEFINES+= use_pulseaudio=0
-#.endif
+.endif
-#.if ! ${MACHINE_CPU:Msse2}
+.if ! ${MACHINE_CPU:Msse2}
GYP_DEFINES+= disable_sse2=1
-#.endif
+.endif
-.if ${OSVERSION} < 4014
-IGNORE= requires libusb 2 API, which is not available
-BUILD_DEPENDS+= clang:${PORTSDIR}/lang/clang
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+
+.if ${PORT_OPTIONS:MTEST}
+.include "Makefile.tests"
+ALL_TARGET+= ${TEST_TARGETS}
.endif
-CC= clang
-CXX= clang++
-GYP_DEFINES+= clang=1
+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
+.endif
+CONFIGURE_ENV+= CC=${CC} \
+ CXX=${CXX} \
+ GYP_GENERATORS=ninja \
+ GYP_DEFINES="${GYP_DEFINES}" \
+ GPERF=${LOCALBASE}/bin/gperf
MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \
+ GPERF=${LOCALBASE}/bin/gperf \
+ PATH=/usr/local/bin:${PATH}
+FAKE_MAKEENV+= BUILDTYPE=${BUILDTYPE} \
GPERF=${LOCALBASE}/bin/gperf
-CONFIGURE_ENV+= LD=${CC}
-MAKE_JOBS_SAFE= yes
+MAKE_ARGS+= -C out/${BUILDTYPE}
.include <bsd.port.pre.mk>
+#.if ${CHOSEN_COMPILER_TYPE} == gcc
+GYP_DEFINES+= gcc_version=${CXX:S/g++//}
+#CFLAGS+= -Wno-unknown-warning
+#gcc 4.6- ?
+#CFLAGS+= -Wno-error=unknown-warning
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc
+#.else
+#GYP_DEFINES+= clang=1
+#CFLAGS+= -Wno-unknown-warning-option
+#EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang
+#CONFIGURE_ENV+= AR=/usr/bin/ar
+#.endif
+
+# according to portlint the below is passed via bsd.port.mk,
+# but 'make -V CONFIGURE_ENV' does not show it:
+CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \
+ CPPFLAGS="${CPPFLAGS}" \
+ CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+
pre-everything::
+ @${ECHO_MSG}
@${ECHO_MSG} "To build Chromium, you should have around 1 GB of memory"
- @${ECHO_MSG} "and a fair amount of free diskspace (~ 2.2GB)."
+.if ${PORT_OPTIONS:MDEBUG}
+ @${ECHO_MSG} "and lots of free diskspace (~ 8.5GB)."
+.else
+ @${ECHO_MSG} "and a fair amount of free diskspace (~ 2.4GB)."
+.endif
+ @${ECHO_MSG}
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/WebCore/plugins/PluginDatabase.cpp \
- ${WRKSRC}/crypto/crypto.gyp \
+ ${WRKSRC}/third_party/WebKit/Source/testing/testing.gyp \
${WRKSRC}/v8/tools/gyp/v8.gyp \
- ${WRKSRC}/v8/build/common.gypi
- @${REINPLACE_CMD} -e "s|linux|freebsd|" \
- ${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py
+ ${WRKSRC}/v8/build/toolchain.gypi
+ @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \
+ ${WRKSRC}/chrome/common/chrome_paths.cc
+ @${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} && \
- GYP_DEFINES="${GYP_DEFINES}" ${PYTHON_CMD} \
- ./build/gyp_chromium chrome/chrome.gyp --depth .
+ cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
+ ./build/gyp_chromium chrome/chrome.gyp --depth .
+test regression-test: build
+.for t in ${TEST_TARGETS}
+ cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
+ ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
+.endfor
+
do-install:
- @${MKDIR} ${DATADIR}
+ ${MKDIR} ${DATADIR}
${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${MANPREFIX}/man/man1
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/product_logo_48.png ${DATADIR}
${INSTALL_SCRIPT} ${WRKSRC}/out/${BUILDTYPE}/chrome-wrapper \
@@ -161,11 +228,13 @@
.for p in chrome chrome_100_percent content_resources resources
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak ${DATADIR}
.endfor
-.for f in chrome libffmpegsumo.so mksnapshot protoc
+.for f in chrome libffmpegsumo.so protoc
${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${DATADIR}
.endfor
cd ${WRKSRC}/out/${BUILDTYPE} && \
${COPYTREE_SHARE} "locales resources" ${DATADIR}
- ${LN} -sf ${DATADIR}/chrome ${PREFIX}/bin
+ ${MKDIR} ${DESKTOPDIR}
+ ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop ${DESKTOPDIR}
+ ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${PREFIX}/bin
.include <bsd.port.post.mk>
Modified: trunk/www/chromium/distinfo
===================================================================
--- trunk/www/chromium/distinfo 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/distinfo 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,2 +1,4 @@
-SHA256 (chromium-courgette-redacted-23.0.1271.97.tar.xz) = a41a9511bc7f3f4d8336a3bd3c8b309c7ebad6bff2e02fce081bb194349c6a36
-SIZE (chromium-courgette-redacted-23.0.1271.97.tar.xz) = 179510640
+SHA256 (chromium-33.0.1750.146.tar.xz) = d5b0e7a0f086aac200493fe4e5849ca84e9e21f7770c5d5830060da9fc2c4a74
+SIZE (chromium-33.0.1750.146.tar.xz) = 185394896
+SHA256 (chromium-33.0.1750.146-testdata.tar.xz) = 918ccc080788ea9b8eba2e479b521c22b37b14c62d4bc0906d7f15a88f12c84c
+SIZE (chromium-33.0.1750.146-testdata.tar.xz) = 112429020
Added: trunk/www/chromium/files/chrome.in
===================================================================
--- trunk/www/chromium/files/chrome.in (rev 0)
+++ trunk/www/chromium/files/chrome.in 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+SYSCTL=kern.ipc.shm_allow_removed
+if [ `sysctl -n $SYSCTL` = 0 ] ; then
+ cat << EOMSG
+For correct operation, shared memory support has to be enabled
+in Chromium by performing the following command as root :
+
+sysctl $SYSCTL=1
+
+To preserve this setting across reboots, append the following
+to /etc/sysctl.conf :
+
+$SYSCTL=1
+EOMSG
+ exit 1
+fi
+%%PREFIX%%/share/chromium/chrome $*
Added: trunk/www/chromium/files/chromium-browser.desktop.in
===================================================================
--- trunk/www/chromium/files/chromium-browser.desktop.in (rev 0)
+++ trunk/www/chromium/files/chromium-browser.desktop.in 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Encoding=UTF-8
+Name=Chromium
+Comment=%%COMMENT%%
+Icon=%%DATADIR%%/product_logo_48.png
+Exec=chrome %U
+Categories=Application;Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
+StartupNotify=true
Added: trunk/www/chromium/files/extra-patch-clang
===================================================================
--- trunk/www/chromium/files/extra-patch-clang (rev 0)
+++ trunk/www/chromium/files/extra-patch-clang 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,274 @@
+--- base/allocator/allocator_extension.cc 2013-07-03 23:39:54.000000000 -0400
++++ base/allocator/allocator_extension.cc 2013-07-19 00:39:26.000000000 -0400
+@@ -35,20 +35,20 @@
+ void SetGetAllocatorWasteSizeFunction(
+ thunks::GetAllocatorWasteSizeFunction get_allocator_waste_size_function) {
+ DCHECK_EQ(thunks::GetGetAllocatorWasteSizeFunction(),
+- reinterpret_cast<thunks::GetAllocatorWasteSizeFunction>(NULL));
++ static_cast<thunks::GetAllocatorWasteSizeFunction>(NULL));
+ thunks::SetGetAllocatorWasteSizeFunction(get_allocator_waste_size_function);
+ }
+
+ void SetGetStatsFunction(thunks::GetStatsFunction get_stats_function) {
+ DCHECK_EQ(thunks::GetGetStatsFunction(),
+- reinterpret_cast<thunks::GetStatsFunction>(NULL));
++ static_cast<thunks::GetStatsFunction>(NULL));
+ thunks::SetGetStatsFunction(get_stats_function);
+ }
+
+ void SetReleaseFreeMemoryFunction(
+ thunks::ReleaseFreeMemoryFunction release_free_memory_function) {
+ DCHECK_EQ(thunks::GetReleaseFreeMemoryFunction(),
+- reinterpret_cast<thunks::ReleaseFreeMemoryFunction>(NULL));
++ static_cast<thunks::ReleaseFreeMemoryFunction>(NULL));
+ thunks::SetReleaseFreeMemoryFunction(release_free_memory_function);
+ }
+
+--- base/profiler/alternate_timer.cc 2013-07-03 23:39:54.000000000 -0400
++++ base/profiler/alternate_timer.cc 2013-07-19 00:41:06.000000000 -0400
+@@ -21,7 +21,7 @@
+ // Set an alternate timer function to replace the OS time function when
+ // profiling.
+ void SetAlternateTimeSource(NowFunction* now_function, TimeSourceType type) {
+- DCHECK_EQ(reinterpret_cast<NowFunction*>(NULL), g_time_function);
++ DCHECK_EQ(static_cast<NowFunction*>(NULL), g_time_function);
+ g_time_function = now_function;
+ g_time_source_type = type;
+ }
+--- base/threading/thread_local_storage_unittest.cc.orig 2013-08-30 23:06:21.000000000 +0300
++++ base/threading/thread_local_storage_unittest.cc 2013-08-30 23:06:50.000000000 +0300
+@@ -60,7 +60,7 @@
+ void ThreadLocalStorageCleanup(void *value) {
+ int *ptr = reinterpret_cast<int*>(value);
+ // Destructors should never be called with a NULL.
+- ASSERT_NE(reinterpret_cast<int*>(NULL), ptr);
++ ASSERT_NE(static_cast<int*>(NULL), ptr);
+ if (*ptr == kFinalTlsValue)
+ return; // We've been called enough times.
+ 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 @@
+ }
+ // We must NOT do any allocations during this callback.
+ // Using the simple linked lists avoids all allocations.
+- DCHECK_EQ(this->next_retired_worker_, reinterpret_cast<ThreadData*>(NULL));
++ DCHECK_EQ(this->next_retired_worker_, static_cast<ThreadData*>(NULL));
+ this->next_retired_worker_ = first_retired_worker_;
+ first_retired_worker_ = this;
+ }
+--- base/tracked_objects_unittest.cc.orig 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 @@
+ Births* birth = ThreadData::TallyABirthIfActive(location);
+
+ if (ThreadData::status() == ThreadData::DEACTIVATED)
+- EXPECT_EQ(reinterpret_cast<Births*>(NULL), birth);
++ EXPECT_EQ(static_cast<Births*>(NULL), birth);
+ else
+- EXPECT_NE(reinterpret_cast<Births*>(NULL), birth);
++ EXPECT_NE(static_cast<Births*>(NULL), birth);
+ }
+
+ // Helper function to verify the most common test expectations.
+@@ -231,7 +231,7 @@
+ return;
+
+ scoped_ptr<DeathData> data(new DeathData());
+- ASSERT_NE(data, reinterpret_cast<DeathData*>(NULL));
++ ASSERT_NE(data, static_cast<DeathData*>(NULL));
+ 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 @@
+ Location location(kFunction, kFile, kLineNumber, NULL);
+ // Do not delete |birth|. We don't own it.
+ Births* birth = ThreadData::TallyABirthIfActive(location);
+- EXPECT_NE(reinterpret_cast<Births*>(NULL), birth);
++ EXPECT_NE(static_cast<Births*>(NULL), birth);
+
+ const TrackedTime kTimePosted = TrackedTime() + Duration::FromMilliseconds(1);
+ const TrackedTime kStartOfRun = TrackedTime() +
+--- chrome/browser/metrics/thread_watcher.cc 2013-07-03 23:45:55.000000000 -0400
++++ chrome/browser/metrics/thread_watcher.cc 2013-07-19 01:38:45.000000000 -0400
+@@ -40,7 +40,7 @@
+ MSVC_PUSH_DISABLE_WARNING(4748)
+
+ int* NullPointer() {
+- return reinterpret_cast<int*>(NULL);
++ return static_cast<int*>(NULL);
+ }
+
+ void NullPointerCrash(int line_number) {
+--- chrome/browser/sync/glue/synced_session_tracker.cc 2013-07-03 23:46:07.000000000 -0400
++++ chrome/browser/sync/glue/synced_session_tracker.cc 2013-07-19 01:50:13.000000000 -0400
+@@ -232,7 +232,7 @@
+ }
+ DCHECK(window_ptr);
+ DCHECK_EQ(window_ptr->window_id.id(), window_id);
+- DCHECK_EQ(reinterpret_cast<SessionWindow*>(NULL),
++ DCHECK_EQ(static_cast<SessionWindow*>(NULL),
+ GetSession(session_tag)->windows[window_id]);
+ GetSession(session_tag)->windows[window_id] = window_ptr;
+ }
+--- 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 @@
+ // |stream| is closed at this point. Start() should reopen it again.
+ EXPECT_CALL(manager(), MakeAudioOutputStream(_, _))
+ .Times(2)
+- .WillRepeatedly(Return(reinterpret_cast<AudioOutputStream*>(NULL)));
++ .WillRepeatedly(Return(static_cast<AudioOutputStream*>(NULL)));
+
+ EXPECT_CALL(callback_, OnError(_))
+ .Times(2);
+--- media/filters/decrypting_video_decoder_unittest.cc.orig 2013-08-30 23:27:39.000000000 +0300
++++ media/filters/decrypting_video_decoder_unittest.cc 2013-08-30 23:28:27.000000000 +0300
+@@ -482,7 +482,7 @@
+ // callback to cancel the |decryptor_ready_cb|.
+ EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback()))
+ .WillOnce(ResetAndRunCallback(&decryptor_ready_cb,
+- reinterpret_cast<Decryptor*>(NULL)));
++ static_cast<Decryptor*>(NULL)));
+ Stop();
+ }
+
+--- net/url_request/view_cache_helper_unittest.cc.orig 2013-09-01 00:33:32.000000000 +0300
++++ net/url_request/view_cache_helper_unittest.cc 2013-09-01 00:34:02.000000000 +0300
+@@ -29,7 +29,7 @@
+ };
+
+ TestURLRequestContext::TestURLRequestContext()
+- : cache_(reinterpret_cast<HttpTransactionFactory*>(NULL), NULL,
++ : cache_(static_cast<HttpTransactionFactory*>(NULL), NULL,
+ HttpCache::DefaultBackend::InMemory(0)) {
+ set_http_transaction_factory(&cache_);
+ }
+--- third_party/hunspell/src/hunspell/affentry.hxx 2013-07-03 23:52:32.000000000 -0400
++++ third_party/hunspell/src/hunspell/affentry.hxx 2013-07-19 01:31:57.000000000 -0400
+@@ -27,7 +27,7 @@
+ struct hentry * checkword(const char * word, int len, char in_compound,
+ const FLAG needflag = FLAG_NULL);
+
+- struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL);
++ struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = 0);
+
+ char * check_morph(const char * word, int len, char in_compound,
+ const FLAG needflag = FLAG_NULL);
+@@ -90,7 +90,7 @@
+ // const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT);
+ const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0);
+
+- struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL);
++ struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = 0);
+
+ char * check_twosfx_morph(const char * word, int len, int optflags,
+ PfxEntry* ppfx, const FLAG needflag = FLAG_NULL);
+--- third_party/libjingle/source/talk/base/taskrunner.cc 2013-07-03 23:54:05.000000000 -0400
++++ third_party/libjingle/source/talk/base/taskrunner.cc 2013-07-19 00:46:25.000000000 -0400
+@@ -119,7 +119,7 @@
+ std::vector<Task *>::iterator it;
+ it = std::remove(tasks_.begin(),
+ tasks_.end(),
+- reinterpret_cast<Task *>(NULL));
++ static_cast<Task *>(NULL));
+
+ tasks_.erase(it, tasks_.end());
+
+--- third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2013-07-03 23:54:15.000000000 -0400
++++ third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2013-07-19 00:44:09.000000000 -0400
+@@ -439,7 +439,7 @@
+ }
+
+ CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id)
+- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
++ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
+ CMapFormat::kFormat0,
+ cmap_id) {
+ }
+@@ -563,7 +563,7 @@
+ : CMapTable::CMap::Builder(data ? down_cast<WritableFontData*>(
+ data->Slice(offset, data->ReadUShort(
+ offset + Offset::kFormat0Length)))
+- : reinterpret_cast<WritableFontData*>(NULL),
++ : static_cast<WritableFontData*>(NULL),
+ CMapFormat::kFormat2, cmap_id) {
+ // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix.
+ }
+@@ -574,7 +574,7 @@
+ : CMapTable::CMap::Builder(data ? down_cast<ReadableFontData*>(
+ data->Slice(offset, data->ReadUShort(
+ offset + Offset::kFormat0Length)))
+- : reinterpret_cast<ReadableFontData*>(NULL),
++ : static_cast<ReadableFontData*>(NULL),
+ CMapFormat::kFormat2, cmap_id) {
+ // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix.
+ }
+@@ -958,7 +958,7 @@
+ CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments,
+ IntegerList* glyph_id_array,
+ const CMapId& cmap_id)
+- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
++ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
+ CMapFormat::kFormat4, cmap_id),
+ segments_(segments->begin(), segments->end()),
+ glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) {
+@@ -966,7 +966,7 @@
+ }
+
+ CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id)
+- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
++ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
+ CMapFormat::kFormat4, cmap_id) {
+ }
+
+--- 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 @@
+
+ local_object->SetInternalField(0, reinterpret_cast<Smi*>(break_iterator));
+ // Make sure that the pointer to adopted text is NULL.
+- local_object->SetInternalField(1, reinterpret_cast<Smi*>(NULL));
++ local_object->SetInternalField(1, static_cast<Smi*>(NULL));
+
+ RETURN_IF_EMPTY_HANDLE(isolate,
+ 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 @@
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wconversion-null"
+ #endif
++/* Avoid compiler error: http://pastebin.com/1edWUE84
+ EXPECT_EQ(1, SafeSPrintf(buf, "%d", NULL));
+ EXPECT_EQ("0", std::string(buf));
+ EXPECT_EQ(3, SafeSPrintf(buf, "%p", NULL));
+ EXPECT_EQ("0x0", std::string(buf));
+ EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL));
+ EXPECT_EQ("<NULL>", std::string(buf));
++*/
+ #if defined(__GCC__)
+ #pragma GCC diagnostic pop
+ #endif
+--- v8/src/unique.h.orig 2014-01-07 21:03:55.000000000 +0100
++++ v8/src/unique.h 2014-01-13 00:41:59.000000000 +0100
+@@ -130,7 +130,7 @@
+
+ // TODO(titzer): this is a hack to migrate to Unique<T> incrementally.
+ static Unique<T> CreateUninitialized(Handle<T> handle) {
+- return Unique<T>(reinterpret_cast<Address>(NULL), handle);
++ return Unique<T>(static_cast<Address>(NULL), handle);
+ }
+
+ 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 @@
+ gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const {
+ if (guest_->GetEmbedderRenderWidgetHostView())
+ return guest_->GetEmbedderRenderWidgetHostView()->GetNativeViewId();
+- return static_cast<gfx::NativeViewId>(NULL);
++ return reinterpret_cast<gfx::NativeViewId>(NULL);
+ }
+
+ gfx::NativeViewAccessible RenderWidgetHostViewGuest::GetNativeViewAccessible() {
Added: trunk/www/chromium/files/extra-patch-fixup-execinfo
===================================================================
--- trunk/www/chromium/files/extra-patch-fixup-execinfo (rev 0)
+++ trunk/www/chromium/files/extra-patch-fixup-execinfo 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- 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 @@
+ static V8_INLINE void DumpBacktrace() {
+ #if V8_LIBC_GLIBC || V8_OS_BSD
+ void* trace[100];
+- int size = backtrace(trace, ARRAY_SIZE(trace));
++ size_t size = backtrace(trace, ARRAY_SIZE((size_t**)trace));
+ char** symbols = backtrace_symbols(trace, size);
+ i::OS::PrintError("\n==== C stack trace ===============================\n\n");
+ if (size == 0) {
Modified: trunk/www/chromium/files/extra-patch-gcc
===================================================================
--- trunk/www/chromium/files/extra-patch-gcc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/extra-patch-gcc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,5 +1,5 @@
---- base/shared_memory.h.orig 2011-04-01 21:54:26.066717848 +0300
-+++ base/shared_memory.h 2011-04-01 21:55:14.292717813 +0300
+--- 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 @@
#if defined(OS_POSIX)
@@ -18,16 +18,6 @@
#include "talk/base/basictypes.h"
#include "talk/base/criticalsection.h"
#include "talk/base/logging.h"
---- base/debug/trace_event.h.orig 2011-04-01 22:22:50.326752296 +0300
-+++ base/debug/trace_event.h 2011-04-01 22:23:12.004715315 +0300
-@@ -29,6 +29,7 @@
- #include "base/debug/trace_event_win.h"
- #else // defined(OS_WIN)
-
-+#include <stdio.h>
- #include <string>
-
- #include "base/scoped_ptr.h"
--- media/filters/file_data_source.h.orig 2011-09-14 10:01:06.000000000 +0200
+++ media/filters/file_data_source.h 2011-09-26 19:08:17.000000000 +0200
@@ -5,6 +5,7 @@
@@ -38,3 +28,61 @@
#include <string>
#include "base/gtest_prod_util.h"
+--- content/public/common/child_process_sandbox_support_linux.h.orig 2013-10-11 19:30:28.000000000 +0200
++++ content/public/common/child_process_sandbox_support_linux.h 2013-10-16 15:29:00.000000000 +0200
+@@ -7,6 +7,7 @@
+
+ #include <stdint.h>
+ #include <string>
++#include <sys/types.h>
+
+ #include "content/common/content_export.h"
+
+--- 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 @@
+ #include "opt.h"
+ #include "common.h"
+
++/* TODO(rene) work around a compile error with GCC 4.6.4 on FreeBSD */
++#define __BSD_VISIBLE 1
++
+ #if HAVE_SCHED_GETAFFINITY
+ #ifndef _GNU_SOURCE
+ # define _GNU_SOURCE
+--- content/browser/browser_shutdown_profile_dumper.cc.orig 2014-02-20 15:28:24.000000000 -0500
++++ content/browser/browser_shutdown_profile_dumper.cc 2014-03-03 15:36:33.000000000 -0500
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include <stdio.h>
++
+ #include "content/browser/browser_shutdown_profile_dumper.h"
+
+ #include "base/base_switches.h"
+--- testing/perf/perf_test.cc 2014-03-03 12:59:30.000000000 -0500
++++ testing/perf/perf_test.cc.orig 2014-02-20 15:28:27.000000000 -0500
+@@ -2,10 +2,10 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include <stdio.h>
++
+ #include "testing/perf/perf_test.h"
+
+-#include <stdio.h>
+-
+ #include "base/logging.h"
+ #include "base/strings/string_number_conversions.h"
+ #include "base/strings/stringprintf.h"
+--- ui/gfx/codec/jpeg_codec.cc.orig 2014-02-20 15:27:56.000000000 -0500
++++ ui/gfx/codec/jpeg_codec.cc 2014-03-03 14:33:42.000000000 -0500
+@@ -15,6 +15,7 @@
+ #if defined(USE_SYSTEM_LIBJPEG)
+ #include <jpeglib.h>
+ #elif defined(USE_LIBJPEG_TURBO)
++#include <stdio.h>
+ #include "third_party/libjpeg_turbo/jpeglib.h"
+ #else
+ #include "third_party/libjpeg/jpeglib.h"
Property changes on: trunk/www/chromium/files/extra-patch-gcc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/chromium/files/patch-base__base.gyp
===================================================================
--- trunk/www/chromium/files/patch-base__base.gyp 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-base__base.gyp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,14 +1,14 @@
---- base/base.gyp.orig 2011-09-11 11:01:29.000000000 +0300
-+++ base/base.gyp 2011-09-14 00:13:24.000000000 +0300
-@@ -320,6 +320,11 @@
- 'test/scoped_locale.h',
+--- 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 @@
+ ['include', '^debug/proc_maps_linux_unittest\\.cc$'],
],
}],
-+ ['OS=="freebsd"', {
-+ 'sources!': [
-+ 'test/test_file_util_linux.cc',
++ ['<(os_bsd) == 1', {
++ 'sources/': [
++ ['exclude', '^debug/proc_maps_linux_unittest\\.cc$'],
+ ],
+ }],
- ],
- 'sources': [
- 'perftimer.cc',
+ ], # target_conditions
+ },
+ {
Property changes on: trunk/www/chromium/files/patch-base__base.gyp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-base__base.gypi
===================================================================
--- trunk/www/chromium/files/patch-base__base.gypi (rev 0)
+++ trunk/www/chromium/files/patch-base__base.gypi 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,18 @@
+--- 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 @@
+ 'process/memory_stubs.cc',
+ ],
+ 'sources/': [
++ ['exclude', '^debug/proc_maps_linux\\.cc$'],
+ ['exclude', '^files/file_path_watcher_linux\\.cc$'],
+ ['exclude', '^files/file_path_watcher_stub\\.cc$'],
+ ['exclude', '^file_util_linux\\.cc$'],
++ ['exclude', '^process/memory_linux\\.cc$'],
+ ['exclude', '^process/process_linux\\.cc$'],
+ ['exclude', '^sys_info_linux\\.cc$'],
++ ['exclude', '^process/process_iterator_linux\\.cc$'],
++ ['exclude', '^process/process_metrics_linux\\.cc$'],
+ ],
+ }],
+ ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', {
Modified: trunk/www/chromium/files/patch-base__debug__stack_trace_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-base__debug__stack_trace_posix.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-base__debug__stack_trace_posix.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,9 +1,19 @@
---- base/debug/stack_trace_posix.cc.orig 2012-10-01 23:40:32.000000000 +0300
-+++ base/debug/stack_trace_posix.cc 2012-10-01 23:41:09.000000000 +0300
-@@ -148,9 +148,15 @@
- } // namespace
+--- 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
- StackTrace::StackTrace() {
+ #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.
Property changes on: trunk/www/chromium/files/patch-base__debug__stack_trace_posix.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-base__file_util_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-base__file_util_posix.cc (rev 0)
+++ trunk/www/chromium/files/patch-base__file_util_posix.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- 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 @@
+ #endif // defined(OS_ANDROID)
+ results->is_directory = S_ISDIR(file_info.st_mode);
+ results->size = file_info.st_size;
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || (defined(OS_FREEBSD) && __FreeBSD_version < 900000)
+ results->last_modified = Time::FromTimeSpec(file_info.st_mtimespec);
+ results->last_accessed = Time::FromTimeSpec(file_info.st_atimespec);
+ results->creation_time = Time::FromTimeSpec(file_info.st_ctimespec);
Added: trunk/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc (rev 0)
+++ trunk/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,16 @@
+--- 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
+@@ -2,8 +2,13 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include "build/build_config.h"
++
+ #include <sys/socket.h>
+ #include <sys/types.h>
++#if defined(OS_BSD)
++#include <signal.h>
++#endif
+ #include <unistd.h>
+
+ #include "base/bind.h"
Added: trunk/www/chromium/files/patch-base__process__internal_linux.h
===================================================================
--- trunk/www/chromium/files/patch-base__process__internal_linux.h (rev 0)
+++ trunk/www/chromium/files/patch-base__process__internal_linux.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +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 @@
+
+ #include "base/files/file_path.h"
+
++#include <unistd.h> /* pid_t */
++
+ namespace base {
+ namespace internal {
+
Added: trunk/www/chromium/files/patch-base__process__memory_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-base__process__memory_unittest.cc (rev 0)
+++ trunk/www/chromium/files/patch-base__process__memory_unittest.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,24 @@
+--- 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 @@
+
+ // 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.
+ // 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)
+
+@@ -375,5 +375,5 @@
+ #endif // !ARCH_CPU_64_BITS
+ #endif // OS_MACOSX
+
+-#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) &&
++#endif // !defined(OS_ANDROID) && !defined(OS_BSD) &&
+ // !defined(OS_WIN) && !defined(ADDRESS_SANITIZER)
Added: trunk/www/chromium/files/patch-base__process__process_handle_freebsd.cc
===================================================================
--- trunk/www/chromium/files/patch-base__process__process_handle_freebsd.cc (rev 0)
+++ trunk/www/chromium/files/patch-base__process__process_handle_freebsd.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,51 @@
+--- 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
+@@ -6,33 +6,35 @@
+
+ #include <sys/sysctl.h>
+ #include <sys/types.h>
+-#include <unistd.h>
++#include <sys/user.h>
++
++#include "base/logging.h"
+
+ namespace base {
+
+ ProcessId GetParentProcessId(ProcessHandle process) {
+ struct kinfo_proc info;
+- size_t length;
+- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process };
+-
+- if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0)
++ size_t length = sizeof(struct kinfo_proc);
++ int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process };
++ if (sysctl(mib, 4, &info, &length, NULL, 0) < 0) {
++ DPLOG(ERROR) << "sysctl";
++ return -1;
++ }
++ if (length == 0)
+ return -1;
+-
+ return info.ki_ppid;
+ }
+
+ FilePath GetProcessExecutablePath(ProcessHandle process) {
+ char pathname[PATH_MAX];
+- size_t length;
++ size_t length = sizeof(pathname);
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, process };
+-
+- length = sizeof(pathname);
+-
+- if (sysctl(mib, arraysize(mib), pathname, &length, NULL, 0) < 0 ||
+- length == 0) {
++ if (sysctl(mib, arraysize(mib), pathname, &length, NULL, 0) < 0) {
++ DPLOG(ERROR) << "sysctl";
+ return FilePath();
+ }
+-
++ if (length == 0)
++ return FilePath();
+ return FilePath(std::string(pathname));
+ }
+
Added: trunk/www/chromium/files/patch-base__process__process_iterator.h
===================================================================
--- trunk/www/chromium/files/patch-base__process__process_iterator.h (rev 0)
+++ trunk/www/chromium/files/patch-base__process__process_iterator.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,14 @@
+--- 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
+@@ -21,6 +21,11 @@
+ #include <windows.h>
+ #include <tlhelp32.h>
+ #elif defined(OS_MACOSX) || defined(OS_BSD)
++#if defined(OS_BSD)
++#include <kvm.h>
++#include <sys/param.h>
++#include <sys/user.h>
++#endif
+ #include <sys/sysctl.h>
+ #elif defined(OS_POSIX)
+ #include <dirent.h>
Added: trunk/www/chromium/files/patch-base__process__process_iterator_freebsd.cc
===================================================================
--- trunk/www/chromium/files/patch-base__process__process_iterator_freebsd.cc (rev 0)
+++ trunk/www/chromium/files/patch-base__process__process_iterator_freebsd.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,13 @@
+--- ./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
+@@ -6,6 +6,10 @@
+
+ #include <sys/sysctl.h>
+
++/* getuid() */
++#include <unistd.h>
++#include <sys/types.h>
++
+ #include "base/logging.h"
+ #include "base/strings/string_util.h"
+
Added: trunk/www/chromium/files/patch-base__process__process_metrics.h
===================================================================
--- trunk/www/chromium/files/patch-base__process__process_metrics.h (rev 0)
+++ trunk/www/chromium/files/patch-base__process__process_metrics.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,16 @@
+--- 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"
+
++#if defined(OS_BSD)
++#include <kvm.h>
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#include <sys/user.h>
++#endif
++
+ #if defined(OS_MACOSX)
+ #include <mach/mach.h>
+ #endif
Added: trunk/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
===================================================================
--- trunk/www/chromium/files/patch-base__process__process_metrics_freebsd.cc (rev 0)
+++ trunk/www/chromium/files/patch-base__process__process_metrics_freebsd.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,13 @@
+--- ./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
+@@ -4,6 +4,10 @@
+
+ #include "base/process/process_metrics.h"
+
++#include "base/sys_info.h"
++
++#include <unistd.h> /* getpagesize() */
++
+ namespace base {
+
+ ProcessMetrics::ProcessMetrics(ProcessHandle process)
Added: trunk/www/chromium/files/patch-base__security_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-base__security_unittest.cc (rev 0)
+++ trunk/www/chromium/files/patch-base__security_unittest.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- 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 @@
+ // FAILS_ is too clunky.
+ void OverflowTestsSoftExpectTrue(bool overflow_detected) {
+ if (!overflow_detected) {
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_NACL)
+ // Sadly, on Linux, Android, and OSX we don't have a good story yet. Don't
+ // fail the test, but report.
+ printf("Platform has overflow: %s\n",
Modified: trunk/www/chromium/files/patch-base__sys_info_freebsd.cc
===================================================================
--- trunk/www/chromium/files/patch-base__sys_info_freebsd.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-base__sys_info_freebsd.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,6 +1,34 @@
---- base/sys_info_freebsd.cc.orig 2012-10-31 21:02:04.000000000 +0200
-+++ base/sys_info_freebsd.cc 2012-11-07 17:49:20.000000000 +0200
-@@ -33,4 +33,25 @@
+--- 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
+@@ -4,6 +4,7 @@
+
+ #include "base/sys_info.h"
+
++#include <sys/types.h>
+ #include <sys/sysctl.h>
+
+ #include "base/logging.h"
+@@ -23,6 +24,19 @@
+ }
+
+ // static
++int64 SysInfo::AmountOfAvailablePhysicalMemory() {
++ int available_pages, page_size;
++ size_t size = sizeof(available_pages);
++ sysctlbyname("vm.stats.vm.v_free_count", &available_pages, &size, NULL, 0);
++ sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
++ if (available_pages == -1 || page_size == -1) {
++ NOTREACHED();
++ return 0;
++ }
++ return static_cast<int64>(available_pages) * page_size;
++}
++
++// static
+ size_t SysInfo::MaxSharedMemorySize() {
+ size_t limit;
+ size_t size = sizeof(limit);
+@@ -33,4 +47,25 @@
return limit;
}
Property changes on: trunk/www/chromium/files/patch-base__sys_info_freebsd.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/chromium/files/patch-base__sys_info_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-base__sys_info_posix.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-base__sys_info_posix.cc 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-base__sys_info_posix.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-base__test__expectations__expectation.cc
===================================================================
--- trunk/www/chromium/files/patch-base__test__expectations__expectation.cc (rev 0)
+++ trunk/www/chromium/files/patch-base__test__expectations__expectation.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,19 @@
+--- 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 @@
+ variant != "64") {
+ return false;
+ }
++ } else if (name == "FreeBSD") {
+ } else if (name == "ChromeOS") {
+ // TODO(rsesek): Figure out what ChromeOS needs.
+ } else if (name == "iOS") {
+@@ -119,6 +120,8 @@
+ platform.variant = "32";
+ else if (arch == "x86_64")
+ platform.variant = "64";
++#elif defined(OS_FREEBSD)
++ platform.name = "FreeBSD";
+ #else
+ NOTREACHED();
+ #endif
Added: trunk/www/chromium/files/patch-base__test__launcher__test_launcher.cc
===================================================================
--- trunk/www/chromium/files/patch-base__test__launcher__test_launcher.cc (rev 0)
+++ trunk/www/chromium/files/patch-base__test__launcher__test_launcher.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,13 @@
+--- 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 @@
+ #include "base/mac/scoped_nsautorelease_pool.h"
+ #endif
+
++#if defined(OS_FREEBSD)
++#include <signal.h>
++#endif
++
+ namespace base {
+
+ // See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nkdTP7sstSc/uT3FaE_sgkAJ .
Added: trunk/www/chromium/files/patch-base__threading__platform_thread_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-base__threading__platform_thread_linux.cc (rev 0)
+++ trunk/www/chromium/files/patch-base__threading__platform_thread_linux.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,21 @@
+--- 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
+@@ -16,7 +16,9 @@
+ #include "base/tracked_objects.h"
+
+ #if !defined(OS_NACL)
++#if !defined(OS_BSD)
+ #include <sys/prctl.h>
++#endif
+ #include <sys/resource.h>
+ #include <sys/syscall.h>
+ #include <sys/time.h>
+@@ -52,7 +54,7 @@
+ ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
+ tracked_objects::ThreadData::InitializeThreadContext(name);
+
+-#if !defined(OS_NACL)
++#if !defined(OS_NACL) && !defined(OS_BSD)
+ // On linux we can get the thread names to show up in the debugger by setting
+ // the process name for the LWP. We don't want to do this for the main
+ // thread because that would rename the process, causing tools like killall
Added: trunk/www/chromium/files/patch-breakpad__breakpad.gyp
===================================================================
--- trunk/www/chromium/files/patch-breakpad__breakpad.gyp (rev 0)
+++ trunk/www/chromium/files/patch-breakpad__breakpad.gyp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- breakpad/breakpad.gyp.orig 2014-01-07 21:02:21.000000000 +0100
++++ breakpad/breakpad.gyp 2014-01-12 22:55:47.000000000 +0100
+@@ -334,7 +334,7 @@
+ },
+ ],
+ }],
+- [ 'OS=="linux" or OS=="android"', {
++ [ 'OS=="linux" or OS=="android" or os_bsd==1', {
+ 'conditions': [
+ ['OS=="android"', {
+ 'defines': [
Modified: trunk/www/chromium/files/patch-build__common.gypi
===================================================================
--- trunk/www/chromium/files/patch-build__common.gypi 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-build__common.gypi 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,6 +1,15 @@
---- build/common.gypi.orig 2012-05-30 10:01:43.000000000 +0300
-+++ build/common.gypi 2012-06-05 23:01:25.000000000 +0300
-@@ -575,6 +575,10 @@
+--- 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 @@
+ }],
+
+ # DBus usage.
+- ['OS=="linux" and embedded==0', {
++ ['(OS=="linux" or OS=="freebsd") and embedded==0', {
+ 'use_dbus%': 1,
+ }, {
+ 'use_dbus%': 0,
+@@ -1008,6 +1008,10 @@
# able to turn it off for various reasons.
'linux_disable_pie%': 0,
@@ -11,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.
-@@ -806,7 +810,7 @@
- # This is used to tweak build flags for gcc 4.4.
- 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
+@@ -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': [
- ['branding=="Chrome"', {
- 'linux_breakpad%': 1,
-@@ -2278,6 +2282,13 @@
+ ['target_arch=="mipsel"', {
+ 'werror%': '',
+@@ -3610,6 +3614,13 @@
'ldflags': [
'-Wl,--no-keep-memory',
],
Property changes on: trunk/www/chromium/files/patch-build__common.gypi
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-build__gyp_chromium
===================================================================
--- trunk/www/chromium/files/patch-build__gyp_chromium (rev 0)
+++ trunk/www/chromium/files/patch-build__gyp_chromium 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +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 @@
+
+ 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)])
Added: trunk/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,83 @@
+--- 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 @@
+ #include "ui/base/x/x11_util.h"
+ #endif
+
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ #include "components/breakpad/app/breakpad_linux.h"
+ #endif
+
+@@ -115,7 +115,7 @@
+ g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
+ #endif
+
+-#if defined(OS_POSIX)
++#if defined(OS_POSIX) && !defined(OS_BSD)
+ 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 ||
+ #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 @@
+ std::string format_str =
+ command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
+ if (format_str == "machine") {
+- format = diagnostics::DiagnosticsWriter::MACHINE;
++ format = diagnostics::DiagnosticsWriter::THEMACHINE;
+ } else if (format_str == "log") {
+ format = diagnostics::DiagnosticsWriter::LOG;
+ } else {
+@@ -433,7 +433,7 @@
+ std::string format_str =
+ command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
+ if (format_str == "machine") {
+- format = diagnostics::DiagnosticsWriter::MACHINE;
++ format = diagnostics::DiagnosticsWriter::THEMACHINE;
+ } else if (format_str == "human") {
+ format = diagnostics::DiagnosticsWriter::HUMAN;
+ } else {
+@@ -564,7 +564,7 @@
+ std::string process_type =
+ command_line.GetSwitchValueASCII(switches::kProcessType);
+
+-#if defined(OS_POSIX)
++#if defined(OS_POSIX) && !defined(OS_BSD)
+ breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer());
+ #endif
+
+@@ -703,7 +703,7 @@
+ #endif
+ }
+
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD)
+ // Zygote needs to call InitCrashReporter() in RunZygote().
+ if (process_type != switches::kZygoteProcess) {
+ #if defined(OS_ANDROID)
+@@ -715,7 +715,7 @@
+ breakpad::InitCrashReporter(process_type);
+ #endif // defined(OS_ANDROID)
+ }
+-#endif // defined(OS_POSIX) && !defined(OS_MACOSX)
++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD)
+
+ // After all the platform Breakpads have been initialized, store the command
+ // line for crash reporting.
+@@ -800,7 +800,7 @@
+ return process_type == switches::kNaClLoaderProcess ||
+ process_type == switches::kRelauncherProcess;
+ }
+-#elif defined(OS_POSIX) && !defined(OS_ANDROID)
++#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ content::ZygoteForkDelegate* ChromeMainDelegate::ZygoteStarting() {
+ #if defined(DISABLE_NACL)
+ return NULL;
Added: trunk/www/chromium/files/patch-chrome__app__chrome_main_delegate.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__app__chrome_main_delegate.h (rev 0)
+++ trunk/www/chromium/files/patch-chrome__app__chrome_main_delegate.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- 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
+@@ -31,7 +31,7 @@
+ virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE;
+ virtual bool DelaySandboxInitialization(
+ const std::string& process_type) OVERRIDE;
+-#elif defined(OS_POSIX) && !defined(OS_ANDROID)
++#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ virtual content::ZygoteForkDelegate* ZygoteStarting() OVERRIDE;
+ virtual void ZygoteForked() OVERRIDE;
+ #endif
Index: trunk/www/chromium/files/patch-chrome__browser__about_flags.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__about_flags.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-chrome__browser__about_flags.cc 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-chrome__browser__about_flags.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-chrome__browser__browser_process_impl.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__browser_process_impl.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__browser_process_impl.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,38 @@
+--- 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 @@
+
+ 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
+
Index: trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,16 +1,22 @@
---- chrome/browser/chrome_browser_main_posix.cc.orig 2012-05-30 10:01:59.000000000 +0300
-+++ chrome/browser/chrome_browser_main_posix.cc 2012-06-05 21:35:31.000000000 +0300
-@@ -238,7 +238,13 @@
+--- 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 @@
+ g_pipe_pid = getpid();
g_shutdown_pipe_read_fd = pipefd[0];
g_shutdown_pipe_write_fd = pipefd[1];
- #if !defined(ADDRESS_SANITIZER)
+#if defined(OS_FREEBSD)
+ // PTHREAD_STACK_MIN causes chromium to crash under FreeBSD,
+ // we request the default pthread stack size by specifying 0 here.
+ const size_t kShutdownDetectorThreadStackSize = 0;
+#else
+ #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN;
-+#endif
#else
- // ASan instrumentation bloats the stack, so we need to increase the stack
+@@ -318,6 +323,7 @@
// size to avoid hitting the guard page.
+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
+ #endif
++#endif // OS_FREEBSD
+ // TODO(viettrungluu,willchan): crbug.com/29675 - This currently leaks, so
+ // if you change this, you'll probably need to change the suppression.
+ if (!base::PlatformThread::CreateNonJoinable(
Property changes on: trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,11 +1,47 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2012-05-30 10:01:59.000000000 +0300
-+++ chrome/browser/chrome_content_browser_client.cc 2012-06-05 21:38:09.000000000 +0300
-@@ -132,7 +132,7 @@
- #include "chrome/browser/chrome_browser_main_extra_parts_ash.h"
- #endif
+--- 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 @@
+ }
+ }
--#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_ANDROID)
- #include "base/linux_util.h"
- #include "chrome/browser/crash_handler_host_linuxish.h"
- #endif
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
+ const std::string& process_type) {
+ base::FilePath dumps_path;
+@@ -543,7 +543,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 @@
+
+ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
+ CommandLine* command_line, int child_process_id) {
+-#if defined(OS_POSIX)
++#if defined(OS_POSIX) && !defined(OS_BSD)
+ if (breakpad::IsCrashReporterEnabled()) {
+ std::string enable_crash_reporter;
+ GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter);
+@@ -2525,7 +2525,7 @@
+ Profile::FromBrowserContext(browser_context)));
+ }
+
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
+ const CommandLine& command_line,
+ int child_process_id,
+@@ -2580,7 +2580,7 @@
+ }
+ #endif // defined(OS_ANDROID)
+ }
+-#endif // defined(OS_POSIX) && !defined(OS_MACOSX)
++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+
+ #if defined(OS_WIN)
+ const wchar_t* ChromeContentBrowserClient::GetResourceDllName() {
Property changes on: trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- 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 @@
+ const base::FilePath& storage_partition_path,
+ ScopedVector<fileapi::FileSystemBackend>* additional_backends) OVERRIDE;
+
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ virtual void GetAdditionalMappedFilesForChildProcess(
+ const CommandLine& command_line,
+ int child_process_id,
Added: trunk/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- 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
+@@ -268,7 +268,7 @@
+ console_->SetColor(color);
+ console_->Write(ASCIIToUTF16(result));
+ }
+- if (format_ == MACHINE) {
++ if (format_ == THEMACHINE) {
+ return WriteInfoLine(base::StringPrintf(
+ "%03d %s (%s)", outcome_code, id.c_str(), extra.c_str()));
+ } else {
Added: trunk/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- 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
+@@ -18,7 +18,7 @@
+ public:
+ // The type of formatting done by this writer.
+ enum FormatType {
+- MACHINE,
++ THEMACHINE,
+ LOG,
+ HUMAN
+ };
Added: trunk/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,15 @@
+--- 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 @@
+ }
+
+ bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunImpl() {
++#if !defined(OS_FREEBSD)
+ RemovableStorageProvider::GetAllDevices(
+ base::Bind(
+ &ImageWriterPrivateListRemovableStorageDevicesFunction::OnDeviceListReady,
+ this));
++#endif
+ return true;
+ }
+
Added: trunk/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__operation.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__operation.h (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__operation.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- chrome/browser/extensions/api/image_writer_private/operation.h.orig 2013-11-08 07:40:50.000000000 +0100
++++ chrome/browser/extensions/api/image_writer_private/operation.h 2013-11-15 20:19:03.000000000 +0100
+@@ -107,7 +107,7 @@
+ friend class base::RefCountedThreadSafe<Operation>;
+
+ // TODO(haven): Clean up these switches. http://crbug.com/292956
+-#if defined(OS_LINUX) && !defined(CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(CHROMEOS)
+ void WriteRun();
+ void WriteChunk(scoped_ptr<image_writer_utils::ImageReader> reader,
+ scoped_ptr<image_writer_utils::ImageWriter> writer,
Added: trunk/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,66 @@
+--- ./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
+@@ -4,6 +4,10 @@
+
+ #include "chrome/browser/extensions/api/music_manager_private/device_id.h"
+
++#if defined(OS_FREEBSD)
++#include <sys/types.h>
++#include <net/if_dl.h>
++#endif
+ #include <sys/socket.h> // Must be included before ifaddrs.h.
+ #include <ifaddrs.h>
+ #include <net/if.h>
+@@ -100,11 +104,33 @@
+ const char* prefixes[],
+ size_t prefixes_count) {
+ const int MAC_LENGTH = 6;
++#if defined(OS_FREEBSD)
++ struct ifaddrs *ifap, *ifinfo;
++#else
+ struct ifreq ifinfo;
++#endif
+
+ memset(&ifinfo, 0, sizeof(ifinfo));
+- strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
+
++#if defined(OS_FREEBSD)
++ int result = getifaddrs(&ifap);
++ if (result != 0)
++ return true;
++ result = 1; // no MAC found yet
++ for (ifinfo = ifap; ifinfo != NULL; ifinfo = ifinfo->ifa_next) {
++ struct sockaddr* sa = ifinfo->ifa_addr;
++ if (sa->sa_family == AF_LINK &&
++ !strncmp(ifinfo->ifa_name, ifaddr->ifa_name,
++ sizeof(ifinfo->ifa_name) - 1)) {
++ result = 0;
++ break;
++ }
++ }
++
++ char mac_address[6];
++ strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), sizeof(mac_address));
++#else
++ strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
+ int sd = socket(AF_INET, SOCK_DGRAM, 0);
+ int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo);
+ close(sd);
+@@ -114,11 +140,17 @@
+
+ const char* mac_address =
+ static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data);
++#endif
+ if (!is_valid_mac_address_.Run(mac_address, MAC_LENGTH))
+ return true;
+
++#if defined(OS_FREEBSD)
++ if (!IsValidPrefix(ifinfo->ifa_name, prefixes, prefixes_count))
++ return true;
++#else
+ if (!IsValidPrefix(ifinfo.ifr_name, prefixes, prefixes_count))
+ return true;
++#endif
+
+ // Got one!
+ found_mac_address_ =
Added: trunk/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,20 @@
+--- chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2014-02-20 21:27:38.000000000 +0100
++++ chrome/browser/extensions/api/serial/serial_connection_posix.cc 2014-02-24 16:10:53.000000000 +0100
+@@ -36,7 +36,7 @@
+ BITRATE_TO_SPEED_CASE(9600)
+ BITRATE_TO_SPEED_CASE(19200)
+ BITRATE_TO_SPEED_CASE(38400)
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ BITRATE_TO_SPEED_CASE(57600)
+ BITRATE_TO_SPEED_CASE(115200)
+ BITRATE_TO_SPEED_CASE(230400)
+@@ -71,7 +71,7 @@
+ SPEED_TO_BITRATE_CASE(9600)
+ SPEED_TO_BITRATE_CASE(19200)
+ SPEED_TO_BITRATE_CASE(38400)
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ SPEED_TO_BITRATE_CASE(57600)
+ SPEED_TO_BITRATE_CASE(115200)
+ SPEED_TO_BITRATE_CASE(230400)
Added: trunk/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- chrome/browser/gpu/gl_string_manager.cc.orig 2013-09-02 20:59:56.000000000 +0300
++++ chrome/browser/gpu/gl_string_manager.cc 2013-09-02 21:01:13.000000000 +0300
+@@ -25,7 +25,7 @@
+
+ void GLStringManager::Initialize() {
+ // On MacOSX or Windows, preliminary GPUInfo is enough.
+-#if defined(OS_LINUX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+ // We never remove this observer from GpuDataManager.
+ content::GpuDataManager::GetInstance()->AddObserver(this);
+
Added: trunk/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- chrome/browser/gpu/gpu_feature_checker.cc.orig
++++ chrome/browser/gpu/gpu_feature_checker.cc
+@@ -33,7 +33,7 @@ void GPUFeatureChecker::CheckGPUFeatureAvailability() {
+ CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+
+ bool finalized = true;
+-#if defined(OS_LINUX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+ // On Windows and Mac, so far we can always make the final WebGL blacklisting
+ // decision based on partial GPU info; on Linux, we need to launch the GPU
+ // process to collect full GPU info and make the final decision.
Added: trunk/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- chrome/browser/media/webrtc_log_uploader.cc.orig 2013-08-17 21:10:06.000000000 +0300
++++ chrome/browser/media/webrtc_log_uploader.cc 2013-08-17 21:10:45.000000000 +0300
+@@ -102,6 +102,8 @@
+ const char product[] = "Chrome_Android";
+ #elif defined(OS_CHROMEOS)
+ const char product[] = "Chrome_ChromeOS";
++#elif defined(OS_FREEBSD)
++ const char product[] = "Chrome_FreeBSD";
+ #else
+ // This file should not be compiled for other platforms.
+ COMPILE_ASSERT(false);
Added: trunk/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,14 @@
+--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-01-07 21:01:47.000000000 +0100
++++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc 2014-01-13 17:44:02.000000000 +0100
+@@ -33,9 +33,11 @@
+ // Note that this initializes the delegate asynchronously, but since
+ // the delegate will only be used from the IO thread, it is guaranteed
+ // to be created before use of it expects it to be there.
++#if !defined(OS_FREEBSD)
+ CreateMTPDeviceAsyncDelegate(device_location,
+ base::Bind(&MTPDeviceMapService::AddAsyncDelegate,
+ base::Unretained(this), device_location));
++#endif
+ mtp_device_usage_map_[device_location] = 0;
+ }
+
Added: trunk/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,14 @@
+--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-02-03 15:15:11.000000000 -0500
++++ chrome/browser/media_galleries/media_file_system_registry.cc 2014-02-24 20:57:03.060309366 -0500
+@@ -591,7 +591,10 @@
+ // Constructor in 'private' section because depends on private class definition.
+ MediaFileSystemRegistry::MediaFileSystemRegistry()
+ : file_system_context_(new MediaFileSystemContextImpl(this)) {
+- StorageMonitor::GetInstance()->AddObserver(this);
++ /* This conditional is needed for shutdown. Destructors
++ try to get the media file system registry. */
++ if (StorageMonitor::GetInstance())
++ StorageMonitor::GetInstance()->AddObserver(this);
+ }
+
+ MediaFileSystemRegistry::~MediaFileSystemRegistry() {
Index: trunk/www/chromium/files/patch-chrome__browser__memory_details.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__memory_details.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-chrome__browser__memory_details.cc 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-chrome__browser__memory_details.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/chromium/files/patch-chrome__browser__net__connection_tester.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__net__connection_tester.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-chrome__browser__net__connection_tester.cc 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-chrome__browser__net__connection_tester.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- chrome/browser/plugins/plugins_resource_service.cc.orig 2013-01-03 16:15:04.489512557 +0200
++++ chrome/browser/plugins/plugins_resource_service.cc 2013-01-03 16:16:48.346512702 +0200
+@@ -31,7 +31,7 @@
+ std::string filename;
+ #if defined(OS_WIN)
+ filename = "plugins_win.json";
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ filename = "plugins_linux.json";
+ #elif defined(OS_MACOSX)
+ filename = "plugins_mac.json";
Added: trunk/www/chromium/files/patch-chrome__browser__storage_monitor__storage_monitor.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__storage_monitor__storage_monitor.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__storage_monitor__storage_monitor.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,18 @@
+--- chrome/browser/storage_monitor/storage_monitor.cc.orig 2013-08-23 15:58:31.000000000 +0300
++++ chrome/browser/storage_monitor/storage_monitor.cc 2013-08-23 15:59:02.000000000 +0300
+@@ -63,6 +63,7 @@
+
+ void StorageMonitor::EnsureInitialized(base::Closure callback) {
+ DCHECK(thread_checker_.CalledOnValidThread());
++#if !defined(OS_BSD)
+ if (initialized_) {
+ if (!callback.is_null())
+ callback.Run();
+@@ -78,6 +79,7 @@
+
+ initializing_ = true;
+ Init();
++#endif
+ }
+
+ bool StorageMonitor::IsInitialized() {
Added: trunk/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/gtk/accelerators_gtk.h.orig 2013-09-28 19:10:31.000000000 +0200
++++ chrome/browser/ui/gtk/accelerators_gtk.h 2013-10-11 13:42:01.000000000 +0200
+@@ -8,6 +8,8 @@
+ #include "base/containers/hash_tables.h"
+ #include "ui/base/accelerators/accelerator.h"
+
++#include <vector>
++
+ template <typename T> struct DefaultSingletonTraits;
+
+ class AcceleratorsGtk {
Added: trunk/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/gtk/first_run_dialog.cc.orig 2013-09-25 23:01:19.000000000 +0300
++++ chrome/browser/ui/gtk/first_run_dialog.cc 2013-09-25 23:11:03.000000000 +0300
+@@ -160,6 +160,7 @@
+ if (dialog_)
+ gtk_widget_hide_all(dialog_);
+
++#if !defined(OS_BSD)
+ // Check if user has opted into reporting.
+ if (report_crashes_ &&
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(report_crashes_))) {
+@@ -168,6 +169,9 @@
+ } else {
+ GoogleUpdateSettings::SetCollectStatsConsent(false);
+ }
++#else
++ GoogleUpdateSettings::SetCollectStatsConsent(false);
++#endif
+
+ // If selected set as default browser.
+ if (make_default_ &&
Modified: trunk/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/about_ui.cc.orig 2012-10-31 21:02:22.000000000 +0200
-+++ chrome/browser/ui/webui/about_ui.cc 2012-11-07 15:58:46.000000000 +0200
-@@ -928,7 +928,7 @@
+--- chrome/browser/ui/webui/about_ui.cc.orig 2013-02-28 10:15:18.000000000 +0200
++++ chrome/browser/ui/webui/about_ui.cc 2013-03-06 20:47:33.000000000 +0200
+@@ -740,7 +740,7 @@
return data;
}
@@ -9,7 +9,7 @@
std::string AboutLinuxProxyConfig() {
std::string data;
AppendHeader(&data, 0,
-@@ -944,6 +944,7 @@
+@@ -756,6 +756,7 @@
return data;
}
@@ -17,20 +17,20 @@
void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id,
bool good) {
data->append("<tr><td>");
-@@ -1005,6 +1006,7 @@
+@@ -818,6 +819,7 @@
return data;
}
#endif
+#endif
- std::string AboutVersionStaticContent(const std::string& query) {
- return ResourceBundle::GetSharedInstance().GetRawDataResource(
-@@ -1396,7 +1398,7 @@
- } else if (host == chrome::kChromeUIDNSHost) {
- AboutDnsHandler::Start(this, request_id);
+ // AboutMemoryHandler ----------------------------------------------------------
+
+@@ -986,7 +988,7 @@
+ } else if (source_name_ == chrome::kChromeUIDNSHost) {
+ AboutDnsHandler::Start(profile(), callback);
return;
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
- } else if (host == chrome::kChromeUILinuxProxyConfigHost) {
+ } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {
response = AboutLinuxProxyConfig();
#endif
Property changes on: trunk/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/webui/certificate_viewer_webui.cc.orig 2014-01-07 21:01:49.000000000 +0100
++++ chrome/browser/ui/webui/certificate_viewer_webui.cc 2014-01-13 15:16:24.000000000 +0100
+@@ -228,7 +228,7 @@
+ if (cert_index < 0)
+ return;
+
+- NativeWebContentsModalDialog window =
++ _GtkWindow* window =
+ platform_util::GetTopLevel(dialog_->dialog()->GetNativeDialog());
+ ShowCertExportDialog(web_ui()->GetWebContents(),
+ window,
Modified: trunk/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,9 +1,9 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2012-05-30 10:01:56.000000000 +0300
-+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2012-06-05 21:58:25.000000000 +0300
-@@ -320,7 +320,7 @@
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2012-11-27 10:02:11.000000000 +0200
++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2012-11-28 21:02:24.000000000 +0200
+@@ -366,7 +366,7 @@
+ url.host() == chrome::kChromeUIMemoryRedirectHost ||
url.host() == chrome::kChromeUIStatsHost ||
- url.host() == chrome::kChromeUITermsHost ||
- url.host() == chrome::kChromeUIVersionHost
+ url.host() == chrome::kChromeUITermsHost
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
|| url.host() == chrome::kChromeUILinuxProxyConfigHost
Property changes on: trunk/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,42 @@
+--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2013-08-30 06:46:19.000000000 +0300
++++ chrome/browser/ui/webui/options/browser_options_handler.cc 2013-09-03 21:15:44.092633766 +0300
+@@ -322,7 +322,8 @@
+ { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
+ { "translateEnableTranslate",
+ IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
++ !defined(OS_ANDROID)
+ { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
+ { "themesNativeButton", IDS_THEMES_GTK_BUTTON },
+ { "themesSetClassic", IDS_THEMES_SET_CLASSIC },
+@@ -596,7 +597,8 @@
+ "requestProfilesInfo",
+ base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
+ base::Unretained(this)));
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
++ !defined(OS_ANDROID)
+ web_ui()->RegisterMessageCallback(
+ "themesSetNative",
+ base::Bind(&BrowserOptionsHandler::ThemesSetNative,
+@@ -1323,7 +1325,8 @@
+ ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
+ bool is_native_theme = false;
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
++ !defined(OS_ANDROID)
+ bool profile_is_managed = profile->IsManaged();
+ is_native_theme = theme_service->UsingNativeTheme();
+ base::FundamentalValue native_theme_enabled(!is_native_theme &&
+@@ -1345,7 +1348,8 @@
+ ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
+ }
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
++ !defined(OS_ANDROID)
+ void BrowserOptionsHandler::ThemesSetNative(const ListValue* args) {
+ content::RecordAction(UserMetricsAction("Options_GtkThemeSet"));
+ Profile* profile = Profile::FromWebUI(web_ui());
Added: trunk/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,12 @@
+--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2013-09-03 21:22:36.851628387 +0300
++++ chrome/browser/ui/webui/options/browser_options_handler.h 2013-09-03 21:23:09.395628553 +0300
+@@ -193,7 +193,8 @@
+
+ void ObserveThemeChanged();
+ void ThemesReset(const base::ListValue* args);
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
++ !defined(OS_ANDROID)
+ void ThemesSetNative(const base::ListValue* args);
+ #endif
+
Added: trunk/www/chromium/files/patch-chrome__browser__usb__usb_context.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__usb__usb_context.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__usb__usb_context.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,12 @@
+--- chrome/browser/usb/usb_context.cc.orig 2013-10-08 21:07:13.000000000 +0300
++++ chrome/browser/usb/usb_context.cc 2013-10-08 22:04:50.000000000 +0300
+@@ -44,7 +44,9 @@
+ running_ = false;
+ // Spreading running_ to the UsbEventHandler thread.
+ base::subtle::MemoryBarrier();
++#if !defined(OS_FREEBSD)
+ libusb_interrupt_handle_event(context_);
++#endif
+ base::PlatformThread::Join(thread_handle_);
+ }
+
Added: trunk/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- chrome/browser/web_applications/web_app.cc.orig 2013-11-16 01:16:28.000000000 +0100
++++ chrome/browser/web_applications/web_app.cc 2013-11-17 21:13:42.000000000 +0100
+@@ -228,7 +228,7 @@
+ }
+ #endif
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ std::string GetWMClassFromAppName(std::string app_name) {
+ file_util::ReplaceIllegalCharactersInPath(&app_name, '_');
+ TrimString(app_name, "_", &app_name);
Added: trunk/www/chromium/files/patch-chrome__browser__web_applications__web_app.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__web_applications__web_app.h (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__web_applications__web_app.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- chrome/browser/web_applications/web_app.h.orig 2013-11-08 07:40:41.000000000 +0100
++++ chrome/browser/web_applications/web_app.h 2013-11-15 23:02:30.000000000 +0100
+@@ -97,7 +97,7 @@
+ IconInfoList* icons);
+ #endif
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ // Windows that correspond to web apps need to have a deterministic (and
+ // different) WMClass than normal chrome windows so the window manager groups
+ // them as a separate application.
Modified: trunk/www/chromium/files/patch-chrome__chrome_browser.gypi
===================================================================
--- trunk/www/chromium/files/patch-chrome__chrome_browser.gypi 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-chrome__chrome_browser.gypi 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,15 +1,44 @@
---- chrome/chrome_browser.gypi.orig 2012-10-31 21:02:48.000000000 +0200
-+++ chrome/chrome_browser.gypi 2012-11-07 16:06:11.000000000 +0200
-@@ -2531,6 +2531,14 @@
+--- chrome/chrome_browser.gypi.orig 2013-09-20 05:36:07.000000000 +0300
++++ chrome/chrome_browser.gypi 2013-09-23 20:34:16.000000000 +0300
+@@ -2735,7 +2735,7 @@
+ '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
+ ],
+ }],
+- ['OS=="linux" and chromeos==0', {
++ ['(OS=="linux" and chromeos==0) or os_bsd==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:libspeechd',
+ ],
+@@ -2859,7 +2859,7 @@
+ ],
+ },
+ }],
+- ['os_posix == 1 and OS != "mac" and OS != "ios"', {
++ ['os_posix == 1 and OS != "mac" and OS != "ios" and os_bsd != 1', {
+ 'sources': [
+ 'app/breakpad_linux.cc',
+ 'app/breakpad_linux.h',
+@@ -3104,6 +3104,25 @@
['exclude', '^browser/usb/'],
],
}],
+ ['os_bsd==1', {
-+ 'sources!': [
-+ 'browser/media_gallery/media_device_notifications_linux.cc',
-+ 'browser/media_gallery/media_device_notifications_linux.h',
-+ 'browser/system_monitor/removable_device_notifications_linux.cc',
-+ 'browser/system_monitor/removable_device_notifications_linux.h'
++ 'sources/': [
++ ['exclude', '^browser/chrome_browser_main_linux.cc'],
++ ['exclude', '^browser/chrome_browser_main_linux.h'],
++ ['exclude', '^browser/media_galleries/linux/'],
++ ['exclude', '^browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc'],
++ ['exclude', '^browser/storage_monitor/media_transfer_protocol_device_observer_linux.h'],
++ ['exclude', '^browser/storage_monitor/removable_device_notifications_linux.cc'],
++ ['exclude', '^browser/storage_monitor/removable_device_notifications_linux.h'],
++ ['exclude', '^browser/storage_monitor/storage_monitor_linux.cc'],
++ ['exclude', '^browser/storage_monitor/storage_monitor_linux.h'],
++ ['exclude', '^browser/storage_monitor/udev_util_linux.cc'],
++ ['exclude', '^browser/storage_monitor/udev_util_linux.h'],
++ ['exclude', '^browser/storage_monitor/test_media_transfer_protocol_manager_linux.cc'],
++ ['exclude', '^browser/storage_monitor/test_media_transfer_protocol_manager_linux.h'],
++ ['exclude', '^browser/storage_monitor/mtab_watcher_linux.cc'],
++ ['exclude', '^browser/storage_monitor/mtab_watcher_linux.h'],
+ ],
+ }],
['OS=="mac"', {
Property changes on: trunk/www/chromium/files/patch-chrome__chrome_browser.gypi
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
===================================================================
--- trunk/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi (rev 0)
+++ trunk/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,14 @@
+--- chrome/chrome_browser_extensions.gypi.orig 2013-11-16 01:17:16.000000000 +0100
++++ chrome/chrome_browser_extensions.gypi 2013-11-17 17:09:41.000000000 +0100
+@@ -854,6 +854,11 @@
+ 'browser/extensions/window_controller_list_observer.h',
+ ],
+ 'conditions': [
++ ['os_bsd==1', {
++ 'sources/': [
++ ['exclude', '^browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc'],
++ ],
++ }],
+ ['chromeos==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:dbus',
Modified: trunk/www/chromium/files/patch-chrome__common__chrome_paths.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__common__chrome_paths.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-chrome__common__chrome_paths.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths.cc.orig 2012-05-23 04:50:48.000000000 +0300
-+++ chrome/common/chrome_paths.cc 2012-05-26 00:47:40.880289194 +0300
-@@ -334,10 +334,12 @@
+--- chrome/common/chrome_paths.cc.orig 2013-02-28 10:15:52.000000000 +0200
++++ chrome/common/chrome_paths.cc 2013-03-06 21:25:36.000000000 +0200
+@@ -441,10 +441,12 @@
if (!file_util::PathExists(cur)) // We don't want to create this
return false;
break;
@@ -8,9 +8,9 @@
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
case chrome::DIR_POLICY_FILES: {
#if defined(GOOGLE_CHROME_BUILD)
- cur = FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
+ cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
+#elif defined(OS_BSD)
-+ cur = FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies"));
++ cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies"));
#else
- cur = FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
+ cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
#endif
Property changes on: trunk/www/chromium/files/patch-chrome__common__chrome_paths.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-chrome__common__chrome_switches.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__common__chrome_switches.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__common__chrome_switches.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,18 @@
+--- chrome/common/chrome_switches.cc.orig 2013-11-08 07:41:00.000000000 +0100
++++ chrome/common/chrome_switches.cc 2013-11-16 01:18:01.000000000 +0100
+@@ -1563,13 +1563,13 @@
+ #endif
+ #endif // OS_POSIX
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
+ // Triggers migration of user data directory to another directory
+ // specified as a parameter. The migration is done under singleton lock,
+ // and sanity checks are made to avoid corrupting the profile.
+ // The browser exits after migration is complete.
+ const char kMigrateDataDirForSxS[] = "migrate-data-dir-for-sxs";
+-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif // (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
+
+ #if defined(OS_MACOSX)
+ // Forcibly disables Lion-style on newer OSes, to allow developers to test the
Added: trunk/www/chromium/files/patch-chrome__common__chrome_switches.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__common__chrome_switches.h (rev 0)
+++ trunk/www/chromium/files/patch-chrome__common__chrome_switches.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- chrome/common/chrome_switches.h.orig 2013-11-08 07:41:00.000000000 +0100
++++ chrome/common/chrome_switches.h 2013-11-16 01:20:25.000000000 +0100
+@@ -435,7 +435,7 @@
+ #endif
+ #endif
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
+ extern const char kMigrateDataDirForSxS[];
+ #endif
+
Added: trunk/www/chromium/files/patch-chrome__common__omaha_query_params__omaha_query_params.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__common__omaha_query_params__omaha_query_params.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__common__omaha_query_params__omaha_query_params.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- chrome/common/omaha_query_params/omaha_query_params.cc.orig 2013-05-07 22:43:58.000000000 +0300
++++ chrome/common/omaha_query_params/omaha_query_params.cc 2013-05-07 22:44:41.000000000 +0300
+@@ -28,6 +28,8 @@
+ "linux";
+ #elif defined(OS_OPENBSD)
+ "openbsd";
++#elif defined(OS_FREEBSD)
++ "freebsd";
+ #else
+ #error "unknown os"
+ #endif
Added: trunk/www/chromium/files/patch-chrome__common__pref_names.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__common__pref_names.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__common__pref_names.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- chrome/common/pref_names.cc.orig 2013-08-17 21:26:00.000000000 +0300
++++ chrome/common/pref_names.cc 2013-08-17 21:26:43.000000000 +0300
+@@ -955,7 +955,7 @@
+ // Boolean controlling whether SafeSearch is mandatory for Google Web Searches.
+ const char kForceSafeSearch[] = "settings.force_safesearch";
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // Linux specific preference on whether we should match the system theme.
+ const char kUsesSystemTheme[] = "extensions.theme.use_system";
+ #endif
Added: trunk/www/chromium/files/patch-chrome__common__pref_names.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__common__pref_names.h (rev 0)
+++ trunk/www/chromium/files/patch-chrome__common__pref_names.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- chrome/common/pref_names.h.orig 2013-08-17 20:35:53.000000000 +0300
++++ chrome/common/pref_names.h 2013-08-17 20:36:25.000000000 +0300
+@@ -341,7 +341,7 @@
+ extern const char kForceSafeSearch[];
+ extern const char kDeleteTimePeriod[];
+ extern const char kLastClearBrowsingDataTime[];
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ extern const char kUsesSystemTheme[];
+ #endif
+ extern const char kCurrentThemePackFilename[];
Added: trunk/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,44 @@
+--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2013-07-15 20:44:54.000000000 +0300
++++ chrome/renderer/pepper/pepper_flash_font_file_host.cc 2013-07-15 20:45:49.000000000 +0300
+@@ -13,7 +13,7 @@
+ #include "ppapi/proxy/ppapi_messages.h"
+ #include "ppapi/proxy/serialized_structs.h"
+
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "content/public/common/child_process_sandbox_support_linux.h"
+ #endif
+
+@@ -28,12 +28,12 @@
+ : ResourceHost(host->GetPpapiHost(), instance, resource),
+ renderer_ppapi_host_(host),
+ fd_(-1) {
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ fd_ = content::MatchFontWithFallback(
+ description.face.c_str(), description.weight >=
+ PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD,
+ description.italic, charset);
+-#endif // defined(OS_LINUX) || defined(OS_OPENBSD)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+ }
+
+ PepperFlashFontFileHost::~PepperFlashFontFileHost() {
+@@ -54,7 +54,7 @@
+ uint32_t table) {
+ std::string contents;
+ int32_t result = PP_ERROR_FAILED;
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ if (fd_ != -1) {
+ size_t length = 0;
+ if (content::GetFontTable(fd_, table, 0 /* offset */, NULL, &length)) {
+@@ -69,7 +69,7 @@
+ }
+ }
+ }
+-#endif // defined(OS_LINUX) || defined(OS_OPENBSD)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ context->reply_msg = PpapiPluginMsg_FlashFontFile_GetFontTableReply(contents);
+ return result;
Added: trunk/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h (rev 0)
+++ trunk/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- chrome/renderer/printing/print_web_view_helper.h.orig 2013-08-30 06:47:03.000000000 +0300
++++ chrome/renderer/printing/print_web_view_helper.h 2013-09-03 21:39:51.232633592 +0300
+@@ -231,7 +231,7 @@
+ void FinishFramePrinting();
+
+ // Prints the page listed in |params|.
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_MACOSX)
+ void PrintPageInternal(const PrintMsg_PrintPage_Params& params,
+ const gfx::Size& canvas_size,
+ WebKit::WebFrame* frame,
Index: trunk/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__test__base__testing_browser_process.h 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-chrome__test__base__testing_browser_process.h 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-chrome__test__perf__perf_test.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__test__perf__perf_test.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__test__perf__perf_test.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- chrome/test/perf/perf_test.cc.orig 2013-08-19 21:01:58.000000000 +0300
++++ chrome/test/perf/perf_test.cc 2013-08-19 21:03:16.000000000 +0300
+@@ -352,7 +352,7 @@
+ AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name,
+ total_working_set_size, "bytes",
+ false /* not important */);
+-#elif defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_ANDROID)
++#elif defined(OS_POSIX) && !defined(OS_NACL)
+ AppendResult(output,
+ "vm_size_final_b",
+ std::string(),
Index: trunk/www/chromium/files/patch-chrome__test__ui__ui_test.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__test__ui__ui_test.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-chrome__test__ui__ui_test.cc 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-chrome__test__ui__ui_test.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/chromium/files/patch-chrome__tools__build__linux__sed.sh
===================================================================
--- trunk/www/chromium/files/patch-chrome__tools__build__linux__sed.sh 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-chrome__tools__build__linux__sed.sh 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-chrome__tools__build__linux__sed.sh
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-components__policy__resources__policy_templates.json
===================================================================
--- trunk/www/chromium/files/patch-components__policy__resources__policy_templates.json (rev 0)
+++ trunk/www/chromium/files/patch-components__policy__resources__policy_templates.json 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,29 @@
+--- components/policy/resources/policy_templates.json.orig 2013-09-24 21:57:03.000000000 +0300
++++ components/policy/resources/policy_templates.json 2013-09-24 21:59:32.000000000 +0300
+@@ -1366,7 +1366,7 @@
+ 'name': 'GSSAPILibraryName',
+ 'type': 'string',
+ 'schema': { 'type': 'string' },
+- 'supported_on': ['chrome.linux:9-'],
++ 'supported_on': ['chrome.linux:9-', 'chrome.freebsd:9-'],
+ 'features': {
+ 'dynamic_refresh': False,
+ 'per_profile': False,
+@@ -3339,7 +3339,7 @@
+ 'name': 'RequireOnlineRevocationChecksForLocalAnchors',
+ 'type': 'main',
+ 'schema': { 'type': 'boolean' },
+- 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'],
++ 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.freebsd:30-', 'chrome.win:30-'],
+ 'features': {
+ 'dynamic_refresh': True,
+ 'per_profile': False,
+@@ -3976,7 +3976,7 @@
+ 'name': 'BackgroundModeEnabled',
+ 'type': 'main',
+ 'schema': { 'type': 'boolean' },
+- 'supported_on': ['chrome.win:19-', 'chrome.linux:19-'],
++ 'supported_on': ['chrome.win:19-', 'chrome.linux:19-', 'chrome.freebsd:19-'],
+ 'features': {
+ 'can_be_recommended': True,
+ 'dynamic_refresh': True,
Added: trunk/www/chromium/files/patch-components__policy__tools__generate_policy_source.py
===================================================================
--- trunk/www/chromium/files/patch-components__policy__tools__generate_policy_source.py (rev 0)
+++ trunk/www/chromium/files/patch-components__policy__tools__generate_policy_source.py 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- components/policy/tools/generate_policy_source.py.orig 2013-09-24 21:55:28.000000000 +0300
++++ components/policy/tools/generate_policy_source.py 2013-09-24 21:56:43.000000000 +0300
+@@ -64,7 +64,7 @@
+ if platform.startswith('chrome.'):
+ platform_sub = platform[7:]
+ if platform_sub == '*':
+- self.platforms.extend(['win', 'mac', 'linux'])
++ self.platforms.extend(['win', 'mac', 'linux', 'freebsd'])
+ else:
+ self.platforms.append(platform_sub)
+ else:
Modified: trunk/www/chromium/files/patch-content__app__content_main_runner.cc
===================================================================
--- trunk/www/chromium/files/patch-content__app__content_main_runner.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-content__app__content_main_runner.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,38 +1,35 @@
---- content/app/content_main_runner.cc.orig 2012-10-31 21:01:34.000000000 +0200
-+++ content/app/content_main_runner.cc 2012-11-07 17:25:10.000000000 +0200
-@@ -91,7 +91,7 @@
- extern int RendererMain(const content::MainFunctionParams&);
- extern int WorkerMain(const content::MainFunctionParams&);
- extern int UtilityMain(const content::MainFunctionParams&);
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- namespace content {
- extern int ZygoteMain(const MainFunctionParams&,
- ZygoteForkDelegate* forkdelegate);
-@@ -333,7 +333,7 @@
+--- content/app/content_main_runner.cc.orig 2013-07-15 19:05:22.000000000 +0300
++++ content/app/content_main_runner.cc 2013-07-15 19:11:30.000000000 +0300
+@@ -78,10 +78,10 @@
+ #include "base/posix/global_descriptors.h"
+ #include "content/public/common/content_descriptors.h"
+
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+ #include "content/public/common/zygote_fork_delegate_linux.h"
+ #endif
+-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ #include "content/zygote/zygote_main.h"
+ #endif
+
+@@ -323,7 +323,8 @@
int (*function)(const MainFunctionParams&);
};
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \
++ !defined(OS_BSD)
// On platforms that use the zygote, we have a special subset of
// subprocesses that are launched via the zygote. This function
// fills in some process-launching bits around ZygoteMain().
-@@ -438,7 +438,7 @@
+@@ -432,7 +433,8 @@
}
}
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \
++ !defined(OS_BSD)
// Zygote startup is special -- see RunZygote comments above
// for why we don't use ZygoteMain directly.
if (process_type == switches::kZygoteProcess)
-@@ -548,7 +548,7 @@
- kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor);
- #endif // !OS_ANDROID && !OS_IOS
-
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- g_fds->Set(kCrashDumpSignal,
- kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor);
- #endif
Property changes on: trunk/www/chromium/files/patch-content__app__content_main_runner.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/chromium/files/patch-content__browser__browser_main_loop.cc
===================================================================
--- trunk/www/chromium/files/patch-content__browser__browser_main_loop.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-content__browser__browser_main_loop.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,15 +1,6 @@
---- content/browser/browser_main_loop.cc.orig 2012-10-31 21:01:35.000000000 +0200
-+++ content/browser/browser_main_loop.cc 2012-11-07 15:40:53.000000000 +0200
-@@ -61,7 +61,7 @@
- #include "net/base/winsock_init.h"
- #endif
-
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include <glib-object.h>
- #endif
-
-@@ -79,7 +79,7 @@
+--- content/browser/browser_main_loop.cc.orig 2014-02-20 21:28:24.000000000 +0100
++++ content/browser/browser_main_loop.cc 2014-02-24 20:28:45.000000000 +0100
+@@ -102,7 +102,7 @@
#include "ui/gfx/gtk_util.h"
#endif
@@ -17,40 +8,31 @@
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
#include <sys/stat.h>
- #include "base/process_util.h"
-@@ -100,7 +100,7 @@
-
+ #include "content/browser/renderer_host/render_sandbox_host_linux.h"
+@@ -125,7 +125,7 @@
+ namespace content {
namespace {
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
void SetupSandbox(const CommandLine& parsed_command_line) {
+ TRACE_EVENT0("startup", "SetupSandbox");
// TODO(evanm): move this into SandboxWrapper; I'm just trying to move this
- // code en masse out of chrome_main for now.
-@@ -128,7 +128,7 @@
- }
- #endif
+@@ -346,7 +346,7 @@
+ void BrowserMainLoop::EarlyInitialization() {
+ TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- static void GLibLogHandler(const gchar* log_domain,
- GLogLevelFlags log_level,
- const gchar* message,
-@@ -286,7 +286,7 @@
- }
- #endif // !defined(USE_OPENSSL)
-
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ // No thread should be created before this call, as SetupSandbox()
+ // will end-up using fork().
SetupSandbox(parsed_command_line_);
+@@ -784,7 +784,7 @@
+ }
#endif
-@@ -681,7 +681,7 @@
- // are no #else branches on any #ifs.
- // TODO(stevenjb): Move platform specific code into platform specific Parts
- // (Need to add InitializeToolkit stage to BrowserParts).
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // Glib type system initialization. Needed at least for gconf,
- // used in net/proxy/proxy_config_service_linux.cc. Most likely
- // this is superfluous as gtk_init() ought to do this. It's
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ ZygoteHostImpl::GetInstance()->TearDownAfterLastChild();
+ #endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+
Property changes on: trunk/www/chromium/files/patch-content__browser__browser_main_loop.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/chromium/files/patch-content__browser__child_process_launcher.cc
===================================================================
--- trunk/www/chromium/files/patch-content__browser__child_process_launcher.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-content__browser__child_process_launcher.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,8 +1,8 @@
---- content/browser/child_process_launcher.cc.orig 2012-10-31 21:01:35.000000000 +0200
-+++ content/browser/child_process_launcher.cc 2012-11-19 22:35:00.000000000 +0200
-@@ -52,7 +52,7 @@
+--- content/browser/child_process_launcher.cc.orig 2012-11-27 10:01:25.000000000 +0200
++++ content/browser/child_process_launcher.cc 2012-12-09 17:02:22.000000000 +0200
+@@ -53,7 +53,7 @@
termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION),
- exit_code_(content::RESULT_CODE_NORMAL_EXIT),
+ exit_code_(RESULT_CODE_NORMAL_EXIT),
starting_(true)
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
@@ -9,17 +9,17 @@
, zygote_(false)
#endif
{
-@@ -188,7 +188,7 @@
- base::GlobalDescriptors::Mapping files_to_register;
- files_to_register.push_back(std::pair<base::GlobalDescriptors::Key, int>(
- kPrimaryIPCChannel, ipcfd));
+@@ -196,7 +196,7 @@
+ FileDescriptorInfo(kPrimaryIPCChannel,
+ base::FileDescriptor(ipcfd, false)));
+
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(OS_BSD)
- content::GetContentClient()->browser()->
- GetAdditionalMappedFilesForChildProcess(*cmd_line, &files_to_register);
- if (use_zygote) {
-@@ -209,7 +209,7 @@
- id_file.first + base::GlobalDescriptors::kBaseDescriptor));
+ GetContentClient()->browser()->
+ GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id,
+ &files_to_register);
+@@ -217,7 +217,7 @@
+ base::GlobalDescriptors::kBaseDescriptor));
}
-#if !defined(OS_MACOSX)
@@ -27,7 +27,7 @@
if (process_type == switches::kRendererProcess) {
const int sandbox_fd =
RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
-@@ -261,7 +261,7 @@
+@@ -269,7 +269,7 @@
base::Bind(
&Context::Notify,
this_object.get(),
@@ -36,7 +36,7 @@
use_zygote,
#endif
handle));
-@@ -269,7 +269,7 @@
+@@ -277,7 +277,7 @@
}
void Notify(
@@ -45,7 +45,7 @@
bool zygote,
#endif
base::ProcessHandle handle) {
-@@ -282,7 +282,7 @@
+@@ -290,7 +290,7 @@
if (!handle)
LOG(ERROR) << "Failed to launch child process";
@@ -54,7 +54,7 @@
zygote_ = zygote;
#endif
if (client_) {
-@@ -305,7 +305,7 @@
+@@ -313,7 +313,7 @@
BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
base::Bind(
&Context::TerminateInternal,
@@ -63,7 +63,7 @@
zygote_,
#endif
process_.handle()));
-@@ -319,7 +319,7 @@
+@@ -327,7 +327,7 @@
}
static void TerminateInternal(
@@ -72,8 +72,8 @@
bool zygote,
#endif
base::ProcessHandle handle) {
-@@ -333,7 +333,7 @@
- process.Terminate(content::RESULT_CODE_NORMAL_EXIT);
+@@ -341,7 +341,7 @@
+ process.Terminate(RESULT_CODE_NORMAL_EXIT);
// On POSIX, we must additionally reap the child.
#if defined(OS_POSIX)
-#if !defined(OS_MACOSX)
@@ -81,7 +81,7 @@
if (zygote) {
// If the renderer was created via a zygote, we have to proxy the reaping
// through the zygote process.
-@@ -360,7 +360,7 @@
+@@ -368,7 +368,7 @@
#if defined(OS_ANDROID)
// The fd to close after creating the process.
int ipcfd_;
@@ -90,7 +90,7 @@
bool zygote_;
#endif
};
-@@ -413,7 +413,7 @@
+@@ -423,7 +423,7 @@
*exit_code = context_->exit_code_;
return context_->termination_status_;
}
Property changes on: trunk/www/chromium/files/patch-content__browser__child_process_launcher.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-content__browser__download__base_file.cc
===================================================================
--- trunk/www/chromium/files/patch-content__browser__download__base_file.cc (rev 0)
+++ trunk/www/chromium/files/patch-content__browser__download__base_file.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,12 @@
+--- content/browser/download/base_file.cc.orig 2013-08-18 21:43:48.000000000 +0300
++++ content/browser/download/base_file.cc 2013-08-18 21:44:22.000000000 +0300
+@@ -212,7 +212,8 @@
+ }
+
+ // OS_WIN, OS_MACOSX and OS_LINUX have specialized implementations.
+-#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX)
++#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX) && \
++ !defined(OS_BSD)
+ DownloadInterruptReason BaseFile::AnnotateWithSourceInformation() {
+ return DOWNLOAD_INTERRUPT_REASON_NONE;
+ }
Added: trunk/www/chromium/files/patch-content__browser__download__base_file_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-content__browser__download__base_file_linux.cc (rev 0)
+++ trunk/www/chromium/files/patch-content__browser__download__base_file_linux.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,12 @@
+--- content/browser/download/base_file_linux.cc.orig 2013-08-21 09:50:31.000000000 +0300
++++ content/browser/download/base_file_linux.cc 2013-08-21 09:51:22.000000000 +0300
+@@ -13,7 +13,9 @@
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK(!detached_);
+
++#if !defined(OS_BSD)
+ AddOriginMetadataToFile(full_path_, source_url_, referrer_url_);
++#endif
+ return DOWNLOAD_INTERRUPT_REASON_NONE;
+ }
+
Added: trunk/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc (rev 0)
+++ trunk/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,35 @@
+--- content/browser/fileapi/file_system_dir_url_request_job_unittest.cc.orig 2014-01-07 21:02:28.000000000 +0100
++++ content/browser/fileapi/file_system_dir_url_request_job_unittest.cc 2014-01-13 16:18:14.000000000 +0100
+@@ -248,7 +248,7 @@
+
+ std::istringstream in(delegate_->data_received());
+ std::string line;
+- EXPECT_TRUE(std::getline(in, line));
++ /*EXPECT_TRUE*/(std::getline(in, line));
+
+ #if defined(OS_WIN)
+ EXPECT_EQ("<script>start(\"foo\\\\bar\");</script>", line);
+@@ -256,10 +256,10 @@
+ EXPECT_EQ("<script>start(\"/foo/bar\");</script>", line);
+ #endif
+
+- EXPECT_TRUE(std::getline(in, line));
++ /*EXPECT_TRUE*/(std::getline(in, line));
+ VerifyListingEntry(line, "hoge", "hoge", false, 10);
+
+- EXPECT_TRUE(std::getline(in, line));
++ /*EXPECT_TRUE*/(std::getline(in, line));
+ VerifyListingEntry(line, "baz", "baz", true, 0);
+ }
+
+@@ -307,8 +307,8 @@
+
+ std::istringstream in(delegate_->data_received());
+ std::string line;
+- EXPECT_TRUE(std::getline(in, line));
+- EXPECT_FALSE(std::getline(in, line));
++ /*EXPECT_TRUE*/(std::getline(in, line));
++ /*EXPECT_FALSE*/(std::getline(in, line));
+
+ TestRequestWithContext(CreateFileSystemURL("foo"),
+ file_system_context.get());
Added: trunk/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc
===================================================================
--- trunk/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc (rev 0)
+++ trunk/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- content/browser/geolocation/location_arbitrator_impl.cc.orig 2014-01-07 21:02:28.000000000 +0100
++++ content/browser/geolocation/location_arbitrator_impl.cc 2014-01-13 16:30:21.000000000 +0100
+@@ -160,7 +160,7 @@
+ }
+
+ LocationProvider* LocationArbitratorImpl::NewSystemLocationProvider() {
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD)
+ return NULL;
+ #else
+ return content::NewSystemLocationProvider();
Added: trunk/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
===================================================================
--- trunk/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc (rev 0)
+++ trunk/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,203 @@
+--- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2013-11-15 12:34:18.000000000 +0100
++++ content/browser/geolocation/wifi_data_provider_freebsd.cc 2013-11-15 22:09:52.000000000 +0100
+@@ -0,0 +1,200 @@
++// Copyright (c) 2010 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// For FreeBSD we use the getifaddrs(3) to obtain the list of interfaces
++// and then check for those with an 802.11 media type and able to return
++// a list of stations. This is similar to ifconfig(8).
++
++#include "content/browser/geolocation/wifi_data_provider_freebsd.h"
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <sys/sockio.h>
++#include <net/if.h>
++#include <net/if_media.h>
++#include <ifaddrs.h>
++#include <net80211/ieee80211_ioctl.h>
++#include <net/ethernet.h>
++
++#include "base/strings/utf_string_conversions.h"
++#include "content/browser/geolocation/wifi_data_provider_common.h"
++
++namespace content {
++namespace {
++// The time periods, in milliseconds, between successive polls of the wifi data.
++const int kDefaultPollingInterval = 10000; // 10s
++const int kNoChangePollingInterval = 120000; // 2 mins
++const int kTwoNoChangePollingInterval = 600000; // 10 mins
++const int kNoWifiPollingIntervalMilliseconds = 20 * 1000; // 20s
++
++// Convert a wifi frequency to the corresponding channel.
++// Taken from wifi_data_provider_linux.cc where it says this was
++// adapted from geolocaiton/wifilib.cc in googleclient (internal to google).
++int frquency_to_channel(int frequency_Mhz) {
++ if (frequency_Mhz >= 2412 && frequency_Mhz <= 2472) // Channels 1-13.
++ return (frequency_Mhz - 2407) / 5;
++ if (frequency_Mhz == 2484)
++ return 14;
++ if (frequency_Mhz > 5000 && frequency_Mhz < 6000) // .11a bands.
++ return (frequency_Mhz - 5000) / 5;
++ // Ignore everything else.
++ return AccessPointData().channel; // invalid channel
++}
++
++// Provides the wifi API binding for FreeBSD.
++class FreeBSDAccessPointData : public WifiDataProviderCommon::WlanApiInterface {
++public:
++ FreeBSDAccessPointData();
++ ~FreeBSDAccessPointData();
++
++ // this does nothing
++ bool Init();
++
++ // get the AP data
++ virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data);
++
++private:
++ DISALLOW_COPY_AND_ASSIGN(FreeBSDAccessPointData);
++};
++
++FreeBSDAccessPointData::FreeBSDAccessPointData() {
++}
++
++FreeBSDAccessPointData::~FreeBSDAccessPointData() {
++}
++
++bool FreeBSDAccessPointData::Init() {
++ return true;
++}
++
++bool FreeBSDAccessPointData::GetAccessPointData(WifiData::AccessPointDataSet* data) {
++ bool res;
++ char *dupn;
++ struct ifaddrs *ifal, *ifa;
++ struct ifreq ifr;
++ struct ifmediareq ifmr;
++ struct ieee80211req i802r;
++ int s;
++ char iscanbuf[32*1024], *vsr;
++ unsigned len;
++ AccessPointData apd;
++
++ res = false;
++ if (getifaddrs(&ifal) < 0)
++ return res;
++
++ dupn = NULL;
++ for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
++ memset(&ifr, 0, sizeof(ifr));
++
++ if (dupn != NULL && strcmp(dupn, ifa->ifa_name) == 0)
++ continue;
++ dupn = ifa->ifa_name;
++
++ strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name));
++ ifr.ifr_addr.sa_family = AF_LOCAL;
++
++ if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0)
++ continue;
++
++ (void) memset(&ifmr, 0, sizeof(ifmr));
++ (void) strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name));
++
++ if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
++ close(s);
++ continue;
++ }
++ if (IFM_TYPE(ifmr.ifm_active) != IFM_IEEE80211) {
++ close(s);
++ continue;
++ }
++
++ (void) memset(&i802r, 0, sizeof(i802r));
++ (void) strncpy(i802r.i_name, ifa->ifa_name, sizeof(i802r.i_name));
++ i802r.i_type = IEEE80211_IOC_SCAN_RESULTS;
++ i802r.i_data = iscanbuf;
++ i802r.i_len = sizeof(iscanbuf);
++ if (ioctl(s, SIOCG80211, &i802r) < 0) {
++ close(s);
++ continue;
++ }
++
++ close(s);
++
++ vsr = (char *) i802r.i_data;
++ len = i802r.i_len;
++ while (len >= sizeof(struct ieee80211req_scan_result)) {
++ struct ieee80211req_scan_result *isr;
++ char *id;
++ int idlen;
++ char ssid[IEEE80211_NWID_LEN+1];
++
++ isr = (struct ieee80211req_scan_result *) vsr;
++
++ if (isr->isr_meshid_len) {
++ id = vsr + isr->isr_ie_off + isr->isr_ssid_len;
++ idlen = isr->isr_meshid_len;
++ }
++ else {
++ id = vsr + isr->isr_ie_off;
++ idlen = isr->isr_ssid_len;
++ }
++ strncpy(ssid, id, idlen);
++ ssid[idlen] = '\0';
++ apd.ssid = UTF8ToUTF16(ssid);
++ apd.mac_address = MacAddressAsString16(isr->isr_bssid);
++ apd.radio_signal_strength = (isr->isr_rssi/2) + isr->isr_noise;
++ apd.signal_to_noise = apd.radio_signal_strength - isr->isr_noise;
++ apd.channel = frquency_to_channel(isr->isr_freq);
++ VLOG(1) << "FreeBSD access point: "
++ << "SSID: " << apd.ssid << ", "
++ << "MAC: " << apd.mac_address << ", "
++ << "Strength: " << apd.radio_signal_strength << ":"
++ << apd.signal_to_noise << ", "
++ << "Channel: " << apd.channel;
++ data->insert(apd);
++ res = true;
++ len -= isr->isr_len;
++ vsr += isr->isr_len;
++ }
++ }
++
++ freeifaddrs(ifal);
++
++ return res;
++}
++
++} // namespace
++
++// static
++WifiDataProviderImplBase* WifiDataProvider::DefaultFactoryFunction() {
++ return new FreeBSDWifiDataProvider();
++}
++
++FreeBSDWifiDataProvider::FreeBSDWifiDataProvider() {
++}
++
++FreeBSDWifiDataProvider::~FreeBSDWifiDataProvider() {
++}
++
++WifiDataProviderCommon::WlanApiInterface* FreeBSDWifiDataProvider::NewWlanApi() {
++
++ scoped_ptr<FreeBSDAccessPointData> wlan_api(new FreeBSDAccessPointData);
++ if (wlan_api->Init())
++ return wlan_api.release();
++
++ return NULL;
++}
++
++WifiPollingPolicy* FreeBSDWifiDataProvider::NewPollingPolicy() {
++ return new GenericWifiPollingPolicy<kDefaultPollingInterval,
++ kNoChangePollingInterval,
++ kTwoNoChangePollingInterval,
++ kNoWifiPollingIntervalMilliseconds>;
++}
++
++} // namespace content
Added: trunk/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h
===================================================================
--- trunk/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h (rev 0)
+++ trunk/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,34 @@
+--- content/browser/geolocation/wifi_data_provider_freebsd.h.orig 2013-11-15 12:34:18.000000000 +0100
++++ content/browser/geolocation/wifi_data_provider_freebsd.h 2013-11-15 22:08:05.000000000 +0100
+@@ -0,0 +1,31 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_FREEBSD_H_
++#define CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_FREEBSD_H_
++
++#include "base/compiler_specific.h"
++#include "content/browser/geolocation/wifi_data_provider_common.h"
++#include "content/common/content_export.h"
++
++namespace content {
++
++// Implementation of the wifi data provider for FreeBSD.
++class CONTENT_EXPORT FreeBSDWifiDataProvider : public WifiDataProviderCommon {
++public:
++ FreeBSDWifiDataProvider();
++
++private:
++ virtual ~FreeBSDWifiDataProvider();
++
++ // WifiDataProviderCommon
++ virtual WlanApiInterface* NewWlanApi() OVERRIDE;
++ virtual WifiPollingPolicy* NewPollingPolicy() OVERRIDE;
++
++ DISALLOW_COPY_AND_ASSIGN(FreeBSDWifiDataProvider);
++};
++
++} // namespace content
++
++#endif // CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_FREEBSD_H_
Added: trunk/www/chromium/files/patch-content__browser__renderer_host__pepper__pepper_file_io_host.cc
===================================================================
--- trunk/www/chromium/files/patch-content__browser__renderer_host__pepper__pepper_file_io_host.cc (rev 0)
+++ trunk/www/chromium/files/patch-content__browser__renderer_host__pepper__pepper_file_io_host.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,19 @@
+--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2014-02-20 21:28:22.000000000 +0100
++++ content/browser/renderer_host/pepper/pepper_file_io_host.cc 2014-02-24 22:13:44.000000000 +0100
+@@ -308,10 +308,12 @@
+ int64_t actual_offset =
+ (open_flags_ & PP_FILEOPENFLAG_APPEND) ? max_written_offset_ : offset;
+
+- uint64_t max_offset = actual_offset + buffer.size();
+- if (max_offset > static_cast<uint64_t>(std::numeric_limits<int64_t>::max()))
+- return PP_ERROR_FAILED; // max_offset overflows.
+- int64_t amount = static_cast<int64_t>(max_offset) - max_written_offset_;
++ // (rene) rename 'max_offset' to '_max_offset' to avoid a conflict with
++ // /usr/include/vm/vm_map.h on FreeBSD 10.0
++ uint64_t _max_offset = actual_offset + buffer.size();
++ if (_max_offset > static_cast<uint64_t>(std::numeric_limits<int64_t>::max()))
++ return PP_ERROR_FAILED; // _max_offset overflows.
++ int64_t amount = static_cast<int64_t>(_max_offset) - max_written_offset_;
+
+ // Quota request amounts are restricted to 32 bits so we can use atomics
+ // when we move this code to the plugin side of the proxy.
Index: trunk/www/chromium/files/patch-content__common__set_process_title_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-content__common__set_process_title_linux.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-content__common__set_process_title_linux.cc 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-content__common__set_process_title_linux.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/chromium/files/patch-content__common__set_process_title_linux.h
===================================================================
--- trunk/www/chromium/files/patch-content__common__set_process_title_linux.h 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-content__common__set_process_title_linux.h 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-content__common__set_process_title_linux.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/chromium/files/patch-content__content_browser.gypi
===================================================================
--- trunk/www/chromium/files/patch-content__content_browser.gypi 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-content__content_browser.gypi 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,20 +1,41 @@
---- content/content_browser.gypi.orig 2012-10-31 21:01:37.000000000 +0200
-+++ content/content_browser.gypi 2012-11-07 13:18:40.000000000 +0200
-@@ -995,8 +995,17 @@
+--- ./content/content_browser.gypi.orig 2014-02-20 21:28:25.000000000 +0100
++++ ./content/content_browser.gypi 2014-02-24 23:00:37.000000000 +0100
+@@ -586,6 +586,8 @@
+ 'browser/geolocation/wifi_data_provider_common_win.cc',
+ 'browser/geolocation/wifi_data_provider_common_win.h',
+ 'browser/geolocation/wifi_data_provider_corewlan_mac.mm',
++ 'browser/geolocation/wifi_data_provider_freebsd.cc',
++ 'browser/geolocation/wifi_data_provider_freebsd.h',
+ 'browser/geolocation/wifi_data_provider_linux.cc',
+ 'browser/geolocation/wifi_data_provider_linux.h',
+ 'browser/geolocation/wifi_data_provider_mac.cc',
+@@ -1543,8 +1545,18 @@
+ ],
}],
['os_bsd==1', {
- 'sources/': [
-+ ['exclude', 'public/browser/zygote_host_linux\\.h$'],
-+ ['exclude', 'browser/zygote_host/zygote_host_impl_linux\\.cc$'],
-+ ['exclude', 'browser/zygote_host/zygote_host_impl_linux\\.h$'],
-+ ['exclude', 'zygote/zygote_linux\\.cc$'],
-+ ['exclude', 'zygote/zygote_linux\\.h$'],
-+ ['exclude', 'zygote/zygote_main_linux\\.cc$'],
-+ ['exclude', '^browser/device_monitor_linux\\.cc$'],
-+ ['exclude', '^browser/download/file_metadata_linux\\.cc$'],
- ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'],
- ['exclude', '^browser/geolocation/wifi_data_provider_linux\\.cc$'],
-+ ['exclude', '^browser/udev_linux\\.cc$'],
+- 'sources/': [
+- ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'],
++ 'sources!': [
++ 'public/browser/zygote_host_linux.h',
++ 'browser/zygote_host/zygote_host_impl_linux.cc',
++ 'browser/zygote_host/zygote_host_impl_linux.h',
++ 'zygote/zygote_linux.cc',
++ 'zygote/zygote_linux.h',
++ 'zygote/zygote_main_linux.cc',
++ 'browser/device_monitor_linux.cc',
++ 'browser/download/file_metadata_linux.cc',
++ 'browser/gamepad/gamepad_platform_data_fetcher_linux.cc',
++ 'browser/geolocation/wifi_data_provider_linux.cc',
++ 'browser/udev_linux.cc',
],
}],
- ['use_aura==1', {
+ ['use_aura!=1 and OS!="win"', {
+@@ -1635,7 +1647,7 @@
+ 'browser/geolocation/empty_wifi_data_provider.cc',
+ ],
+ }],
+- ['OS == "linux" and use_dbus==1', {
++ ['(OS == "linux" or OS=="freebsd") and use_dbus==1', {
+ 'sources!': [
+ 'browser/geolocation/empty_wifi_data_provider.cc',
+ ],
Property changes on: trunk/www/chromium/files/patch-content__content_browser.gypi
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/chromium/files/patch-content__content_common.gypi
===================================================================
--- trunk/www/chromium/files/patch-content__content_common.gypi 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-content__content_common.gypi 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,11 +1,24 @@
---- content/content_common.gypi.orig 2012-11-07 15:08:50.000000000 +0200
-+++ content/content_common.gypi 2012-11-07 15:09:05.000000000 +0200
-@@ -330,8 +330,6 @@
- 'common/sandbox_linux.cc',
- 'common/sandbox_policy.cc',
- 'common/sandbox_policy.h',
-- 'common/sandbox_seccomp_bpf_linux.cc',
-- 'common/sandbox_seccomp_bpf_linux.h',
- 'common/savable_url_schemes.cc',
- 'common/savable_url_schemes.h',
- 'common/set_process_title.cc',
+--- content/content_common.gypi.orig 2014-02-20 21:28:25.000000000 +0100
++++ content/content_common.gypi 2014-02-24 20:59:04.000000000 +0100
+@@ -482,6 +482,21 @@
+ 'content.gyp:common_aidl',
+ ],
+ }],
++ ['os_bsd==1', {
++ 'sources!': [
++ 'common/sandbox_linux.cc',
++ 'common/sandbox_linux.h',
++ 'common/sandbox_init_linux.cc',
++ 'common/sandbox_seccomp_bpf_linux.cc',
++ 'common/sandbox_seccomp_bpf_linux.h',
++ 'common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc',
++ 'common/sandbox_linux/bpf_gpu_policy_linux.cc',
++ 'common/sandbox_linux/bpf_ppapi_policy_linux.cc',
++ 'common/sandbox_linux/bpf_renderer_policy_linux.cc',
++ 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
++ 'common/sandbox_linux/sandbox_seccomp_bpf_linux.cc',
++ ],
++ }],
+ ['toolkit_uses_gtk == 1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
Property changes on: trunk/www/chromium/files/patch-content__content_common.gypi
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-content__content_tests.gypi
===================================================================
--- trunk/www/chromium/files/patch-content__content_tests.gypi (rev 0)
+++ trunk/www/chromium/files/patch-content__content_tests.gypi 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,18 @@
+--- content/content_tests.gypi.orig 2013-01-08 23:49:55.890245836 +0200
++++ content/content_tests.gypi 2013-01-08 23:52:52.374246102 +0200
+@@ -585,6 +585,15 @@
+ 'browser/geolocation/wifi_data_provider_linux_unittest.cc',
+ ],
+ }],
++ ['OS == "freebsd"', {
++ 'sources!': [
++ 'browser/download/file_metadata_unittest_linux.cc',
++ 'browser/geolocation/wifi_data_provider_linux_unittest.cc',
++ 'browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc',
++ 'browser/renderer_host/media/media_stream_manager_unittest.cc',
++ 'browser/renderer_host/media/media_stream_ui_controller_unittest.cc',
++ ],
++ }],
+ ['OS != "android" and OS != "ios"', {
+ 'dependencies': [
+ '../third_party/libvpx/libvpx.gyp:libvpx',
Modified: trunk/www/chromium/files/patch-content__plugin__plugin_main_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-content__plugin__plugin_main_linux.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-content__plugin__plugin_main_linux.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,5 +1,5 @@
---- content/plugin/plugin_main_linux.cc.orig 2010-12-16 02:11:58.000000000 +0100
-+++ content/plugin/plugin_main_linux.cc 2010-12-20 20:15:08.000000000 +0100
+--- content/plugin/plugin_main_linux.cc.orig 2012-11-28 04:01:26.000000000 +0200
++++ content/plugin/plugin_main_linux.cc 2012-12-04 22:14:32.000000000 +0200
@@ -5,13 +5,13 @@
#include <signal.h>
#include <string.h>
@@ -12,7 +12,7 @@
// This whole file is only useful on 64-bit architectures.
-#if defined(ARCH_CPU_64_BITS)
-+#if defined(ARCH_CPU_64_BITS) && !defined(OS_FREEBSD)
++#if defined(ARCH_CPU_64_BITS) && !defined(OS_BSD)
namespace {
Property changes on: trunk/www/chromium/files/patch-content__plugin__plugin_main_linux.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-content__public__test__browser_test_base.cc
===================================================================
--- trunk/www/chromium/files/patch-content__public__test__browser_test_base.cc (rev 0)
+++ trunk/www/chromium/files/patch-content__public__test__browser_test_base.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,13 @@
+--- content/public/test/browser_test_base.cc.orig 2013-01-08 23:22:25.608704051 +0200
++++ content/public/test/browser_test_base.cc 2013-01-08 23:24:45.354245363 +0200
+@@ -4,6 +4,10 @@
+
+ #include "content/public/test/browser_test_base.h"
+
++#if defined(OS_FREEBSD)
++#include <sys/signal.h>
++#endif
++
+ #include "base/bind.h"
+ #include "base/command_line.h"
+ #include "base/debug/stack_trace.h"
Added: trunk/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
===================================================================
--- trunk/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc (rev 0)
+++ trunk/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,24 @@
+--- content/renderer/media/webrtc_audio_capturer.cc.orig 2013-08-30 06:45:44.000000000 +0300
++++ content/renderer/media/webrtc_audio_capturer.cc 2013-09-03 21:47:30.139633005 +0300
+@@ -26,10 +26,10 @@
+ // The listed rates below adds restrictions and WebRtcAudioDeviceImpl::Init()
+ // will fail if the user selects any rate outside these ranges.
+ const int kValidInputRates[] = {96000, 48000, 44100, 32000, 16000, 8000};
+-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+-const int kValidInputRates[] = {48000, 44100};
+ #elif defined(OS_ANDROID)
+ const int kValidInputRates[] = {48000, 44100};
++#elif defined(OS_POSIX)
++const int kValidInputRates[] = {48000, 44100};
+ #else
+ const int kValidInputRates[] = {44100};
+ #endif
+@@ -430,7 +430,7 @@
+ // CaptureCallback.
+ #if defined(OS_WIN) || defined(OS_MACOSX)
+ DCHECK_LE(volume, 1.0);
+-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
++#elif defined(OS_POSIX) && !defined(OS_ANDROID)
+ // We have a special situation on Linux where the microphone volume can be
+ // "higher than maximum". The input volume slider in the sound preference
+ // allows the user to set a scaling that is higher than 100%. It means that
Added: trunk/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc
===================================================================
--- trunk/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc (rev 0)
+++ trunk/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- content/renderer/media/webrtc_audio_renderer.cc.orig 2013-09-02 21:19:42.000000000 +0300
++++ content/renderer/media/webrtc_audio_renderer.cc 2013-09-02 21:21:52.000000000 +0300
+@@ -31,7 +31,7 @@
+ // rates below adds restrictions and Initialize() will fail if the user selects
+ // any rate outside these ranges.
+ const int kValidOutputRates[] = {96000, 48000, 44100, 32000, 16000};
+-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ const int kValidOutputRates[] = {48000, 44100};
+ #elif defined(OS_ANDROID)
+ // TODO(leozwang): We want to use native sampling rate on Android to achieve
Added: trunk/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc
===================================================================
--- trunk/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc (rev 0)
+++ trunk/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- content/renderer/pepper/usb_key_code_conversion.cc.orig 2013-09-03 23:00:20.220628554 +0300
++++ content/renderer/pepper/usb_key_code_conversion.cc 2013-09-03 23:02:18.736631955 +0300
+@@ -10,7 +10,7 @@
+
+ namespace content {
+
+-#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_WIN)
++#if !((defined(OS_POSIX) && !defined(OS_ANDROID)) || defined(OS_WIN))
+
+ uint32_t UsbKeyCodeForKeyboardEvent(const WebKeyboardEvent& key_event) {
+ return 0;
Modified: trunk/www/chromium/files/patch-content__renderer__render_process_impl.cc
===================================================================
--- trunk/www/chromium/files/patch-content__renderer__render_process_impl.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-content__renderer__render_process_impl.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,27 +1,18 @@
---- content/renderer/render_process_impl.cc.orig 2012-01-18 11:11:41.000000000 +0200
-+++ content/renderer/render_process_impl.cc 2012-01-29 17:05:58.000000000 +0200
-@@ -105,7 +105,7 @@
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_OPENBSD)
- // Windows and Linux create transport DIBs inside the renderer
- return TransportDIB::Create(size, transport_dib_next_sequence_number_++);
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_FREEBSD)
- // Mac creates transport DIBs in the browser, so we need to do a sync IPC to
- // get one. The TransportDIB is cached in the browser.
- TransportDIB::Handle handle;
-@@ -122,7 +122,7 @@
- if (!dib)
- return;
+--- content/renderer/render_process_impl.cc.orig 2013-08-09 19:07:03.000000000 +0000
++++ content/renderer/render_process_impl.cc 2013-08-12 21:00:44.000000000 +0000
+@@ -89,7 +89,7 @@
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_FREEBSD)
- // On Mac we need to tell the browser that it can drop a reference to the
- // shared memory.
- IPC::Message* msg = new ViewHostMsg_FreeTransportDIB(dib->id());
-@@ -140,7 +140,7 @@
+ bool RenderProcessImpl::InProcessPlugins() {
+ const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Plugin processes require a UI message loop, and the Linux message loop
+ // implementation only allows one UI loop per process.
+ if (command_line.HasSwitch(switches::kInProcessPlugins))
+@@ -152,7 +152,7 @@
int width = rect.width();
int height = rect.height();
- const size_t stride = skia::PlatformCanvas::StrideForWidth(rect.width());
+ const size_t stride = skia::PlatformCanvasStrideForWidth(rect.width());
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
const size_t max_size = base::SysInfo::MaxSharedMemorySize();
Property changes on: trunk/www/chromium/files/patch-content__renderer__render_process_impl.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,12 +1,25 @@
---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2012-10-31 21:01:36.000000000 +0200
-+++ content/renderer/renderer_main_platform_delegate_linux.cc 2012-11-07 17:38:32.000000000 +0200
-@@ -34,7 +34,9 @@
+--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2013-05-13 01:33:56.000000000 +0000
++++ content/renderer/renderer_main_platform_delegate_linux.cc 2013-05-16 23:29:28.000000000 +0000
+@@ -41,11 +41,14 @@
+ // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox
//
- // The seccomp sandbox mode 1 (sandbox/linux/seccomp-legacy) and mode 2
- // (sandbox/linux/seccomp-bpf) are started in InitializeSandbox().
+ // Anything else is started in InitializeSandbox().
+#if !defined(OS_BSD)
- content::InitializeSandbox();
+ LinuxSandbox::InitializeSandbox();
+#endif
return true;
}
+ void RendererMainPlatformDelegate::RunSandboxTests(bool no_sandbox) {
++#if !defined(OS_BSD)
+ // The LinuxSandbox class requires going through initialization before
+ // GetStatus() and others can be used. When we are not launched through the
+ // Zygote, this initialization will only happen in the renderer process if
+@@ -80,6 +83,7 @@
+ CHECK_EQ(errno, EPERM);
+ }
+ #endif // __x86_64__
++#endif
+ }
+
+ } // namespace content
Property changes on: trunk/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc
===================================================================
--- trunk/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,16 +1,16 @@
---- content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2012-11-15 23:43:31.000000000 +0200
-+++ content/renderer/renderer_webkitplatformsupport_impl.cc 2012-11-15 23:43:50.000000000 +0200
-@@ -62,7 +62,7 @@
- #include "third_party/WebKit/Source/WebKit/chromium/public/platform/mac/WebSandboxSupport.h"
+--- content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2013-04-30 10:20:40.000000000 +0300
++++ content/renderer/renderer_webkitplatformsupport_impl.cc 2013-05-07 21:11:09.000000000 +0300
+@@ -87,7 +87,7 @@
+ #include "third_party/WebKit/public/platform/mac/WebSandboxSupport.h"
#endif
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ #include <map>
#include <string>
- #include <map>
-@@ -117,7 +117,7 @@
- int mode);
+@@ -164,7 +164,7 @@
+ scoped_refptr<ThreadSafeSender> thread_safe_sender_;
};
-#if defined(OS_ANDROID)
@@ -18,16 +18,16 @@
// WebKit doesn't use WebSandboxSupport on android so we don't need to
// implement anything here.
class RendererWebKitPlatformSupportImpl::SandboxSupport {
-@@ -216,7 +216,7 @@
+@@ -256,7 +256,7 @@
}
- WebKit::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() {
+ blink::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_BSD)
// WebKit doesn't use WebSandboxSupport on android.
return NULL;
#else
-@@ -463,7 +463,7 @@
+@@ -541,7 +541,7 @@
return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
}
Property changes on: trunk/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-gpu__config__gpu_control_list.cc
===================================================================
--- trunk/www/chromium/files/patch-gpu__config__gpu_control_list.cc (rev 0)
+++ trunk/www/chromium/files/patch-gpu__config__gpu_control_list.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,15 @@
+--- gpu/config/gpu_control_list.cc.orig 2013-09-02 21:03:44.000000000 +0300
++++ gpu/config/gpu_control_list.cc 2013-09-02 21:05:31.000000000 +0300
+@@ -1346,10 +1346,10 @@
+ return kOsWin;
+ #elif defined(OS_ANDROID)
+ return kOsAndroid;
+-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+- return kOsLinux;
+ #elif defined(OS_MACOSX)
+ return kOsMacosx;
++#elif defined(OS_POSIX)
++ return kOsLinux;
+ #else
+ return kOsUnknown;
+ #endif
Added: trunk/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc (rev 0)
+++ trunk/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,12 @@
+--- gpu/config/gpu_control_list_unittest.cc.orig 2013-09-02 21:20:16.000000000 +0300
++++ gpu/config/gpu_control_list_unittest.cc 2013-09-02 21:21:01.000000000 +0300
+@@ -177,8 +177,7 @@
+ features = control_list->MakeDecision(
+ GpuControlList::kOsLinux, kOsVersion, gpu_info());
+ EXPECT_SINGLE_FEATURE(features, TEST_FEATURE_0);
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || \
+- defined(OS_OPENBSD)
++#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_ANDROID))
+ // ControlList entries will be filtered to the current OS only upon loading.
+ EXPECT_TRUE(control_list->LoadList(
+ vendor_json, GpuControlList::kCurrentOsOnly));
Added: trunk/www/chromium/files/patch-gpu__config__gpu_test_config.cc
===================================================================
--- trunk/www/chromium/files/patch-gpu__config__gpu_test_config.cc (rev 0)
+++ trunk/www/chromium/files/patch-gpu__config__gpu_test_config.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,20 @@
+--- gpu/config/gpu_test_config.cc.orig 2013-09-02 21:22:26.000000000 +0300
++++ gpu/config/gpu_test_config.cc 2013-09-02 21:23:55.000000000 +0300
+@@ -17,8 +17,6 @@
+ GPUTestConfig::OS GetCurrentOS() {
+ #if defined(OS_CHROMEOS)
+ return GPUTestConfig::kOsChromeOS;
+-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+- return GPUTestConfig::kOsLinux;
+ #elif defined(OS_WIN)
+ int32 major_version = 0;
+ int32 minor_version = 0;
+@@ -53,6 +51,8 @@
+ }
+ #elif defined(OS_ANDROID)
+ return GPUTestConfig::kOsAndroid;
++#elif defined(OS_POSIX)
++ return GPUTestConfig::kOsLinux;
+ #endif
+ return GPUTestConfig::kOsUnknown;
+ }
Added: trunk/www/chromium/files/patch-gpu__gpu_config.gypi
===================================================================
--- trunk/www/chromium/files/patch-gpu__gpu_config.gypi (rev 0)
+++ trunk/www/chromium/files/patch-gpu__gpu_config.gypi 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- gpu/gpu_config.gypi.orig 2013-08-12 20:57:26.000000000 +0000
++++ gpu/gpu_config.gypi 2013-08-12 20:58:18.000000000 +0000
+@@ -67,7 +67,7 @@
+ '../third_party/amd/amd_videocard_info_win.cc',
+ ],
+ }],
+- ['OS=="linux" and use_x11==1', {
++ ['(OS=="linux" or os_bsd==1) and use_x11==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:libpci',
+ '../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl',
Added: trunk/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc (rev 0)
+++ trunk/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- media/audio/audio_input_volume_unittest.cc.orig 2013-04-30 10:22:14.000000000 +0300
++++ media/audio/audio_input_volume_unittest.cc 2013-05-07 21:17:17.000000000 +0300
+@@ -57,7 +57,7 @@
+ params, device_id);
+ EXPECT_TRUE(NULL != ais);
+
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Some linux devices do not support our settings, we may fail to open
+ // those devices.
+ if (!ais->Open()) {
Added: trunk/www/chromium/files/patch-media__base__audio_splicer.cc
===================================================================
--- trunk/www/chromium/files/patch-media__base__audio_splicer.cc (rev 0)
+++ trunk/www/chromium/files/patch-media__base__audio_splicer.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,20 @@
+--- media/base/audio_splicer.cc.orig 2013-08-30 06:47:05.000000000 +0300
++++ media/base/audio_splicer.cc 2013-09-03 22:08:02.140628065 +0300
+@@ -60,7 +60,7 @@
+ base::TimeDelta expected_timestamp = output_timestamp_helper_.GetTimestamp();
+ base::TimeDelta delta = timestamp - expected_timestamp;
+
+- if (std::abs(delta.InMilliseconds()) > kMaxTimeDeltaInMilliseconds) {
++ if (std::labs(delta.InMilliseconds()) > kMaxTimeDeltaInMilliseconds) {
+ DVLOG(1) << "Timestamp delta too large: " << delta.InMicroseconds() << "us";
+ return false;
+ }
+@@ -69,7 +69,7 @@
+ if (delta != base::TimeDelta())
+ frames_to_fill = output_timestamp_helper_.GetFramesToTarget(timestamp);
+
+- if (frames_to_fill == 0 || std::abs(frames_to_fill) < min_gap_size_) {
++ if (frames_to_fill == 0 || std::labs(frames_to_fill) < min_gap_size_) {
+ AddOutputBuffer(input);
+ return true;
+ }
Added: trunk/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
===================================================================
--- trunk/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc (rev 0)
+++ trunk/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- media/filters/decrypting_audio_decoder.cc.orig 2013-08-30 06:47:05.000000000 +0300
++++ media/filters/decrypting_audio_decoder.cc 2013-09-03 22:11:24.289626887 +0300
+@@ -30,7 +30,7 @@
+ // Out of sync of 100ms would be pretty noticeable and we should keep any
+ // drift below that.
+ const int64 kOutOfSyncThresholdInMilliseconds = 100;
+- return std::abs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) >
++ return std::labs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) >
+ kOutOfSyncThresholdInMilliseconds;
+ }
+
Modified: trunk/www/chromium/files/patch-media__media.gyp
===================================================================
--- trunk/www/chromium/files/patch-media__media.gyp 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-media__media.gyp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,6 +1,6 @@
---- media/media.gyp.orig 2012-04-25 10:01:21.000000000 +0300
-+++ media/media.gyp 2012-04-30 00:26:41.000000000 +0300
-@@ -341,7 +341,7 @@
+--- media/media.gyp.orig 2013-11-08 07:41:32.000000000 +0100
++++ media/media.gyp 2013-11-15 16:39:58.000000000 +0100
+@@ -563,7 +563,7 @@
'audio/openbsd/audio_manager_openbsd.h',
],
}],
@@ -9,12 +9,12 @@
'variables': {
'conditions': [
['sysroot!=""', {
-@@ -858,7 +858,7 @@
- },
- ],
- }],
-- ['OS == "linux" and target_arch != "arm"', {
-+ ['(OS == "linux" or OS == "freebsd") and target_arch != "arm"', {
- 'targets': [
- {
- 'target_name': 'tile_render_bench',
+@@ -836,7 +836,7 @@
+ 'ENABLE_EAC3_PLAYBACK',
+ ],
+ }],
+- ['OS!="linux" and OS!="win"', {
++ ['OS!="linux" and OS!="win" and OS!="freebsd"', {
+ 'sources!': [
+ 'base/keyboard_event_counter.cc',
+ 'base/keyboard_event_counter.h',
Property changes on: trunk/www/chromium/files/patch-media__media.gyp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/chromium/files/patch-native_client__build__common.gypi
===================================================================
--- trunk/www/chromium/files/patch-native_client__build__common.gypi 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-native_client__build__common.gypi 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-native_client__build__common.gypi
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp
===================================================================
--- trunk/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp
===================================================================
--- trunk/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp
===================================================================
--- trunk/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/chromium/files/patch-net__base__dns_reloader.cc
===================================================================
--- trunk/www/chromium/files/patch-net__base__dns_reloader.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-net__base__dns_reloader.cc 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-net__base__dns_reloader.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-net__base__mime_util_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-net__base__mime_util_unittest.cc (rev 0)
+++ trunk/www/chromium/files/patch-net__base__mime_util_unittest.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- net/base/mime_util_unittest.cc.orig 2013-09-02 22:31:36.000000000 +0300
++++ net/base/mime_util_unittest.cc 2013-09-02 22:32:33.000000000 +0300
+@@ -245,7 +245,7 @@
+ { "MeSsAge/*", 1, "eml" },
+ { "image/bmp", 1, "bmp" },
+ { "video/*", 6, "mp4" },
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_IOS)
++#if (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_IOS)
+ { "video/*", 6, "mpg" },
+ #else
+ { "video/*", 6, "mpeg" },
Added: trunk/www/chromium/files/patch-net__base__net_util.h
===================================================================
--- trunk/www/chromium/files/patch-net__base__net_util.h (rev 0)
+++ trunk/www/chromium/files/patch-net__base__net_util.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,12 @@
+--- net/base/net_util.h.orig 2013-09-01 00:45:45.000000000 +0300
++++ net/base/net_util.h 2013-09-01 00:47:35.000000000 +0300
+@@ -13,6 +13,9 @@
+ #elif defined(OS_POSIX)
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#if defined(OS_BSD)
++#include <netinet/in.h>
++#endif
+ #endif
+
+ #include <list>
Index: trunk/www/chromium/files/patch-net__base__network_change_notifier.cc
===================================================================
--- trunk/www/chromium/files/patch-net__base__network_change_notifier.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-net__base__network_change_notifier.cc 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-net__base__network_change_notifier.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/chromium/files/patch-net__dns__address_sorter_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-net__dns__address_sorter_posix.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-net__dns__address_sorter_posix.cc 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-net__dns__address_sorter_posix.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc (rev 0)
+++ trunk/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- net/dns/dns_config_service_posix_unittest.cc.orig 2013-09-01 00:10:54.000000000 +0300
++++ net/dns/dns_config_service_posix_unittest.cc 2013-09-01 00:22:00.000000000 +0300
+@@ -2,8 +2,6 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
+-#include <resolv.h>
+-
+ #include "base/sys_byteorder.h"
+ #include "net/dns/dns_config_service_posix.h"
+
Added: trunk/www/chromium/files/patch-net__dns__dns_session.cc
===================================================================
--- trunk/www/chromium/files/patch-net__dns__dns_session.cc (rev 0)
+++ trunk/www/chromium/files/patch-net__dns__dns_session.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- net/dns/dns_session.cc.orig 2013-08-19 01:54:01.000000000 +0200
++++ net/dns/dns_session.cc 2013-08-26 12:42:02.000000000 +0200
+@@ -176,7 +176,7 @@
+ base::TimeDelta current_error = rtt - estimate;
+ estimate += current_error / 8; // * alpha
+ base::TimeDelta abs_error = base::TimeDelta::FromInternalValue(
+- std::abs(current_error.ToInternalValue()));
++ std::labs(current_error.ToInternalValue()));
+ deviation += (abs_error - deviation) / 4; // * delta
+
+ // Histogram-based method.
Added: trunk/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc (rev 0)
+++ trunk/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,13 @@
+--- net/http/http_auth_gssapi_posix.cc.orig 2013-09-02 22:50:25.000000000 +0300
++++ net/http/http_auth_gssapi_posix.cc 2013-09-02 22:52:13.000000000 +0300
+@@ -430,8 +430,8 @@
+ static const char* const kDefaultLibraryNames[] = {
+ #if defined(OS_MACOSX)
+ "libgssapi_krb5.dylib" // MIT Kerberos
+-#elif defined(OS_OPENBSD)
+- "libgssapi.so" // Heimdal - OpenBSD
++#elif defined(OS_BSD)
++ "libgssapi.so" // Heimdal - OpenBSD / FreeBSD
+ #else
+ "libgssapi_krb5.so.2", // MIT Kerberos - FC, Suse10, Debian
+ "libgssapi.so.4", // Heimdal - Suse10, MDK
Modified: trunk/www/chromium/files/patch-net__net.gyp
===================================================================
--- trunk/www/chromium/files/patch-net__net.gyp 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-net__net.gyp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,6 +1,6 @@
---- net/net.gyp.orig 2012-09-25 16:01:38.000000000 +0300
-+++ net/net.gyp 2012-10-01 20:04:49.000000000 +0300
-@@ -943,9 +943,10 @@
+--- net/net.gyp.orig 2013-09-20 05:36:19.000000000 +0300
++++ net/net.gyp 2013-09-23 20:45:35.000000000 +0300
+@@ -1283,9 +1283,10 @@
}],
['os_bsd==1', {
'sources!': [
@@ -12,3 +12,24 @@
],
},{
'dependencies': [
+@@ -1865,7 +1866,7 @@
+ 'websockets/websocket_throttle_unittest.cc',
+ ],
+ 'conditions': [
+- ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
++ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and os_bsd != 1', {
+ 'dependencies': [
+ 'quic_library',
+ 'flip_in_mem_edsm_server_library',
+@@ -2140,6 +2141,11 @@
+ 'cert/x509_cert_types_unittest.cc',
+ ],
+ }],
++ [ 'os_bsd == 1', {
++ 'sources!': [
++ 'base/address_tracker_linux_unittest.cc',
++ ],
++ }],
+ ],
+ },
+ {
Property changes on: trunk/www/chromium/files/patch-net__net.gyp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,6 +1,6 @@
---- net/proxy/proxy_config_service_linux.cc.orig 2012-04-25 10:01:34.000000000 +0300
-+++ net/proxy/proxy_config_service_linux.cc 2012-04-29 21:37:33.000000000 +0300
-@@ -18,7 +18,13 @@
+--- net/proxy/proxy_config_service_linux.cc.orig 2013-08-22 10:48:23.000000000 +0300
++++ net/proxy/proxy_config_service_linux.cc 2013-08-22 14:41:23.000000000 +0300
+@@ -12,7 +12,13 @@
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
@@ -14,7 +14,7 @@
#include <unistd.h>
#include <map>
-@@ -907,9 +913,10 @@
+@@ -845,9 +851,10 @@
public base::MessagePumpLibevent::Watcher {
public:
explicit SettingGetterImplKDE(base::Environment* env_var_getter)
@@ -21,30 +21,26 @@
- : inotify_fd_(-1), notify_delegate_(NULL), indirect_manual_(false),
- auto_no_pac_(false), reversed_bypass_list_(false),
- env_var_getter_(env_var_getter), file_loop_(NULL) {
-+ : config_fd_(-1), inotify_fd_(-1), notify_delegate_(NULL),
-+ indirect_manual_(false), auto_no_pac_(false),
++ : inotify_fd_(-1), config_fd_(-1), notify_delegate_(NULL),
++ indirect_manual_(false), auto_no_pac_(false),
+ reversed_bypass_list_(false), env_var_getter_(env_var_getter),
+ file_loop_(NULL) {
// This has to be called on the UI thread (http://crbug.com/69057).
base::ThreadRestrictions::ScopedAllowIO allow_io;
-@@ -972,9 +979,14 @@
- // task is left pending on the file loop after the loop was quit,
+@@ -911,9 +918,10 @@
// and pending tasks may then be deleted without being run.
// Here in the KDE version, we can safely close the file descriptor
-- // anyway. (Not that it really matters; the process is exiting.)
-+ // anyway. (Not that it really matters; the process is exiting.)
-+ if(config_fd_ >= 0) {
-+ close(config_fd_);
-+ config_fd_ = -1;
-+ }
- if (inotify_fd_ >= 0)
+ // anyway. (Not that it really matters; the process is exiting.)
+- if (inotify_fd_ >= 0)
++ if (inotify_fd_ >= 0 || config_fd_ >= 0)
ShutDown();
+ DCHECK(inotify_fd_ < 0);
+ DCHECK(config_fd_ < 0);
- DCHECK(inotify_fd_ < 0);
}
-@@ -983,18 +995,25 @@
+ virtual bool Init(base::SingleThreadTaskRunner* glib_thread_task_runner,
+@@ -921,11 +929,21 @@
// This has to be called on the UI thread (http://crbug.com/69057).
base::ThreadRestrictions::ScopedAllowIO allow_io;
DCHECK(inotify_fd_ < 0);
@@ -54,15 +50,19 @@
inotify_fd_ = inotify_init();
+#endif
if (inotify_fd_ < 0) {
++#if defined(OS_FREEBSD)
++ PLOG(ERROR) << "kqueue failed";
++#else
PLOG(ERROR) << "inotify_init failed";
++#endif
return false;
}
++
+#if !defined(OS_FREEBSD)
int flags = fcntl(inotify_fd_, F_GETFL);
-+ // This call returns ENOTTY on FreeBSD.
if (fcntl(inotify_fd_, F_SETFL, flags | O_NONBLOCK) < 0) {
PLOG(ERROR) << "fcntl failed";
- close(inotify_fd_);
+@@ -933,6 +951,7 @@
inotify_fd_ = -1;
return false;
}
@@ -70,37 +70,49 @@
file_loop_ = file_loop;
// The initial read is done on the current thread, not |file_loop_|,
// since we will need to have it for SetUpAndFetchInitialConfig().
-@@ -1014,6 +1033,18 @@
- bool SetUpNotifications(ProxyConfigServiceLinux::Delegate* delegate) {
+@@ -947,20 +966,38 @@
+ close(inotify_fd_);
+ inotify_fd_ = -1;
+ }
++ if (config_fd_ >= 0) {
++ close(config_fd_);
++ config_fd_ = -1;
++ }
+ }
+
+ virtual bool SetUpNotifications(
+ ProxyConfigServiceLinux::Delegate* delegate) OVERRIDE {
DCHECK(inotify_fd_ >= 0);
- DCHECK(MessageLoop::current() == file_loop_);
++ DCHECK(config_fd_ >= 0);
+ DCHECK(base::MessageLoop::current() == file_loop_);
+ // We can't just watch the kioslaverc file directly, since KDE will write
+ // a new copy of it and then rename it whenever settings are changed and
+ // inotify watches inodes (so we'll be watching the old deleted file after
+ // the first change, and it will never change again). So, we watch the
+ // directory instead. We then act only on changes to the kioslaverc entry.
+#if defined(OS_FREEBSD)
-+ config_fd_ = open(kde_config_dir_.value().c_str(), O_RDONLY);
++ config_fd_ = HANDLE_EINTR(open(kde_config_dir_.value().c_str(), O_RDONLY));
+
+ if (config_fd_ == -1)
+ return false;
+
+ struct kevent ev;
-+ EV_SET(&ev, config_fd_, EVFILT_VNODE,
-+ (EV_ADD | EV_CLEAR), NOTE_WRITE, 0, NULL);
++ EV_SET(&ev, config_fd_, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_WRITE,
++ 0, NULL);
+ if (kevent(inotify_fd_, &ev, 1, NULL, 0, NULL) == -1)
+ return false;
+#else
- // We can't just watch the kioslaverc file directly, since KDE will write
- // a new copy of it and then rename it whenever settings are changed and
- // inotify watches inodes (so we'll be watching the old deleted file after
-@@ -1022,6 +1053,7 @@
if (inotify_add_watch(inotify_fd_, kde_config_dir_.value().c_str(),
IN_MODIFY | IN_MOVED_TO) < 0)
return false;
+#endif
notify_delegate_ = delegate;
- if (!file_loop_->WatchFileDescriptor(inotify_fd_, true,
- MessageLoopForIO::WATCH_READ, &inotify_watcher_, this))
-@@ -1039,7 +1071,23 @@
- void OnFileCanReadWithoutBlocking(int fd) {
+ if (!file_loop_->WatchFileDescriptor(inotify_fd_,
+ true,
+@@ -981,7 +1018,19 @@
+ virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE {
DCHECK_EQ(fd, inotify_fd_);
- DCHECK(MessageLoop::current() == file_loop_);
+ DCHECK(base::MessageLoop::current() == file_loop_);
+#if defined(OS_FREEBSD)
+ struct kevent ev;
+ int rv = kevent(inotify_fd_, NULL, 0, &ev, 1, NULL);
@@ -109,36 +121,28 @@
+ OnChangeNotification();
+ } else {
+ LOG(ERROR) << "kevent() failure; no longer watching kioslaverc!";
-+ inotify_watcher_.StopWatchingFileDescriptor();
-+ close(config_fd_);
-+ config_fd_ = -1;
-+ close(inotify_fd_);
-+ inotify_fd_ = -1;
++ ShutDown();
+ }
+#else
OnChangeNotification();
+#endif
}
- void OnFileCanWriteWithoutBlocking(int fd) {
+ virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE {
NOTREACHED();
-@@ -1317,10 +1365,14 @@
- // from the inotify file descriptor and starts up a debounce timer if
- // an event for kioslaverc is seen.
+@@ -1260,8 +1309,11 @@
void OnChangeNotification() {
-+ DCHECK_GE(config_fd_, 0);
DCHECK_GE(inotify_fd_, 0);
-- DCHECK(MessageLoop::current() == file_loop_);
+ DCHECK(base::MessageLoop::current() == file_loop_);
- char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4];
-+ DCHECK(MessageLoop::current() == file_loop_);
bool kioslaverc_touched = false;
-+ #if defined(OS_FREEBSD)
-+ kioslaverc_touched = true;
-+ #else
++#if defined(OS_BSD)
++ kioslaverc_touched = true;
++#else
+ char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4];
ssize_t r;
while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) {
// inotify returns variable-length structures, which is why we have
-@@ -1357,6 +1409,7 @@
+@@ -1298,6 +1350,7 @@
inotify_fd_ = -1;
}
}
@@ -146,11 +150,11 @@
if (kioslaverc_touched) {
// We don't use Reset() because the timer may not yet be running.
// (In that case Stop() is a no-op.)
-@@ -1371,6 +1424,7 @@
- typedef std::map<StringListSetting,
+@@ -1313,6 +1366,7 @@
std::vector<std::string> > strings_map_type;
-+ int config_fd_;
int inotify_fd_;
++ int config_fd_;
base::MessagePumpLibevent::FileDescriptorWatcher inotify_watcher_;
ProxyConfigServiceLinux::Delegate* notify_delegate_;
+ base::OneShotTimer<SettingGetterImplKDE> debounce_timer_;
Property changes on: trunk/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/chromium/files/patch-net__proxy__proxy_service.cc
===================================================================
--- trunk/www/chromium/files/patch-net__proxy__proxy_service.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-net__proxy__proxy_service.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,15 +1,15 @@
---- net/proxy/proxy_service.cc.orig 2012-05-30 10:01:26.000000000 +0300
-+++ net/proxy/proxy_service.cc 2012-06-05 22:28:13.000000000 +0300
-@@ -38,7 +38,7 @@
+--- net/proxy/proxy_service.cc.orig 2013-08-09 22:05:31.000000000 +0300
++++ net/proxy/proxy_service.cc 2013-08-19 21:08:08.000000000 +0300
+@@ -39,7 +39,7 @@
#elif defined(OS_MACOSX)
#include "net/proxy/proxy_config_service_mac.h"
#include "net/proxy/proxy_resolver_mac.h"
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
#include "net/proxy/proxy_config_service_linux.h"
- #endif
-
-@@ -1429,7 +1429,7 @@
+ #elif defined(OS_ANDROID)
+ #include "net/proxy/proxy_config_service_android.h"
+@@ -1347,7 +1347,7 @@
<< "profile_io_data.cc::CreateProxyConfigService and this should "
<< "be used only for examples.";
return new UnsetProxyConfigService;
Property changes on: trunk/www/chromium/files/patch-net__proxy__proxy_service.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/chromium/files/patch-net__socket__socks5_client_socket.cc
===================================================================
--- trunk/www/chromium/files/patch-net__socket__socks5_client_socket.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-net__socket__socks5_client_socket.cc 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-net__socket__socks5_client_socket.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h
===================================================================
--- trunk/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h (rev 0)
+++ trunk/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,12 @@
+--- net/socket/tcp_listen_socket_unittest.h.orig 2013-09-01 00:30:34.000000000 +0300
++++ net/socket/tcp_listen_socket_unittest.h 2013-09-01 00:31:11.000000000 +0300
+@@ -13,6 +13,9 @@
+ #include <arpa/inet.h>
+ #include <errno.h>
+ #include <sys/socket.h>
++#if defined(OS_BSD)
++#include <netinet/in.h>
++#endif
+ #endif
+
+ #include "base/basictypes.h"
Added: trunk/www/chromium/files/patch-net__spdy__spdy_priority_forest.h
===================================================================
--- trunk/www/chromium/files/patch-net__spdy__spdy_priority_forest.h (rev 0)
+++ trunk/www/chromium/files/patch-net__spdy__spdy_priority_forest.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,10 @@
+--- net/spdy/spdy_priority_forest.h.orig 2013-09-28 19:11:06.000000000 +0200
++++ net/spdy/spdy_priority_forest.h 2013-10-10 14:59:28.000000000 +0200
+@@ -7,6 +7,7 @@
+
+ #include <map>
+ #include <set>
++#include <vector>
+
+ #include "base/basictypes.h"
+ #include "base/containers/hash_tables.h"
Added: trunk/www/chromium/files/patch-net__udp__udp_socket_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-net__udp__udp_socket_unittest.cc (rev 0)
+++ trunk/www/chromium/files/patch-net__udp__udp_socket_unittest.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- net/udp/udp_socket_unittest.cc.orig 2013-09-01 17:50:31.000000000 +0300
++++ net/udp/udp_socket_unittest.cc 2013-09-01 17:50:50.000000000 +0300
+@@ -202,7 +202,7 @@
+ client_entries, 5, NetLog::TYPE_SOCKET_ALIVE));
+ }
+
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ // UDPSocketPrivate_Broadcast is disabled for OSX because it requires
+ // root permissions on OSX 10.7+.
+ TEST_F(UDPSocketTest, DISABLED_Broadcast) {
Index: trunk/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc
===================================================================
--- trunk/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-remoting__remoting.gyp
===================================================================
--- trunk/www/chromium/files/patch-remoting__remoting.gyp (rev 0)
+++ trunk/www/chromium/files/patch-remoting__remoting.gyp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,20 @@
+--- remoting/remoting.gyp.orig 2013-08-09 19:06:51.000000000 +0000
++++ remoting/remoting.gyp 2013-08-12 21:21:56.000000000 +0000
+@@ -53,7 +53,7 @@
+
+ 'conditions': [
+ # Remoting host is supported only on Windows, OSX and Linux (with X11).
+- ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', {
++ ['OS=="win" or OS=="mac" or OS=="freebsd" or (OS=="linux" and chromeos==0 and use_x11==1)', {
+ 'enable_remoting_host': 1,
+ }, {
+ 'enable_remoting_host': 0,
+@@ -484,7 +484,7 @@
+ 'host/win/wts_terminal_observer.h',
+ ],
+ 'conditions': [
+- ['OS=="linux"', {
++ ['OS=="linux" or os_bsd==1', {
+ 'dependencies': [
+ # Always use GTK on Linux, even for Aura builds.
+ #
Added: trunk/www/chromium/files/patch-skia__skia_library.gypi
===================================================================
--- trunk/www/chromium/files/patch-skia__skia_library.gypi (rev 0)
+++ trunk/www/chromium/files/patch-skia__skia_library.gypi 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- skia/skia_library.gypi.orig 2013-09-03 22:15:35.743627150 +0300
++++ skia/skia_library.gypi 2013-09-03 22:17:46.187628519 +0300
+@@ -193,7 +193,7 @@
+ }],
+
+ #Settings for text blitting, chosen to approximate the system browser.
+- [ 'OS == "linux"', {
++ [ 'OS == "linux" or os_bsd == 1', {
+ 'defines': [
+ 'SK_GAMMA_EXPONENT=1.2',
+ 'SK_GAMMA_CONTRAST=0.2',
Added: trunk/www/chromium/files/patch-sync__util__get_session_name.cc
===================================================================
--- trunk/www/chromium/files/patch-sync__util__get_session_name.cc (rev 0)
+++ trunk/www/chromium/files/patch-sync__util__get_session_name.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,20 @@
+--- sync/util/get_session_name.cc.orig 2014-01-07 21:02:32.000000000 +0100
++++ sync/util/get_session_name.cc 2014-01-11 02:17:44.000000000 +0100
+@@ -11,7 +11,7 @@
+ #include "base/sys_info.h"
+ #include "base/task_runner.h"
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "sync/util/get_session_name_linux.h"
+ #elif defined(OS_IOS)
+ #include "sync/util/get_session_name_ios.h"
+@@ -36,7 +36,7 @@
+ // like "stumpy-signed-mp-v2keys" etc. The information can be checked on
+ // "CHROMEOS_RELEASE_BOARD" line in chrome://system.
+ session_name = board.substr(0, 6) == "stumpy" ? "Chromebox" : "Chromebook";
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ session_name = internal::GetHostname();
+ #elif defined(OS_IOS)
+ session_name = internal::GetComputerName();
Added: trunk/www/chromium/files/patch-sync__util__get_session_name_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-sync__util__get_session_name_linux.cc (rev 0)
+++ trunk/www/chromium/files/patch-sync__util__get_session_name_linux.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,14 @@
+--- sync/util/get_session_name_linux.cc.orig 2013-08-16 23:53:51.000000000 +0300
++++ sync/util/get_session_name_linux.cc 2013-08-16 23:56:00.000000000 +0300
+@@ -13,8 +13,9 @@
+ namespace internal {
+
+ std::string GetHostname() {
+- char hostname[HOST_NAME_MAX];
+- if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success.
++ int len = sysconf(_SC_HOST_NAME_MAX);
++ char hostname[len];
++ if (gethostname(hostname, len) == 0) // Success.
+ return hostname;
+ return base::GetLinuxDistro();
+ }
Modified: trunk/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
===================================================================
--- trunk/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,21 +1,29 @@
---- testing/gtest/include/gtest/internal/gtest-port.h.orig 2011-09-15 00:02:57.000000000 +0300
-+++ testing/gtest/include/gtest/internal/gtest-port.h 2011-09-14 23:56:19.000000000 +0300
-@@ -229,6 +229,9 @@
- # ifdef ANDROID
- # define GTEST_OS_LINUX_ANDROID 1
- # endif // ANDROID
+--- testing/gtest/include/gtest/internal/gtest-port.h.orig 2013-08-19 02:58:58.000000000 +0300
++++ testing/gtest/include/gtest/internal/gtest-port.h 2013-08-30 19:49:05.000000000 +0300
+@@ -261,6 +261,8 @@
+ # define GTEST_OS_NACL 1
+ #elif defined __OpenBSD__
+ # define GTEST_OS_OPENBSD 1
+#elif defined __FreeBSD__
-+# define GTEST_OS_LINUX 1
+# define GTEST_OS_FREEBSD 1
- #elif defined __MVS__
- # define GTEST_OS_ZOS 1
- #elif defined(__sun) && defined(__SVR4)
-@@ -505,7 +508,7 @@
- #ifndef GTEST_HAS_CLONE
- // The user didn't tell us, so we need to figure it out.
+ #elif defined __QNX__
+ # define GTEST_OS_QNX 1
+ #endif // __CYGWIN__
+@@ -473,7 +475,7 @@
+ // To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
+ // to your compiler flags.
+ # define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX \
+- || GTEST_OS_QNX)
++ || GTEST_OS_QNX || GTEST_OS_FREEBSD)
+ #endif // GTEST_HAS_PTHREAD
--# if GTEST_OS_LINUX && !defined(__ia64__)
-+# if GTEST_OS_LINUX && !GTEST_OS_FREEBSD && !defined(__ia64__)
- # define GTEST_HAS_CLONE 1
- # else
- # define GTEST_HAS_CLONE 0
+ #if GTEST_HAS_PTHREAD
+@@ -642,7 +644,7 @@
+ (GTEST_OS_MAC && !GTEST_OS_IOS) || GTEST_OS_IOS_SIMULATOR || \
+ (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
+ GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
+- GTEST_OS_OPENBSD || GTEST_OS_QNX)
++ GTEST_OS_OPENBSD || GTEST_OS_FREEBSD || GTEST_OS_QNX)
+ # define GTEST_HAS_DEATH_TEST 1
+ # include <vector> // NOLINT
+ #endif
Property changes on: trunk/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/chromium/files/patch-testing__gtest__src__gtest.cc
===================================================================
--- trunk/www/chromium/files/patch-testing__gtest__src__gtest.cc 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-testing__gtest__src__gtest.cc 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-testing__gtest__src__gtest.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi (rev 0)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/build/features.gypi.orig 2013-08-30 06:55:03.000000000 +0300
++++ third_party/WebKit/Source/build/features.gypi 2013-09-03 22:27:08.777629842 +0300
+@@ -94,7 +94,7 @@
+ 'ENABLE_WEB_AUDIO=1',
+ ],
+ }],
+- ['OS=="win" or OS=="android" or OS=="linux"', {
++ ['OS=="win" or OS=="android" or OS=="linux" or os_bsd==1', {
+ 'feature_defines': [
+ 'ENABLE_OPENTYPE_VERTICAL=1',
+ ],
Added: trunk/www/chromium/files/patch-third_party__WebKit__Source__config.h
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__config.h (rev 0)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__config.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,10 @@
+--- third_party/WebKit/Source/config.h.orig 2013-11-08 07:50:10.000000000 +0100
++++ third_party/WebKit/Source/config.h 2013-11-15 16:58:16.000000000 +0100
+@@ -167,6 +167,6 @@
+ #define __STDC_FORMAT_MACROS 1
+ #endif
+
+-#if OS(LINUX) || OS(ANDROID) || ENABLE(HARFBUZZ_ON_WINDOWS)
++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) || ENABLE(HARFBUZZ_ON_WINDOWS)
+ #define WTF_USE_HARFBUZZ 1
+ #endif
Added: trunk/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,29 @@
+--- third_party/WebKit/Source/core/core.gyp.orig 2013-08-09 19:15:52.000000000 +0000
++++ third_party/WebKit/Source/core/core.gyp 2013-08-12 21:31:28.000000000 +0000
+@@ -593,7 +593,7 @@
+ ['exclude', 'platform/Theme\\.cpp$'],
+ ],
+ 'conditions': [
+- ['OS!="linux"', {
++ ['OS!="linux" and os_bsd!=1', {
+ 'sources/': [
+ ['exclude', 'Linux\\.cpp$'],
+ ],
+@@ -946,7 +946,7 @@
+ # Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable.
+ 'cflags': ['-Wno-uninitialized'],
+ }],
+- ['OS != "linux"', {
++ ['OS != "linux" and os_bsd != 1', {
+ 'sources/': [
+ ['exclude', 'Linux\\.cpp$'],
+ ],
+@@ -991,7 +991,7 @@
+ ['OS=="win" and buildtype=="Official"', {
+ 'msvs_shard': 19,
+ }],
+- ['OS != "linux"', {
++ ['OS != "linux" and os_bsd != 1', {
+ 'sources/': [
+ ['exclude', 'Linux\\.cpp$'],
+ ],
Added: trunk/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,20 @@
+--- third_party/WebKit/Source/platform/blink_platform.gyp.orig 2014-02-20 21:32:30.000000000 +0100
++++ third_party/WebKit/Source/platform/blink_platform.gyp 2014-02-25 01:06:25.000000000 +0100
+@@ -196,7 +196,7 @@
+ # compiler optimizations, see crbug.com/237063
+ 'msvs_disabled_warnings': [ 4267, 4334, 4724 ],
+ 'conditions': [
+- ['OS=="linux" or OS=="android"', {
++ ['OS=="linux" or OS=="android" or OS=="freebsd"', {
+ 'sources/': [
+ # Cherry-pick files excluded by the broader regular expressions above.
+ ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'],
+@@ -304,7 +304,7 @@
+ ['exclude', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'],
+ ],
+ }],
+- ['OS != "linux" and OS != "mac" and (OS != "win" or (OS == "win" and "ENABLE_GDI_FONTS_ON_WINDOWS=1" in feature_defines))', {
++ ['OS != "linux" and OS != "freebsd" and OS != "mac" and (OS != "win" or (OS == "win" and "ENABLE_GDI_FONTS_ON_WINDOWS=1" in feature_defines))', {
+ 'sources/': [
+ ['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
+ ],
Added: trunk/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,13 @@
+--- third_party/WebKit/Source/testing/runner/WebAXObjectProxy.cpp.orig 2014-01-07 21:06:22.000000000 +0100
++++ third_party/WebKit/Source/testing/runner/WebAXObjectProxy.cpp 2014-01-13 13:22:53.000000000 +0100
+@@ -36,6 +36,10 @@
+ #include "public/platform/WebRect.h"
+ #include "public/platform/WebString.h"
+
++#if defined(OS_FREEBSD)
++#include <stdlib.h> // atoi()
++#endif
++
+ using namespace blink;
+ using namespace std;
+
Added: trunk/www/chromium/files/patch-third_party__WebKit__Source__testing__testing.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__testing__testing.gyp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__testing__testing.gyp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,15 @@
+--- third_party/WebKit/Source/testing/testing.gyp.orig 2013-09-03 23:36:08.000000000 +0300
++++ third_party/WebKit/Source/testing/testing.gyp 2013-09-03 23:37:05.000000000 +0300
+@@ -339,5 +339,12 @@
+ },
+ },
+ }],
++ ['OS=="freebsd"', {
++ 'target_defaults': {
++ 'include_dirs': [
++ '/usr/local/include',
++ ],
++ },
++ }],
+ ], # conditions
+ }
Added: trunk/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,22 @@
+--- third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp.orig 2014-01-07 21:06:23.000000000 +0100
++++ third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp 2014-01-11 00:54:01.000000000 +0100
+@@ -40,6 +40,8 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
+
++#include <cstdlib>
++
+ #include "wtf/Assertions.h"
+
+ namespace {
+@@ -65,8 +67,8 @@
+ "gtk-double-click-time", &doubleClickTime,
+ "gtk-double-click-distance", &doubleClickDistance, NULL);
+ return (time - gLastClickTime) > doubleClickTime
+- || abs(x - gLastClickX) > doubleClickDistance
+- || abs(y - gLastClickY) > doubleClickDistance;
++ || std::abs(x - gLastClickX) > doubleClickDistance
++ || std::abs(y - gLastClickY) > doubleClickDistance;
+ }
+
+ void resetClickCountState()
Added: trunk/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,20 @@
+--- third_party/WebKit/Source/web/linux/WebFontRendering.cpp.orig 2014-02-20 21:32:26.000000000 +0100
++++ third_party/WebKit/Source/web/linux/WebFontRendering.cpp 2014-02-25 00:44:05.000000000 +0100
+@@ -34,7 +34,7 @@
+ #include "platform/fonts/FontDescription.h"
+ #include "platform/fonts/FontPlatformData.h"
+
+-#if OS(LINUX)
++#if OS(LINUX) || OS(FREEBSD)
+ #include "public/platform/linux/WebFontInfo.h"
+ #endif
+
+@@ -77,7 +77,7 @@
+ void WebFontRendering::setSubpixelPositioning(bool useSubpixelPositioning)
+ {
+ FontDescription::setSubpixelPositioning(useSubpixelPositioning);
+-#if OS(LINUX)
++#if OS(LINUX) || OS(FREEBSD)
+ WebFontInfo::setSubpixelPositioning(useSubpixelPositioning);
+ #endif
+ }
Added: trunk/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/web/web.gyp.orig 2013-07-15 19:48:12.000000000 +0300
++++ third_party/WebKit/Source/web/web.gyp 2013-07-15 19:48:46.000000000 +0300
+@@ -142,7 +142,7 @@
+ },
+ },
+ }],
+- ['OS == "linux"', {
++ ['OS == "linux" or os_bsd == 1', {
+ 'dependencies': [
+ '<(DEPTH)/build/linux/system.gyp:fontconfig',
+ ],
Added: trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,10 @@
+--- third_party/WebKit/Source/wtf/Assertions.cpp.orig 2013-09-28 19:19:20.000000000 +0200
++++ third_party/WebKit/Source/wtf/Assertions.cpp 2013-10-10 11:45:33.000000000 +0200
+@@ -37,6 +37,7 @@
+ #include "Compiler.h"
+ #include "OwnArrayPtr.h"
+
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <string.h>
Added: trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h (rev 0)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,23 @@
+--- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2014-02-20 21:32:28.000000000 +0100
++++ third_party/WebKit/Source/wtf/ByteSwap.h 2014-02-24 17:55:43.000000000 +0100
+@@ -52,14 +52,20 @@
+
+ #else
+
++#ifndef bswap64
+ ALWAYS_INLINE uint64_t bswap64(uint64_t x) { return __builtin_bswap64(x); }
++#endif
++#ifndef bswap32
+ ALWAYS_INLINE uint32_t bswap32(uint32_t x) { return __builtin_bswap32(x); }
++#endif
+ // GCC 4.6 lacks __builtin_bswap16. Newer versions have it but we support 4.6.
++#ifndef bswap16
+ #if COMPILER(CLANG)
+ ALWAYS_INLINE uint16_t bswap16(uint16_t x) { return __builtin_bswap16(x); }
+ #else
+ inline uint16_t bswap16(uint16_t x) { return ((x & 0xff00) >> 8) | ((x & 0x00ff) << 8); }
+ #endif
++#endif
+
+ #endif
+
Added: trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,28 @@
+--- third_party/WebKit/Source/wtf/DateMath.cpp.orig 2013-11-08 07:50:10.000000000 +0100
++++ third_party/WebKit/Source/wtf/DateMath.cpp 2013-11-15 12:55:05.000000000 +0100
+@@ -80,6 +80,7 @@
+ #include "StringExtras.h"
+
+ #include <algorithm>
++#include <cstdlib>
+ #include <limits.h>
+ #include <limits>
+ #include <math.h>
+@@ -785,7 +786,7 @@
+ return std::numeric_limits<double>::quiet_NaN();
+
+ int sgn = (o < 0) ? -1 : 1;
+- o = abs(o);
++ o = std::abs(o);
+ if (*dateString != ':') {
+ if (o >= 24)
+ offset = ((o / 100) * 60 + (o % 100)) * sgn;
+@@ -874,7 +875,7 @@
+ stringBuilder.append(' ');
+
+ stringBuilder.append(utcOffset > 0 ? '+' : '-');
+- int absoluteUTCOffset = abs(utcOffset);
++ int absoluteUTCOffset = std::abs(utcOffset);
+ stringBuilder.append(twoDigitStringFromNumber(absoluteUTCOffset / 60));
+ stringBuilder.append(twoDigitStringFromNumber(absoluteUTCOffset % 60));
+
Index: trunk/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c
===================================================================
--- trunk/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-third_party__libjingle__libjingle.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__libjingle__libjingle.gyp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__libjingle__libjingle.gyp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,20 @@
+--- third_party/libjingle/libjingle.gyp.orig 2013-08-09 22:05:45.000000000 +0300
++++ third_party/libjingle/libjingle.gyp 2013-08-18 00:43:44.000000000 +0300
+@@ -532,7 +532,7 @@
+ '<(libjingle_source)/talk/base/unixfilesystem.h',
+ ],
+ }],
+- ['OS=="linux"', {
++ ['OS=="linux" or os_bsd==1', {
+ 'sources': [
+ '<(libjingle_source)/talk/base/latebindingsymboltable.cc',
+ '<(libjingle_source)/talk/base/latebindingsymboltable.h',
+@@ -772,7 +772,7 @@
+ ],
+ }],
+ # TODO(mallinath) - Enable SCTP for iOS.
+- ['OS!="ios"', {
++ ['OS!="ios" and os_bsd!=1', {
+ 'defines': [
+ ['HAVE_SCTP',
+ ],
Added: trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc
===================================================================
--- trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc (rev 0)
+++ trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,48 @@
+--- third_party/libjingle/source/talk/base/cpumonitor.cc.orig 2014-01-07 21:03:06.000000000 +0100
++++ third_party/libjingle/source/talk/base/cpumonitor.cc 2014-01-13 02:01:01.000000000 +0100
+@@ -52,13 +52,13 @@
+ #include <mach/task.h>
+ #endif // defined(IOS) || defined(OSX)
+
+-#if defined(LINUX) || defined(ANDROID)
++#if defined(LINUX) || defined(ANDROID) || defined(BSD)
+ #include <sys/resource.h>
+ #include <errno.h>
+ #include <stdio.h>
+ #include "talk/base/fileutils.h"
+ #include "talk/base/pathutils.h"
+-#endif // defined(LINUX) || defined(ANDROID)
++#endif // defined(LINUX) || defined(ANDROID) || defined(BSD)
+
+ #if defined(IOS) || defined(OSX)
+ static uint64 TimeValueTToInt64(const time_value_t &time_value) {
+@@ -281,6 +281,11 @@
+ const uint64 cpu_times = nice + system + user;
+ const uint64 total_times = cpu_times + idle;
+ #endif // defined(LINUX) || defined(ANDROID)
++#if defined(BSD)
++ const uint64 cpu_times = 0;
++ const uint64 total_times = 0;
++ return 0.f;
++#endif
+
+ #if defined(__native_client__)
+ // TODO(ryanpetrie): Implement this via PPAPI when it's available.
+@@ -355,7 +360,7 @@
+ TimeValueTToInt64(task_term_info.system_time));
+ #endif // defined(IOS) || defined(OSX)
+
+-#if defined(LINUX) || defined(ANDROID)
++#if defined(LINUX) || defined(ANDROID) || defined(BSD)
+ rusage usage;
+ if (getrusage(RUSAGE_SELF, &usage) < 0) {
+ LOG_ERR(LS_ERROR) << "getrusage failed";
+@@ -365,7 +370,7 @@
+ const uint64 cpu_times =
+ (usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) * kNumMicrosecsPerSec +
+ usage.ru_utime.tv_usec + usage.ru_stime.tv_usec;
+-#endif // defined(LINUX) || defined(ANDROID)
++#endif // defined(LINUX) || defined(ANDROID) || defined(BSD)
+
+ #if defined(__native_client__)
+ // TODO(ryanpetrie): Implement this via PPAPI when it's available.
Index: trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h
===================================================================
--- trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc
===================================================================
--- trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc (rev 0)
+++ trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,17 @@
+--- third_party/libjingle/source/talk/base/linux.cc.orig 2013-07-15 17:38:04.000000000 +0300
++++ third_party/libjingle/source/talk/base/linux.cc 2013-07-15 17:39:04.000000000 +0300
+@@ -25,7 +25,7 @@
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+-#if defined(LINUX) || defined(ANDROID)
++#if defined(LINUX) || defined(ANDROID) || defined(BSD)
+ #include "talk/base/linux.h"
+
+ #include <ctype.h>
+@@ -279,4 +279,4 @@
+
+ } // namespace talk_base
+
+-#endif // defined(LINUX) || defined(ANDROID)
++#endif // defined(LINUX) || defined(ANDROID) || defined(BSD)
Added: trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h
===================================================================
--- trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h (rev 0)
+++ trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,18 @@
+--- third_party/libjingle/source/talk/base/linux.h.orig 2013-07-15 17:36:34.000000000 +0300
++++ third_party/libjingle/source/talk/base/linux.h 2013-07-15 17:37:47.000000000 +0300
+@@ -28,7 +28,7 @@
+ #ifndef TALK_BASE_LINUX_H_
+ #define TALK_BASE_LINUX_H_
+
+-#if defined(LINUX) || defined(ANDROID)
++#if defined(LINUX) || defined(ANDROID) || defined(BSD)
+ #include <string>
+ #include <map>
+ #include <vector>
+@@ -131,5 +131,5 @@
+
+ } // namespace talk_base
+
+-#endif // defined(LINUX) || defined(ANDROID)
++#endif // defined(LINUX) || defined(ANDROID) || defined(BSD)
+ #endif // TALK_BASE_LINUX_H_
Added: trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h
===================================================================
--- trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h (rev 0)
+++ trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,13 @@
+--- third_party/libjingle/source/talk/base/network.h.orig 2013-05-26 21:44:12.257312749 +0200
++++ third_party/libjingle/source/talk/base/network.h 2013-05-26 21:45:08.869297313 +0200
+@@ -38,6 +38,10 @@
+ #include "talk/base/messagehandler.h"
+ #include "talk/base/sigslot.h"
+
++#if defined(OS_FREEBSD)
++#include <sys/types.h>
++#endif
++
+ #if defined(POSIX)
+ struct ifaddrs;
+ #endif // defined(POSIX)
Added: trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc
===================================================================
--- trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc (rev 0)
+++ trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,20 @@
+--- third_party/libjingle/source/talk/base/systeminfo.cc.orig 2013-09-03 03:20:59.000000000 -0400
++++ third_party/libjingle/source/talk/base/systeminfo.cc 2013-09-12 15:47:30.000000000 -0400
+@@ -36,7 +36,7 @@
+ #elif defined(OSX)
+ #include <ApplicationServices/ApplicationServices.h>
+ #include <CoreServices/CoreServices.h>
+-#elif defined(LINUX) || defined(ANDROID)
++#elif defined(LINUX) || defined(ANDROID) || defined(BSD)
+ #include <unistd.h>
+ #endif
+ #if defined(OSX) || defined(IOS)
+@@ -48,7 +48,7 @@
+ #include "talk/base/win32.h"
+ #elif defined(OSX)
+ #include "talk/base/macconversion.h"
+-#elif defined(LINUX) || defined(ANDROID)
++#elif defined(LINUX) || defined(ANDROID) || defined(BSD)
+ #include "talk/base/linux.h"
+ #endif
+ #include "talk/base/common.h"
Index: trunk/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/chromium/files/patch-third_party__libusb__libusb.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__libusb__libusb.gyp 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-third_party__libusb__libusb.gyp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,48 +1,22 @@
---- third_party/libusb/libusb.gyp.orig 2012-08-27 06:35:03.000000000 +0300
-+++ third_party/libusb/libusb.gyp 2012-08-28 06:46:24.000000000 +0300
-@@ -10,23 +10,33 @@
- {
- 'target_name': 'libusb',
- 'conditions': [
-- ['OS == "linux" and use_system_libusb', {
-+ ['(OS == "linux" or os_bsd == 1) and use_system_libusb', {
- 'type': 'none',
- 'direct_dependent_settings': {
- 'defines': [
- 'USE_SYSTEM_LIBUSB',
- ],
-- 'cflags': [
-- '<!@(pkg-config --cflags libusb-1.0)',
-- ],
-- 'link_settings': {
-- 'ldflags': [
-- '<!@(pkg-config --libs-only-L --libs-only-other libusb-1.0)',
-- ],
-- 'libraries': [
-- '<!@(pkg-config --libs-only-l libusb-1.0)',
-- ],
-- },
-+ 'conditions': [
-+ ['OS == "freebsd"', {
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lusb',
-+ ],
-+ },
-+ }, {
-+ 'cflags': [
-+ '<!@(pkg-config --cflags libusb-1.0)',
-+ ],
-+ 'link_settings': {
-+ 'ldflags': [
-+ '<!@(pkg-config --libs-only-L --libs-only-other libusb-1.0)',
-+ ],
-+ 'libraries': [
-+ '<!@(pkg-config --libs-only-l libusb-1.0)',
-+ ],
-+ },
-+ }],
-+ ],
- },
- }, {
- 'type': '<(library)',
+--- third_party/libusb/libusb.gyp.orig 2013-06-19 01:35:24.000000000 +0000
++++ third_party/libusb/libusb.gyp 2013-06-24 21:04:31.000000000 +0000
+@@ -67,6 +67,19 @@
+ '_GNU_SOURCE=1',
+ ],
+ }],
++ ['OS == "freebsd"', {
++ 'type': 'none',
++ 'sources/': [
++ ['exclude', '^src/libusb/'],
++ ],
++ 'direct_dependent_settings': {
++ 'link_settings': {
++ 'libraries': [
++ '-lusb',
++ ],
++ },
++ },
++ }],
+ ],
+ },
+ ],
Property changes on: trunk/www/chromium/files/patch-third_party__libusb__libusb.gyp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/chromium/files/patch-third_party__libvpx__obj_int_extract.sh
===================================================================
--- trunk/www/chromium/files/patch-third_party__libvpx__obj_int_extract.sh 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-third_party__libvpx__obj_int_extract.sh 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-third_party__libvpx__obj_int_extract.sh
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
===================================================================
--- trunk/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,5 +1,5 @@
---- third_party/libvpx/unpack_lib_posix.sh.orig 2012-09-29 23:59:44.000000000 +0300
-+++ third_party/libvpx/unpack_lib_posix.sh 2012-09-30 00:02:38.000000000 +0300
+--- third_party/libvpx/unpack_lib_posix.sh.orig 2013-05-08 22:39:15.000000000 +0300
++++ third_party/libvpx/unpack_lib_posix.sh 2013-05-08 22:37:44.000000000 +0300
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
@@ -6,3 +6,21 @@
#
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
+@@ -45,16 +45,12 @@
+ ar=$AR
+ fi
+
+-obj_list="$($ar t $lib_file | grep '\.o$')"
++obj_list="$($ar t $lib_file)"
+
+ function extract_object {
+ for f in $obj_list; do
+ filename="${f##*/}"
+
+- if [ -z "$(echo $filename | grep $1)" ]; then
+- continue
+- fi
+-
+ # Only echo this if debugging.
+ # echo "Extract $filename from archive to $out_dir/$1."
+ $ar p $lib_file $filename > $out_dir/$1
Property changes on: trunk/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h
===================================================================
--- trunk/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h 2014-03-23 19:32:03 UTC (rev 16110)
Property changes on: trunk/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-third_party__webrtc__build__common.gypi
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__build__common.gypi (rev 0)
+++ trunk/www/chromium/files/patch-third_party__webrtc__build__common.gypi 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,16 @@
+--- third_party/webrtc/build/common.gypi.orig 2013-07-16 16:41:06.000000000 +0300
++++ third_party/webrtc/build/common.gypi 2013-07-16 17:21:31.000000000 +0300
+@@ -272,6 +272,13 @@
+ #'WEBRTC_CLOCK_TYPE_REALTIME',
+ ],
+ }],
++ ['os_bsd==1', {
++ 'defines': [
++ 'WEBRTC_BSD',
++ 'WEBRTC_LINUX',
++ 'WEBRTC_THREAD_RR',
++ ],
++ }],
+ ['OS=="mac"', {
+ 'defines': [
+ 'WEBRTC_MAC',
Added: trunk/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi (rev 0)
+++ trunk/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,20 @@
+--- third_party/webrtc/modules/audio_device/audio_device.gypi.orig 2013-07-16 18:26:35.000000000 +0300
++++ third_party/webrtc/modules/audio_device/audio_device.gypi 2013-07-16 18:29:22.000000000 +0300
+@@ -45,7 +45,7 @@
+ 'dummy/audio_device_utility_dummy.h',
+ ],
+ 'conditions': [
+- ['OS=="linux"', {
++ ['OS=="linux" or os_bsd==1', {
+ 'include_dirs': [
+ 'linux',
+ ],
+@@ -133,7 +133,7 @@
+ }],
+ ],
+ }],
+- ['OS=="linux"', {
++ ['OS=="linux" or OS=="freebsd"', {
+ 'defines': [
+ 'LINUX_ALSA',
+ ],
Added: trunk/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi (rev 0)
+++ trunk/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,14 @@
+--- third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig 2013-08-16 22:24:59.000000000 +0300
++++ third_party/webrtc/modules/desktop_capture/desktop_capture.gypi 2013-08-16 22:27:28.000000000 +0300
+@@ -75,6 +75,11 @@
+ ],
+ },
+ }],
++ ['os_bsd==1', {
++ 'include_dirs': [
++ '<(prefix_dir)/include',
++ ],
++ }],
+ ['OS!="win" and OS!="mac" and use_x11==0', {
+ 'sources': [
+ "screen_capturer_null.cc",
Added: trunk/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc (rev 0)
+++ trunk/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,10 @@
+--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2013-10-09 17:35:26.000000000 +0200
++++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc 2013-10-09 17:32:54.000000000 +0200
+@@ -14,6 +14,7 @@
+ #include <string.h>
+
+ #include <algorithm>
++#include <cstdlib>
+ #include <iterator>
+
+ #include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h"
Added: trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc (rev 0)
+++ trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,14 @@
+--- third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig 2013-07-16 17:22:11.000000000 +0300
++++ third_party/webrtc/system_wrappers/source/atomic32_posix.cc 2013-07-16 17:23:12.000000000 +0300
+@@ -12,7 +12,11 @@
+
+ #include <assert.h>
+ #include <inttypes.h>
++#if defined(WEBRTC_BSD)
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
+
+ #include "common_types.h"
+
Added: trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc (rev 0)
+++ trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,34 @@
+--- third_party/webrtc/system_wrappers/source/cpu_info.cc.orig 2013-08-09 22:21:35.000000000 +0300
++++ third_party/webrtc/system_wrappers/source/cpu_info.cc 2013-08-16 23:27:36.000000000 +0300
+@@ -12,7 +12,10 @@
+
+ #if defined(_WIN32)
+ #include <Windows.h>
+-#elif defined(WEBRTC_MAC)
++#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD)
++#if defined(WEBRTC_BSD)
++#include <sys/param.h>
++#endif
+ #include <sys/sysctl.h>
+ #include <sys/types.h>
+ #else // defined(WEBRTC_LINUX) or defined(WEBRTC_ANDROID)
+@@ -34,13 +37,17 @@
+ WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
+ "Available number of cores:%d", number_of_cores_);
+
+-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
++#elif (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)) && !defined(WEBRTC_BSD)
+ number_of_cores_ = static_cast<uint32_t>(sysconf(_SC_NPROCESSORS_ONLN));
+ WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
+ "Available number of cores:%d", number_of_cores_);
+
+-#elif defined(WEBRTC_MAC)
++#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD)
++#if defined(WEBRTC_BSD)
++ int name[] = {CTL_HW, HW_NCPU};
++#else
+ int name[] = {CTL_HW, HW_AVAILCPU};
++#endif
+ int ncpu;
+ size_t size = sizeof(ncpu);
+ if (0 == sysctl(name, 2, &ncpu, &size, NULL, 0)) {
Added: trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc (rev 0)
+++ trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,59 @@
+--- third_party/webrtc/system_wrappers/source/thread_posix.cc.orig 2013-08-09 22:21:35.000000000 +0300
++++ third_party/webrtc/system_wrappers/source/thread_posix.cc 2013-08-16 23:34:09.000000000 +0300
+@@ -51,9 +51,11 @@
+ #include <string.h> // strncpy
+ #include <unistd.h>
+ #ifdef WEBRTC_LINUX
++#if !defined(WEBRTC_BSD)
+ #include <linux/unistd.h>
+-#include <sched.h>
+ #include <sys/prctl.h>
++#endif
++#include <sched.h>
+ #include <sys/syscall.h>
+ #include <sys/types.h>
+ #endif
+@@ -136,12 +138,12 @@
+ }
+
+ uint32_t ThreadWrapper::GetThreadId() {
+-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_LINUX)
++#if (defined(WEBRTC_ANDROID) || defined(WEBRTC_LINUX)) && !defined(WEBRTC_BSD)
+ return static_cast<uint32_t>(syscall(__NR_gettid));
+ #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
+ return pthread_mach_thread_np(pthread_self());
+ #else
+- return reinterpret_cast<uint32_t>(pthread_self());
++ return reinterpret_cast<uint64_t>(pthread_self());
+ #endif
+ }
+
+@@ -171,7 +173,8 @@
+ delete crit_state_;
+ }
+
+-#define HAS_THREAD_ID !defined(WEBRTC_IOS) && !defined(WEBRTC_MAC)
++#define HAS_THREAD_ID !defined(WEBRTC_IOS) && !defined(WEBRTC_MAC) && \
++ !defined(WEBRTC_BSD)
+
+ bool ThreadPosix::Start(unsigned int& thread_id)
+ {
+@@ -235,7 +238,8 @@
+
+ // CPU_ZERO and CPU_SET are not available in NDK r7, so disable
+ // SetAffinity on Android for now.
+-#if (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID)))
++#if (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID) && \
++ !defined(WEBRTC_BSD)))
+ bool ThreadPosix::SetAffinity(const int* processor_numbers,
+ const unsigned int amount_of_processors) {
+ if (!processor_numbers || (amount_of_processors == 0)) {
+@@ -317,7 +321,7 @@
+ event_->Set();
+
+ if (set_thread_name_) {
+-#ifdef WEBRTC_LINUX
++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
+ prctl(PR_SET_NAME, (unsigned long)name_, 0, 0, 0);
+ #endif
+ WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
Added: trunk/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h (rev 0)
+++ trunk/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2013-08-09 22:21:34.000000000 +0300
++++ third_party/webrtc/voice_engine/voice_engine_defines.h 2013-08-16 21:25:45.000000000 +0300
+@@ -260,7 +260,7 @@
+ #include <pthread.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
+-#ifndef QNX
++#if !defined(QNX) && !defined(WEBRTC_BSD)
+ #include <linux/net.h>
+ #ifndef ANDROID
+ #include <sys/soundcard.h>
Added: trunk/www/chromium/files/patch-tools__grit__grit__node__base.py
===================================================================
--- trunk/www/chromium/files/patch-tools__grit__grit__node__base.py (rev 0)
+++ trunk/www/chromium/files/patch-tools__grit__grit__node__base.py 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,10 @@
+--- tools/grit/grit/node/base.py.orig 2013-08-09 22:25:28.000000000 +0300
++++ tools/grit/grit/node/base.py 2013-08-16 21:30:43.000000000 +0300
+@@ -460,6 +460,7 @@
+ 'is_win': target_platform in ('cygwin', 'win32'),
+ 'is_android': target_platform == 'android',
+ 'is_ios': target_platform == 'ios',
++ 'is_bsd': 'bsd' in target_platform,
+ 'is_posix': (target_platform in ('darwin', 'linux2', 'linux3', 'sunos5',
+ 'android', 'ios')
+ or 'bsd' in target_platform),
Modified: trunk/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
===================================================================
--- trunk/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,6 +1,6 @@
---- tools/gyp/pylib/gyp/generator/make.py.orig 2012-10-31 21:04:03.000000000 +0200
-+++ tools/gyp/pylib/gyp/generator/make.py 2012-11-07 15:22:38.000000000 +0200
-@@ -87,7 +87,7 @@
+--- tools/gyp/pylib/gyp/generator/make.py.orig 2012-11-27 10:03:58.000000000 +0200
++++ tools/gyp/pylib/gyp/generator/make.py 2012-12-10 22:26:33.000000000 +0200
+@@ -86,7 +86,7 @@
else:
operating_system = flavor
if flavor == 'android':
@@ -9,8 +9,26 @@
default_variables.setdefault('OS', operating_system)
default_variables.setdefault('SHARED_LIB_SUFFIX', '.so')
default_variables.setdefault('SHARED_LIB_DIR','$(builddir)/lib.$(TOOLSET)')
-@@ -269,13 +269,13 @@
- # in gyp's make.py where ARFLAGS.host etc. is computed.
+@@ -250,30 +250,30 @@
+ CFLAGS.target ?= $(CFLAGS)
+ CXX.target ?= %(CXX.target)s
+ CXXFLAGS.target ?= $(CXXFLAGS)
+-LINK.target ?= %(LINK.target)s
++LINK.target ?= %(CXX.target)s
+ LDFLAGS.target ?= $(LDFLAGS)
+ AR.target ?= $(AR)
+
+ # C++ apps need to be linked with g++.
+ #
+ # Note: flock is used to seralize linking. Linking is a memory-intensive
+ # process so running parallel links can often lead to thrashing. To disable
+ # the serialization, override LINK via an envrionment variable as follows:
+ #
+ # export LINK=g++
+ #
+ # This will allow make to invoke N linker processes as specified in -jN.
+ LINK ?= %(flock)s $(builddir)/linker.lock $(CXX.target)
+
# TODO(evan): move all cross-compilation logic to gyp-time so we don't need
# to replicate this environment fallback in make as well.
-CC.host ?= %(CC.host)s
@@ -24,12 +42,12 @@
+CFLAGS.host ?= $(CFLAGS)
+CXX.host ?= $(CXX)
+CXXFLAGS.host ?= $(CXXFLAGS)
-+LINK.host ?= $(LINK)
++LINK.host ?= $(CXX)
+LDFLAGS.host ?= $(LDFLAGS)
+AR.host ?= $(AR)
- ARFLAGS.host := %(ARFLAGS.host)s
# Define a dir function that can handle spaces.
+ # http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions
@@ -1770,7 +1770,7 @@
return modules
Property changes on: trunk/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp
===================================================================
--- trunk/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,5 +1,5 @@
---- ./tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2010-12-16 02:33:31.000000000 +0100
-+++ ./tools/gyp/test/additional-targets/src/dir1/actions.gyp 2010-12-20 20:15:08.000000000 +0100
+--- tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2010-12-16 02:33:31.000000000 +0100
++++ tools/gyp/test/additional-targets/src/dir1/actions.gyp 2010-12-20 20:15:08.000000000 +0100
@@ -47,7 +47,7 @@
},
],
Property changes on: trunk/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp
===================================================================
--- trunk/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,5 +1,5 @@
---- ./tools/gyp/test/library/src/library.gyp.orig 2010-12-16 02:33:32.000000000 +0100
-+++ ./tools/gyp/test/library/src/library.gyp 2010-12-20 20:15:08.000000000 +0100
+--- tools/gyp/test/library/src/library.gyp.orig 2010-12-16 02:33:32.000000000 +0100
++++ tools/gyp/test/library/src/library.gyp 2010-12-20 20:15:08.000000000 +0100
@@ -48,7 +48,7 @@
},
],
Property changes on: trunk/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/chromium/files/patch-ui__events__event_switches.cc
===================================================================
--- trunk/www/chromium/files/patch-ui__events__event_switches.cc (rev 0)
+++ trunk/www/chromium/files/patch-ui__events__event_switches.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- ui/events/event_switches.cc.orig 2014-01-13 11:38:50.000000000 +0100
++++ ui/events/event_switches.cc 2014-01-13 11:38:26.000000000 +0100
+@@ -20,7 +20,7 @@
+ // disabled: touch events are disabled.
+ const char kTouchEventsDisabled[] = "disabled";
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ // Tells chrome to interpret events from these devices as touch events. Only
+ // available with XInput 2 (i.e. X server 1.8 or above). The id's of the
+ // devices can be retrieved from 'xinput list'.
Added: trunk/www/chromium/files/patch-ui__events__event_switches.h
===================================================================
--- trunk/www/chromium/files/patch-ui__events__event_switches.h (rev 0)
+++ trunk/www/chromium/files/patch-ui__events__event_switches.h 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- ui/events/event_switches.h.orig 2014-01-07 21:02:04.000000000 +0100
++++ ui/events/event_switches.h 2014-01-13 11:38:59.000000000 +0100
+@@ -16,7 +16,7 @@
+ EVENTS_BASE_EXPORT extern const char kTouchEventsEnabled[];
+ EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[];
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ EVENTS_BASE_EXPORT extern const char kTouchDevices[];
+ #endif
+
Added: trunk/www/chromium/files/patch-ui__gl__gl.gyp
===================================================================
--- trunk/www/chromium/files/patch-ui__gl__gl.gyp (rev 0)
+++ trunk/www/chromium/files/patch-ui__gl__gl.gyp 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,11 @@
+--- ui/gl/gl.gyp.orig 2013-08-09 22:06:46.000000000 +0300
++++ ui/gl/gl.gyp 2013-08-16 21:35:40.000000000 +0300
+@@ -178,7 +178,7 @@
+ },
+ ],
+ 'conditions': [
+- ['OS in ("win", "android", "linux")', {
++ ['OS in ("win", "android", "linux", "freebsd", "openbsd")', {
+ 'sources': [
+ 'egl_util.cc',
+ 'egl_util.h',
Added: trunk/www/chromium/files/patch-v8__src__checks.cc
===================================================================
--- trunk/www/chromium/files/patch-v8__src__checks.cc (rev 0)
+++ trunk/www/chromium/files/patch-v8__src__checks.cc 2014-03-23 19:32:03 UTC (rev 16110)
@@ -0,0 +1,10 @@
+--- v8/src/checks.cc.orig 2014-01-07 21:03:55.000000000 +0100
++++ v8/src/checks.cc 2014-01-11 01:09:31.000000000 +0100
+@@ -32,6 +32,7 @@
+ # include <execinfo.h>
+ #endif // V8_LIBC_GLIBC || V8_OS_BSD
+ #include <stdio.h>
++#include <unistd.h> // size_t
+
+ #include "platform.h"
+ #include "v8.h"
Modified: trunk/www/chromium/pkg-plist
===================================================================
--- trunk/www/chromium/pkg-plist 2014-03-23 19:18:39 UTC (rev 16109)
+++ trunk/www/chromium/pkg-plist 2014-03-23 19:32:03 UTC (rev 16110)
@@ -1,4 +1,6 @@
bin/chrome
+man/man1/chrome.1.gz
+share/applications/chromium-browser.desktop
%%DATADIR%%/chrome
%%DATADIR%%/chrome-wrapper
%%DATADIR%%/chrome.pak
@@ -58,29 +60,36 @@
%%DATADIR%%/locales/vi.pak
%%DATADIR%%/locales/zh-CN.pak
%%DATADIR%%/locales/zh-TW.pak
-%%DATADIR%%/mksnapshot
%%DATADIR%%/product_logo_48.png
%%DATADIR%%/protoc
%%DATADIR%%/resources.pak
%%DATADIR%%/resources/extension/demo/library.js
+%%DATADIR%%/resources/inspector/accelerometer.css
+%%DATADIR%%/resources/inspector/breakpointsList.css
+%%DATADIR%%/resources/inspector/buildSystemOnly.js
+%%DATADIR%%/resources/inspector/flameChart.css
+%%DATADIR%%/resources/inspector/sidebarPane.css
%%DATADIR%%/resources/inspector/auditsPanel.css
%%DATADIR%%/resources/inspector/AuditsPanel.js
%%DATADIR%%/resources/inspector/breadcrumbList.css
+%%DATADIR%%/resources/inspector/canvasProfiler.css
%%DATADIR%%/resources/inspector/cmdevtools.css
%%DATADIR%%/resources/inspector/codemirror.css
%%DATADIR%%/resources/inspector/CodeMirrorTextEditor.js
%%DATADIR%%/resources/inspector/cssNamedFlows.css
%%DATADIR%%/resources/inspector/dataGrid.css
-%%DATADIR%%/resources/inspector/devTools.css
%%DATADIR%%/resources/inspector/devtools.html
-%%DATADIR%%/resources/inspector/DevTools.js
%%DATADIR%%/resources/inspector/devtools_extension_api.js
%%DATADIR%%/resources/inspector/elementsPanel.css
%%DATADIR%%/resources/inspector/ElementsPanel.js
+%%DATADIR%%/resources/inspector/filter.css
%%DATADIR%%/resources/inspector/filteredItemSelectionDialog.css
%%DATADIR%%/resources/inspector/heapProfiler.css
%%DATADIR%%/resources/inspector/HeapSnapshotWorker.js
%%DATADIR%%/resources/inspector/helpScreen.css
+%%DATADIR%%/resources/inspector/inspector.css
+%%DATADIR%%/resources/inspector/inspector.js
+%%DATADIR%%/resources/inspector/Images/addIcon.png
%%DATADIR%%/resources/inspector/Images/applicationCache.png
%%DATADIR%%/resources/inspector/Images/back.png
%%DATADIR%%/resources/inspector/Images/breakpointBorder.png
@@ -87,30 +96,16 @@
%%DATADIR%%/resources/inspector/Images/breakpointConditionalBorder.png
%%DATADIR%%/resources/inspector/Images/breakpointConditionalCounterBorder.png
%%DATADIR%%/resources/inspector/Images/breakpointCounterBorder.png
+%%DATADIR%%/resources/inspector/Images/breakpoint2.png
+%%DATADIR%%/resources/inspector/Images/breakpoint2_2x.png
+%%DATADIR%%/resources/inspector/Images/breakpointConditional2.png
+%%DATADIR%%/resources/inspector/Images/breakpointConditional2_2x.png
%%DATADIR%%/resources/inspector/Images/checker.png
-%%DATADIR%%/resources/inspector/Images/closeButtons.png
%%DATADIR%%/resources/inspector/Images/cookie.png
%%DATADIR%%/resources/inspector/Images/database.png
%%DATADIR%%/resources/inspector/Images/databaseTable.png
-%%DATADIR%%/resources/inspector/Images/debuggerContinue.png
-%%DATADIR%%/resources/inspector/Images/debuggerPause.png
-%%DATADIR%%/resources/inspector/Images/debuggerStepInto.png
-%%DATADIR%%/resources/inspector/Images/debuggerStepOut.png
-%%DATADIR%%/resources/inspector/Images/debuggerStepOver.png
%%DATADIR%%/resources/inspector/Images/deleteIcon.png
-%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallDown.png
-%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallDownBlack.png
-%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallDownWhite.png
-%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallRight.png
-%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallRightBlack.png
-%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallRightDown.png
-%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallRightDownBlack.png
-%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallRightDownWhite.png
-%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallRightWhite.png
%%DATADIR%%/resources/inspector/Images/domain.png
-%%DATADIR%%/resources/inspector/Images/errorIcon.png
-%%DATADIR%%/resources/inspector/Images/errorMediumIcon.png
-%%DATADIR%%/resources/inspector/Images/errorRedDot.png
%%DATADIR%%/resources/inspector/Images/fileSystem.png
%%DATADIR%%/resources/inspector/Images/forward.png
%%DATADIR%%/resources/inspector/Images/frame.png
@@ -118,7 +113,6 @@
%%DATADIR%%/resources/inspector/Images/glossyHeaderPressed.png
%%DATADIR%%/resources/inspector/Images/glossyHeaderSelected.png
%%DATADIR%%/resources/inspector/Images/glossyHeaderSelectedPressed.png
-%%DATADIR%%/resources/inspector/Images/goArrow.png
%%DATADIR%%/resources/inspector/Images/graphLabelCalloutLeft.png
%%DATADIR%%/resources/inspector/Images/graphLabelCalloutRight.png
%%DATADIR%%/resources/inspector/Images/indexedDB.png
@@ -126,13 +120,11 @@
%%DATADIR%%/resources/inspector/Images/indexedDBObjectStore.png
%%DATADIR%%/resources/inspector/Images/localStorage.png
%%DATADIR%%/resources/inspector/Images/namedFlowOverflow.png
-%%DATADIR%%/resources/inspector/Images/navigatorShowHideButton.png
+%%DATADIR%%/resources/inspector/Images/navigationControls.png
+%%DATADIR%%/resources/inspector/Images/navigationControls_2x.png
%%DATADIR%%/resources/inspector/Images/paneAddButtons.png
-%%DATADIR%%/resources/inspector/Images/paneBottomGrow.png
-%%DATADIR%%/resources/inspector/Images/paneBottomGrowActive.png
%%DATADIR%%/resources/inspector/Images/paneElementStateButtons.png
%%DATADIR%%/resources/inspector/Images/paneFilterButtons.png
-%%DATADIR%%/resources/inspector/Images/paneGrowHandleLine.png
%%DATADIR%%/resources/inspector/Images/paneRefreshButtons.png
%%DATADIR%%/resources/inspector/Images/paneSettingsButtons.png
%%DATADIR%%/resources/inspector/Images/popoverArrows.png
@@ -140,7 +132,6 @@
%%DATADIR%%/resources/inspector/Images/profileGroupIcon.png
%%DATADIR%%/resources/inspector/Images/profileIcon.png
%%DATADIR%%/resources/inspector/Images/profileSmallIcon.png
-%%DATADIR%%/resources/inspector/Images/profilesSilhouette.png
%%DATADIR%%/resources/inspector/Images/programCounterBorder.png
%%DATADIR%%/resources/inspector/Images/radioDot.png
%%DATADIR%%/resources/inspector/Images/regionEmpty.png
@@ -152,39 +143,21 @@
%%DATADIR%%/resources/inspector/Images/resourceJSIcon.png
%%DATADIR%%/resources/inspector/Images/resourcePlainIcon.png
%%DATADIR%%/resources/inspector/Images/resourcePlainIconSmall.png
-%%DATADIR%%/resources/inspector/Images/resourcesSizeGraphIcon.png
%%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.png
-%%DATADIR%%/resources/inspector/Images/scriptsSilhouette.png
%%DATADIR%%/resources/inspector/Images/searchNext.png
%%DATADIR%%/resources/inspector/Images/searchPrev.png
-%%DATADIR%%/resources/inspector/Images/searchSmallBlue.png
-%%DATADIR%%/resources/inspector/Images/searchSmallBrightBlue.png
-%%DATADIR%%/resources/inspector/Images/searchSmallGray.png
-%%DATADIR%%/resources/inspector/Images/searchSmallWhite.png
-%%DATADIR%%/resources/inspector/Images/segment.png
-%%DATADIR%%/resources/inspector/Images/segmentChromium.png
-%%DATADIR%%/resources/inspector/Images/segmentEnd.png
-%%DATADIR%%/resources/inspector/Images/segmentHover.png
-%%DATADIR%%/resources/inspector/Images/segmentHoverChromium.png
-%%DATADIR%%/resources/inspector/Images/segmentHoverEnd.png
-%%DATADIR%%/resources/inspector/Images/segmentHoverEndChromium.png
-%%DATADIR%%/resources/inspector/Images/segmentSelected.png
-%%DATADIR%%/resources/inspector/Images/segmentSelectedChromium.png
-%%DATADIR%%/resources/inspector/Images/segmentSelectedEnd.png
-%%DATADIR%%/resources/inspector/Images/segmentSelectedEndChromium.png
%%DATADIR%%/resources/inspector/Images/sessionStorage.png
+%%DATADIR%%/resources/inspector/Images/settingsListRemove.png
+%%DATADIR%%/resources/inspector/Images/settingsListRemove_2x.png
%%DATADIR%%/resources/inspector/Images/spinner.gif
%%DATADIR%%/resources/inspector/Images/spinnerActive.gif
%%DATADIR%%/resources/inspector/Images/spinnerActiveSelected.gif
%%DATADIR%%/resources/inspector/Images/spinnerInactive.gif
%%DATADIR%%/resources/inspector/Images/spinnerInactiveSelected.gif
-%%DATADIR%%/resources/inspector/Images/splitviewDimple.png
-%%DATADIR%%/resources/inspector/Images/splitviewDividerBackground.png
%%DATADIR%%/resources/inspector/Images/statusbarButtonGlyphs.png
%%DATADIR%%/resources/inspector/Images/statusbarButtonGlyphs2x.png
%%DATADIR%%/resources/inspector/Images/statusbarResizerHorizontal.png
%%DATADIR%%/resources/inspector/Images/statusbarResizerVertical.png
-%%DATADIR%%/resources/inspector/Images/successGreenDot.png
%%DATADIR%%/resources/inspector/Images/thumbActiveHoriz.png
%%DATADIR%%/resources/inspector/Images/thumbActiveVert.png
%%DATADIR%%/resources/inspector/Images/thumbHoriz.png
@@ -191,7 +164,6 @@
%%DATADIR%%/resources/inspector/Images/thumbHoverHoriz.png
%%DATADIR%%/resources/inspector/Images/thumbHoverVert.png
%%DATADIR%%/resources/inspector/Images/thumbVert.png
-%%DATADIR%%/resources/inspector/Images/tickMark.png
%%DATADIR%%/resources/inspector/Images/timelineHollowPillBlue.png
%%DATADIR%%/resources/inspector/Images/timelineHollowPillGray.png
%%DATADIR%%/resources/inspector/Images/timelineHollowPillGreen.png
@@ -206,31 +178,18 @@
%%DATADIR%%/resources/inspector/Images/timelinePillPurple.png
%%DATADIR%%/resources/inspector/Images/timelinePillRed.png
%%DATADIR%%/resources/inspector/Images/timelinePillYellow.png
-%%DATADIR%%/resources/inspector/Images/toolbarIcons.png
-%%DATADIR%%/resources/inspector/Images/toolbarIconsSmall.png
%%DATADIR%%/resources/inspector/Images/toolbarItemSelected.png
%%DATADIR%%/resources/inspector/Images/trackHoriz.png
%%DATADIR%%/resources/inspector/Images/trackVert.png
-%%DATADIR%%/resources/inspector/Images/treeDownTriangleBlack.png
-%%DATADIR%%/resources/inspector/Images/treeDownTriangleWhite.png
-%%DATADIR%%/resources/inspector/Images/treeRightTriangleBlack.png
-%%DATADIR%%/resources/inspector/Images/treeRightTriangleWhite.png
-%%DATADIR%%/resources/inspector/Images/treeUpTriangleBlack.png
-%%DATADIR%%/resources/inspector/Images/treeUpTriangleWhite.png
-%%DATADIR%%/resources/inspector/Images/userInputIcon.png
-%%DATADIR%%/resources/inspector/Images/userInputPreviousIcon.png
-%%DATADIR%%/resources/inspector/Images/userInputResultIcon.png
-%%DATADIR%%/resources/inspector/Images/warningIcon.png
-%%DATADIR%%/resources/inspector/Images/warningMediumIcon.png
-%%DATADIR%%/resources/inspector/Images/warningOrangeDot.png
-%%DATADIR%%/resources/inspector/Images/warningsErrors.png
%%DATADIR%%/resources/inspector/indexedDBViews.css
%%DATADIR%%/resources/inspector/inspectorCommon.css
-%%DATADIR%%/resources/inspector/nativeMemoryProfiler.css
+%%DATADIR%%/resources/inspector/LayersPanel.js
+%%DATADIR%%/resources/inspector/layersPanel.css
%%DATADIR%%/resources/inspector/navigatorView.css
%%DATADIR%%/resources/inspector/networkLogView.css
%%DATADIR%%/resources/inspector/networkPanel.css
%%DATADIR%%/resources/inspector/NetworkPanel.js
+%%DATADIR%%/resources/inspector/overrides.css
%%DATADIR%%/resources/inspector/panelEnablerView.css
%%DATADIR%%/resources/inspector/profilesPanel.css
%%DATADIR%%/resources/inspector/ProfilesPanel.js
@@ -239,15 +198,15 @@
%%DATADIR%%/resources/inspector/resourceView.css
%%DATADIR%%/resources/inspector/revisionHistory.css
%%DATADIR%%/resources/inspector/ScriptFormatterWorker.js
-%%DATADIR%%/resources/inspector/scriptsPanel.css
-%%DATADIR%%/resources/inspector/ScriptsPanel.js
+%%DATADIR%%/resources/inspector/screencastView.css
+%%DATADIR%%/resources/inspector/sourcesPanel.css
+%%DATADIR%%/resources/inspector/SourcesPanel.js
+%%DATADIR%%/resources/inspector/sourcesView.css
+%%DATADIR%%/resources/inspector/spectrum.css
%%DATADIR%%/resources/inspector/splitView.css
-%%DATADIR%%/resources/inspector/tabbedPane.css
-%%DATADIR%%/resources/inspector/textEditor.css
%%DATADIR%%/resources/inspector/textPrompt.css
%%DATADIR%%/resources/inspector/timelinePanel.css
%%DATADIR%%/resources/inspector/TimelinePanel.js
-%%DATADIR%%/resources/inspector/webGLProfiler.css
%%DATADIR%%/xdg-settings
@dirrm %%DATADIR%%/locales
@dirrm %%DATADIR%%/resources/inspector/Images
More information about the Midnightbsd-cvs
mailing list