[Midnightbsd-cvs] mports [17338] trunk/www/chromium/files: update patchset
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Sep 15 22:25:20 EDT 2014
Revision: 17338
http://svnweb.midnightbsd.org/mports/?rev=17338
Author: laffer1
Date: 2014-09-15 22:25:20 -0400 (Mon, 15 Sep 2014)
Log Message:
-----------
update patchset
Added Paths:
-----------
trunk/www/chromium/files/extra-patch-libusb-pc
trunk/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc
trunk/www/chromium/files/patch-base__process__launch.cc
trunk/www/chromium/files/patch-base__process__launch.h
trunk/www/chromium/files/patch-base__strings__safe_sprintf.cc
trunk/www/chromium/files/patch-build__filename_rules.gypi
trunk/www/chromium/files/patch-build__linux__system.gyp
trunk/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp
trunk/www/chromium/files/patch-build__linux__unbundle__openssl.gyp
trunk/www/chromium/files/patch-cc__layers__layer_impl.cc
trunk/www/chromium/files/patch-chrome__app__chromium_strings.grd
trunk/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc
trunk/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc
trunk/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc
trunk/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc
trunk/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc
trunk/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc
trunk/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
trunk/www/chromium/files/patch-chrome__common__chrome_paths.h
trunk/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc
trunk/www/chromium/files/patch-components__storage_monitor.gypi
trunk/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc
trunk/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
trunk/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h
trunk/www/chromium/files/patch-components__usb_service.gypi
trunk/www/chromium/files/patch-components__usb_service__usb_context.cc
trunk/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc
trunk/www/chromium/files/patch-components__usb_service__usb_device_handle.cc
trunk/www/chromium/files/patch-components__usb_service__usb_device_impl.cc
trunk/www/chromium/files/patch-components__usb_service__usb_interface.cc
trunk/www/chromium/files/patch-components__usb_service__usb_service_impl.cc
trunk/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc
trunk/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc
trunk/www/chromium/files/patch-crypto__nss_util.cc
trunk/www/chromium/files/patch-device__hid__hid.gyp
trunk/www/chromium/files/patch-device__serial__serial.gyp
trunk/www/chromium/files/patch-media__cast__rtcp__rtcp.cc
trunk/www/chromium/files/patch-net__base__address_tracker_linux.h
trunk/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc
trunk/www/chromium/files/patch-net__net.gypi
trunk/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc
trunk/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc
trunk/www/chromium/files/patch-printing__printing.gyp
trunk/www/chromium/files/patch-remoting__remoting_host.gypi
trunk/www/chromium/files/patch-skia__skia_chrome.gypi
trunk/www/chromium/files/patch-skia__skia_common.gypi
trunk/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp
trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp
trunk/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h
trunk/www/chromium/files/patch-third_party__khronos__khronos.gyp
trunk/www/chromium/files/patch-third_party__libexif__libexif.gyp
trunk/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp
trunk/www/chromium/files/patch-third_party__sfntly__sfntly.gyp
trunk/www/chromium/files/patch-third_party__sqlite__sqlite.gyp
trunk/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc
trunk/www/chromium/files/patch-ui__app_list__app_list_constants.cc
trunk/www/chromium/files/patch-ui__app_list__app_list_constants.h
trunk/www/chromium/files/patch-ui__base__ui_base.gyp
trunk/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc
trunk/www/chromium/files/patch-ui__views__views.gyp
trunk/www/chromium/files/patch-ui__views__views_delegate.cc
trunk/www/chromium/files/patch-ui__views__views_delegate.h
Added: trunk/www/chromium/files/extra-patch-libusb-pc
===================================================================
--- trunk/www/chromium/files/extra-patch-libusb-pc (rev 0)
+++ trunk/www/chromium/files/extra-patch-libusb-pc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,20 @@
+--- build/linux/unbundle/libusb.gyp.orig 2014-08-12 21:02:52.000000000 +0200
++++ build/linux/unbundle/libusb.gyp 2014-08-17 16:21:03.000000000 +0200
+@@ -18,14 +18,14 @@
+ ],
+ 'direct_dependent_settings': {
+ '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)',
++ '-lusb',
+ ],
+ },
+ },
Added: trunk/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc (rev 0)
+++ trunk/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,44 @@
+--- ./base/posix/unix_domain_socket_linux.cc.orig 2014-08-12 21:01:28.000000000 +0200
++++ ./base/posix/unix_domain_socket_linux.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -18,6 +18,15 @@
+ #include "base/posix/eintr_wrapper.h"
+ #include "base/stl_util.h"
+
++#if defined(__FreeBSD__)
++// Port over Linux ucred structure
++struct ucred {
++ pid_t pid; // process ID of the sending process
++ uid_t uid; // user ID of the sending process
++ gid_t gid; // group ID of the sending process
++};
++#endif
++
+ const size_t UnixDomainSocket::kMaxFileDescriptors = 16;
+
+ // Creates a connected pair of UNIX-domain SOCK_SEQPACKET sockets, and passes
+@@ -35,7 +44,13 @@
+ // static
+ bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
+ const int enable = 1;
++#if defined(__FreeBSD__)
++ // XXX(rene) do this? :
++ // taken from dbus, Academic Free License 2.1 / GPL 2+
++ return 0; // fake OK
++#else
+ return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0;
++#endif
+ }
+
+ // static
+@@ -131,7 +146,11 @@
+ wire_fds_len = payload_len / sizeof(int);
+ }
+ if (cmsg->cmsg_level == SOL_SOCKET &&
++#if defined(__FreeBSD__)
++ 1) { // XXX(rene) carpet getting full ...
++#else
+ cmsg->cmsg_type == SCM_CREDENTIALS) {
++#endif
+ DCHECK(payload_len == sizeof(struct ucred));
+ DCHECK(pid == -1);
+ pid = reinterpret_cast<struct ucred*>(CMSG_DATA(cmsg))->pid;
Added: trunk/www/chromium/files/patch-base__process__launch.cc
===================================================================
--- trunk/www/chromium/files/patch-base__process__launch.cc (rev 0)
+++ trunk/www/chromium/files/patch-base__process__launch.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,15 @@
+--- ./base/process/launch.cc.orig 2014-08-12 21:01:27.000000000 +0200
++++ ./base/process/launch.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -23,10 +23,10 @@
+ fds_to_remap(NULL),
+ maximize_rlimits(NULL),
+ new_process_group(false)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ , clone_flags(0)
+ , allow_new_privs(false)
+-#endif // OS_LINUX
++#endif // OS_LINUX || OS_FREEBSD
+ #if defined(OS_CHROMEOS)
+ , ctrl_terminal_fd(-1)
+ #endif // OS_CHROMEOS
Added: trunk/www/chromium/files/patch-base__process__launch.h
===================================================================
--- trunk/www/chromium/files/patch-base__process__launch.h (rev 0)
+++ trunk/www/chromium/files/patch-base__process__launch.h 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,19 @@
+--- ./base/process/launch.h.orig 2014-08-12 21:01:27.000000000 +0200
++++ ./base/process/launch.h 2014-08-13 09:56:56.000000000 +0200
+@@ -108,14 +108,14 @@
+ // will be the same as its pid.
+ bool new_process_group;
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ // If non-zero, start the process using clone(), using flags as provided.
+ int clone_flags;
+
+ // By default, child processes will have the PR_SET_NO_NEW_PRIVS bit set. If
+ // true, then this bit will not be set in the new child process.
+ bool allow_new_privs;
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_FREEBSD)
+
+ #if defined(OS_CHROMEOS)
+ // If non-negative, the specified file descriptor will be set as the launched
Added: trunk/www/chromium/files/patch-base__strings__safe_sprintf.cc
===================================================================
--- trunk/www/chromium/files/patch-base__strings__safe_sprintf.cc (rev 0)
+++ trunk/www/chromium/files/patch-base__strings__safe_sprintf.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,19 @@
+--- ./base/strings/safe_sprintf.cc.orig 2014-08-12 21:01:27.000000000 +0200
++++ ./base/strings/safe_sprintf.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -107,11 +107,11 @@
+ : buffer_(buffer),
+ size_(size - 1), // Account for trailing NUL byte
+ count_(0) {
+-// The following assertion does not build on Mac and Android. This is because
+-// static_assert only works with compile-time constants, but mac uses
+-// libstdc++4.2 and android uses stlport, which both don't mark
+-// numeric_limits::max() as constexp.
+-#if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS)
++// The following assertion does not build on Mac and Android and older FreeBSD.
++// This is because static_assert only works with compile-time constants, but
++// mac and FreeBSD < 10 use libstdc++4.2 and android uses stlport, which both
++// don't mark numeric_limits::max() as constexp.
++#if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS) && !(defined(OS_FREEBSD) && __FreeBSD_version > 1000054)
+ COMPILE_ASSERT(kSSizeMaxConst == \
+ static_cast<size_t>(std::numeric_limits<ssize_t>::max()),
+ kSSizeMax_is_the_max_value_of_an_ssize_t);
Added: trunk/www/chromium/files/patch-build__filename_rules.gypi
===================================================================
--- trunk/www/chromium/files/patch-build__filename_rules.gypi (rev 0)
+++ trunk/www/chromium/files/patch-build__filename_rules.gypi 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./build/filename_rules.gypi.orig 2014-08-12 21:02:52.000000000 +0200
++++ ./build/filename_rules.gypi 2014-08-13 09:56:56.000000000 +0200
+@@ -85,7 +85,7 @@
+ ['<(use_aura)==0 or OS!="win" or >(nacl_untrusted_build)==1', {
+ 'sources/': [ ['exclude', '_aurawin\\.(h|cc)$'] ]
+ }],
+- ['<(use_aura)==0 or OS!="linux" or >(nacl_untrusted_build)==1', {
++ ['<(use_aura)==0 or (OS!="linux" and OS!="openbsd" and OS!="freebsd") or >(nacl_untrusted_build)==1', {
+ 'sources/': [ ['exclude', '_auralinux\\.(h|cc)$'] ]
+ }],
+ ['<(use_ash)==0 or >(nacl_untrusted_build)==1', {
Added: trunk/www/chromium/files/patch-build__linux__system.gyp
===================================================================
--- trunk/www/chromium/files/patch-build__linux__system.gyp (rev 0)
+++ trunk/www/chromium/files/patch-build__linux__system.gyp 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,16 @@
+--- ./build/linux/system.gyp.orig 2014-08-12 21:02:52.000000000 +0200
++++ ./build/linux/system.gyp 2014-08-13 09:56:56.000000000 +0200
+@@ -885,6 +885,13 @@
+ 'include_dirs': [
+ '../..',
+ ],
++ 'conditions' : [
++ ['OS=="freebsd"', {
++ 'include_dirs': [
++ '<(prefix_dir)/include',
++ ],
++ }],
++ ],
+ 'hard_dependency': 1,
+ 'actions': [
+ {
Added: trunk/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp
===================================================================
--- trunk/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp (rev 0)
+++ trunk/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,17 @@
+--- ./build/linux/unbundle/libwebp.gyp.orig 2014-08-12 21:02:52.000000000 +0200
++++ ./build/linux/unbundle/libwebp.gyp 2014-08-13 09:56:56.000000000 +0200
+@@ -14,13 +14,7 @@
+ },
+ 'link_settings': {
+ 'libraries': [
+- # Check for presence of webpdemux library, use it if present.
+- '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
+- '--code "int main() { return 0; }" '
+- '--run-linker '
+- '--on-success "-lwebp -lwebpdemux" '
+- '--on-failure "-lwebp" '
+- '-- -lwebpdemux)',
++ '-lwebp -lwebpdemux',
+ ],
+ },
+ }
Added: trunk/www/chromium/files/patch-build__linux__unbundle__openssl.gyp
===================================================================
--- trunk/www/chromium/files/patch-build__linux__unbundle__openssl.gyp (rev 0)
+++ trunk/www/chromium/files/patch-build__linux__unbundle__openssl.gyp 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,21 @@
+--- build/linux/unbundle/openssl.gyp.orig 2014-08-12 21:02:52.000000000 +0200
++++ build/linux/unbundle/openssl.gyp 2014-08-18 17:16:23.000000000 +0200
+@@ -9,15 +9,15 @@
+ 'type': 'none',
+ 'direct_dependent_settings': {
+ 'cflags': [
+- '<!@(pkg-config --cflags openssl)',
++ '',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+- '<!@(pkg-config --libs-only-L --libs-only-other openssl)',
++ '',
+ ],
+ 'libraries': [
+- '<!@(pkg-config --libs-only-l openssl)',
++ '-lssl',
+ ],
+ },
+ }
Added: trunk/www/chromium/files/patch-cc__layers__layer_impl.cc
===================================================================
--- trunk/www/chromium/files/patch-cc__layers__layer_impl.cc (rev 0)
+++ trunk/www/chromium/files/patch-cc__layers__layer_impl.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,32 @@
+--- ./cc/layers/layer_impl.cc.orig 2014-08-12 21:03:00.000000000 +0200
++++ ./cc/layers/layer_impl.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -1215,21 +1215,23 @@
+ scale_factor * scaled_scroll_bounds.height());
+ scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds);
+
+- gfx::Vector2dF max_offset(
++ // (rene) prevent name collision with /usr/include/vm/vm_map.h on FreeBSD
++ // which also defines max_offset
++ gfx::Vector2dF _max_offset(
+ scaled_scroll_bounds.width() - scroll_clip_layer_->bounds().width(),
+ scaled_scroll_bounds.height() - scroll_clip_layer_->bounds().height());
+ // We need the final scroll offset to be in CSS coords.
+- max_offset.Scale(1 / scale_factor);
+- max_offset.SetToMax(gfx::Vector2dF());
+- return gfx::ToFlooredVector2d(max_offset);
++ _max_offset.Scale(1 / scale_factor);
++ _max_offset.SetToMax(gfx::Vector2dF());
++ return gfx::ToFlooredVector2d(_max_offset);
+ }
+
+ gfx::Vector2dF LayerImpl::ClampScrollToMaxScrollOffset() {
+- gfx::Vector2dF max_offset = MaxScrollOffset();
++ gfx::Vector2dF _max_offset = MaxScrollOffset();
+ gfx::Vector2dF old_offset = TotalScrollOffset();
+ gfx::Vector2dF clamped_offset = old_offset;
+
+- clamped_offset.SetToMin(max_offset);
++ clamped_offset.SetToMin(_max_offset);
+ clamped_offset.SetToMax(gfx::Vector2d());
+ gfx::Vector2dF delta = clamped_offset - old_offset;
+ if (!delta.IsZero())
Added: trunk/www/chromium/files/patch-chrome__app__chromium_strings.grd
===================================================================
--- trunk/www/chromium/files/patch-chrome__app__chromium_strings.grd (rev 0)
+++ trunk/www/chromium/files/patch-chrome__app__chromium_strings.grd 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./chrome/app/chromium_strings.grd.orig 2014-08-12 21:02:25.000000000 +0200
++++ ./chrome/app/chromium_strings.grd 2014-08-13 09:56:56.000000000 +0200
+@@ -1099,7 +1099,7 @@
+ </message>
+
+ <!-- ProcessSingleton -->
+- <if expr="is_linux or is_macosx">
++ <if expr="is_linux or is_macosx or is_bsd">
+ <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
+ The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
+ </message>
Added: trunk/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,19 @@
+--- ./chrome/browser/extensions/api/serial/serial_api.cc.orig 2014-08-12 21:01:44.000000000 +0200
++++ ./chrome/browser/extensions/api/serial/serial_api.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -84,7 +84,7 @@
+
+ void SerialGetDevicesFunction::Work() {
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+-
++#if !defined(OS_FREEBSD) //XXX(rene) quick hack
+ device::SerialDeviceInfoList devices;
+ scoped_ptr<device::SerialDeviceEnumerator> enumerator =
+ device::SerialDeviceEnumerator::Create();
+@@ -106,6 +106,7 @@
+ }
+
+ results_ = serial::GetDevices::Results::Create(out_devices);
++#endif
+ }
+
+ SerialConnectFunction::SerialConnectFunction() {}
Added: trunk/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,15 @@
+--- ./chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-08-12 21:01:33.000000000 +0200
++++ ./chrome/browser/media_galleries/media_folder_finder.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -50,10 +50,10 @@
+ chrome::DIR_USER_APPLICATIONS,
+ chrome::DIR_USER_LIBRARY,
+ #endif
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ base::DIR_CACHE,
+ #endif
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ base::DIR_TEMP,
+ #endif
+ };
Added: trunk/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./chrome/browser/omaha_query_params/omaha_query_params.cc.orig 2014-08-12 21:01:47.000000000 +0200
++++ ./chrome/browser/omaha_query_params/omaha_query_params.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -29,6 +29,8 @@
+ "linux";
+ #elif defined(OS_OPENBSD)
+ "openbsd";
++#elif defined(OS_FREEBSD)
++ "freebsd";
+ #else
+ #error "unknown os"
+ #endif
Added: trunk/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-08-12 21:01:40.000000000 +0200
++++ ./chrome/browser/policy/policy_prefs_browsertest.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -169,6 +169,8 @@
+ const std::string os("chromeos");
+ #elif defined(OS_LINUX)
+ const std::string os("linux");
++#elif defined(OS_FREEBSD)
++ const std::string os("freebsd");
+ #else
+ #error "Unknown platform"
+ #endif
Added: trunk/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./chrome/browser/ui/startup/startup_browser_creator.cc.orig 2014-08-12 21:01:35.000000000 +0200
++++ ./chrome/browser/ui/startup/startup_browser_creator.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -81,7 +81,7 @@
+ #include "chromeos/chromeos_switches.h"
+ #endif
+
+-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
++#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_FREEBSD))
+ #include "ui/events/x/touch_factory_x11.h"
+ #endif
+
Added: trunk/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,20 @@
+--- ./chrome/browser/ui/views/first_run_dialog.cc.orig 2014-08-12 21:01:38.000000000 +0200
++++ ./chrome/browser/ui/views/first_run_dialog.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -124,12 +124,16 @@
+ bool FirstRunDialog::Accept() {
+ GetWidget()->Hide();
+
++#if !defined(OS_BSD)
+ if (report_crashes_ && report_crashes_->checked()) {
+ if (GoogleUpdateSettings::SetCollectStatsConsent(true))
+ breakpad::InitCrashReporter(std::string());
+- } else {
++ } else
++#else
++ {
+ GoogleUpdateSettings::SetCollectStatsConsent(false);
+ }
++#endif
+
+ if (make_default_ && make_default_->checked())
+ ShellIntegration::SetAsDefaultBrowser();
Added: trunk/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
===================================================================
--- trunk/www/chromium/files/patch-chrome__chrome_browser_ui.gypi (rev 0)
+++ trunk/www/chromium/files/patch-chrome__chrome_browser_ui.gypi 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,38 @@
+--- ./chrome/chrome_browser_ui.gypi.orig 2014-08-12 21:02:25.000000000 +0200
++++ ./chrome/chrome_browser_ui.gypi 2014-08-13 09:56:57.000000000 +0200
+@@ -2665,7 +2665,7 @@
+ 'browser/ui/views/message_center/web_notification_tray.cc',
+ ],
+ }],
+- ['use_aura==1 and use_ash==0 and use_ozone==0 and OS=="linux"', {
++ ['use_aura==1 and use_ash==0 and use_ozone==0 and (OS=="linux" or os_bsd==1)', {
+ 'dependencies': [
+ # gtk2 is the only component that can interact with gtk2 in our new
+ # world.
+@@ -2673,7 +2673,7 @@
+ '../build/linux/system.gyp:gio',
+ ],
+ }],
+- ['use_aura==0 or chromeos==1 or OS!="linux"', {
++ ['use_aura==0 or chromeos==1 or (OS!="linux" and os_bsd!=1)', {
+ 'sources!': [
+ 'browser/ui/views/first_run_dialog.cc',
+ 'browser/ui/views/first_run_dialog.h',
+@@ -3042,7 +3042,7 @@
+ }],
+ ],
+ }],
+- ['OS=="linux"', {
++ ['OS=="linux" or os_bsd==1', {
+ 'conditions': [
+ ['use_aura==1', {
+ 'dependencies': [
+@@ -3135,7 +3135,7 @@
+ 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
+ ],
+ }],
+- ['OS!="linux" and OS!="win"', {
++ ['OS!="linux" and OS!="win" and os_bsd!=1', {
+ 'sources': [
+ 'browser/ui/startup/session_crashed_bubble.cc'
+ ],
Added: trunk/www/chromium/files/patch-chrome__common__chrome_paths.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__common__chrome_paths.h (rev 0)
+++ trunk/www/chromium/files/patch-chrome__common__chrome_paths.h 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./chrome/common/chrome_paths.h.orig 2014-08-12 21:02:17.000000000 +0200
++++ ./chrome/common/chrome_paths.h 2014-08-13 09:56:57.000000000 +0200
+@@ -116,7 +116,7 @@
+ // files to be installed when managed user
+ // session starts.
+
+-#if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
++#if defined(OS_LINUX) || defined(OS_FREEBSD) || (defined(OS_MACOSX) && !defined(OS_IOS))
+ DIR_NATIVE_MESSAGING, // System directory where native messaging host
+ // manifest files are stored.
+ DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts
Added: trunk/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc (rev 0)
+++ trunk/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,20 @@
+--- ./chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2014-08-12 21:02:10.000000000 +0200
++++ ./chrome/test/chromedriver/chrome/chrome_finder.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -42,7 +42,7 @@
+ installation_locations[i].Append(L"Chromium\\Application"));
+ }
+ }
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_FREEBSD)
+ void GetApplicationDirs(std::vector<base::FilePath>* locations) {
+ locations->push_back(base::FilePath("/opt/google/chrome"));
+ locations->push_back(base::FilePath("/usr/local/bin"));
+@@ -91,7 +91,7 @@
+ base::FilePath("Google Chrome.app/Contents/MacOS/Google Chrome"),
+ base::FilePath("Chromium.app/Contents/MacOS/Chromium")
+ };
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_FREEBSD)
+ base::FilePath browser_exes_array[] = {
+ base::FilePath("google-chrome"),
+ base::FilePath("chrome"),
Added: trunk/www/chromium/files/patch-components__storage_monitor.gypi
===================================================================
--- trunk/www/chromium/files/patch-components__storage_monitor.gypi (rev 0)
+++ trunk/www/chromium/files/patch-components__storage_monitor.gypi 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,27 @@
+--- ./components/storage_monitor.gypi.orig 2014-08-12 21:02:37.000000000 +0200
++++ ./components/storage_monitor.gypi 2014-08-13 09:56:57.000000000 +0200
+@@ -49,6 +49,24 @@
+ 'storage_monitor/volume_mount_watcher_win.h',
+ ],
+ 'conditions': [
++ ['os_bsd == 1', {
++ 'sources!': [
++ 'storage_monitor/media_transfer_protocol_device_observer_linux.cc',
++ 'storage_monitor/media_transfer_protocol_device_observer_linux.h',
++ 'storage_monitor/mtab_watcher_linux.cc',
++ 'storage_monitor/mtab_watcher_linux.h',
++ 'storage_monitor/storage_monitor_linux.cc',
++ 'storage_monitor/storage_monitor_linux.h',
++ 'storage_monitor/udev_util_linux.cc',
++ 'storage_monitor/udev_util_linux.h',
++ ],
++ }],
++ ['OS == "freebsd"', {
++ 'sources': [
++ 'storage_monitor/storage_monitor_freebsd.cc',
++ 'storage_monitor/storage_monitor_freebsd.h',
++ ],
++ }],
+ ['OS == "mac"', {
+ 'link_settings': {
+ 'libraries': [
Added: trunk/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc
===================================================================
--- trunk/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc (rev 0)
+++ trunk/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,18 @@
+--- ./components/storage_monitor/storage_monitor.cc.orig 2014-08-12 21:02:37.000000000 +0200
++++ ./components/storage_monitor/storage_monitor.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -85,6 +85,7 @@
+
+ void StorageMonitor::EnsureInitialized(base::Closure callback) {
+ DCHECK(thread_checker_.CalledOnValidThread());
++//#if !defined(OS_BSD) //XXX(rene) why disabled?
+ if (initialized_) {
+ if (!callback.is_null())
+ callback.Run();
+@@ -100,6 +101,7 @@
+
+ initializing_ = true;
+ Init();
++//#endif
+ }
+
+ bool StorageMonitor::IsInitialized() const {
Added: trunk/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
===================================================================
--- trunk/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc (rev 0)
+++ trunk/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,105 @@
+--- ./components/storage_monitor/storage_monitor_freebsd.cc.orig 2014-08-13 09:56:57.000000000 +0200
++++ ./components/storage_monitor/storage_monitor_freebsd.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -0,0 +1,102 @@
++// Copyright 2014 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.
++
++// StorageMonitorFreeBSD implementation.
++
++#include "components/storage_monitor/storage_monitor_freebsd.h"
++
++#include <stdio.h>
++
++#include <list>
++
++#include "base/basictypes.h"
++#include "base/bind.h"
++#include "base/metrics/histogram.h"
++#include "base/process/kill.h"
++#include "base/process/launch.h"
++#include "base/stl_util.h"
++#include "base/strings/string_number_conversions.h"
++#include "base/strings/string_util.h"
++#include "base/strings/utf_string_conversions.h"
++#include "components/storage_monitor/media_storage_util.h"
++#include "components/storage_monitor/removable_device_constants.h"
++#include "components/storage_monitor/storage_info.h"
++
++using content::BrowserThread;
++
++namespace storage_monitor {
++
++namespace {
++
++// udev device property constants.
++const char kBlockSubsystemKey[] = "block";
++const char kDiskDeviceTypeKey[] = "disk";
++const char kFsUUID[] = "ID_FS_UUID";
++const char kLabel[] = "ID_FS_LABEL";
++const char kModel[] = "ID_MODEL";
++const char kModelID[] = "ID_MODEL_ID";
++const char kRemovableSysAttr[] = "removable";
++const char kSerialShort[] = "ID_SERIAL_SHORT";
++const char kSizeSysAttr[] = "size";
++const char kVendor[] = "ID_VENDOR";
++const char kVendorID[] = "ID_VENDOR_ID";
++
++StorageMonitor::EjectStatus EjectPathOnFileThread(
++ const base::FilePath& path,
++ const base::FilePath& device) {
++ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
++
++ static const char kUmountBinary[] = "/sbin/umount";
++ std::vector<std::string> command;
++ command.push_back(kUmountBinary);
++ command.push_back(path.value());
++
++ base::LaunchOptions options;
++ base::ProcessHandle handle;
++ if (!base::LaunchProcess(command, options, &handle))
++ return StorageMonitor::EJECT_FAILURE;
++
++ int exit_code = -1;
++ if (!base::WaitForExitCodeWithTimeout(handle, &exit_code,
++ base::TimeDelta::FromMilliseconds(3000))) {
++ base::KillProcess(handle, -1, false);
++ base::EnsureProcessTerminated(handle);
++ return StorageMonitor::EJECT_FAILURE;
++ }
++
++ // TODO(gbillock): Make sure this is found in documentation
++ // somewhere. Experimentally it seems to hold that exit code
++ // 1 means device is in use.
++ if (exit_code == 1)
++ return StorageMonitor::EJECT_IN_USE;
++ if (exit_code != 0)
++ return StorageMonitor::EJECT_FAILURE;
++
++ return StorageMonitor::EJECT_OK;
++}
++
++} // namespace
++
++StorageMonitorFreeBSD::StorageMonitorFreeBSD() {
++ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
++}
++
++StorageMonitorFreeBSD::~StorageMonitorFreeBSD() {
++ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
++}
++
++void StorageMonitorFreeBSD::Init() {
++}
++
++bool StorageMonitorFreeBSD::GetStorageInfoForPath(
++ const base::FilePath& path,
++ StorageInfo* device_info) const {
++ return false; // TODO
++}
++
++StorageMonitor* StorageMonitor::CreateInternal() {
++ return new StorageMonitorFreeBSD();
++}
++
++} // namespace storage_monitor
Added: trunk/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h
===================================================================
--- trunk/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h (rev 0)
+++ trunk/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,50 @@
+--- ./components/storage_monitor/storage_monitor_freebsd.h.orig 2014-08-13 09:56:57.000000000 +0200
++++ ./components/storage_monitor/storage_monitor_freebsd.h 2014-08-13 09:56:57.000000000 +0200
+@@ -0,0 +1,47 @@
++// Copyright 2014 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.
++
++// StorageMonitorFreeBSD processes mount point change events, notifies listeners
++// about the addition and deletion of media devices, and answers queries about
++// mounted devices.
++// StorageMonitorFreeBSD lives on the UI thread, and uses ???
++// the FILE thread to get mount point change events.
++
++#ifndef COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_
++#define COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_
++
++#include <map>
++#include <string>
++
++#include "base/basictypes.h"
++#include "base/compiler_specific.h"
++#include "base/files/file_path.h"
++#include "base/files/file_path_watcher.h"
++#include "base/memory/scoped_ptr.h"
++#include "base/memory/weak_ptr.h"
++#include "components/storage_monitor/storage_monitor.h"
++#include "content/public/browser/browser_thread.h"
++
++namespace storage_monitor {
++
++class StorageMonitorFreeBSD : public StorageMonitor {
++ public:
++ // Should only be called by browser start up code.
++ // Use StorageMonitor::GetInstance() instead.
++ explicit StorageMonitorFreeBSD();
++ virtual ~StorageMonitorFreeBSD();
++
++ // Must be called for StorageMonitorFreeBSD to work.
++ virtual void Init() OVERRIDE;
++ private:
++ // StorageMonitor implementation.
++ virtual bool GetStorageInfoForPath(const base::FilePath& path,
++ StorageInfo* device_info) const OVERRIDE;
++
++ DISALLOW_COPY_AND_ASSIGN(StorageMonitorFreeBSD);
++};
++
++} // namespace storage_monitor
++
++#endif // COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_
Added: trunk/www/chromium/files/patch-components__usb_service.gypi
===================================================================
--- trunk/www/chromium/files/patch-components__usb_service.gypi (rev 0)
+++ trunk/www/chromium/files/patch-components__usb_service.gypi 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,14 @@
+--- ./components/usb_service.gypi.orig 2014-08-12 21:02:37.000000000 +0200
++++ ./components/usb_service.gypi 2014-08-13 09:56:57.000000000 +0200
+@@ -37,6 +37,11 @@
+ 'dependencies': [
+ '../build/linux/system.gyp:udev',
+ ],
++ }],
++ ['OS == "freebsd"', {
++ 'dependencies!': [
++ '../third_party/libusb/libusb.gyp:libusb',
++ ],
+ }]
+ ]
+ }],
Added: trunk/www/chromium/files/patch-components__usb_service__usb_context.cc
===================================================================
--- trunk/www/chromium/files/patch-components__usb_service__usb_context.cc (rev 0)
+++ trunk/www/chromium/files/patch-components__usb_service__usb_context.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,26 @@
+--- ./components/usb_service/usb_context.cc.orig 2014-08-12 21:02:37.000000000 +0200
++++ ./components/usb_service/usb_context.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -7,8 +7,13 @@
+ #include "base/logging.h"
+ #include "base/synchronization/waitable_event.h"
+ #include "base/threading/platform_thread.h"
++#if defined(OS_FREEBSD)
++#include "libusb.h"
++#define LIBUSB_CALL
++#else
+ #include "third_party/libusb/src/libusb/interrupt.h"
+ #include "third_party/libusb/src/libusb/libusb.h"
++#endif
+
+ namespace usb_service {
+
+@@ -45,7 +50,9 @@
+ running_ = false;
+ // Spreading running_ to the UsbEventHandler thread.
+ base::subtle::MemoryBarrier();
++#if !defined(OS_FREEBSD) // XXX(rene) only available in bundled version
+ libusb_interrupt_handle_event(context_);
++#endif
+ base::PlatformThread::Join(thread_handle_);
+ }
+
Added: trunk/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc (rev 0)
+++ trunk/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,14 @@
+--- ./components/usb_service/usb_context_unittest.cc.orig 2014-08-12 21:02:37.000000000 +0200
++++ ./components/usb_service/usb_context_unittest.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -6,7 +6,11 @@
+ #include "build/build_config.h"
+ #include "components/usb_service/usb_context.h"
+ #include "testing/gtest/include/gtest/gtest.h"
++#if defined(OS_FREEBSD)
++#include "libusb.h"
++#else
+ #include "third_party/libusb/src/libusb/libusb.h"
++#endif
+
+ using usb_service::UsbContext;
+ using usb_service::PlatformUsbContext;
Added: trunk/www/chromium/files/patch-components__usb_service__usb_device_handle.cc
===================================================================
--- trunk/www/chromium/files/patch-components__usb_service__usb_device_handle.cc (rev 0)
+++ trunk/www/chromium/files/patch-components__usb_service__usb_device_handle.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,27 @@
+--- ./components/usb_service/usb_device_handle.cc.orig 2014-08-12 21:02:37.000000000 +0200
++++ ./components/usb_service/usb_device_handle.cc 2014-08-17 16:54:01.000000000 +0200
+@@ -16,7 +16,24 @@
+ #include "components/usb_service/usb_interface.h"
+ #include "components/usb_service/usb_service.h"
+ #include "content/public/browser/browser_thread.h"
++#if defined(OS_FREEBSD)
++#include "libusb.h"
++#define LIBUSB_CALL
++#else
+ #include "third_party/libusb/src/libusb/libusb.h"
++#endif
++
++/* Define for FreeBSD < 9.3, thanks to db at freebsd.org */
++#if defined(OS_FREEBSD) && __FreeBSD_version < 903000
++int libusb_get_string_descriptor(libusb_device_handle *dev,
++ uint8_t descriptor_index, uint16_t lang_id, unsigned char* data, int length) {
++ return libusb_control_transfer(dev,
++ LIBUSB_ENDPOINT_IN | 0x0, /* Endpoint 0 IN */
++ LIBUSB_REQUEST_GET_DESCRIPTOR,
++ (LIBUSB_DT_STRING << 8) | descriptor_index,
++ lang_id, data, (uint16_t)length, 1000);
++}
++#endif
+
+ using content::BrowserThread;
+
Added: trunk/www/chromium/files/patch-components__usb_service__usb_device_impl.cc
===================================================================
--- trunk/www/chromium/files/patch-components__usb_service__usb_device_impl.cc (rev 0)
+++ trunk/www/chromium/files/patch-components__usb_service__usb_device_impl.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,14 @@
+--- ./components/usb_service/usb_device_impl.cc.orig 2014-08-12 21:02:37.000000000 +0200
++++ ./components/usb_service/usb_device_impl.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -10,7 +10,11 @@
+ #include "components/usb_service/usb_context.h"
+ #include "components/usb_service/usb_device_handle.h"
+ #include "content/public/browser/browser_thread.h"
++#if defined(OS_FREEBSD)
++#include "libusb.h"
++#else
+ #include "third_party/libusb/src/libusb/libusb.h"
++#endif
+
+ #if defined(OS_CHROMEOS)
+ #include "base/sys_info.h"
Added: trunk/www/chromium/files/patch-components__usb_service__usb_interface.cc
===================================================================
--- trunk/www/chromium/files/patch-components__usb_service__usb_interface.cc (rev 0)
+++ trunk/www/chromium/files/patch-components__usb_service__usb_interface.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,14 @@
+--- ./components/usb_service/usb_interface.cc.orig 2014-08-12 21:02:37.000000000 +0200
++++ ./components/usb_service/usb_interface.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -5,7 +5,11 @@
+ #include "components/usb_service/usb_interface.h"
+
+ #include "base/logging.h"
++#if defined(OS_FREEBSD)
++#include "libusb.h"
++#else
+ #include "third_party/libusb/src/libusb/libusb.h"
++#endif
+
+ namespace usb_service {
+
Added: trunk/www/chromium/files/patch-components__usb_service__usb_service_impl.cc
===================================================================
--- trunk/www/chromium/files/patch-components__usb_service__usb_service_impl.cc (rev 0)
+++ trunk/www/chromium/files/patch-components__usb_service__usb_service_impl.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,14 @@
+--- ./components/usb_service/usb_service_impl.cc.orig 2014-08-12 21:02:37.000000000 +0200
++++ ./components/usb_service/usb_service_impl.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -13,7 +13,11 @@
+ #include "components/usb_service/usb_context.h"
+ #include "components/usb_service/usb_device_impl.h"
+ #include "content/public/browser/browser_thread.h"
++#if defined(OS_FREEBSD)
++#include "libusb.h"
++#else
+ #include "third_party/libusb/src/libusb/libusb.h"
++#endif
+
+ namespace usb_service {
+
Added: trunk/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc
===================================================================
--- trunk/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc (rev 0)
+++ trunk/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2014-08-12 21:01:24.000000000 +0200
++++ ./content/browser/renderer_host/render_widget_host_view_aura.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -626,7 +626,7 @@
+ if (host)
+ return reinterpret_cast<gfx::NativeViewId>(host->GetAcceleratedWidget());
+ #endif
+- return static_cast<gfx::NativeViewId>(NULL);
++ return static_cast<gfx::NativeViewId>(0);
+ }
+
+ gfx::NativeViewAccessible RenderWidgetHostViewAura::GetNativeViewAccessible() {
Added: trunk/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc
===================================================================
--- trunk/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc (rev 0)
+++ trunk/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,24 @@
+--- ./content/renderer/accessibility/blink_ax_tree_source.cc.orig 2014-08-12 21:01:18.000000000 +0200
++++ ./content/renderer/accessibility/blink_ax_tree_source.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -431,13 +431,15 @@
+ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X, scroll_offset.width());
+ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y, scroll_offset.height());
+
+- const gfx::Size& min_offset = document.frame()->minimumScrollOffset();
+- dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MIN, min_offset.width());
+- dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MIN, min_offset.height());
++ // Prefix {min|max}_offset with '_' to avoid collision with
++ // FreeBSD namespace
++ const gfx::Size& _min_offset = document.frame()->minimumScrollOffset();
++ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MIN, _min_offset.width());
++ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MIN, _min_offset.height());
+
+- const gfx::Size& max_offset = document.frame()->maximumScrollOffset();
+- dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, max_offset.width());
+- dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MAX, max_offset.height());
++ const gfx::Size& _max_offset = document.frame()->maximumScrollOffset();
++ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, _max_offset.width());
++ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MAX, _max_offset.height());
+ }
+
+ if (dst->role == ui::AX_ROLE_TABLE) {
Added: trunk/www/chromium/files/patch-crypto__nss_util.cc
===================================================================
--- trunk/www/chromium/files/patch-crypto__nss_util.cc (rev 0)
+++ trunk/www/chromium/files/patch-crypto__nss_util.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,33 @@
+--- ./crypto/nss_util.cc.orig 2014-08-12 21:03:00.000000000 +0200
++++ ./crypto/nss_util.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -13,7 +13,7 @@
+ #include <prtime.h>
+ #include <secmod.h>
+
+-#if defined(OS_OPENBSD)
++#if defined(OS_BSD)
+ #include <sys/mount.h>
+ #include <sys/param.h>
+ #endif
+@@ -138,7 +138,7 @@
+ // detection when database_dir is on NFS. See http://crbug.com/48585.
+ //
+ // TODO(wtc): port this function to other USE_NSS platforms. It is defined
+-// only for OS_LINUX and OS_OPENBSD simply because the statfs structure
++// only for OS_LINUX and OS_BSD simply because the statfs structure
+ // is OS-specific.
+ //
+ // Because this function sets an environment variable it must be run before we
+@@ -149,10 +149,10 @@
+ base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN;
+ if (base::GetFileSystemType(database_dir, &fs_type))
+ db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS);
+-#elif defined(OS_OPENBSD)
++#elif defined(OS_BSD)
+ struct statfs buf;
+ if (statfs(database_dir.value().c_str(), &buf) == 0)
+- db_on_nfs = (strcmp(buf.f_fstypename, MOUNT_NFS) == 0);
++ db_on_nfs = (strcmp(buf.f_fstypename, "nfs") == 0);
+ #else
+ NOTIMPLEMENTED();
+ #endif
Added: trunk/www/chromium/files/patch-device__hid__hid.gyp
===================================================================
--- trunk/www/chromium/files/patch-device__hid__hid.gyp (rev 0)
+++ trunk/www/chromium/files/patch-device__hid__hid.gyp 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,21 @@
+--- ./device/hid/hid.gyp.orig 2014-08-12 21:02:53.000000000 +0200
++++ ./device/hid/hid.gyp 2014-08-13 09:56:57.000000000 +0200
+@@ -19,6 +19,18 @@
+ '../../build/linux/system.gyp:udev',
+ ],
+ }],
++ ['os_bsd==1', {
++ 'sources!': [
++ 'device_monitor_linux.cc',
++ 'device_monitor_linux.h',
++ 'hid_connection_linux.cc',
++ 'hid_connection_linux.h',
++ 'hid_service_linux.cc',
++ 'hid_service_linux.h',
++ 'input_service_linux.cc',
++ 'input_service_linux.h',
++ ],
++ }],
+ ],
+ 'sources': [
+ 'device_monitor_linux.cc',
Added: trunk/www/chromium/files/patch-device__serial__serial.gyp
===================================================================
--- trunk/www/chromium/files/patch-device__serial__serial.gyp (rev 0)
+++ trunk/www/chromium/files/patch-device__serial__serial.gyp 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,15 @@
+--- ./device/serial/serial.gyp.orig 2014-08-12 21:02:53.000000000 +0200
++++ ./device/serial/serial.gyp 2014-08-13 09:56:57.000000000 +0200
+@@ -19,6 +19,12 @@
+ '../../build/linux/system.gyp:udev',
+ ],
+ }],
++ ['os_bsd==1', {
++ 'sources!': [
++ 'serial_device_enumerator_linux.cc',
++ 'serial_device_enumerator_linux.h',
++ ],
++ }],
+ ],
+ 'sources': [
+ 'serial_device_enumerator.cc',
Added: trunk/www/chromium/files/patch-media__cast__rtcp__rtcp.cc
===================================================================
--- trunk/www/chromium/files/patch-media__cast__rtcp__rtcp.cc (rev 0)
+++ trunk/www/chromium/files/patch-media__cast__rtcp__rtcp.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./media/cast/rtcp/rtcp.cc.orig 2014-08-12 21:02:56.000000000 +0200
++++ ./media/cast/rtcp/rtcp.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -361,7 +361,7 @@
+ int64 rtp_time_diff_ms = rtp_timestamp_diff / frequency_khz;
+
+ // Sanity check.
+- if (std::abs(rtp_time_diff_ms) > kMaxDiffSinceReceivedRtcpMs)
++ if (std::labs(rtp_time_diff_ms) > kMaxDiffSinceReceivedRtcpMs)
+ return false;
+
+ *rtp_timestamp_in_ticks = ConvertNtpToTimeTicks(last_received_ntp_seconds_,
Added: trunk/www/chromium/files/patch-net__base__address_tracker_linux.h
===================================================================
--- trunk/www/chromium/files/patch-net__base__address_tracker_linux.h (rev 0)
+++ trunk/www/chromium/files/patch-net__base__address_tracker_linux.h 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,15 @@
+--- ./net/base/address_tracker_linux.h.orig 2014-08-12 21:02:39.000000000 +0200
++++ ./net/base/address_tracker_linux.h 2014-08-13 09:56:57.000000000 +0200
+@@ -6,10 +6,12 @@
+ #define NET_BASE_ADDRESS_TRACKER_LINUX_H_
+
+ #include <sys/socket.h> // Needed to include netlink.
++#if !defined(__FreeBSD__)
+ // Mask superfluous definition of |struct net|. This is fixed in Linux 2.6.38.
+ #define net net_kernel
+ #include <linux/rtnetlink.h>
+ #undef net
++#endif
+
+ #include <map>
+
Added: trunk/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc (rev 0)
+++ trunk/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,14 @@
+--- ./net/base/address_tracker_linux_unittest.cc.orig 2014-08-12 21:02:39.000000000 +0200
++++ ./net/base/address_tracker_linux_unittest.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -4,7 +4,11 @@
+
+ #include "net/base/address_tracker_linux.h"
+
++#if defined(__linux__)
+ #include <linux/if.h>
++#else
++#include <net/if.h>
++#endif
+
+ #include <vector>
+
Added: trunk/www/chromium/files/patch-net__net.gypi
===================================================================
--- trunk/www/chromium/files/patch-net__net.gypi (rev 0)
+++ trunk/www/chromium/files/patch-net__net.gypi 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,22 @@
+--- ./net/net.gypi.orig 2014-08-12 21:02:41.000000000 +0200
++++ ./net/net.gypi 2014-08-13 09:56:58.000000000 +0200
+@@ -167,8 +167,8 @@
+ 'android/network_change_notifier_factory_android.h',
+ 'android/network_library.cc',
+ 'android/network_library.h',
+- 'base/address_tracker_linux.cc',
+- 'base/address_tracker_linux.h',
++ #'base/address_tracker_linux.cc',
++ #'base/address_tracker_linux.h',
+ 'base/backoff_entry.cc',
+ 'base/backoff_entry.h',
+ 'base/bandwidth_metrics.cc',
+@@ -1229,7 +1229,7 @@
+ 'android/keystore_unittest.cc',
+ 'android/network_change_notifier_android_unittest.cc',
+ 'base/address_list_unittest.cc',
+- 'base/address_tracker_linux_unittest.cc',
++ #'base/address_tracker_linux_unittest.cc',
+ 'base/backoff_entry_unittest.cc',
+ 'base/data_url_unittest.cc',
+ 'base/directory_lister_unittest.cc',
Added: trunk/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc
===================================================================
--- trunk/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc (rev 0)
+++ trunk/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./net/quic/congestion_control/rtt_stats.cc.orig 2014-08-12 21:02:38.000000000 +0200
++++ ./net/quic/congestion_control/rtt_stats.cc 2014-08-13 09:56:58.000000000 +0200
+@@ -73,7 +73,7 @@
+ } else {
+ mean_deviation_ = QuicTime::Delta::FromMicroseconds(
+ kOneMinusBeta * mean_deviation_.ToMicroseconds() +
+- kBeta * std::abs(smoothed_rtt_.Subtract(rtt_sample).ToMicroseconds()));
++ kBeta * std::labs(smoothed_rtt_.Subtract(rtt_sample).ToMicroseconds()));
+ smoothed_rtt_ = smoothed_rtt_.Multiply(kOneMinusAlpha).Add(
+ rtt_sample.Multiply(kAlpha));
+ DVLOG(1) << "Cubic; smoothed_rtt(us):" << smoothed_rtt_.ToMicroseconds()
Added: trunk/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc
===================================================================
--- trunk/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc (rev 0)
+++ trunk/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,46 @@
+--- ./ppapi/proxy/file_io_resource.cc.orig 2014-08-12 21:01:17.000000000 +0200
++++ ./ppapi/proxy/file_io_resource.cc 2014-08-13 09:56:58.000000000 +0200
+@@ -294,15 +294,17 @@
+
+ if (check_quota_) {
+ int64_t increase = 0;
+- uint64_t max_offset = 0;
++ // (rene) avoid name collission with /usr/include/vm/vm_map.h on FreeBSD
++ // which also defines max_offset
++ uint64_t _max_offset = 0;
+ bool append = (open_flags_ & PP_FILEOPENFLAG_APPEND) != 0;
+ if (append) {
+ increase = bytes_to_write;
+ } else {
+- uint64_t max_offset = offset + bytes_to_write;
+- if (max_offset > static_cast<uint64_t>(kint64max))
++ uint64_t _max_offset = offset + bytes_to_write;
++ if (_max_offset > static_cast<uint64_t>(kint64max))
+ return PP_ERROR_FAILED; // amount calculation would overflow.
+- increase = static_cast<int64_t>(max_offset) - max_written_offset_;
++ increase = static_cast<int64_t>(_max_offset) - max_written_offset_;
+ }
+
+ if (increase > 0) {
+@@ -319,7 +321,7 @@
+ if (append)
+ append_mode_write_amount_ += bytes_to_write;
+ else
+- max_written_offset_ = max_offset;
++ max_written_offset_ = _max_offset;
+ }
+ }
+ return WriteValidated(offset, buffer, bytes_to_write, callback);
+@@ -597,9 +599,9 @@
+ } else {
+ DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted);
+
+- int64_t max_offset = offset + bytes_to_write;
+- if (max_written_offset_ < max_offset)
+- max_written_offset_ = max_offset;
++ int64_t _max_offset = offset + bytes_to_write;
++ if (max_written_offset_ < _max_offset)
++ max_written_offset_ = _max_offset;
+ }
+
+ int32_t result = WriteValidated(offset, buffer, bytes_to_write, callback);
Added: trunk/www/chromium/files/patch-printing__printing.gyp
===================================================================
--- trunk/www/chromium/files/patch-printing__printing.gyp (rev 0)
+++ trunk/www/chromium/files/patch-printing__printing.gyp 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./printing/printing.gyp.orig 2014-08-12 21:02:51.000000000 +0200
++++ ./printing/printing.gyp 2014-08-13 09:56:58.000000000 +0200
+@@ -193,7 +193,7 @@
+ 'backend/print_backend_chromeos.cc',
+ ],
+ }],
+- ['OS=="linux" and chromeos==0', {
++ ['(OS=="linux" or os_bsd == 1) and chromeos==0', {
+ 'sources': [
+ 'printing_context_linux.cc',
+ 'printing_context_linux.h',
Added: trunk/www/chromium/files/patch-remoting__remoting_host.gypi
===================================================================
--- trunk/www/chromium/files/patch-remoting__remoting_host.gypi (rev 0)
+++ trunk/www/chromium/files/patch-remoting__remoting_host.gypi 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,20 @@
+--- ./remoting/remoting_host.gypi.orig 2014-08-12 21:02:33.000000000 +0200
++++ ./remoting/remoting_host.gypi 2014-08-13 09:56:58.000000000 +0200
+@@ -12,7 +12,7 @@
+ 'variables': {
+ '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_bsd==1 or (OS=="linux" and chromeos==0 and use_x11==1)', {
+ 'enable_remoting_host': 1,
+ }, {
+ 'enable_remoting_host': 0,
+@@ -266,7 +266,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.
+ '../build/linux/system.gyp:gtk',
Added: trunk/www/chromium/files/patch-skia__skia_chrome.gypi
===================================================================
--- trunk/www/chromium/files/patch-skia__skia_chrome.gypi (rev 0)
+++ trunk/www/chromium/files/patch-skia__skia_chrome.gypi 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,14 @@
+--- ./skia/skia_chrome.gypi.orig 2014-08-12 21:03:06.000000000 +0200
++++ ./skia/skia_chrome.gypi 2014-08-13 09:56:58.000000000 +0200
+@@ -78,6 +78,11 @@
+ 'ext/vector_platform_device_skia.h',
+ ],
+ 'conditions': [
++ [ 'use_cairo == 1', {
++ 'dependencies': [
++ '../build/linux/system.gyp:pangocairo',
++ ],
++ }],
+ [ 'OS == "android" and enable_printing == 0', {
+ 'sources!': [
+ 'ext/skia_utils_base.cc',
Added: trunk/www/chromium/files/patch-skia__skia_common.gypi
===================================================================
--- trunk/www/chromium/files/patch-skia__skia_common.gypi (rev 0)
+++ trunk/www/chromium/files/patch-skia__skia_common.gypi 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./skia/skia_common.gypi.orig 2014-08-12 21:03:06.000000000 +0200
++++ ./skia/skia_common.gypi 2014-08-13 09:56:58.000000000 +0200
+@@ -66,7 +66,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-third_party__WebKit__Source__platform__heap__ThreadState.cpp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,36 @@
+--- ./third_party/WebKit/Source/platform/heap/ThreadState.cpp.orig 2014-08-12 21:07:16.000000000 +0200
++++ ./third_party/WebKit/Source/platform/heap/ThreadState.cpp 2014-08-13 09:56:58.000000000 +0200
+@@ -45,13 +45,22 @@
+ extern "C" void* __libc_stack_end; // NOLINT
+ #endif
+
++#if OS(FREEBSD)
++#include <pthread_np.h>
++#endif
++
+ namespace WebCore {
+
+ static void* getStackStart()
+ {
+-#if defined(__GLIBC__) || OS(ANDROID)
++#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD)
+ pthread_attr_t attr;
++#if OS(FREEBSD)
++ pthread_attr_init(&attr);
++ if (!pthread_attr_get_np(pthread_self(), &attr)) {
++#else
+ if (!pthread_getattr_np(pthread_self(), &attr)) {
++#endif
+ void* base;
+ size_t size;
+ int error = pthread_attr_getstack(&attr, &base, &size);
+@@ -59,6 +68,9 @@
+ pthread_attr_destroy(&attr);
+ return reinterpret_cast<Address>(base) + size;
+ }
++#if OS(FREEBSD)
++ pthread_attr_destroy(&attr);
++#endif
+ #if defined(__GLIBC__)
+ // pthread_getattr_np can fail for the main thread. In this case
+ // just like NaCl we rely on the __libc_stack_end to give us
Added: trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./third_party/WebKit/Source/wtf/wtf.gyp.orig 2014-08-12 21:07:13.000000000 +0200
++++ ./third_party/WebKit/Source/wtf/wtf.gyp 2014-08-13 09:56:58.000000000 +0200
+@@ -70,7 +70,7 @@
+ 'target_name': 'wtf',
+ 'type': '<(component)',
+ 'include_dirs': [
+- '..',
++ '..', '<(prefix_dir)/include',
+ ],
+ 'dependencies': [
+ 'wtf_config',
Added: trunk/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h
===================================================================
--- trunk/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h (rev 0)
+++ trunk/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.orig 2014-08-12 21:03:19.000000000 +0200
++++ ./third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h 2014-08-13 09:56:58.000000000 +0200
+@@ -1,7 +1,7 @@
+ /* Automatically generated by configure - do not modify! */
+ #ifndef FFMPEG_CONFIG_H
+ #define FFMPEG_CONFIG_H
+-#define FFMPEG_CONFIGURATION "--disable-everything --disable-avdevice --disable-avfilter --disable-bzlib --disable-doc --disable-ffprobe --disable-lzo --disable-network --disable-postproc --disable-swresample --disable-swscale --disable-zlib --enable-fft --enable-rdft --enable-shared --disable-iconv --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --optflags=-O2 --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='vp3,vorbis,vp8' --arch=i686 --enable-yasm --extra-cflags=-m32 --extra-ldflags=-m32 --enable-pic --disable-error-resilience"
++#define FFMPEG_CONFIGURATION "--disable-everything --disable-avdevice --disable-avfilter --disable-bzlib --disable-doc --disable-ffprobe --disable-lzo --disable-network --disable-postproc --disable-swresample --disable-swscale --disable-zlib --enable-fft --enable-rdft --enable-shared --disable-iconv --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --optflags=-O2 --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='vp3,vorbis,vp8' --arch=i686 --enable-yasm --extra-cflags=-m32,-mstack-alignment=16,-mstackrealign --extra-ldflags=-m32 --enable-pic --disable-error-resilience"
+ #define FFMPEG_LICENSE "LGPL version 2.1 or later"
+ #define CONFIG_THIS_YEAR 2013
+ #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
Added: trunk/www/chromium/files/patch-third_party__khronos__khronos.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__khronos__khronos.gyp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__khronos__khronos.gyp 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,10 @@
+--- ./third_party/khronos/khronos.gyp.orig 2014-08-12 21:02:46.000000000 +0200
++++ ./third_party/khronos/khronos.gyp 2014-08-13 09:56:58.000000000 +0200
+@@ -11,6 +11,7 @@
+ 'include_dirs': [
+ '.',
+ '../../gpu', # Contains GLES2/gl2chromium.h
++ '<(prefix_dir)/include',
+ ],
+ },
+ },
Added: trunk/www/chromium/files/patch-third_party__libexif__libexif.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__libexif__libexif.gyp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__libexif__libexif.gyp 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,14 @@
+--- ./third_party/libexif/libexif.gyp.orig 2014-07-15 21:03:04.000000000 +0200
++++ ./third_party/libexif/libexif.gyp 2014-08-11 15:06:34.000000000 +0200
+@@ -5,9 +5,9 @@
+ {
+ 'variables': {
+ 'conditions': [
+- ['OS == "linux" and chromeos==0', {
++ ['(OS == "linux" or OS == "freebsd") and chromeos==0', {
+ 'use_system_libexif%': 1,
+- }, { # OS != "linux" and chromeos==0
++ }, { # (OS != "linux" and OS != "freebsd") or chromeos==0
+ 'use_system_libexif%': 0,
+ }],
+ ],
Added: trunk/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,10 @@
+--- ./third_party/libphonenumber/libphonenumber.gyp.orig 2014-08-12 21:02:49.000000000 +0200
++++ ./third_party/libphonenumber/libphonenumber.gyp 2014-08-13 09:56:58.000000000 +0200
+@@ -11,6 +11,7 @@
+ # generated protocol headers to be available with "phonenumbers" include
+ # path, e.g. #include "phonenumbers/foo.pb.h".
+ '<(SHARED_INTERMEDIATE_DIR)/protoc_out/third_party/libphonenumber',
++ '<(prefix_dir)/include',
+ ],
+ 'defines': [
+ 'I18N_PHONENUMBERS_USE_ICU_REGEXP=1',
Added: trunk/www/chromium/files/patch-third_party__sfntly__sfntly.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__sfntly__sfntly.gyp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__sfntly__sfntly.gyp 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./third_party/sfntly/sfntly.gyp.orig 2014-08-12 21:02:45.000000000 +0200
++++ ./third_party/sfntly/sfntly.gyp 2014-08-13 09:56:59.000000000 +0200
+@@ -126,7 +126,7 @@
+ 'cpp/src/sample/chromium/subsetter_impl.h',
+ ],
+ 'include_dirs': [
+- 'cpp/src', '../..',
++ 'cpp/src', '../..', '<(prefix_dir)/include',
+ ],
+ # This macro must be define to suppress the use of exception
+ 'defines': [
Added: trunk/www/chromium/files/patch-third_party__sqlite__sqlite.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__sqlite__sqlite.gyp (rev 0)
+++ trunk/www/chromium/files/patch-third_party__sqlite__sqlite.gyp 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./third_party/sqlite/sqlite.gyp.orig 2014-08-12 21:02:44.000000000 +0200
++++ ./third_party/sqlite/sqlite.gyp 2014-08-13 09:56:59.000000000 +0200
+@@ -105,6 +105,8 @@
+ 'amalgamation',
+ # Needed for fts2 to build.
+ 'src/src',
++ # FreeBSD ...
++ '<(prefix_dir)/include',
+ ],
+ 'dependencies': [
+ '../icu/icu.gyp:icui18n',
Added: trunk/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc (rev 0)
+++ trunk/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,13 @@
+--- ./third_party/webrtc/modules/video_coding/main/source/receiver.cc.orig 2014-08-12 21:04:10.000000000 +0200
++++ ./third_party/webrtc/modules/video_coding/main/source/receiver.cc 2014-08-13 09:57:00.000000000 +0200
+@@ -134,8 +134,8 @@
+ // Assume that render timing errors are due to changes in the video stream.
+ if (next_render_time_ms < 0) {
+ timing_error = true;
+- } else if (std::abs(next_render_time_ms - now_ms) > max_video_delay_ms_) {
+- int frame_delay = static_cast<int>(std::abs(next_render_time_ms - now_ms));
++ } else if (std::labs(next_render_time_ms - now_ms) > max_video_delay_ms_) {
++ int frame_delay = static_cast<int>(std::labs(next_render_time_ms - now_ms));
+ LOG(LS_WARNING) << "A frame about to be decoded is out of the configured "
+ << "delay bounds (" << frame_delay << " > "
+ << max_video_delay_ms_
Added: trunk/www/chromium/files/patch-ui__app_list__app_list_constants.cc
===================================================================
--- trunk/www/chromium/files/patch-ui__app_list__app_list_constants.cc (rev 0)
+++ trunk/www/chromium/files/patch-ui__app_list__app_list_constants.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./ui/app_list/app_list_constants.cc.orig 2014-08-12 21:02:31.000000000 +0200
++++ ./ui/app_list/app_list_constants.cc 2014-08-13 09:57:00.000000000 +0200
+@@ -81,7 +81,7 @@
+ const ui::ResourceBundle::FontStyle kItemTextFontStyle =
+ ui::ResourceBundle::SmallBoldFont;
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ #if defined(GOOGLE_CHROME_BUILD)
+ const char kAppListWMClass[] = "chrome_app_list";
+ #else // CHROMIUM_BUILD
Added: trunk/www/chromium/files/patch-ui__app_list__app_list_constants.h
===================================================================
--- trunk/www/chromium/files/patch-ui__app_list__app_list_constants.h (rev 0)
+++ trunk/www/chromium/files/patch-ui__app_list__app_list_constants.h 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,13 @@
+--- ./ui/app_list/app_list_constants.h.orig 2014-08-12 21:02:31.000000000 +0200
++++ ./ui/app_list/app_list_constants.h 2014-08-13 09:57:00.000000000 +0200
+@@ -57,8 +57,8 @@
+
+ APP_LIST_EXPORT extern const ui::ResourceBundle::FontStyle kItemTextFontStyle;
+
+-#if defined(OS_LINUX)
+-// The WM_CLASS name for the app launcher window on Linux.
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
++// The WM_CLASS name for the app launcher window on Linux/FreeBSD.
+ APP_LIST_EXPORT extern const char kAppListWMClass[];
+ #endif
+
Added: trunk/www/chromium/files/patch-ui__base__ui_base.gyp
===================================================================
--- trunk/www/chromium/files/patch-ui__base__ui_base.gyp (rev 0)
+++ trunk/www/chromium/files/patch-ui__base__ui_base.gyp 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./ui/base/ui_base.gyp.orig 2014-08-12 21:02:27.000000000 +0200
++++ ./ui/base/ui_base.gyp 2014-08-13 09:57:00.000000000 +0200
+@@ -366,7 +366,7 @@
+ 'x/selection_utils.h',
+ ]
+ }],
+- ['use_aura==0 or OS!="linux"', {
++ ['use_aura==0 or (OS!="linux" and os_bsd!=1)', {
+ 'sources!': [
+ 'resource/resource_bundle_auralinux.cc',
+ ],
Added: trunk/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc
===================================================================
--- trunk/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc (rev 0)
+++ trunk/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,20 @@
+--- ui/shell_dialogs/select_file_dialog.cc.orig 2014-08-12 21:02:27.000000000 +0200
++++ ui/shell_dialogs/select_file_dialog.cc 2014-08-17 19:43:29.000000000 +0200
+@@ -20,7 +20,7 @@
+ #include "ui/shell_dialogs/select_file_dialog_mac.h"
+ #elif defined(OS_ANDROID)
+ #include "ui/shell_dialogs/select_file_dialog_android.h"
+-#elif defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX)
++#elif defined(USE_AURA) && !defined(USE_ASH) && (defined(OS_LINUX) || defined(OS_FREEBSD))
+ #include "ui/shell_dialogs/linux_shell_dialog.h"
+ #endif
+
+@@ -76,7 +76,7 @@
+ return dialog;
+ }
+
+-#if defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX)
++#if defined(USE_AURA) && !defined(USE_ASH) && (defined(OS_LINUX) || defined(OS_FREEBSD))
+ const ui::LinuxShellDialog* shell_dialogs = ui::LinuxShellDialog::instance();
+ if (shell_dialogs)
+ return shell_dialogs->CreateSelectFileDialog(listener, policy);
Added: trunk/www/chromium/files/patch-ui__views__views.gyp
===================================================================
--- trunk/www/chromium/files/patch-ui__views__views.gyp (rev 0)
+++ trunk/www/chromium/files/patch-ui__views__views.gyp 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./ui/views/views.gyp.orig 2014-08-12 21:02:26.000000000 +0200
++++ ./ui/views/views.gyp 2014-08-13 09:57:00.000000000 +0200
+@@ -461,7 +461,7 @@
+ '../display/display.gyp:display_util',
+ ],
+ }],
+- ['OS=="linux" and chromeos==0', {
++ ['(OS=="linux" or os_bsd==1) and chromeos==0', {
+ 'dependencies': [
+ '../shell_dialogs/shell_dialogs.gyp:shell_dialogs',
+ ],
Added: trunk/www/chromium/files/patch-ui__views__views_delegate.cc
===================================================================
--- trunk/www/chromium/files/patch-ui__views__views_delegate.cc (rev 0)
+++ trunk/www/chromium/files/patch-ui__views__views_delegate.cc 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./ui/views/views_delegate.cc.orig 2014-08-12 21:02:26.000000000 +0200
++++ ./ui/views/views_delegate.cc 2014-08-13 09:57:00.000000000 +0200
+@@ -50,7 +50,7 @@
+ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
+ return false;
+ }
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
+ gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
+ return NULL;
+ }
Added: trunk/www/chromium/files/patch-ui__views__views_delegate.h
===================================================================
--- trunk/www/chromium/files/patch-ui__views__views_delegate.h (rev 0)
+++ trunk/www/chromium/files/patch-ui__views__views_delegate.h 2014-09-16 02:25:20 UTC (rev 17338)
@@ -0,0 +1,11 @@
+--- ./ui/views/views_delegate.h.orig 2014-08-12 21:02:26.000000000 +0200
++++ ./ui/views/views_delegate.h 2014-08-13 09:57:00.000000000 +0200
+@@ -94,7 +94,7 @@
+ // Returns true if the window passed in is in the Windows 8 metro
+ // environment.
+ virtual bool IsWindowInMetro(gfx::NativeWindow window) const;
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
+ virtual gfx::ImageSkia* GetDefaultWindowIcon() const;
+ #endif
+
More information about the Midnightbsd-cvs
mailing list