svn commit: r329879 - in head/www/chromium: . files
Rene Ladan
rene at FreeBSD.org
Wed Oct 9 10:01:17 UTC 2013
Author: rene
Date: Wed Oct 9 10:01:09 2013
New Revision: 329879
URL: http://svnweb.freebsd.org/changeset/ports/329879
Log:
Update to 30.0.1599.66
Note that support for 10.0 is currently untested, WIP.
Submitted by: George Liaskos
Security: http://vuxml.org/freebsd/e5414d0c-2ade-11e3-821d-00262d5ed8ee.html
Added:
head/www/chromium/files/patch-base__base.gyp (contents, props changed)
head/www/chromium/files/patch-base__process__memory_unittest.cc (contents, props changed)
head/www/chromium/files/patch-base__process__process_handle_freebsd.cc (contents, props changed)
head/www/chromium/files/patch-chrome__app__policy__policy_templates.json (contents, props changed)
head/www/chromium/files/patch-chrome__browser__browser_process_impl.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h (contents, props changed)
head/www/chromium/files/patch-chrome__browser__chrome_notification_types.h (contents, props changed)
head/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__usb__usb_context.cc (contents, props changed)
head/www/chromium/files/patch-chrome__tools__build__generate_policy_source.py (contents, props changed)
head/www/chromium/files/patch-content__browser__plugin_service_impl.cc (contents, props changed)
head/www/chromium/files/patch-content__renderer__pepper__pepper_plugin_instance_impl.cc (contents, props changed)
head/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc (contents, props changed)
head/www/chromium/files/patch-skia__skia_chrome.gypi (contents, props changed)
head/www/chromium/files/patch-skia__skia_library.gypi (contents, props changed)
head/www/chromium/files/patch-third_party__WebKit__Source__testing__testing.gyp (contents, props changed)
head/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp (contents, props changed)
Deleted:
head/www/chromium/files/extra-patch-libc++
head/www/chromium/files/patch-base__process_util_freebsd.cc
head/www/chromium/files/patch-base__process_util_unittest.cc
head/www/chromium/files/patch-build__linux__python_arch.sh
head/www/chromium/files/patch-chrome__browser__browser_about_handler.cc
head/www/chromium/files/patch-chrome__browser__extensions__api__system_info_storage__storage_info_provider_bsd.cc
head/www/chromium/files/patch-chrome__browser__extensions__api__system_info_storage__system_info_storage_api.cc
head/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h
head/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
head/www/chromium/files/patch-chrome__common__chrome_notification_types.h
head/www/chromium/files/patch-content__renderer__media__webrtc_audio_device_impl.cc
head/www/chromium/files/patch-issue-17359002
head/www/chromium/files/patch-skia__skia.gyp
head/www/chromium/files/patch-third_party__WebKit__Source__WebKit__chromium__WebKit.gyp
head/www/chromium/files/patch-third_party__WebKit__Tools__DumpRenderTree__DumpRenderTree.gyp__DumpRenderTree.gyp
head/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h
head/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc
head/www/chromium/files/patch-third_party__webrtc__video_engine__stream_synchronization.cc
head/www/chromium/files/patch-webkit__plugins__npapi__plugin_utils.cc
head/www/chromium/files/patch-webkit__plugins__ppapi__ppapi_plugin_instance.cc
head/www/chromium/files/patch-webkit__plugins__ppapi__usb_key_code_conversion.cc
Modified:
head/www/chromium/Makefile
head/www/chromium/distinfo
head/www/chromium/files/extra-patch-clang
head/www/chromium/files/extra-patch-gcc
head/www/chromium/files/patch-base__base.gypi
head/www/chromium/files/patch-base__sys_info_freebsd.cc
head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
head/www/chromium/files/patch-chrome__chrome_browser.gypi
head/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h
head/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
head/www/chromium/files/patch-media__base__audio_splicer.cc
head/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
head/www/chromium/files/patch-net__net.gyp
head/www/chromium/files/patch-third_party__WebKit__Source__core__features.gypi
head/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc
head/www/chromium/pkg-plist
Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/Makefile Wed Oct 9 10:01:09 2013 (r329879)
@@ -1,10 +1,11 @@
+# Created by: Florent Thoumie <flz at FreeBSD.org>
# $FreeBSD$
#TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3
PORTNAME= chromium
DISTVERSIONPREFIX= courgette-redacted-
-DISTVERSION= 29.0.1547.76
+DISTVERSION= 30.0.1599.66
CATEGORIES= www
MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/:testdata \
http://download.goodking.org/downloads/:browser \
@@ -19,7 +20,7 @@ LICENSE= BSD LGPL21 MPL
LICENSE_COMB= multi
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
-CFLAGS+= -fno-stack-protector
+CFLAGS+= -fno-stack-protector -Wno-unknown-warning-option
BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
bash:${PORTSDIR}/shells/bash \
@@ -139,9 +140,9 @@ CXX= clang++
.endif
GYP_DEFINES+= clang=1
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang
-.if ${OSVERSION} >= 1000054
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++
-.endif
+#.if ${OSVERSION} >= 1000054
+#EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++
+#.endif
.endif
.if ${PORT_OPTIONS:MTEST}
@@ -155,7 +156,7 @@ TEST_TARGETS= base_unittests \
sql_unittests \
net_unittests \
content_unittests
-EXCLUDED_TESTS=
+EXCLUDED_TESTS= GpuDriverBugListTest.CurrentDriverBugListValidation
NINJA_TARGETS+= ${TEST_TARGETS}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:browser \
${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:testdata
@@ -202,7 +203,7 @@ post-patch:
${WRKSRC}/third_party/libvpx/libvpx.gyp \
${WRKSRC}/crypto/crypto.gyp \
${WRKSRC}/v8/tools/gyp/v8.gyp \
- ${WRKSRC}/v8/build/common.gypi
+ ${WRKSRC}/v8/build/toolchain.gypi
@${REINPLACE_CMD} -e "s|/usr/bin/gcc|${CC}|" \
${WRKSRC}/third_party/WebKit/Source/core/core.gypi
@${REINPLACE_CMD} -e "s|'../courgette/courgette.gyp:courgette_lib',||" \
Modified: head/www/chromium/distinfo
==============================================================================
--- head/www/chromium/distinfo Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/distinfo Wed Oct 9 10:01:09 2013 (r329879)
@@ -1,4 +1,4 @@
-SHA256 (chromium-courgette-redacted-29.0.1547.76.tar.xz) = f2981bc31c485cad0e8ff2a540a74dd75fa1ec5e7a5357ef19b5c4d662d9f442
-SIZE (chromium-courgette-redacted-29.0.1547.76.tar.xz) = 173600568
-SHA256 (chromium-29.0.1547.76-testdata.tar.xz) = 408c13b3b2d56725c8569280710c07340cce463c9de44677211ea4fa566b4591
-SIZE (chromium-29.0.1547.76-testdata.tar.xz) = 108867432
+SHA256 (chromium-courgette-redacted-30.0.1599.66.tar.xz) = 473f3b0914e8ab4bea022b0e2b55eab1df43cebfef0d0c1d6f9aea2c2f2eadce
+SIZE (chromium-courgette-redacted-30.0.1599.66.tar.xz) = 167634408
+SHA256 (chromium-30.0.1599.66-testdata.tar.xz) = eca21bed4df5f0df5e75cccc8f057c54754dde88027cbe25cec21a31010102d6
+SIZE (chromium-30.0.1599.66-testdata.tar.xz) = 108833456
Modified: head/www/chromium/files/extra-patch-clang
==============================================================================
--- head/www/chromium/files/extra-patch-clang Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/files/extra-patch-clang Wed Oct 9 10:01:09 2013 (r329879)
@@ -233,24 +233,3 @@
CMapFormat::kFormat4, cmap_id) {
}
---- v8/src/heap.cc.orig 2013-08-30 22:09:43.000000000 +0300
-+++ v8/src/heap.cc 2013-08-30 22:10:26.000000000 +0300
-@@ -7285,7 +7285,7 @@
-
- #ifdef DEBUG
-
--Object* const PathTracer::kAnyGlobalObject = reinterpret_cast<Object*>(NULL);
-+Object* const PathTracer::kAnyGlobalObject = static_cast<Object*>(NULL);
-
- class PathTracer::MarkVisitor: public ObjectVisitor {
- public:
---- v8/src/stub-cache.cc 2013-07-03 23:56:49.000000000 -0400
-+++ v8/src/stub-cache.cc 2013-07-19 00:35:10.000000000 -0400
-@@ -1476,7 +1476,7 @@
- Handle<Name> name) {
- return (FLAG_print_code_stubs && !name.is_null() && name->IsString())
- ? GetCodeWithFlags(flags, *Handle<String>::cast(name)->ToCString())
-- : GetCodeWithFlags(flags, reinterpret_cast<char*>(NULL));
-+ : GetCodeWithFlags(flags, static_cast<char*>(NULL));
- }
-
Modified: head/www/chromium/files/extra-patch-gcc
==============================================================================
--- head/www/chromium/files/extra-patch-gcc Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/files/extra-patch-gcc Wed Oct 9 10:01:09 2013 (r329879)
@@ -28,3 +28,26 @@
#include <string>
#include "base/gtest_prod_util.h"
+--- third_party/libjingle/source/talk/base/network.h.orig 2013-05-26 21:44:12.257312749 +0200
++++ third_party/libjingle/source/talk/base/network.h 2013-05-26 21:45:08.869297313 +0200
+@@ -38,6 +38,10 @@
+ #include "talk/base/messagehandler.h"
+ #include "talk/base/sigslot.h"
+
++#if defined(OS_FREEBSD)
++#include <sys/types.h>
++#endif
++
+ #if defined(POSIX)
+ struct ifaddrs;
+ #endif // defined(POSIX)
+--- base/sys_info_freebsd.cc.orig 2013-05-17 22:44:42.000000000 +0200
++++ base/sys_info_freebsd.cc 2013-05-26 22:57:45.885322785 +0200
+@@ -4,6 +4,7 @@
+
+ #include "base/sys_info.h"
+
++#include <sys/types.h>
+ #include <sys/sysctl.h>
+
+ #include "base/logging.h"
Added: head/www/chromium/files/patch-base__base.gyp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base__base.gyp Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,14 @@
+--- base/base.gyp.orig 2013-09-26 02:17:34.000000000 +0300
++++ base/base.gyp 2013-09-26 03:00:53.000000000 +0300
+@@ -823,6 +823,11 @@
+ ['include', '^debug/proc_maps_linux_unittest\\.cc$'],
+ ],
+ }],
++ ['<(os_bsd) == 1', {
++ 'sources/': [
++ ['exclude', '^debug/proc_maps_linux_unittest\\.cc$'],
++ ],
++ }],
+ ], # target_conditions
+ },
+ {
Modified: head/www/chromium/files/patch-base__base.gypi
==============================================================================
--- head/www/chromium/files/patch-base__base.gypi Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/files/patch-base__base.gypi Wed Oct 9 10:01:09 2013 (r329879)
@@ -1,8 +1,15 @@
---- base/base.gypi.orig 2013-08-09 22:05:55.000000000 +0300
-+++ base/base.gypi 2013-08-17 20:58:50.000000000 +0300
-@@ -838,6 +838,8 @@
- ['exclude', '^process_linux\\.cc$'],
- ['exclude', '^process_util_linux\\.cc$'],
+--- base/base.gypi.orig 2013-09-28 20:09:58.000000000 +0300
++++ base/base.gypi 2013-09-26 02:24:27.000000000 +0300
+@@ -872,11 +872,15 @@
+ 'process/memory_stubs.cc',
+ ],
+ 'sources/': [
++ ['exclude', '^debug/proc_maps_linux\\.cc$'],
+ ['exclude', '^files/file_path_watcher_linux\\.cc$'],
+ ['exclude', '^files/file_path_watcher_stub\\.cc$'],
+ ['exclude', '^file_util_linux\\.cc$'],
++ ['exclude', '^process/memory_linux\\.cc$'],
+ ['exclude', '^process/process_linux\\.cc$'],
['exclude', '^sys_info_linux\\.cc$'],
+ ['exclude', '^process/process_iterator_linux\\.cc$'],
+ ['exclude', '^process/process_metrics_linux\\.cc$'],
Added: head/www/chromium/files/patch-base__process__memory_unittest.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base__process__memory_unittest.cc Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,24 @@
+--- base/process/memory_unittest.cc.orig 2013-09-24 23:49:53.000000000 +0300
++++ base/process/memory_unittest.cc 2013-09-24 23:50:57.000000000 +0300
+@@ -153,12 +153,12 @@
+
+ // Android doesn't implement set_new_handler, so we can't use the
+ // OutOfMemoryTest cases.
+-// OpenBSD does not support these tests either.
++// OpenBSD and FreeBSD does not support these tests either.
+ // AddressSanitizer and ThreadSanitizer define the malloc()/free()/etc.
+ // functions so that they don't crash if the program is out of memory, so the
+ // OOM tests aren't supposed to work.
+ // TODO(vandebo) make this work on Windows too.
+-#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && \
++#if !defined(OS_ANDROID) && !defined(OS_BSD) && \
+ !defined(OS_WIN) && \
+ !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER)
+
+@@ -375,5 +375,5 @@
+ #endif // !ARCH_CPU_64_BITS
+ #endif // OS_MACOSX
+
+-#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) &&
++#endif // !defined(OS_ANDROID) && !defined(OS_BSD) &&
+ // !defined(OS_WIN) && !defined(ADDRESS_SANITIZER)
Added: head/www/chromium/files/patch-base__process__process_handle_freebsd.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base__process__process_handle_freebsd.cc Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,51 @@
+--- base/process/process_handle_freebsd.cc.orig 2013-09-20 05:35:17.000000000 +0300
++++ base/process/process_handle_freebsd.cc 2013-09-24 20:41:45.000000000 +0300
+@@ -6,33 +6,35 @@
+
+ #include <sys/sysctl.h>
+ #include <sys/types.h>
+-#include <unistd.h>
++#include <sys/user.h>
++
++#include "base/logging.h"
+
+ namespace base {
+
+ ProcessId GetParentProcessId(ProcessHandle process) {
+ struct kinfo_proc info;
+- size_t length;
+- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process };
+-
+- if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0)
++ size_t length = sizeof(struct kinfo_proc);
++ int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process };
++ if (sysctl(mib, 4, &info, &length, NULL, 0) < 0) {
++ DPLOG(ERROR) << "sysctl";
++ return -1;
++ }
++ if (length == 0)
+ return -1;
+-
+ return info.ki_ppid;
+ }
+
+ FilePath GetProcessExecutablePath(ProcessHandle process) {
+ char pathname[PATH_MAX];
+- size_t length;
++ size_t length = sizeof(pathname);
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, process };
+-
+- length = sizeof(pathname);
+-
+- if (sysctl(mib, arraysize(mib), pathname, &length, NULL, 0) < 0 ||
+- length == 0) {
++ if (sysctl(mib, arraysize(mib), pathname, &length, NULL, 0) < 0) {
++ DPLOG(ERROR) << "sysctl";
+ return FilePath();
+ }
+-
++ if (length == 0)
++ return FilePath();
+ return FilePath(std::string(pathname));
+ }
+
Modified: head/www/chromium/files/patch-base__sys_info_freebsd.cc
==============================================================================
--- head/www/chromium/files/patch-base__sys_info_freebsd.cc Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/files/patch-base__sys_info_freebsd.cc Wed Oct 9 10:01:09 2013 (r329879)
@@ -1,14 +1,6 @@
---- base/sys_info_freebsd.cc.orig 2013-09-03 03:09:04.000000000 -0400
-+++ base/sys_info_freebsd.cc 2013-09-12 14:46:12.000000000 -0400
-@@ -4,6 +4,7 @@
-
- #include "base/sys_info.h"
-
-+#include <sys/types.h>
- #include <sys/sysctl.h>
-
- #include "base/logging.h"
-@@ -23,6 +24,19 @@
+--- base/sys_info_freebsd.cc.orig 2012-11-27 10:01:52.000000000 +0200
++++ base/sys_info_freebsd.cc 2012-12-09 18:04:30.000000000 +0200
+@@ -23,6 +23,19 @@
}
// static
@@ -28,7 +20,7 @@
size_t SysInfo::MaxSharedMemorySize() {
size_t limit;
size_t size = sizeof(limit);
-@@ -33,4 +47,25 @@
+@@ -33,4 +46,25 @@
return limit;
}
Modified: head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Wed Oct 9 10:01:09 2013 (r329879)
@@ -1,6 +1,24 @@
---- chrome/app/chrome_main_delegate.cc.orig 2012-12-04 23:34:32.000000000 +0200
-+++ chrome/app/chrome_main_delegate.cc 2012-12-04 23:35:37.000000000 +0200
-@@ -264,7 +264,7 @@
+--- 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 @@
+ #include "ui/base/x/x11_util.h"
+ #endif
+
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ #include "chrome/app/breakpad_linux.h"
+ #endif
+
+@@ -110,7 +110,7 @@
+ g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
+ #endif
+
+-#if defined(OS_POSIX)
++#if defined(OS_POSIX) && !defined(OS_BSD)
+ base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky
+ g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER;
+ #endif
+@@ -230,7 +230,7 @@
// Mac needs them for the plugin process name.
process_type == switches::kPluginProcess ||
#endif
@@ -9,3 +27,30 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
+@@ -573,7 +573,7 @@
+ std::string process_type =
+ command_line.GetSwitchValueASCII(switches::kProcessType);
+
+-#if defined(OS_POSIX)
++#if defined(OS_POSIX) && !defined(OS_BSD)
+ breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer());
+ #endif
+
+@@ -699,7 +699,7 @@
+ #endif
+ }
+
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ // 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 @@
+ SetUpProfilingShutdownHandler();
+ }
+
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets
+ // this up for the browser process in a different manner.
+ InitCrashReporter();
Added: head/www/chromium/files/patch-chrome__app__policy__policy_templates.json
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__app__policy__policy_templates.json Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,29 @@
+--- chrome/app/policy/policy_templates.json.orig 2013-09-24 21:57:03.000000000 +0300
++++ chrome/app/policy/policy_templates.json 2013-09-24 21:59:32.000000000 +0300
+@@ -1365,7 +1365,7 @@
+ 'name': 'GSSAPILibraryName',
+ 'type': 'string',
+ 'schema': { 'type': 'string' },
+- 'supported_on': ['chrome.linux:9-'],
++ 'supported_on': ['chrome.linux:9-', 'chrome.freebsd:9-'],
+ 'features': {
+ 'dynamic_refresh': False,
+ 'per_profile': False,
+@@ -3251,7 +3251,7 @@
+ 'name': 'RequireOnlineRevocationChecksForLocalAnchors',
+ 'type': 'main',
+ 'schema': { 'type': 'boolean' },
+- 'supported_on': ['chrome_os:0.30-', 'chrome.linux:30-', 'chrome.win:30-'],
++ 'supported_on': ['chrome_os:0.30-', 'chrome.linux:30-', 'chrome.freebsd:30-', 'chrome.win:30-'],
+ 'features': {
+ 'dynamic_refresh': True,
+ 'per_profile': False,
+@@ -3766,7 +3766,7 @@
+ 'name': 'BackgroundModeEnabled',
+ 'type': 'main',
+ 'schema': { 'type': 'boolean' },
+- 'supported_on': ['chrome.win:19-', 'chrome.linux:19-'],
++ 'supported_on': ['chrome.win:19-', 'chrome.linux:19-', 'chrome.freebsd:19-'],
+ 'features': {
+ 'can_be_recommended': True,
+ 'dynamic_refresh': True,
Added: head/www/chromium/files/patch-chrome__browser__browser_process_impl.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__browser_process_impl.cc Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,38 @@
+--- chrome/browser/browser_process_impl.cc.orig 2013-09-25 23:32:28.000000000 +0300
++++ chrome/browser/browser_process_impl.cc 2013-09-25 23:34:24.000000000 +0300
+@@ -244,7 +244,7 @@
+
+ ExtensionRendererState::GetInstance()->Shutdown();
+
+-#if !defined(OS_ANDROID) && !defined(OS_IOS)
++#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD)
+ media_file_system_registry_.reset();
+ // Delete |storage_monitor_| now. Otherwise the FILE thread would be gone
+ // when we try to release it in the dtor and Valgrind would report a
+@@ -618,7 +618,7 @@
+ }
+
+ chrome::StorageMonitor* BrowserProcessImpl::storage_monitor() {
+-#if defined(OS_ANDROID) || defined(OS_IOS)
++#if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_BSD)
+ return NULL;
+ #else
+ return storage_monitor_.get();
+@@ -627,7 +627,7 @@
+
+ void BrowserProcessImpl::set_storage_monitor_for_test(
+ scoped_ptr<chrome::StorageMonitor> monitor) {
+-#if !defined(OS_ANDROID) && !defined(OS_IOS)
++#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD)
+ storage_monitor_ = monitor.Pass();
+ #endif
+ }
+@@ -923,7 +923,7 @@
+ }
+ #endif
+
+-#if !defined(OS_ANDROID) && !defined(OS_IOS)
++#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD)
+ storage_monitor_.reset(chrome::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 Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Wed Oct 9 10:01:09 2013 (r329879)
@@ -1,11 +1,56 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2012-05-30 10:01:59.000000000 +0300
-+++ chrome/browser/chrome_content_browser_client.cc 2012-06-05 21:38:09.000000000 +0300
-@@ -132,7 +132,7 @@
- #include "chrome/browser/chrome_browser_main_extra_parts_ash.h"
+--- 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_BSD) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID)
#include "base/linux_util.h"
- #include "chrome/browser/crash_handler_host_linuxish.h"
+ #include "chrome/browser/crash_handler_host_linux.h"
#endif
+@@ -480,7 +480,7 @@
+ }
+ }
+
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ int GetCrashSignalFD(const CommandLine& command_line) {
+ if (command_line.HasSwitch(switches::kExtensionProcess)) {
+ ExtensionCrashHandlerHostLinux* crash_handler =
+@@ -505,7 +505,7 @@
+
+ return -1;
+ }
+-#endif // defined(OS_POSIX) && !defined(OS_MACOSX)
++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+
+ #if !defined(OS_CHROMEOS)
+ GURL GetEffectiveURLForSignin(const GURL& url) {
+@@ -1346,7 +1346,7 @@
+ command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
+ child_process_logging::GetClientId());
+ }
+-#elif defined(OS_POSIX)
++#elif defined(OS_POSIX) && !defined(OS_BSD)
+ if (IsCrashReporterEnabled()) {
+ command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
+ child_process_logging::GetClientId() + "," + base::GetLinuxDistro());
+@@ -2461,7 +2461,7 @@
+ additional_backends->push_back(new sync_file_system::SyncFileSystemBackend());
+ }
+
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
+ const CommandLine& command_line,
+ int child_process_id,
+@@ -2521,7 +2521,7 @@
+ }
+ #endif // defined(OS_ANDROID)
+ }
+-#endif // defined(OS_POSIX) && !defined(OS_MACOSX)
++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+
+ #if defined(OS_WIN)
+ const wchar_t* ChromeContentBrowserClient::GetResourceDllName() {
Added: head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,11 @@
+--- chrome/browser/chrome_content_browser_client.h.orig 2013-09-25 22:20:01.000000000 +0300
++++ chrome/browser/chrome_content_browser_client.h 2013-09-25 22:20:17.000000000 +0300
+@@ -248,7 +248,7 @@
+ const base::FilePath& storage_partition_path,
+ ScopedVector<fileapi::FileSystemBackend>* additional_backends) OVERRIDE;
+
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ virtual void GetAdditionalMappedFilesForChildProcess(
+ const CommandLine& command_line,
+ int child_process_id,
Added: head/www/chromium/files/patch-chrome__browser__chrome_notification_types.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__chrome_notification_types.h Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,18 @@
+--- chrome/browser/chrome_notification_types.h.orig 2012-07-25 23:17:58.000000000 +0300
++++ chrome/browser/chrome_notification_types.h 2012-07-25 23:18:37.000000000 +0300
+@@ -54,13 +54,13 @@
+ // that was closed, no details are expected.
+ NOTIFICATION_WINDOW_CLOSED,
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // On Linux maximize can be an asynchronous operation. This notification
+ // indicates that the window has been maximized. The source is
+ // a Source<BrowserWindow> containing the BrowserWindow that was maximized.
+ // No details are expected.
+ NOTIFICATION_BROWSER_WINDOW_MAXIMIZED,
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ // Sent when the language (English, French...) for a page has been detected.
+ // The details Details<std::string> contain the ISO 639-1 language code and
Added: head/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/gtk/first_run_dialog.cc.orig 2013-09-25 23:01:19.000000000 +0300
++++ chrome/browser/ui/gtk/first_run_dialog.cc 2013-09-25 23:11:03.000000000 +0300
+@@ -160,6 +160,7 @@
+ if (dialog_)
+ gtk_widget_hide_all(dialog_);
+
++#if !defined(OS_BSD)
+ // Check if user has opted into reporting.
+ if (report_crashes_ &&
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(report_crashes_))) {
+@@ -168,6 +169,9 @@
+ } else {
+ GoogleUpdateSettings::SetCollectStatsConsent(false);
+ }
++#else
++ GoogleUpdateSettings::SetCollectStatsConsent(false);
++#endif
+
+ // If selected set as default browser.
+ if (make_default_ &&
Modified: head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc Wed Oct 9 10:01:09 2013 (r329879)
@@ -1,38 +1,42 @@
---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2013-08-23 16:36:11.000000000 +0300
-+++ chrome/browser/ui/webui/options/browser_options_handler.cc 2013-08-23 16:38:28.000000000 +0300
-@@ -337,7 +337,7 @@
+--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2013-08-30 06:46:19.000000000 +0300
++++ chrome/browser/ui/webui/options/browser_options_handler.cc 2013-09-03 21:15:44.092633766 +0300
+@@ -338,7 +338,8 @@
{ "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
{ "translateEnableTranslate",
IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
++ !defined(OS_ANDROID)
{ "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
{ "themesNativeButton", IDS_THEMES_GTK_BUTTON },
{ "themesSetClassic", IDS_THEMES_SET_CLASSIC },
-@@ -583,7 +583,7 @@
- "themesReset",
- base::Bind(&BrowserOptionsHandler::ThemesReset,
+@@ -596,7 +597,8 @@
+ "requestProfilesInfo",
+ base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
base::Unretained(this)));
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
++ !defined(OS_ANDROID)
web_ui()->RegisterMessageCallback(
"themesSetNative",
base::Bind(&BrowserOptionsHandler::ThemesSetNative,
-@@ -1327,7 +1327,7 @@
+@@ -1323,7 +1325,8 @@
ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
bool is_native_theme = false;
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
++ !defined(OS_ANDROID)
+ bool profile_is_managed = profile->IsManaged();
is_native_theme = theme_service->UsingNativeTheme();
base::FundamentalValue native_theme_enabled(!is_native_theme &&
- !profile_is_managed);
-@@ -1350,7 +1350,7 @@
+@@ -1345,7 +1348,8 @@
ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
}
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
++ !defined(OS_ANDROID)
void BrowserOptionsHandler::ThemesSetNative(const ListValue* args) {
content::RecordAction(UserMetricsAction("Options_GtkThemeSet"));
Profile* profile = Profile::FromWebUI(web_ui());
Modified: head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h Wed Oct 9 10:01:09 2013 (r329879)
@@ -1,11 +1,12 @@
---- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2013-08-23 16:36:30.000000000 +0300
-+++ chrome/browser/ui/webui/options/browser_options_handler.h 2013-08-23 16:54:38.000000000 +0300
-@@ -194,7 +194,7 @@
+--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2013-09-03 21:22:36.851628387 +0300
++++ chrome/browser/ui/webui/options/browser_options_handler.h 2013-09-03 21:23:09.395628553 +0300
+@@ -193,7 +193,8 @@
void ObserveThemeChanged();
void ThemesReset(const base::ListValue* args);
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
++ !defined(OS_ANDROID)
void ThemesSetNative(const base::ListValue* args);
#endif
Added: head/www/chromium/files/patch-chrome__browser__usb__usb_context.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__usb__usb_context.cc Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,12 @@
+--- chrome/browser/usb/usb_context.cc.orig 2013-10-08 21:07:13.000000000 +0300
++++ chrome/browser/usb/usb_context.cc 2013-10-08 22:04:50.000000000 +0300
+@@ -44,7 +44,9 @@
+ running_ = false;
+ // Spreading running_ to the UsbEventHandler thread.
+ base::subtle::MemoryBarrier();
++#if !defined(OS_FREEBSD)
+ libusb_interrupt_handle_event(context_);
++#endif
+ base::PlatformThread::Join(thread_handle_);
+ }
+
Modified: head/www/chromium/files/patch-chrome__chrome_browser.gypi
==============================================================================
--- head/www/chromium/files/patch-chrome__chrome_browser.gypi Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/files/patch-chrome__chrome_browser.gypi Wed Oct 9 10:01:09 2013 (r329879)
@@ -1,15 +1,6 @@
---- chrome/chrome_browser.gypi.orig 2013-08-09 22:06:42.000000000 +0300
-+++ chrome/chrome_browser.gypi 2013-08-17 22:05:42.000000000 +0300
-@@ -2456,7 +2456,7 @@
- 'xcode_settings': {'OTHER_LDFLAGS': ['-weak_framework CoreImage']},
- },
- }],
-- ['OS=="mac" or OS=="win" or OS=="linux" or chromeos==1', {
-+ ['OS=="mac" or OS=="win" or OS=="linux" or chromeos==1 or os_bsd==1', {
- 'sources': [
- 'browser/media_galleries/fileapi/device_media_async_file_util.cc',
- 'browser/media_galleries/fileapi/device_media_async_file_util.h',
-@@ -2640,7 +2640,7 @@
+--- chrome/chrome_browser.gypi.orig 2013-09-20 05:36:07.000000000 +0300
++++ chrome/chrome_browser.gypi 2013-09-23 20:34:16.000000000 +0300
+@@ -2735,7 +2735,7 @@
'../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
],
}],
@@ -18,7 +9,16 @@
'dependencies': [
'../build/linux/system.gyp:libspeechd',
],
-@@ -2996,6 +2996,25 @@
+@@ -2859,7 +2859,7 @@
+ ],
+ },
+ }],
+- ['os_posix == 1 and OS != "mac" and OS != "ios"', {
++ ['os_posix == 1 and OS != "mac" and OS != "ios" and os_bsd != 1', {
+ 'sources': [
+ 'app/breakpad_linux.cc',
+ 'app/breakpad_linux.h',
+@@ -3104,6 +3104,25 @@
['exclude', '^browser/usb/'],
],
}],
Modified: head/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h
==============================================================================
--- head/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h Wed Oct 9 10:01:09 2013 (r329879)
@@ -1,11 +1,11 @@
---- chrome/renderer/printing/print_web_view_helper.h.orig 2013-07-15 18:53:40.000000000 +0300
-+++ chrome/renderer/printing/print_web_view_helper.h 2013-07-15 18:54:07.000000000 +0300
-@@ -213,7 +213,7 @@
+--- chrome/renderer/printing/print_web_view_helper.h.orig 2013-08-30 06:47:03.000000000 +0300
++++ chrome/renderer/printing/print_web_view_helper.h 2013-09-03 21:39:51.232633592 +0300
+@@ -231,7 +231,7 @@
void FinishFramePrinting();
// Prints the page listed in |params|.
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_MACOSX)
void PrintPageInternal(const PrintMsg_PrintPage_Params& params,
const gfx::Size& canvas_size,
WebKit::WebFrame* frame,
Added: head/www/chromium/files/patch-chrome__tools__build__generate_policy_source.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__tools__build__generate_policy_source.py Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,11 @@
+--- chrome/tools/build/generate_policy_source.py.orig 2013-09-24 21:55:28.000000000 +0300
++++ chrome/tools/build/generate_policy_source.py 2013-09-24 21:56:43.000000000 +0300
+@@ -67,7 +67,7 @@
+ if platform.startswith('chrome.'):
+ platform_sub = platform[7:]
+ if platform_sub == '*':
+- self.platforms.extend(['win', 'mac', 'linux'])
++ self.platforms.extend(['win', 'mac', 'linux', 'freebsd'])
+ else:
+ self.platforms.append(platform_sub)
+ else:
Added: head/www/chromium/files/patch-content__browser__plugin_service_impl.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-content__browser__plugin_service_impl.cc Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,12 @@
+--- content/browser/plugin_service_impl.cc.orig 2013-08-30 06:45:42.000000000 +0300
++++ content/browser/plugin_service_impl.cc 2013-09-03 22:45:55.464628229 +0300
+@@ -790,7 +790,8 @@
+ }
+
+ bool PluginServiceImpl::NPAPIPluginsSupported() {
+-#if defined(OS_WIN) || defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(USE_AURA))
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
++ (defined(OS_LINUX) && !defined(USE_AURA))
+ return true;
+ #else
+ return false;
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 Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc Wed Oct 9 10:01:09 2013 (r329879)
@@ -1,20 +1,43 @@
---- content/renderer/media/webrtc_audio_capturer.cc.orig 2013-09-02 21:19:59.000000000 +0300
-+++ content/renderer/media/webrtc_audio_capturer.cc 2013-09-02 21:22:12.000000000 +0300
-@@ -24,7 +24,7 @@
+--- content/renderer/media/webrtc_audio_capturer.cc.orig 2013-08-30 06:45:44.000000000 +0300
++++ content/renderer/media/webrtc_audio_capturer.cc 2013-09-03 21:47:30.139633005 +0300
+@@ -26,10 +26,10 @@
// The listed rates below adds restrictions and WebRtcAudioDeviceImpl::Init()
// will fail if the user selects any rate outside these ranges.
- static int kValidInputRates[] = {96000, 48000, 44100, 32000, 16000, 8000};
+ const int kValidInputRates[] = {96000, 48000, 44100, 32000, 16000, 8000};
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- static int kValidInputRates[] = {48000, 44100};
+-const int kValidInputRates[] = {48000, 44100};
#elif defined(OS_ANDROID)
- static int kValidInputRates[] = {48000, 44100};
-@@ -37,7 +37,7 @@
+ const int kValidInputRates[] = {48000, 44100};
++#elif defined(OS_POSIX)
++const int kValidInputRates[] = {48000, 44100};
+ #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_LINUX) || defined(OS_BSD)
++#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)
+ DCHECK_LE(volume, 1.0);
+-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
++#elif defined(OS_POSIX) && !defined(OS_ANDROID)
+ // We have a special situation on Linux where the microphone volume can be
+ // "higher than maximum". The input volume slider in the sound preference
+ // allows the user to set a scaling that is higher than 100%. It means that
Added: head/www/chromium/files/patch-content__renderer__pepper__pepper_plugin_instance_impl.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-content__renderer__pepper__pepper_plugin_instance_impl.cc Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,11 @@
+--- content/renderer/pepper/pepper_plugin_instance_impl.cc.orig 2013-09-03 22:52:07.565628190 +0300
++++ content/renderer/pepper/pepper_plugin_instance_impl.cc 2013-09-03 22:52:34.954633148 +0300
+@@ -1723,7 +1723,7 @@
+ #endif // defined(OS_WIN)
+
+ bool ret = false;
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_ANDROID)
+ // On Linux we just set the final bits in the native metafile
+ // (NativeMetafile and PreviewMetafile must have compatible formats,
+ // i.e. both PDF for this to work).
Added: head/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,11 @@
+--- content/renderer/pepper/usb_key_code_conversion.cc.orig 2013-09-03 23:00:20.220628554 +0300
++++ content/renderer/pepper/usb_key_code_conversion.cc 2013-09-03 23:02:18.736631955 +0300
+@@ -10,7 +10,7 @@
+
+ namespace content {
+
+-#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_WIN)
++#if !((defined(OS_POSIX) && !defined(OS_ANDROID)) || defined(OS_WIN))
+
+ uint32_t UsbKeyCodeForKeyboardEvent(const WebKeyboardEvent& key_event) {
+ return 0;
Modified: head/www/chromium/files/patch-media__base__audio_splicer.cc
==============================================================================
--- head/www/chromium/files/patch-media__base__audio_splicer.cc Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/files/patch-media__base__audio_splicer.cc Wed Oct 9 10:01:09 2013 (r329879)
@@ -1,5 +1,5 @@
---- media/base/audio_splicer.cc.orig 2013-02-21 04:24:13.000000000 +0100
-+++ media/base/audio_splicer.cc 2013-02-26 12:33:35.000000000 +0100
+--- media/base/audio_splicer.cc.orig 2013-08-30 06:47:05.000000000 +0300
++++ media/base/audio_splicer.cc 2013-09-03 22:08:02.140628065 +0300
@@ -60,7 +60,7 @@
base::TimeDelta expected_timestamp = output_timestamp_helper_.GetTimestamp();
base::TimeDelta delta = timestamp - expected_timestamp;
@@ -11,10 +11,10 @@
}
@@ -69,7 +69,7 @@
if (delta != base::TimeDelta())
- bytes_to_fill = output_timestamp_helper_.GetBytesToTarget(timestamp);
+ frames_to_fill = output_timestamp_helper_.GetFramesToTarget(timestamp);
-- if (bytes_to_fill == 0 || std::abs(bytes_to_fill) < min_gap_size_) {
-+ if (bytes_to_fill == 0 || std::labs(bytes_to_fill) < min_gap_size_) {
+- if (frames_to_fill == 0 || std::abs(frames_to_fill) < min_gap_size_) {
++ if (frames_to_fill == 0 || std::labs(frames_to_fill) < min_gap_size_) {
AddOutputBuffer(input);
return true;
}
Modified: head/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
==============================================================================
--- head/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc Wed Oct 9 10:01:09 2013 (r329879)
@@ -1,10 +1,11 @@
---- media/filters/decrypting_audio_decoder.cc.orig 2013-01-07 18:40:10.000000000 -0800
-+++ media/filters/decrypting_audio_decoder.cc 2013-01-12 09:05:12.737640582 -0800
+--- media/filters/decrypting_audio_decoder.cc.orig 2013-08-30 06:47:05.000000000 +0300
++++ media/filters/decrypting_audio_decoder.cc 2013-09-03 22:11:24.289626887 +0300
@@ -30,7 +30,7 @@
// Out of sync of 100ms would be pretty noticeable and we should keep any
// drift below that.
- const int64 kOutOfSyncThresholdInMicroseconds = 100000;
-- return std::abs(timestamp_1.InMicroseconds() - timestamp_2.InMicroseconds()) >
-+ return std::labs(timestamp_1.InMicroseconds() - timestamp_2.InMicroseconds()) >
- kOutOfSyncThresholdInMicroseconds;
+ const int64 kOutOfSyncThresholdInMilliseconds = 100;
+- return std::abs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) >
++ return std::labs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) >
+ kOutOfSyncThresholdInMilliseconds;
}
+
Modified: head/www/chromium/files/patch-net__net.gyp
==============================================================================
--- head/www/chromium/files/patch-net__net.gyp Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/files/patch-net__net.gyp Wed Oct 9 10:01:09 2013 (r329879)
@@ -1,6 +1,6 @@
---- net/net.gyp.orig 2013-08-19 02:54:02.000000000 +0300
-+++ net/net.gyp 2013-09-01 00:26:02.000000000 +0300
-@@ -1259,9 +1259,10 @@
+--- net/net.gyp.orig 2013-09-20 05:36:19.000000000 +0300
++++ net/net.gyp 2013-09-23 20:45:35.000000000 +0300
+@@ -1283,9 +1283,10 @@
}],
['os_bsd==1', {
'sources!': [
@@ -12,7 +12,16 @@
],
},{
'dependencies': [
-@@ -2076,6 +2077,11 @@
+@@ -1865,7 +1866,7 @@
+ 'websockets/websocket_throttle_unittest.cc',
+ ],
+ 'conditions': [
+- ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
++ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and os_bsd != 1', {
+ 'dependencies': [
+ 'quic_library',
+ 'flip_in_mem_edsm_server_library',
+@@ -2140,6 +2141,11 @@
'cert/x509_cert_types_unittest.cc',
],
}],
Added: head/www/chromium/files/patch-skia__skia_chrome.gypi
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-skia__skia_chrome.gypi Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,11 @@
+--- skia/skia_chrome.gypi.orig 2013-09-24 22:30:33.000000000 +0300
++++ skia/skia_chrome.gypi 2013-09-24 22:29:39.000000000 +0300
+@@ -85,7 +85,7 @@
+ # For POSIX platforms, prefer the Mutex implementation provided by Skia
+ # since it does not generate static initializers.
+ # TODO: should check if SK_USE_POSIX_THREADS is defined instead
+- [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios"', {
++ [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios" or os_bsd == 1', {
+ 'sources!': [
+ 'ext/SkThread_chrome.cc',
+ ],
Added: head/www/chromium/files/patch-skia__skia_library.gypi
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-skia__skia_library.gypi Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,20 @@
+--- skia/skia_library.gypi.orig 2013-09-03 22:15:35.743627150 +0300
++++ skia/skia_library.gypi 2013-09-03 22:17:46.187628519 +0300
+@@ -214,7 +214,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',
+@@ -242,7 +242,7 @@
+
+ # For POSIX platforms, prefer the Mutex implementation provided by Skia
+ # since it does not generate static initializers.
+- [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios"', {
++ [ 'os_posix == 1 or OS == "ios"', {
+ 'defines+': [
+ 'SK_USE_POSIX_THREADS',
+ ],
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 Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__core__features.gypi Wed Oct 9 10:01:09 2013 (r329879)
@@ -1,15 +1,6 @@
---- third_party/WebKit/Source/core/features.gypi.orig 2013-07-15 19:58:55.000000000 +0300
-+++ third_party/WebKit/Source/core/features.gypi 2013-07-15 20:00:22.000000000 +0300
-@@ -103,7 +103,7 @@
- 'ENABLE_WEB_AUDIO=1',
- ],
- }],
-- ['OS=="linux" or OS=="mac" or OS=="android"', {
-+ ['OS=="linux" or OS=="mac" or OS=="android" or os_bsd==1', {
- 'feature_defines': [
- # 8Bit text runs should be enabled for all platforms webkit.org/b/111348
- 'ENABLE_8BIT_TEXTRUN=1',
-@@ -128,7 +128,7 @@
+--- third_party/WebKit/Source/core/features.gypi.orig 2013-08-30 06:55:03.000000000 +0300
++++ third_party/WebKit/Source/core/features.gypi 2013-09-03 22:27:08.777629842 +0300
+@@ -94,7 +94,7 @@
'ENABLE_WEB_AUDIO=1',
],
}],
@@ -18,7 +9,7 @@
'feature_defines': [
'ENABLE_OPENTYPE_VERTICAL=1',
],
-@@ -143,7 +143,7 @@
+@@ -104,7 +104,7 @@
'ENABLE_RUBBER_BANDING=1',
],
}],
Added: head/www/chromium/files/patch-third_party__WebKit__Source__testing__testing.gyp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__testing__testing.gyp Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,15 @@
+--- third_party/WebKit/Source/testing/testing.gyp.orig 2013-09-03 23:36:08.000000000 +0300
++++ third_party/WebKit/Source/testing/testing.gyp 2013-09-03 23:37:05.000000000 +0300
+@@ -339,5 +339,12 @@
+ },
+ },
+ }],
++ ['OS=="freebsd"', {
++ 'target_defaults': {
++ 'include_dirs': [
++ '/usr/local/include',
++ ],
++ },
++ }],
+ ], # conditions
+ }
Added: head/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp Wed Oct 9 10:01:09 2013 (r329879)
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/web/web.gyp.orig 2013-07-15 19:48:12.000000000 +0300
++++ third_party/WebKit/Source/web/web.gyp 2013-07-15 19:48:46.000000000 +0300
+@@ -646,7 +646,7 @@
+ },
+ },
+ }],
+- ['OS == "linux"', {
++ ['OS == "linux" or os_bsd == 1', {
+ 'dependencies': [
+ '<(DEPTH)/build/linux/system.gyp:fontconfig',
+ ],
Modified: head/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc
==============================================================================
--- head/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc Wed Oct 9 10:01:09 2013 (r329879)
@@ -1,14 +1,5 @@
---- third_party/libjingle/source/talk/base/systeminfo.cc.orig 2013-09-03 03:20:59.000000000 -0400
-+++ third_party/libjingle/source/talk/base/systeminfo.cc 2013-09-12 15:47:30.000000000 -0400
-@@ -36,7 +36,7 @@
- #elif defined(OSX)
- #include <ApplicationServices/ApplicationServices.h>
- #include <CoreServices/CoreServices.h>
--#elif defined(LINUX) || defined(ANDROID)
-+#elif defined(LINUX) || defined(ANDROID) || defined(BSD)
- #include <unistd.h>
- #endif
- #if defined(OSX) || defined(IOS)
+--- third_party/libjingle/source/talk/base/systeminfo.cc.orig 2013-07-15 17:40:34.000000000 +0300
++++ third_party/libjingle/source/talk/base/systeminfo.cc 2013-07-15 17:41:14.000000000 +0300
@@ -48,7 +48,7 @@
#include "talk/base/win32.h"
#elif defined(OSX)
Modified: head/www/chromium/pkg-plist
==============================================================================
--- head/www/chromium/pkg-plist Wed Oct 9 09:40:41 2013 (r329878)
+++ head/www/chromium/pkg-plist Wed Oct 9 10:01:09 2013 (r329879)
@@ -67,7 +67,6 @@ share/applications/chromium-browser.desk
%%DATADIR%%/resources/inspector/breakpointsList.css
%%DATADIR%%/resources/inspector/buildSystemOnly.js
%%DATADIR%%/resources/inspector/flameChart.css
-%%DATADIR%%/resources/inspector/showhint.css
%%DATADIR%%/resources/inspector/sidebarPane.css
%%DATADIR%%/resources/inspector/auditsPanel.css
%%DATADIR%%/resources/inspector/AuditsPanel.js
@@ -185,14 +184,11 @@ share/applications/chromium-browser.desk
%%DATADIR%%/resources/inspector/Images/timelinePillPurple.png
%%DATADIR%%/resources/inspector/Images/timelinePillRed.png
%%DATADIR%%/resources/inspector/Images/timelinePillYellow.png
-%%DATADIR%%/resources/inspector/Images/toolbarIcons.png
-%%DATADIR%%/resources/inspector/Images/toolbarIconsSmall.png
%%DATADIR%%/resources/inspector/Images/toolbarItemSelected.png
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list