svn commit: r334216 - in head/www/chromium: . files
Rene Ladan
rene at FreeBSD.org
Mon Nov 18 16:02:44 UTC 2013
Author: rene
Date: Mon Nov 18 16:02:34 2013
New Revision: 334216
URL: http://svnweb.freebsd.org/changeset/ports/334216
Log:
Update to 31.0.1650.57
This release has some patches merged back upstream, thanks to George Liaskos.
Security: http://vuxml.org/freebsd/3bfc7016-4bcc-11e3-b0cf-00262d5ed8ee.html
Security: http://vuxml.org/freebsd/e62ab2af-4df4-11e3-b0cf-00262d5ed8ee.html
Added:
head/www/chromium/files/patch-base__strings__safe_sprintf_unittest.cc (contents, props changed)
head/www/chromium/files/patch-base__test__test_launcher.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h (contents, props changed)
head/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__operation.h (contents, props changed)
head/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__web_applications__web_app.h (contents, props changed)
head/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi (contents, props changed)
head/www/chromium/files/patch-chrome__common__chrome_switches.cc (contents, props changed)
head/www/chromium/files/patch-chrome__common__chrome_switches.h (contents, props changed)
head/www/chromium/files/patch-content__browser__geolocation__empty_wifi_data_provider.cc (contents, props changed)
head/www/chromium/files/patch-media__audio__audio_manager_unittest.cc (contents, props changed)
head/www/chromium/files/patch-third_party__WebKit__Source__bindings__v8__V8NPUtils.cpp (contents, props changed)
head/www/chromium/files/patch-third_party__WebKit__Source__bindings__v8__V8PerContextData.cpp (contents, props changed)
head/www/chromium/files/patch-third_party__WebKit__Source__bindings__v8__npruntime.cpp (contents, props changed)
head/www/chromium/files/patch-third_party__WebKit__Source__config.h (contents, props changed)
head/www/chromium/files/patch-third_party__WebKit__Source__core__rendering__RenderingNodeProxy.cpp (contents, props changed)
head/www/chromium/files/patch-third_party__WebKit__Source__web__gtk__WebInputEventFactory.cpp (contents, props changed)
head/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp (contents, props changed)
head/www/chromium/files/patch-v8__src__platform-freebsd.cc (contents, props changed)
Deleted:
head/www/chromium/files/patch-base__sys_byteorder.h
head/www/chromium/files/patch-chrome__browser__chrome_notification_types.h
head/www/chromium/files/patch-chrome__browser__media_galleries__scoped_mtp_device_map_entry.cc
head/www/chromium/files/patch-chrome__browser__process_singleton.h
head/www/chromium/files/patch-chrome__chrome_tests.gypi
head/www/chromium/files/patch-chrome__common__child_process_logging.h
head/www/chromium/files/patch-chrome__common__url_constants.cc
head/www/chromium/files/patch-chrome__common__url_constants.h
head/www/chromium/files/patch-chrome__renderer__pepper__ppb_pdf_impl.cc
head/www/chromium/files/patch-content__browser__geolocation__empty_device_data_provider.cc
head/www/chromium/files/patch-content__browser__plugin_service_impl.cc
head/www/chromium/files/patch-content__browser__web_contents__web_contents_impl.cc
head/www/chromium/files/patch-content__renderer__pepper__pepper_plugin_instance_impl.cc
head/www/chromium/files/patch-skia__ext__vector_platform_device_skia.cc
head/www/chromium/files/patch-skia__ext__vector_platform_device_skia.h
head/www/chromium/files/patch-third_party__WebKit__Source__wtf__NumberOfCores.cpp
head/www/chromium/files/patch-third_party__ffmpeg__libavcodec__pthread.c
head/www/chromium/files/patch-third_party__leveldatabase__env_chromium.cc
head/www/chromium/files/patch-tools__clang__scripts__plugin_flags.sh
head/www/chromium/files/patch-ui__base__l10n__l10n_util.cc
head/www/chromium/files/patch-ui__gfx__image__image_family.h
Modified:
head/www/chromium/Makefile
head/www/chromium/distinfo
head/www/chromium/files/extra-patch-clang
head/www/chromium/files/patch-base__threading__platform_thread_linux.cc
head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
head/www/chromium/files/patch-chrome__browser__browser_process_impl.cc
head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc
head/www/chromium/files/patch-chrome__test__perf__perf_test.cc
head/www/chromium/files/patch-content__browser__browser_main_loop.cc
head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h
head/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
head/www/chromium/files/patch-media__audio__linux__audio_manager_linux.cc
head/www/chromium/files/patch-media__media.gyp
head/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
head/www/chromium/files/patch-third_party__WebKit__Source__core__features.gypi
head/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
head/www/chromium/files/patch-third_party__libjingle__libjingle.gyp
head/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
head/www/chromium/files/patch-webkit__browser__fileapi__file_system_dir_url_request_job_unittest.cc
head/www/chromium/pkg-plist
Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/Makefile Mon Nov 18 16:02:34 2013 (r334216)
@@ -5,7 +5,7 @@
PORTNAME= chromium
DISTVERSIONPREFIX= courgette-redacted-
-DISTVERSION= 30.0.1599.101
+DISTVERSION= 31.0.1650.57
CATEGORIES= www
MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/:testdata \
http://download.goodking.org/downloads/:browser \
@@ -98,6 +98,9 @@ GCC_DESC= Build Chromium with GCC 4.6+
OPTIONS_DEFAULT= CODECS GCONF
+GCONF_USE= GNOME=gconf2
+PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MCODECS}
@@ -108,14 +111,11 @@ GYP_DEFINES+= ffmpeg_branding=Chromium
GYP_DEFINES+= proprietary_codecs=0
.endif
-.if ${PORT_OPTIONS:MGCONF}
-USE_GNOME+= gconf2
-.else
+.if ! ${PORT_OPTIONS:MGCONF}
GYP_DEFINES+= use_gconf=0
.endif
.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio
GYP_DEFINES+= use_pulseaudio=1
.else
GYP_DEFINES+= use_pulseaudio=0
@@ -163,8 +163,7 @@ TEST_TARGETS= base_unittests \
content_unittests
EXCLUDED_TESTS= GpuDriverBugListTest.CurrentDriverBugListValidation
NINJA_TARGETS+= ${TEST_TARGETS}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:browser \
- ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:testdata
+DISTFILES+= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
.endif
.if ${PORT_OPTIONS:MDEBUG}
@@ -182,7 +181,7 @@ CONFIGURE_ENV+= CC=${CC} \
GYP_DEFINES="${GYP_DEFINES}"
# according to portlint the below is passed via bsd.port.mk,
# but 'make -V CONFIGURE_ENV' does not show it:
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \
+CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \
CPPFLAGS="${CPPFLAGS}" \
CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}"
Modified: head/www/chromium/distinfo
==============================================================================
--- head/www/chromium/distinfo Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/distinfo Mon Nov 18 16:02:34 2013 (r334216)
@@ -1,4 +1,4 @@
-SHA256 (chromium-courgette-redacted-30.0.1599.101.tar.xz) = 0c7a8057c19a9df8e87c82b66c276baff3e9681b0b5b25104d7f6fd379e1d05a
-SIZE (chromium-courgette-redacted-30.0.1599.101.tar.xz) = 167651764
-SHA256 (chromium-30.0.1599.101-testdata.tar.xz) = b388b29a64e6d521839b405237ad93559ec93bf74e464b12e69aca6e3d5e1e8c
-SIZE (chromium-30.0.1599.101-testdata.tar.xz) = 108826864
+SHA256 (chromium-courgette-redacted-31.0.1650.57.tar.xz) = 30ba6fd023128812ef2512d88e956924e0fc351e4c440cc078ab03f00b798060
+SIZE (chromium-courgette-redacted-31.0.1650.57.tar.xz) = 183268828
+SHA256 (chromium-31.0.1650.57-testdata.tar.xz) = d929bc500d121784e99e2a902378aad620e533f6c36ad6307b6213fb4ce82a36
+SIZE (chromium-31.0.1650.57-testdata.tar.xz) = 111204896
Modified: head/www/chromium/files/extra-patch-clang
==============================================================================
--- head/www/chromium/files/extra-patch-clang Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/extra-patch-clang Mon Nov 18 16:02:34 2013 (r334216)
@@ -144,17 +144,6 @@
HttpCache::DefaultBackend::InMemory(0)) {
set_http_transaction_factory(&cache_);
}
---- third_party/WebKit/Source/wtf/TypeTraits.h 2013-07-04 00:14:12.000000000 -0400
-+++ third_party/WebKit/Source/wtf/TypeTraits.h 2013-07-19 01:29:01.000000000 -0400
-@@ -24,7 +24,7 @@
-
- #include <wtf/Platform.h>
-
--#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
-+#if !COMPILER(CLANG) && ((defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600)))
- #include <type_traits>
- #if defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)
- #include <tr1/memory>
--- 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 @@
@@ -232,4 +221,15 @@
+ : 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(
Added: head/www/chromium/files/patch-base__strings__safe_sprintf_unittest.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base__strings__safe_sprintf_unittest.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -0,0 +1,17 @@
+--- 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
Added: head/www/chromium/files/patch-base__test__test_launcher.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base__test__test_launcher.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -0,0 +1,13 @@
+--- base/test/test_launcher.cc.orig 2013-11-08 07:42:08.000000000 +0100
++++ base/test/test_launcher.cc 2013-11-15 14:11:58.000000000 +0100
+@@ -8,6 +8,10 @@
+ #include <fcntl.h>
+ #endif
+
++#if defined(OS_BSD)
++#include <signal.h>
++#endif
++
+ #include "base/at_exit.h"
+ #include "base/bind.h"
+ #include "base/command_line.h"
Modified: head/www/chromium/files/patch-base__threading__platform_thread_linux.cc
==============================================================================
--- head/www/chromium/files/patch-base__threading__platform_thread_linux.cc Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-base__threading__platform_thread_linux.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -14,7 +14,7 @@
ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
tracked_objects::ThreadData::InitializeThreadContext(name);
--#ifndef OS_NACL
+-#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
Modified: head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig 2013-09-20 05:35:27.000000000 +0300
-+++ chrome/app/chrome_main_delegate.cc 2013-09-25 21:42:44.000000000 +0300
-@@ -92,7 +92,7 @@
+--- chrome/app/chrome_main_delegate.cc.orig 2013-11-08 07:41:27.000000000 +0100
++++ chrome/app/chrome_main_delegate.cc 2013-11-16 11:29:59.000000000 +0100
+@@ -96,7 +96,7 @@
#include "ui/base/x/x11_util.h"
#endif
@@ -9,7 +9,7 @@
#include "chrome/app/breakpad_linux.h"
#endif
-@@ -110,7 +110,7 @@
+@@ -114,7 +114,7 @@
g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
#endif
@@ -18,7 +18,7 @@
base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky
g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER;
#endif
-@@ -230,7 +230,7 @@
+@@ -234,7 +234,7 @@
// Mac needs them for the plugin process name.
process_type == switches::kPluginProcess ||
#endif
@@ -27,7 +27,25 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
-@@ -573,7 +573,7 @@
+@@ -391,7 +391,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 {
+@@ -432,7 +432,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 {
+@@ -563,7 +563,7 @@
std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType);
@@ -36,7 +54,7 @@
breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer());
#endif
-@@ -699,7 +699,7 @@
+@@ -700,7 +700,7 @@
#endif
}
@@ -45,7 +63,7 @@
// Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain
// sets this up for the browser process in a different manner. Zygotes
// need to call InitCrashReporter() in RunZygote().
-@@ -811,7 +811,7 @@
+@@ -813,7 +813,7 @@
SetUpProfilingShutdownHandler();
}
Modified: head/www/chromium/files/patch-chrome__browser__browser_process_impl.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__browser_process_impl.cc Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-chrome__browser__browser_process_impl.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -12,7 +12,7 @@
@@ -618,7 +618,7 @@
}
- chrome::StorageMonitor* BrowserProcessImpl::storage_monitor() {
+ StorageMonitor* BrowserProcessImpl::storage_monitor() {
-#if defined(OS_ANDROID) || defined(OS_IOS)
+#if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_BSD)
return NULL;
@@ -21,7 +21,7 @@
@@ -627,7 +627,7 @@
void BrowserProcessImpl::set_storage_monitor_for_test(
- scoped_ptr<chrome::StorageMonitor> monitor) {
+ 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();
@@ -33,6 +33,6 @@
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD)
- storage_monitor_.reset(chrome::StorageMonitor::Create());
+ storage_monitor_.reset(StorageMonitor::Create());
#endif
Modified: head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -1,14 +1,5 @@
--- chrome/browser/chrome_content_browser_client.cc.orig 2013-09-25 22:01:36.000000000 +0300
+++ chrome/browser/chrome_content_browser_client.cc 2013-09-25 22:11:33.000000000 +0300
-@@ -166,7 +166,7 @@
- #include "chrome/browser/chrome_browser_main_posix.h"
- #endif
-
--#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_ANDROID)
- #include "base/linux_util.h"
- #include "chrome/browser/crash_handler_host_linux.h"
- #endif
@@ -480,7 +480,7 @@
}
}
Added: head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -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: head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h Mon Nov 18 16:02:34 2013 (r334216)
@@ -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: head/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -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: head/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__operation.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__operation.h Mon Nov 18 16:02:34 2013 (r334216)
@@ -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,
Modified: head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -1,11 +1,11 @@
--- chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2013-05-07 23:41:27.000000000 +0300
+++ chrome/browser/extensions/api/serial/serial_connection_posix.cc 2013-05-08 00:08:36.000000000 +0300
@@ -67,7 +67,7 @@
+ return B19200;
case 38400:
- bitrate_opt_ = B38400;
- break;
+ return B38400;
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
case 57600:
- bitrate_opt_ = B57600;
- break;
+ return B57600;
+ case 115200:
Added: head/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -0,0 +1,16 @@
+--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2013-11-16 01:16:27.000000000 +0100
++++ chrome/browser/media_galleries/media_file_system_registry.cc 2013-11-17 23:26:00.000000000 +0100
+@@ -68,11 +68,13 @@
+ void InitMTPDeviceAsyncDelegate(
+ const base::FilePath::StringType& device_location) {
+ DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
++#if !defined(OS_FREEBSD)
+ content::BrowserThread::PostTask(
+ content::BrowserThread::IO, FROM_HERE, base::Bind(
+ &CreateMTPDeviceAsyncDelegate,
+ device_location,
+ base::Bind(&OnMTPDeviceAsyncDelegateCreated, device_location)));
++#endif
+ }
+
+ } // namespace
Added: head/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -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: head/www/chromium/files/patch-chrome__browser__web_applications__web_app.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__web_applications__web_app.h Mon Nov 18 16:02:34 2013 (r334216)
@@ -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.
Added: head/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi Mon Nov 18 16:02:34 2013 (r334216)
@@ -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',
Added: head/www/chromium/files/patch-chrome__common__chrome_switches.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__common__chrome_switches.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -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: head/www/chromium/files/patch-chrome__common__chrome_switches.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__common__chrome_switches.h Mon Nov 18 16:02:34 2013 (r334216)
@@ -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
+
Modified: head/www/chromium/files/patch-chrome__test__perf__perf_test.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__test__perf__perf_test.cc Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-chrome__test__perf__perf_test.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -1,6 +1,6 @@
--- 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
-@@ -494,7 +494,7 @@
+@@ -352,7 +352,7 @@
AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name,
total_working_set_size, "bytes",
false /* not important */);
Modified: head/www/chromium/files/patch-content__browser__browser_main_loop.cc
==============================================================================
--- head/www/chromium/files/patch-content__browser__browser_main_loop.cc Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-content__browser__browser_main_loop.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -1,14 +1,5 @@
--- content/browser/browser_main_loop.cc.orig 2013-02-28 10:14:31.000000000 +0200
+++ content/browser/browser_main_loop.cc 2013-03-06 21:28:00.000000000 +0200
-@@ -73,7 +73,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
-
@@ -87,7 +87,7 @@
#include "ui/gfx/gtk_util.h"
#endif
@@ -27,15 +18,6 @@
void SetupSandbox(const CommandLine& parsed_command_line) {
// TODO(evanm): move this into SandboxWrapper; I'm just trying to move this
// code en masse out of chrome_main for now.
-@@ -139,7 +139,7 @@
- }
- #endif
-
--#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,
@@ -311,7 +311,7 @@
crypto::EnsureNSPRInit();
#endif // !defined(USE_OPENSSL)
@@ -45,12 +27,3 @@
SetupSandbox(parsed_command_line_);
#endif
-@@ -758,7 +758,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)
- // g_type_init will be deprecated in 2.36. 2.35 is the development
- // version for 2.36, hence do not call g_type_init starting 2.35.
- // http://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-init
Added: head/www/chromium/files/patch-content__browser__geolocation__empty_wifi_data_provider.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-content__browser__geolocation__empty_wifi_data_provider.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -0,0 +1,11 @@
+--- content/browser/geolocation/empty_wifi_data_provider.cc.orig 2013-11-08 07:41:47.000000000 +0100
++++ content/browser/geolocation/empty_wifi_data_provider.cc 2013-11-14 17:33:23.000000000 +0100
+@@ -19,7 +19,7 @@
+ }
+
+ // Only define for platforms that lack a real wifi data provider.
+-#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX)
++#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_FREEBSD)
+ // static
+ WifiDataProviderImplBase* WifiDataProvider::DefaultFactoryFunction() {
+ return new EmptyWifiDataProvider();
Modified: head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
==============================================================================
--- head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -1,6 +1,6 @@
---- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2013-08-17 18:48:06.000000000 +0300
-+++ content/browser/geolocation/wifi_data_provider_freebsd.cc 2013-08-17 20:22:02.000000000 +0300
-@@ -0,0 +1,201 @@
+--- 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.
@@ -100,7 +100,7 @@
+
+ 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;
+
@@ -174,7 +174,6 @@
+} // namespace
+
+// static
-+template<>
+WifiDataProviderImplBase* WifiDataProvider::DefaultFactoryFunction() {
+ return new FreeBSDWifiDataProvider();
+}
@@ -194,8 +193,8 @@
+ return NULL;
+}
+
-+PollingPolicyInterface* FreeBSDWifiDataProvider::NewPollingPolicy() {
-+ return new GenericPollingPolicy<kDefaultPollingInterval,
++WifiPollingPolicy* FreeBSDWifiDataProvider::NewPollingPolicy() {
++ return new GenericWifiPollingPolicy<kDefaultPollingInterval,
+ kNoChangePollingInterval,
+ kTwoNoChangePollingInterval,
+ kNoWifiPollingIntervalMilliseconds>;
Modified: head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h
==============================================================================
--- head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h Mon Nov 18 16:02:34 2013 (r334216)
@@ -1,6 +1,6 @@
---- content/browser/geolocation/wifi_data_provider_freebsd.h.orig 2012-12-27 23:17:38.000000000 +0100
-+++ content/browser/geolocation/wifi_data_provider_freebsd.h 2012-12-28 12:31:07.000000000 +0100
-@@ -0,0 +1,29 @@
+--- 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.
@@ -8,7 +8,9 @@
+#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 {
+
@@ -22,7 +24,7 @@
+
+ // WifiDataProviderCommon
+ virtual WlanApiInterface* NewWlanApi() OVERRIDE;
-+ virtual PollingPolicyInterface* NewPollingPolicy() OVERRIDE;
++ virtual WifiPollingPolicy* NewPollingPolicy() OVERRIDE;
+
+ DISALLOW_COPY_AND_ASSIGN(FreeBSDWifiDataProvider);
+};
Modified: head/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
==============================================================================
--- head/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -13,25 +13,6 @@
#else
const int kValidInputRates[] = {44100};
#endif
-@@ -39,14 +39,14 @@
- #if defined(OS_WIN) || defined(OS_MACOSX)
- // Use a buffer size of 10ms.
- buffer_size = (sample_rate / 100);
--#elif defined(OS_LINUX) || defined(OS_OPENBSD)
-+#elif defined(OS_ANDROID)
-+ // TODO(leozwang): Tune and adjust buffer size on Android.
-+ buffer_size = 2 * sample_rate / 100;
-+#elif defined(OS_POSIX)
- // Based on tests using the current ALSA implementation in Chrome, we have
- // found that the best combination is 20ms on the input side and 10ms on the
- // output side.
- buffer_size = 2 * sample_rate / 100;
--#elif defined(OS_ANDROID)
-- // TODO(leozwang): Tune and adjust buffer size on Android.
-- buffer_size = 2 * sample_rate / 100;
- #endif
- return buffer_size;
- }
@@ -430,7 +430,7 @@
// CaptureCallback.
#if defined(OS_WIN) || defined(OS_MACOSX)
Added: head/www/chromium/files/patch-media__audio__audio_manager_unittest.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-media__audio__audio_manager_unittest.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -0,0 +1,14 @@
+--- media/audio/audio_manager_unittest.cc.orig 2013-11-08 07:41:29.000000000 +0100
++++ media/audio/audio_manager_unittest.cc 2013-11-15 15:40:31.000000000 +0100
+@@ -9,9 +9,9 @@
+ #include "media/audio/audio_manager_base.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ #include "media/audio/linux/audio_manager_linux.h"
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_FREEBSD)
+
+ #if defined(OS_WIN)
+ #include "base/win/scoped_com_initializer.h"
Modified: head/www/chromium/files/patch-media__audio__linux__audio_manager_linux.cc
==============================================================================
--- head/www/chromium/files/patch-media__audio__linux__audio_manager_linux.cc Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-media__audio__linux__audio_manager_linux.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -1,7 +1,7 @@
---- media/audio/linux/audio_manager_linux.cc.orig 2013-02-04 04:01:12.000000000 +0200
-+++ media/audio/linux/audio_manager_linux.cc 2013-02-16 01:04:00.975548702 +0200
-@@ -126,22 +126,20 @@
- void AudioManagerLinux::GetAlsaAudioInputDevices(
+--- media/audio/linux/audio_manager_linux.cc.orig 2013-11-08 07:41:29.000000000 +0100
++++ media/audio/linux/audio_manager_linux.cc 2013-11-15 15:24:00.000000000 +0100
+@@ -127,22 +127,20 @@
+ StreamType type,
media::AudioDeviceNames* device_names) {
// Constants specified by the ALSA API for device hints.
+ static const int kGetAllDevices = -1;
@@ -13,19 +13,19 @@
- void** hints = NULL;
- int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
- if (!error) {
-- GetAlsaDevicesInfo(hints, device_names);
+- GetAlsaDevicesInfo(type, hints, device_names);
-
- // Destroy the hints now that we're done with it.
- wrapper_->DeviceNameFreeHint(hints);
- } else {
-- DLOG(WARNING) << "GetAudioInputDevices: unable to get device hints: "
+- DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: "
- << wrapper_->StrError(error);
- }
+ void** hints = NULL;
+ int error =
+ wrapper_->DeviceNameHint(kGetAllDevices, kPcmInterfaceName, &hints);
+ if (!error) {
-+ GetAlsaDevicesInfo(hints, device_names);
++ GetAlsaDevicesInfo(type, hints, device_names);
+
+ // Destroy the hints now that we're done with it.
+ wrapper_->DeviceNameFreeHint(hints);
@@ -35,16 +35,14 @@
}
}
-@@ -231,40 +229,47 @@
- }
+@@ -244,41 +242,43 @@
- bool AudioManagerLinux::HasAnyAlsaAudioDevice(StreamType stream) {
+ bool AudioManagerLinux::HasAnyAlsaAudioDevice(
+ AudioManagerLinux::StreamType stream) {
+ // Constants specified by the ALSA API for device hints.
+ static const int kGetAllDevices = -1;
static const char kPcmInterfaceName[] = "pcm";
static const char kIoHintName[] = "IOID";
- const char* kNotWantedDevice =
- (stream == kStreamPlayback ? "Input" : "Output");
void** hints = NULL;
bool has_device = false;
- int card = -1;
@@ -60,14 +58,15 @@
- // "Input", "Output", and NULL which means both input and output.
- scoped_ptr_malloc<char> io(wrapper_->DeviceNameGetHint(*hint_iter,
- kIoHintName));
-- if (io != NULL && strcmp(kNotWantedDevice, io.get()) == 0)
+- const char* unwanted_type = UnwantedDeviceTypeWhenEnumerating(stream);
+- if (io != NULL && strcmp(unwanted_type, io.get()) == 0)
- continue; // Wrong type, skip the device.
-
- // Found an input device.
- has_device = true;
- break;
- }
-+ // If checking for Input devices, only return true if there is an
++ // If checking the Input devices, only return true if there is an
+ // actual audio card. The bots have virtual audio input devices that do
+ // not actually generate samples, breaking some tests.
+ // See crbug.com/165401.
@@ -91,20 +90,19 @@
+ // "Input", "Output", and NULL which means both input and output.
+ scoped_ptr_malloc<char> io(wrapper_->DeviceNameGetHint(*hint_iter,
+ kIoHintName));
-+ if (io != NULL && strcmp(kNotWantedDevice, io.get()) == 0)
++ const char* unwanted_type = UnwantedDeviceTypeWhenEnumerating(stream);
++ if (io != NULL && strcmp(unwanted_type, io.get()) == 0)
+ continue; // Wrong type, skip the device.
+
+ // Found a device of the |stream| type.
+ has_device = true;
+ break;
}
-+
-+ // Destroy the hints now that we're done with it.
-+ wrapper_->DeviceNameFreeHint(hints);
-+ hints = NULL;
+ } else {
+ DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: "
+ << wrapper_->StrError(error);
}
-
+-
return has_device;
+ }
+
Modified: head/www/chromium/files/patch-media__media.gyp
==============================================================================
--- head/www/chromium/files/patch-media__media.gyp Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-media__media.gyp Mon Nov 18 16:02:34 2013 (r334216)
@@ -1,6 +1,6 @@
---- media/media.gyp.orig 2013-04-30 10:22:14.000000000 +0300
-+++ media/media.gyp 2013-05-08 21:54:11.000000000 +0300
-@@ -598,7 +598,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,3 +9,12 @@
'variables': {
'conditions': [
['sysroot!=""', {
+@@ -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',
Added: head/www/chromium/files/patch-third_party__WebKit__Source__bindings__v8__V8NPUtils.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__bindings__v8__V8NPUtils.cpp Mon Nov 18 16:02:34 2013 (r334216)
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/bindings/v8/V8NPUtils.cpp.orig 2013-11-08 07:50:07.000000000 +0100
++++ third_party/WebKit/Source/bindings/v8/V8NPUtils.cpp 2013-11-15 16:15:06.000000000 +0100
+@@ -39,6 +39,8 @@
+ #include "core/page/DOMWindow.h"
+ #include "wtf/text/WTFString.h"
+
++#include <stdlib.h>
++
+ namespace WebCore {
+
+ void convertV8ObjectToNPVariant(v8::Local<v8::Value> object, NPObject* owner, NPVariant* result, v8::Isolate* isolate)
Added: head/www/chromium/files/patch-third_party__WebKit__Source__bindings__v8__V8PerContextData.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__bindings__v8__V8PerContextData.cpp Mon Nov 18 16:02:34 2013 (r334216)
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/bindings/v8/V8PerContextData.cpp.orig 2013-11-08 07:50:07.000000000 +0100
++++ third_party/WebKit/Source/bindings/v8/V8PerContextData.cpp 2013-11-15 16:16:51.000000000 +0100
+@@ -35,6 +35,8 @@
+ #include "bindings/v8/V8ObjectConstructor.h"
+ #include "wtf/StringExtras.h"
+
++#include <stdlib.h>
++
+ namespace WebCore {
+
+ template<typename Map>
Added: head/www/chromium/files/patch-third_party__WebKit__Source__bindings__v8__npruntime.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__bindings__v8__npruntime.cpp Mon Nov 18 16:02:34 2013 (r334216)
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/bindings/v8/npruntime.cpp.orig 2013-11-08 07:50:07.000000000 +0100
++++ third_party/WebKit/Source/bindings/v8/npruntime.cpp 2013-11-15 16:19:52.000000000 +0100
+@@ -36,6 +36,8 @@
+ #include "wtf/HashSet.h"
+ #include "wtf/HashTableDeletedValueType.h"
+
++#include <stdlib.h>
++
+ using namespace WebCore;
+
+ // FIXME: Consider removing locks if we're singlethreaded already.
Added: head/www/chromium/files/patch-third_party__WebKit__Source__config.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__config.h Mon Nov 18 16:02:34 2013 (r334216)
@@ -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
+@@ -181,6 +181,6 @@
+ #define __STDC_FORMAT_MACROS 1
+ #endif
+
+-#if OS(LINUX) || OS(ANDROID)
++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+ #define WTF_USE_HARFBUZZ 1
+ #endif
Modified: head/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
==============================================================================
--- head/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp Mon Nov 18 16:02:34 2013 (r334216)
@@ -1,9 +1,9 @@
--- 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
@@ -644,7 +644,7 @@
- ['exclude', 'platform/chromium/ScrollbarThemeChromiumDefault.h'],
- ],
- }],
+ ['exclude', 'platform/graphics/cpu/arm/filters/.*NEON\\.(cpp|h)'],
+ ],
+ 'conditions': [
- ['OS=="linux" or OS=="android"', {
+ ['OS=="linux" or OS=="android" or os_bsd==1', {
'sources/': [
Modified: head/www/chromium/files/patch-third_party__WebKit__Source__core__features.gypi
==============================================================================
--- head/www/chromium/files/patch-third_party__WebKit__Source__core__features.gypi Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__core__features.gypi Mon Nov 18 16:02:34 2013 (r334216)
@@ -9,12 +9,3 @@
'feature_defines': [
'ENABLE_OPENTYPE_VERTICAL=1',
],
-@@ -104,7 +104,7 @@
- 'ENABLE_RUBBER_BANDING=1',
- ],
- }],
-- ['OS=="linux" or OS=="android"', {
-+ ['OS=="linux" or OS=="android" or os_bsd==1', {
- 'feature_defines': [
- 'WTF_USE_HARFBUZZ=1',
- ],
Added: head/www/chromium/files/patch-third_party__WebKit__Source__core__rendering__RenderingNodeProxy.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__core__rendering__RenderingNodeProxy.cpp Mon Nov 18 16:02:34 2013 (r334216)
@@ -0,0 +1,10 @@
+--- third_party/WebKit/Source/core/rendering/RenderingNodeProxy.cpp.orig 2013-11-16 01:26:13.000000000 +0100
++++ third_party/WebKit/Source/core/rendering/RenderingNodeProxy.cpp 2013-11-18 00:00:41.000000000 +0100
+@@ -31,6 +31,7 @@
+ #include "config.h"
+ #include "core/rendering/RenderingNodeProxy.h"
+
++#include "core/dom/Element.h"
+ #include "core/dom/Node.h"
+
+ namespace WebCore {
Added: head/www/chromium/files/patch-third_party__WebKit__Source__web__gtk__WebInputEventFactory.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__web__gtk__WebInputEventFactory.cpp Mon Nov 18 16:02:34 2013 (r334216)
@@ -0,0 +1,22 @@
+--- third_party/WebKit/Source/web/gtk/WebInputEventFactory.cpp.orig 2013-11-08 07:50:07.000000000 +0100
++++ third_party/WebKit/Source/web/gtk/WebInputEventFactory.cpp 2013-11-15 19:38:46.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()
Modified: head/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
==============================================================================
--- head/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp Mon Nov 18 16:02:34 2013 (r334216)
@@ -1,6 +1,6 @@
--- 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
-@@ -646,7 +646,7 @@
+@@ -142,7 +142,7 @@
},
},
}],
Added: head/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp Mon Nov 18 16:02:34 2013 (r334216)
@@ -0,0 +1,38 @@
+--- 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,8 @@
+ #include "StringExtras.h"
+
+ #include <algorithm>
++#include <cstdlib>
++#include <stdlib.h>
+ #include <limits.h>
+ #include <limits>
+ #include <stdint.h>
+@@ -665,7 +667,7 @@
+ return 0;
+ if (*postParsePosition != ':' || (postParsePosition - currentPosition) != 2)
+ return 0;
+- tzHoursAbs = labs(tzHours);
++ tzHoursAbs = std::labs(tzHours);
+ currentPosition = postParsePosition + 1;
+
+ if (!isASCIIDigit(*currentPosition))
+@@ -979,7 +981,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;
+@@ -1077,7 +1079,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));
+
Modified: head/www/chromium/files/patch-third_party__libjingle__libjingle.gyp
==============================================================================
--- head/www/chromium/files/patch-third_party__libjingle__libjingle.gyp Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-third_party__libjingle__libjingle.gyp Mon Nov 18 16:02:34 2013 (r334216)
@@ -15,6 +15,6 @@
# TODO(mallinath) - Enable SCTP for Android and iOS platforms.
- ['OS!="android" and OS!="ios"', {
+ ['OS!="android" and OS!="ios" and os_bsd!=1', {
- 'conditions': [
- ['OS!="win"', {
- 'defines': [
+ 'defines': [
+ ['HAVE_SCTP',
+ ],
Modified: head/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
==============================================================================
--- head/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py Mon Nov 18 15:53:43 2013 (r334215)
+++ head/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py Mon Nov 18 16:02:34 2013 (r334216)
@@ -9,7 +9,7 @@
default_variables.setdefault('OS', operating_system)
default_variables.setdefault('SHARED_LIB_SUFFIX', '.so')
default_variables.setdefault('SHARED_LIB_DIR','$(builddir)/lib.$(TOOLSET)')
-@@ -265,19 +265,19 @@
+@@ -250,30 +250,30 @@
CFLAGS.target ?= $(CFLAGS)
CXX.target ?= %(CXX.target)s
CXXFLAGS.target ?= $(CXXFLAGS)
@@ -17,7 +17,18 @@
+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
@@ -37,7 +48,7 @@
# Define a dir function that can handle spaces.
# http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions
-@@ -1782,7 +1782,7 @@
+@@ -1770,7 +1770,7 @@
return modules
# Retrieve the default value of 'SHARED_LIB_SUFFIX'
Added: head/www/chromium/files/patch-v8__src__platform-freebsd.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-v8__src__platform-freebsd.cc Mon Nov 18 16:02:34 2013 (r334216)
@@ -0,0 +1,11 @@
+--- v8/src/platform-freebsd.cc.orig 2013-11-08 08:01:04.000000000 +0100
++++ v8/src/platform-freebsd.cc 2013-11-15 14:07:46.000000000 +0100
+@@ -189,7 +189,7 @@
+ // There may be no filename in this line. Skip to next.
+ if (start_of_path == NULL) continue;
+ buffer[bytes_read] = 0;
+- LOG(isolate SharedLibraryEvent(start_of_path, start, end));
++ LOG(isolate, SharedLibraryEvent(start_of_path, start, end));
+ }
+ close(fd);
+ }
Modified: head/www/chromium/files/patch-webkit__browser__fileapi__file_system_dir_url_request_job_unittest.cc
==============================================================================
--- head/www/chromium/files/patch-webkit__browser__fileapi__file_system_dir_url_request_job_unittest.cc Mon Nov 18 15:53:43 2013 (r334215)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list