diff options
| author | rene <rene@FreeBSD.org> | 2014-05-21 04:47:17 +0800 |
|---|---|---|
| committer | rene <rene@FreeBSD.org> | 2014-05-21 04:47:17 +0800 |
| commit | a43372856890f380363a5be76395bf9d212cb1ba (patch) | |
| tree | 2dd8ccc48e698b7993db731cd111168b9f3e16d7 /www | |
| parent | e67e68949163e459bb5f2afd4b0c52d4ad4c663b (diff) | |
| download | freebsd-ports-gnome-a43372856890f380363a5be76395bf9d212cb1ba.tar.gz freebsd-ports-gnome-a43372856890f380363a5be76395bf9d212cb1ba.tar.zst freebsd-ports-gnome-a43372856890f380363a5be76395bf9d212cb1ba.zip | |
Update to 35.0.1916.114
Changes include:
- More developer control over touch input
- New JavaScript features
- Unprefixed Shadow DOM
- A number of new apps/extension APIs
- Lots of under the hood changes for stability and performance
MFH: 2014Q2
Security: http://vuxml.org/freebsd/64f3872b-e05d-11e3-9dd4-00262d5ed8ee.html
Diffstat (limited to 'www')
185 files changed, 716 insertions, 677 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 9865d8fa1a4c..e5650a9e47c9 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -4,7 +4,7 @@ #TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3 PORTNAME= chromium -PORTVERSION= 34.0.1847.137 +PORTVERSION= 35.0.1916.114 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -172,7 +172,7 @@ pre-everything:: .if ${PORT_OPTIONS:MDEBUG} @${ECHO_MSG} "and lots of free diskspace (~ 8.5GB)." .else - @${ECHO_MSG} "and a fair amount of free diskspace (~ 2.4GB)." + @${ECHO_MSG} "and a fair amount of free diskspace (~ 3.7GB)." .endif @${ECHO_MSG} diff --git a/www/chromium/Makefile.tests b/www/chromium/Makefile.tests index 0f3b23e5ac61..c96cf3a6fdcc 100644 --- a/www/chromium/Makefile.tests +++ b/www/chromium/Makefile.tests @@ -1,5 +1,5 @@ #$FreeBSD$ - +#telemetry_unittests : unknown ninja target TEST_TARGETS= base_unittests \ crypto_unittests \ cacheinvalidation_unittests \ @@ -15,9 +15,8 @@ TEST_TARGETS= base_unittests \ ipc_tests \ dbus_unittests \ net_unittests \ - media_unittests -# browser_tests: missing test file? -# unit_tests: missing test file? -# chromedriver_unittests: does not build -# chromedriver_tests: does not build -# telemetry_unittests: unknown ninja target + media_unittests \ + chromedriver_unittests \ + chromedriver_tests \ + browser_tests \ + unit_tests diff --git a/www/chromium/distinfo b/www/chromium/distinfo index a155aebfeb83..f7d707d34d1a 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,4 +1,4 @@ -SHA256 (chromium-34.0.1847.137.tar.xz) = 938bf0e673101bb1aeec4c3e2e75df372cebe3d2ee93e9f4669d64ce92656027 -SIZE (chromium-34.0.1847.137.tar.xz) = 190173736 -SHA256 (chromium-34.0.1847.137-testdata.tar.xz) = 386899a35d55e490d9119955f87eb2fa0249258ffb56f2892b0ad63ad1683d85 -SIZE (chromium-34.0.1847.137-testdata.tar.xz) = 108472204 +SHA256 (chromium-35.0.1916.114.tar.xz) = 566fcdc05d53c551d142ac9742ef69ba7c6d5a450d8ec41c0efd4fc8249f77af +SIZE (chromium-35.0.1916.114.tar.xz) = 206243256 +SHA256 (chromium-35.0.1916.114-testdata.tar.xz) = 122977c93e1d211abfe92af2ccad359af83de277e89c89d1259928f0b1a04ea1 +SIZE (chromium-35.0.1916.114-testdata.tar.xz) = 109106164 diff --git a/www/chromium/files/patch-base__base.gyp b/www/chromium/files/patch-base__base.gyp index 111b08dc82d2..691ba8c76ea8 100644 --- a/www/chromium/files/patch-base__base.gyp +++ b/www/chromium/files/patch-base__base.gyp @@ -1,6 +1,6 @@ ---- ./base/base.gyp.orig 2014-04-24 22:36:11.000000000 +0200 -+++ ./base/base.gyp 2014-04-24 23:23:41.000000000 +0200 -@@ -820,6 +820,11 @@ +--- ./base/base.gyp.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/base.gyp 2014-05-04 14:38:46.000000000 +0200 +@@ -803,6 +803,11 @@ ['include', '^debug/proc_maps_linux_unittest\\.cc$'], ], }], diff --git a/www/chromium/files/patch-base__base.gypi b/www/chromium/files/patch-base__base.gypi index f9ef459d1c84..3276135948ed 100644 --- a/www/chromium/files/patch-base__base.gypi +++ b/www/chromium/files/patch-base__base.gypi @@ -1,6 +1,6 @@ ---- ./base/base.gypi.orig 2014-04-24 22:36:11.000000000 +0200 -+++ ./base/base.gypi 2014-04-24 23:23:41.000000000 +0200 -@@ -918,11 +918,15 @@ +--- ./base/base.gypi.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/base.gypi 2014-05-04 14:38:46.000000000 +0200 +@@ -915,11 +915,15 @@ 'process/memory_stubs.cc', ], 'sources/': [ diff --git a/www/chromium/files/patch-base__debug__stack_trace_posix.cc b/www/chromium/files/patch-base__debug__stack_trace_posix.cc index 50c330dd148e..5ce9fd639fea 100644 --- a/www/chromium/files/patch-base__debug__stack_trace_posix.cc +++ b/www/chromium/files/patch-base__debug__stack_trace_posix.cc @@ -1,11 +1,21 @@ ---- ./base/debug/stack_trace_posix.cc.orig 2014-04-24 22:36:11.000000000 +0200 -+++ ./base/debug/stack_trace_posix.cc 2014-04-24 23:23:41.000000000 +0200 -@@ -471,7 +471,7 @@ +--- ./base/debug/stack_trace_posix.cc.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/debug/stack_trace_posix.cc 2014-05-04 15:46:56.000000000 +0200 +@@ -586,6 +586,10 @@ + // for the modules that are loaded in the current process. + // Returns true on success. + bool CacheMemoryRegions() { ++#if defined(OS_FREEBSD) ++ // TODO (rene) avoid link error, implement something? ++ return false; ++#else + // Reads /proc/self/maps. + std::string contents; + if (!ReadProcMaps(&contents)) { +@@ -601,6 +605,7 @@ - // Though the backtrace API man page does not list any possible negative - // return values, we take no chance. -- count_ = std::max(backtrace(trace_, arraysize(trace_)), 0); -+ count_ = std::max<size_t>(backtrace(trace_, arraysize(trace_)), 0); - } + is_initialized_ = true; + return true; ++#endif + } - void StackTrace::Print() const { + // Opens all object files and caches their file descriptors. diff --git a/www/chromium/files/patch-base__file_util_posix.cc b/www/chromium/files/patch-base__file_util_posix.cc deleted file mode 100644 index 327ec2a231ee..000000000000 --- a/www/chromium/files/patch-base__file_util_posix.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ./base/file_util_posix.cc.orig 2014-04-24 22:36:11.000000000 +0200 -+++ ./base/file_util_posix.cc 2014-04-24 23:23:41.000000000 +0200 -@@ -672,7 +672,7 @@ - #endif // defined(OS_ANDROID) - results->is_directory = S_ISDIR(file_info.st_mode); - results->size = file_info.st_size; --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || (defined(OS_FREEBSD) && __FreeBSD_version < 900000) - results->last_modified = Time::FromTimeSpec(file_info.st_mtimespec); - results->last_accessed = Time::FromTimeSpec(file_info.st_atimespec); - results->creation_time = Time::FromTimeSpec(file_info.st_ctimespec); diff --git a/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc b/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc index 2071c5fdc835..af7a17e909cc 100644 --- a/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc +++ b/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc @@ -1,5 +1,5 @@ ---- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-04-24 22:36:11.000000000 +0200 -+++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-04-24 23:23:41.000000000 +0200 +--- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-04-30 22:41:41.000000000 +0200 ++++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-05-04 14:38:46.000000000 +0200 @@ -2,8 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/www/chromium/files/patch-base__process__internal_linux.h b/www/chromium/files/patch-base__process__internal_linux.h index a30872db026f..faf2e218e234 100644 --- a/www/chromium/files/patch-base__process__internal_linux.h +++ b/www/chromium/files/patch-base__process__internal_linux.h @@ -1,5 +1,5 @@ ---- ./base/process/internal_linux.h.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/process/internal_linux.h 2014-04-24 23:23:41.000000000 +0200 +--- ./base/process/internal_linux.h.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/process/internal_linux.h 2014-05-04 14:38:46.000000000 +0200 @@ -12,6 +12,8 @@ #include "base/files/file_path.h" diff --git a/www/chromium/files/patch-base__process__memory_unittest.cc b/www/chromium/files/patch-base__process__memory_unittest.cc index 67821949cc81..0525487568ee 100644 --- a/www/chromium/files/patch-base__process__memory_unittest.cc +++ b/www/chromium/files/patch-base__process__memory_unittest.cc @@ -1,5 +1,5 @@ ---- ./base/process/memory_unittest.cc.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/process/memory_unittest.cc 2014-04-24 23:23:41.000000000 +0200 +--- ./base/process/memory_unittest.cc.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/process/memory_unittest.cc 2014-05-04 16:09:01.000000000 +0200 @@ -151,12 +151,12 @@ // Android doesn't implement set_new_handler, so we can't use the @@ -15,9 +15,9 @@ !defined(OS_WIN) && \ !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) -@@ -372,5 +372,5 @@ - #endif // !ARCH_CPU_64_BITS - #endif // OS_MACOSX +@@ -427,5 +427,5 @@ + EXPECT_TRUE(value_ == NULL); + } -#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && +#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && diff --git a/www/chromium/files/patch-base__process__process_handle_freebsd.cc b/www/chromium/files/patch-base__process__process_handle_freebsd.cc deleted file mode 100644 index 5ba22f391793..000000000000 --- a/www/chromium/files/patch-base__process__process_handle_freebsd.cc +++ /dev/null @@ -1,51 +0,0 @@ ---- ./base/process/process_handle_freebsd.cc.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/process/process_handle_freebsd.cc 2014-04-24 23:23:41.000000000 +0200 -@@ -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)); - } - diff --git a/www/chromium/files/patch-base__process__process_iterator.h b/www/chromium/files/patch-base__process__process_iterator.h deleted file mode 100644 index 0c5af4969be5..000000000000 --- a/www/chromium/files/patch-base__process__process_iterator.h +++ /dev/null @@ -1,14 +0,0 @@ ---- ./base/process/process_iterator.h.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/process/process_iterator.h 2014-04-24 23:23:41.000000000 +0200 -@@ -21,6 +21,11 @@ - #include <windows.h> - #include <tlhelp32.h> - #elif defined(OS_MACOSX) || defined(OS_BSD) -+#if defined(OS_BSD) -+#include <kvm.h> -+#include <sys/param.h> -+#include <sys/user.h> -+#endif - #include <sys/sysctl.h> - #elif defined(OS_POSIX) - #include <dirent.h> diff --git a/www/chromium/files/patch-base__process__process_iterator_freebsd.cc b/www/chromium/files/patch-base__process__process_iterator_freebsd.cc index 6675de452f33..87475ed39d7d 100644 --- a/www/chromium/files/patch-base__process__process_iterator_freebsd.cc +++ b/www/chromium/files/patch-base__process__process_iterator_freebsd.cc @@ -1,8 +1,8 @@ ---- ./base/process/process_iterator_freebsd.cc.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/process/process_iterator_freebsd.cc 2014-04-24 23:23:41.000000000 +0200 -@@ -6,6 +6,10 @@ - +--- ./base/process/process_iterator_freebsd.cc.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/process/process_iterator_freebsd.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -8,6 +8,10 @@ #include <sys/sysctl.h> + #include <unistd.h> +/* getuid() */ +#include <unistd.h> diff --git a/www/chromium/files/patch-base__process__process_metrics.h b/www/chromium/files/patch-base__process__process_metrics.h index e7d6b8030e3e..3a5b90bc4e45 100644 --- a/www/chromium/files/patch-base__process__process_metrics.h +++ b/www/chromium/files/patch-base__process__process_metrics.h @@ -1,5 +1,5 @@ ---- ./base/process/process_metrics.h.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/process/process_metrics.h 2014-04-24 23:23:41.000000000 +0200 +--- ./base/process/process_metrics.h.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/process/process_metrics.h 2014-05-04 14:38:46.000000000 +0200 @@ -17,6 +17,13 @@ #include "base/time/time.h" #include "base/values.h" diff --git a/www/chromium/files/patch-base__process__process_metrics_freebsd.cc b/www/chromium/files/patch-base__process__process_metrics_freebsd.cc index 74bff548350f..4ca06dac4ca7 100644 --- a/www/chromium/files/patch-base__process__process_metrics_freebsd.cc +++ b/www/chromium/files/patch-base__process__process_metrics_freebsd.cc @@ -1,11 +1,9 @@ ---- ./base/process/process_metrics_freebsd.cc.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/process/process_metrics_freebsd.cc 2014-04-24 23:23:41.000000000 +0200 -@@ -4,6 +4,10 @@ +--- ./base/process/process_metrics_freebsd.cc.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/process/process_metrics_freebsd.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -10,6 +10,8 @@ - #include "base/process/process_metrics.h" + #include "base/sys_info.h" -+#include "base/sys_info.h" -+ +#include <unistd.h> /* getpagesize() */ + namespace base { diff --git a/www/chromium/files/patch-base__security_unittest.cc b/www/chromium/files/patch-base__security_unittest.cc index c5204339c145..bd2ea8fdabc5 100644 --- a/www/chromium/files/patch-base__security_unittest.cc +++ b/www/chromium/files/patch-base__security_unittest.cc @@ -1,5 +1,5 @@ ---- ./base/security_unittest.cc.orig 2014-04-24 22:36:11.000000000 +0200 -+++ ./base/security_unittest.cc 2014-04-24 23:23:41.000000000 +0200 +--- ./base/security_unittest.cc.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/security_unittest.cc 2014-05-04 14:38:46.000000000 +0200 @@ -159,7 +159,7 @@ // FAILS_ is too clunky. void OverflowTestsSoftExpectTrue(bool overflow_detected) { diff --git a/www/chromium/files/patch-base__strings__safe_sprintf.cc b/www/chromium/files/patch-base__strings__safe_sprintf.cc index 20eeacd535a3..1109027c59f5 100644 --- a/www/chromium/files/patch-base__strings__safe_sprintf.cc +++ b/www/chromium/files/patch-base__strings__safe_sprintf.cc @@ -1,5 +1,5 @@ ---- ./base/strings/safe_sprintf.cc.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/strings/safe_sprintf.cc 2014-04-24 23:23:41.000000000 +0200 +--- ./base/strings/safe_sprintf.cc.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/strings/safe_sprintf.cc 2014-05-04 14:38:46.000000000 +0200 @@ -107,11 +107,11 @@ : buffer_(buffer), size_(size - 1), // Account for trailing NUL byte diff --git a/www/chromium/files/patch-base__sys_info_freebsd.cc b/www/chromium/files/patch-base__sys_info_freebsd.cc index 9dca90861a43..4ec1ae0b640e 100644 --- a/www/chromium/files/patch-base__sys_info_freebsd.cc +++ b/www/chromium/files/patch-base__sys_info_freebsd.cc @@ -1,5 +1,5 @@ ---- ./base/sys_info_freebsd.cc.orig 2014-04-24 22:36:11.000000000 +0200 -+++ ./base/sys_info_freebsd.cc 2014-04-24 23:23:41.000000000 +0200 +--- ./base/sys_info_freebsd.cc.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/sys_info_freebsd.cc 2014-05-04 14:38:46.000000000 +0200 @@ -4,6 +4,7 @@ #include "base/sys_info.h" diff --git a/www/chromium/files/patch-base__sys_info_posix.cc b/www/chromium/files/patch-base__sys_info_posix.cc index bef84a4fc3b5..1d6417a4e3ea 100644 --- a/www/chromium/files/patch-base__sys_info_posix.cc +++ b/www/chromium/files/patch-base__sys_info_posix.cc @@ -1,5 +1,5 @@ ---- ./base/sys_info_posix.cc.orig 2014-04-24 22:36:11.000000000 +0200 -+++ ./base/sys_info_posix.cc 2014-04-24 23:23:41.000000000 +0200 +--- ./base/sys_info_posix.cc.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/sys_info_posix.cc 2014-05-04 14:38:46.000000000 +0200 @@ -49,7 +49,7 @@ namespace base { diff --git a/www/chromium/files/patch-base__test__expectations__expectation.cc b/www/chromium/files/patch-base__test__expectations__expectation.cc index 1f6acfe4e4ac..6481dadf5987 100644 --- a/www/chromium/files/patch-base__test__expectations__expectation.cc +++ b/www/chromium/files/patch-base__test__expectations__expectation.cc @@ -1,5 +1,5 @@ ---- ./base/test/expectations/expectation.cc.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/test/expectations/expectation.cc 2014-04-24 23:23:41.000000000 +0200 +--- ./base/test/expectations/expectation.cc.orig 2014-04-30 22:41:42.000000000 +0200 ++++ ./base/test/expectations/expectation.cc 2014-05-04 14:38:46.000000000 +0200 @@ -59,6 +59,7 @@ variant != "64") { return false; diff --git a/www/chromium/files/patch-base__test__launcher__test_launcher.cc b/www/chromium/files/patch-base__test__launcher__test_launcher.cc index 004d9342559c..b6c6e17d0452 100644 --- a/www/chromium/files/patch-base__test__launcher__test_launcher.cc +++ b/www/chromium/files/patch-base__test__launcher__test_launcher.cc @@ -1,6 +1,6 @@ ---- ./base/test/launcher/test_launcher.cc.orig 2014-04-24 22:36:09.000000000 +0200 -+++ ./base/test/launcher/test_launcher.cc 2014-04-24 23:23:41.000000000 +0200 -@@ -39,6 +39,10 @@ +--- ./base/test/launcher/test_launcher.cc.orig 2014-04-30 22:41:42.000000000 +0200 ++++ ./base/test/launcher/test_launcher.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -40,6 +40,10 @@ #include "base/mac/scoped_nsautorelease_pool.h" #endif diff --git a/www/chromium/files/patch-base__threading__platform_thread_linux.cc b/www/chromium/files/patch-base__threading__platform_thread_linux.cc index e8c3e3837014..d4b52f43aefb 100644 --- a/www/chromium/files/patch-base__threading__platform_thread_linux.cc +++ b/www/chromium/files/patch-base__threading__platform_thread_linux.cc @@ -1,5 +1,5 @@ ---- ./base/threading/platform_thread_linux.cc.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/threading/platform_thread_linux.cc 2014-04-24 23:23:41.000000000 +0200 +--- ./base/threading/platform_thread_linux.cc.orig 2014-04-30 22:41:42.000000000 +0200 ++++ ./base/threading/platform_thread_linux.cc 2014-05-04 14:38:46.000000000 +0200 @@ -16,7 +16,9 @@ #include "base/tracked_objects.h" diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi index 1f43a64d8a63..992009dc1b0b 100644 --- a/www/chromium/files/patch-build__common.gypi +++ b/www/chromium/files/patch-build__common.gypi @@ -1,6 +1,6 @@ ---- ./build/common.gypi.orig 2014-04-24 22:36:09.000000000 +0200 -+++ ./build/common.gypi 2014-04-24 23:23:42.000000000 +0200 -@@ -565,7 +565,7 @@ +--- ./build/common.gypi.orig 2014-04-30 22:43:21.000000000 +0200 ++++ ./build/common.gypi 2014-05-04 14:43:03.000000000 +0200 +@@ -615,7 +615,7 @@ }], # DBus usage. @@ -9,27 +9,26 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -1002,6 +1002,10 @@ +@@ -878,7 +878,7 @@ + # By default, use ICU data file (icudtl.dat) on all platforms + # except when building Android WebView. + # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). +- ['android_webview_build==0', { ++ ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd"', { + 'icu_use_data_file_flag%' : 1, + }, { + 'icu_use_data_file_flag%' : 0, +@@ -1076,6 +1076,9 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, + 'os_ver%': 0, -+ 'prefix_dir%': '/usr', + 'use_system_libjpeg%': 0, + # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -1322,7 +1326,7 @@ - # TODO(jungshik): Turn this on on Android. - # For ChromeOS, this should be turned on in chromeos-chrome.ebuild - # file as well by adding icu_use_data_file_flag=1 to BUILD_DEFINES. -- ['OS!="android"', { -+ ['OS!="android" and os_bsd!=1', { - 'icu_use_data_file_flag%': 1, - }], - ], -@@ -3701,6 +3705,13 @@ +@@ -3894,6 +3897,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], diff --git a/www/chromium/files/patch-build__gyp_chromium b/www/chromium/files/patch-build__gyp_chromium deleted file mode 100644 index dc462d4294c2..000000000000 --- a/www/chromium/files/patch-build__gyp_chromium +++ /dev/null @@ -1,39 +0,0 @@ ---- ./build/gyp_chromium.orig 2014-04-24 22:36:09.000000000 +0200 -+++ ./build/gyp_chromium 2014-04-24 23:23:42.000000000 +0200 -@@ -39,8 +39,6 @@ - sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit', - 'Source', 'build', 'scripts')) - --import find_depot_tools -- - # On Windows, Psyco shortens warm runs of build/gyp_chromium by about - # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70 - # seconds. Conversely, memory usage of build/gyp_chromium with Psyco -@@ -376,6 +374,7 @@ - # TODO(bradnelson): take this out once this issue is fixed: - # http://code.google.com/p/gyp/issues/detail?id=177 - if sys.platform == 'cygwin': -+ import find_depot_tools - depot_tools_path = find_depot_tools.add_depot_tools_to_path() - python_dir = sorted(glob.glob(os.path.join(depot_tools_path, - 'python2*_bin')))[-1] -@@ -441,6 +440,7 @@ - # don't use the automatic toolchain, as it currently only supports VS2013. - msvs_version = os.environ.get('GYP_MSVS_VERSION', '2013') - if sys.platform in ('win32', 'cygwin') and msvs_version.startswith('2013'): -+ import find_depot_tools - depot_tools_path = find_depot_tools.add_depot_tools_to_path() - toolchain = os.path.normpath(os.path.join( - depot_tools_path, 'win_toolchain', 'vs2013_files')) -@@ -477,8 +477,9 @@ - args.append('--check') - - supplemental_includes = GetSupplementalFiles() -- if not RunGN(supplemental_includes): -- sys.exit(1) -+ #TODO port GN to FreeBSD -+ #if not RunGN(supplemental_includes): -+ # sys.exit(1) - args.extend( - ['-I' + i for i in additional_include_files(supplemental_includes, args)]) - diff --git a/www/chromium/files/patch-cc__layers__layer.cc b/www/chromium/files/patch-cc__layers__layer.cc index 6ffa36ce0cbd..776a65fcf18d 100644 --- a/www/chromium/files/patch-cc__layers__layer.cc +++ b/www/chromium/files/patch-cc__layers__layer.cc @@ -1,6 +1,6 @@ ---- ./cc/layers/layer.cc.orig 2014-04-24 22:35:51.000000000 +0200 -+++ ./cc/layers/layer.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -726,13 +726,15 @@ +--- ./cc/layers/layer.cc.orig 2014-04-30 22:41:25.000000000 +0200 ++++ ./cc/layers/layer.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -720,13 +720,15 @@ DCHECK(current_layer); DCHECK(current_layer->id() == scroll_clip_layer_id_); diff --git a/www/chromium/files/patch-cc__layers__layer_impl.cc b/www/chromium/files/patch-cc__layers__layer_impl.cc index b93e6c1d6c8c..3879744561d3 100644 --- a/www/chromium/files/patch-cc__layers__layer_impl.cc +++ b/www/chromium/files/patch-cc__layers__layer_impl.cc @@ -1,6 +1,6 @@ ---- ./cc/layers/layer_impl.cc.orig 2014-04-24 22:35:51.000000000 +0200 -+++ ./cc/layers/layer_impl.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -1222,21 +1222,23 @@ +--- ./cc/layers/layer_impl.cc.orig 2014-04-30 22:41:25.000000000 +0200 ++++ ./cc/layers/layer_impl.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -1190,21 +1190,23 @@ scaled_scroll_bounds.SetSize(scale_factor * scaled_scroll_bounds.width(), scale_factor * scaled_scroll_bounds.height()); diff --git a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc index fceb46b86668..9d4b8f0bf48e 100644 --- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc +++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc @@ -1,5 +1,5 @@ ---- ./chrome/app/chrome_main_delegate.cc.orig 2014-04-24 22:34:55.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/app/chrome_main_delegate.cc.orig 2014-04-30 22:42:53.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.cc 2014-05-04 14:38:46.000000000 +0200 @@ -95,7 +95,7 @@ #include "ui/base/x/x11_util.h" #endif @@ -45,7 +45,7 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -629,7 +629,7 @@ +@@ -630,7 +630,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -54,7 +54,7 @@ breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); #endif -@@ -747,7 +747,7 @@ +@@ -748,7 +748,7 @@ #endif } @@ -63,7 +63,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -759,7 +759,7 @@ +@@ -760,7 +760,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -72,7 +72,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -844,7 +844,7 @@ +@@ -845,7 +845,7 @@ return process_type == switches::kNaClLoaderProcess || process_type == switches::kRelauncherProcess; } diff --git a/www/chromium/files/patch-chrome__app__chrome_main_delegate.h b/www/chromium/files/patch-chrome__app__chrome_main_delegate.h index abfc6343c87b..971b962bf113 100644 --- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.h +++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.h @@ -1,6 +1,6 @@ ---- ./chrome/app/chrome_main_delegate.h.orig 2014-04-24 22:34:55.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.h 2014-04-24 23:23:42.000000000 +0200 -@@ -31,7 +31,7 @@ +--- ./chrome/app/chrome_main_delegate.h.orig 2014-04-30 22:42:53.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.h 2014-05-04 14:38:46.000000000 +0200 +@@ -35,7 +35,7 @@ virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; virtual bool DelaySandboxInitialization( const std::string& process_type) OVERRIDE; diff --git a/www/chromium/files/patch-chrome__app__chromium_strings.grd b/www/chromium/files/patch-chrome__app__chromium_strings.grd new file mode 100644 index 000000000000..6def6e0d74d5 --- /dev/null +++ b/www/chromium/files/patch-chrome__app__chromium_strings.grd @@ -0,0 +1,11 @@ +--- ./chrome/app/chromium_strings.grd.orig 2014-04-30 22:42:53.000000000 +0200 ++++ ./chrome/app/chromium_strings.grd 2014-05-05 13:13:16.000000000 +0200 +@@ -1115,7 +1115,7 @@ + </message> + + <!-- ProcessSingleton --> +- <if expr="is_linux"> ++ <if expr="is_linux or is_bsd"> + <message name="IDS_PROFILE_IN_USE_LINUX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> + The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. + </message> diff --git a/www/chromium/files/patch-chrome__browser__about_flags.cc b/www/chromium/files/patch-chrome__browser__about_flags.cc index 23341c559643..1a8f09e5b396 100644 --- a/www/chromium/files/patch-chrome__browser__about_flags.cc +++ b/www/chromium/files/patch-chrome__browser__about_flags.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/about_flags.cc.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/browser/about_flags.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -2320,7 +2320,7 @@ +--- ./chrome/browser/about_flags.cc.orig 2014-04-30 22:42:17.000000000 +0200 ++++ ./chrome/browser/about_flags.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -2153,7 +2153,7 @@ return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; diff --git a/www/chromium/files/patch-chrome__browser__browser_process_impl.cc b/www/chromium/files/patch-chrome__browser__browser_process_impl.cc index 0ed743884343..1efe4530605a 100644 --- a/www/chromium/files/patch-chrome__browser__browser_process_impl.cc +++ b/www/chromium/files/patch-chrome__browser__browser_process_impl.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/browser_process_impl.cc.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/browser/browser_process_impl.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -261,7 +261,7 @@ +--- ./chrome/browser/browser_process_impl.cc.orig 2014-04-30 22:42:17.000000000 +0200 ++++ ./chrome/browser/browser_process_impl.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -256,7 +256,7 @@ ExtensionRendererState::GetInstance()->Shutdown(); diff --git a/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc b/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc index 423e4b989107..b03634dcb855 100644 --- a/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc +++ b/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/chrome_browser_main.cc.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/browser/chrome_browser_main.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -973,7 +973,7 @@ +--- ./chrome/browser/chrome_browser_main.cc.orig 2014-04-30 22:42:18.000000000 +0200 ++++ ./chrome/browser/chrome_browser_main.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -972,7 +972,7 @@ } #endif diff --git a/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc b/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc index 22f1069ea9e9..d87be4c80f5d 100644 --- a/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc +++ b/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/chrome_browser_main_posix.cc.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/browser/chrome_browser_main_posix.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/chrome_browser_main_posix.cc.orig 2014-04-30 22:42:18.000000000 +0200 ++++ ./chrome/browser/chrome_browser_main_posix.cc 2014-05-04 14:38:46.000000000 +0200 @@ -314,6 +314,11 @@ g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; diff --git a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc index e6c39c322e96..e048b8d3ae7e 100644 --- a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc +++ b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/chrome_content_browser_client.cc.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/browser/chrome_content_browser_client.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -493,7 +493,7 @@ +--- ./chrome/browser/chrome_content_browser_client.cc.orig 2014-04-30 22:42:18.000000000 +0200 ++++ ./chrome/browser/chrome_content_browser_client.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -501,7 +501,7 @@ } } @@ -9,7 +9,7 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -549,7 +549,7 @@ +@@ -557,7 +557,7 @@ return -1; } @@ -18,7 +18,7 @@ #endif // !defined(OS_ANDROID) #if !defined(OS_CHROMEOS) -@@ -1449,7 +1449,7 @@ +@@ -1460,7 +1460,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( CommandLine* command_line, int child_process_id) { @@ -27,8 +27,8 @@ if (breakpad::IsCrashReporterEnabled()) { std::string enable_crash_reporter; GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter); -@@ -2587,7 +2587,7 @@ - } +@@ -2610,7 +2610,7 @@ + #endif } -#if defined(OS_POSIX) && !defined(OS_MACOSX) @@ -36,7 +36,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const CommandLine& command_line, int child_process_id, -@@ -2642,7 +2642,7 @@ +@@ -2664,7 +2664,7 @@ } #endif // defined(OS_ANDROID) } diff --git a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h index bd34a097de23..ffb38afb4cf2 100644 --- a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h +++ b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h @@ -1,11 +1,11 @@ ---- ./chrome/browser/chrome_content_browser_client.h.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/browser/chrome_content_browser_client.h 2014-04-24 23:23:42.000000000 +0200 -@@ -255,7 +255,7 @@ +--- ./chrome/browser/chrome_content_browser_client.h.orig 2014-04-30 22:42:17.000000000 +0200 ++++ ./chrome/browser/chrome_content_browser_client.h 2014-05-04 14:38:46.000000000 +0200 +@@ -267,7 +267,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, + const base::CommandLine& command_line, int child_process_id, diff --git a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc index 2705fd514da3..8ba8d4f9e378 100644 --- a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc +++ b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-04-24 22:35:10.000000000 +0200 -+++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-04-30 22:42:03.000000000 +0200 ++++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-05-04 14:38:46.000000000 +0200 @@ -268,7 +268,7 @@ console_->SetColor(color); console_->Write(base::ASCIIToUTF16(result)); diff --git a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h index 6bdba7bf291f..140aa8c9cc89 100644 --- a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h +++ b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h @@ -1,5 +1,5 @@ ---- ./chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-04-24 22:35:10.000000000 +0200 -+++ ./chrome/browser/diagnostics/diagnostics_writer.h 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-04-30 22:42:03.000000000 +0200 ++++ ./chrome/browser/diagnostics/diagnostics_writer.h 2014-05-04 14:38:46.000000000 +0200 @@ -18,7 +18,7 @@ public: // The type of formatting done by this writer. diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc b/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc index f5df16858f29..d17d89a0ed46 100644 --- a/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc +++ b/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-04-24 22:35:08.000000000 +0200 -+++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -166,10 +166,12 @@ +--- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-04-30 22:41:59.000000000 +0200 ++++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -167,10 +167,12 @@ } bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunImpl() { diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc b/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc index 89a00ba30fca..d3e43b329c91 100644 --- a/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc +++ b/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-04-24 22:35:09.000000000 +0200 -+++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-04-30 22:42:00.000000000 +0200 ++++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-05-04 14:38:46.000000000 +0200 @@ -4,6 +4,10 @@ #include "chrome/browser/extensions/api/music_manager_private/device_id.h" diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc b/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc index 9042b9795b10..4e8b5bd362b9 100644 --- a/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc +++ b/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/extensions/api/serial/serial_api.cc.orig 2014-04-24 22:35:08.000000000 +0200 -+++ ./chrome/browser/extensions/api/serial/serial_api.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -83,7 +83,7 @@ +--- ./chrome/browser/extensions/api/serial/serial_api.cc.orig 2014-04-30 22:42:00.000000000 +0200 ++++ ./chrome/browser/extensions/api/serial/serial_api.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -84,7 +84,7 @@ void SerialGetDevicesFunction::Work() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); @@ -9,7 +9,7 @@ device::SerialDeviceInfoList devices; scoped_ptr<device::SerialDeviceEnumerator> enumerator = device::SerialDeviceEnumerator::Create(); -@@ -105,6 +105,7 @@ +@@ -106,6 +106,7 @@ } results_ = serial::GetDevices::Results::Create(out_devices); diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc b/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc index 34ac85bc6abd..ba094c2f3af5 100644 --- a/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc +++ b/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2014-04-24 22:35:08.000000000 +0200 -+++ ./chrome/browser/extensions/api/serial/serial_connection_posix.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2014-04-30 22:42:00.000000000 +0200 ++++ ./chrome/browser/extensions/api/serial/serial_connection_posix.cc 2014-05-04 14:38:46.000000000 +0200 @@ -36,7 +36,7 @@ BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) diff --git a/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc b/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc index d06d13849f23..3feed23457cc 100644 --- a/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc +++ b/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/gpu/gl_string_manager.cc.orig 2014-04-24 22:35:12.000000000 +0200 -+++ ./chrome/browser/gpu/gl_string_manager.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/gpu/gl_string_manager.cc.orig 2014-04-30 22:42:17.000000000 +0200 ++++ ./chrome/browser/gpu/gl_string_manager.cc 2014-05-04 14:38:46.000000000 +0200 @@ -25,7 +25,7 @@ void GLStringManager::Initialize() { diff --git a/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc b/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc index aabeccaccb17..cbf7ac49ef9f 100644 --- a/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc +++ b/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-04-24 22:35:12.000000000 +0200 -+++ ./chrome/browser/gpu/gpu_feature_checker.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-04-30 22:42:17.000000000 +0200 ++++ ./chrome/browser/gpu/gpu_feature_checker.cc 2014-05-04 14:38:46.000000000 +0200 @@ -33,7 +33,7 @@ CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); diff --git a/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc b/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc index 9ff2f56909df..0cb972e02e54 100644 --- a/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc +++ b/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/media/webrtc_log_uploader.cc.orig 2014-04-24 22:35:11.000000000 +0200 -+++ ./chrome/browser/media/webrtc_log_uploader.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -155,6 +155,8 @@ +--- ./chrome/browser/media/webrtc_log_uploader.cc.orig 2014-04-30 22:42:02.000000000 +0200 ++++ ./chrome/browser/media/webrtc_log_uploader.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -196,6 +196,8 @@ const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc b/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc index 8f49c3a1a76e..95f3d3d8232f 100644 --- a/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc +++ b/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-04-24 22:35:11.000000000 +0200 -+++ ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-04-30 22:42:13.000000000 +0200 ++++ ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc 2014-05-04 14:38:46.000000000 +0200 @@ -33,9 +33,11 @@ // Note that this initializes the delegate asynchronously, but since // the delegate will only be used from the IO thread, it is guaranteed diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc b/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc index d5e512a0cb62..3343eaecab49 100644 --- a/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc +++ b/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-04-24 22:35:11.000000000 +0200 -+++ ./chrome/browser/media_galleries/media_file_system_registry.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -631,7 +631,10 @@ +--- ./chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-04-30 22:42:13.000000000 +0200 ++++ ./chrome/browser/media_galleries/media_file_system_registry.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -635,7 +635,10 @@ // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl(this)) { diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc b/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc new file mode 100644 index 000000000000..49a0ecd7ee77 --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc @@ -0,0 +1,15 @@ +--- ./chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-04-30 22:42:13.000000000 +0200 ++++ ./chrome/browser/media_galleries/media_folder_finder.cc 2014-05-05 11:50:29.000000000 +0200 +@@ -50,10 +50,10 @@ + chrome::DIR_USER_APPLICATIONS, + chrome::DIR_USER_LIBRARY, + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::DIR_CACHE, + #endif +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + base::DIR_TEMP, + #endif + }; diff --git a/www/chromium/files/patch-chrome__browser__memory_details.cc b/www/chromium/files/patch-chrome__browser__memory_details.cc index 0bab4e127c85..9c241af1ee8b 100644 --- a/www/chromium/files/patch-chrome__browser__memory_details.cc +++ b/www/chromium/files/patch-chrome__browser__memory_details.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/memory_details.cc.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/browser/memory_details.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/memory_details.cc.orig 2014-04-30 22:42:17.000000000 +0200 ++++ ./chrome/browser/memory_details.cc 2014-05-04 14:38:46.000000000 +0200 @@ -32,7 +32,7 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/www/chromium/files/patch-chrome__browser__net__connection_tester.cc b/www/chromium/files/patch-chrome__browser__net__connection_tester.cc index eb157992b5b8..e7dce2924f13 100644 --- a/www/chromium/files/patch-chrome__browser__net__connection_tester.cc +++ b/www/chromium/files/patch-chrome__browser__net__connection_tester.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/net/connection_tester.cc.orig 2014-04-24 22:35:02.000000000 +0200 -+++ ./chrome/browser/net/connection_tester.cc 2014-04-24 23:23:43.000000000 +0200 -@@ -217,7 +217,7 @@ +--- ./chrome/browser/net/connection_tester.cc.orig 2014-04-30 22:41:58.000000000 +0200 ++++ ./chrome/browser/net/connection_tester.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -213,7 +213,7 @@ // Otherwise returns a network error code. int CreateSystemProxyConfigService( scoped_ptr<net::ProxyConfigService>* config_service) { diff --git a/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc b/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc index 788b09688dc3..ac3d44ed4433 100644 --- a/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc +++ b/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/omaha_query_params/omaha_query_params.cc.orig 2014-04-24 22:35:10.000000000 +0200 -+++ ./chrome/browser/omaha_query_params/omaha_query_params.cc 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/browser/omaha_query_params/omaha_query_params.cc.orig 2014-04-30 22:42:02.000000000 +0200 ++++ ./chrome/browser/omaha_query_params/omaha_query_params.cc 2014-05-04 14:38:46.000000000 +0200 @@ -29,6 +29,8 @@ "linux"; #elif defined(OS_OPENBSD) diff --git a/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc b/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc index 14e4b6cc48ae..773b86a84481 100644 --- a/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc +++ b/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/plugins/plugins_resource_service.cc.orig 2014-04-24 22:35:10.000000000 +0200 -+++ ./chrome/browser/plugins/plugins_resource_service.cc 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/browser/plugins/plugins_resource_service.cc.orig 2014-04-30 22:42:06.000000000 +0200 ++++ ./chrome/browser/plugins/plugins_resource_service.cc 2014-05-04 14:38:46.000000000 +0200 @@ -33,7 +33,7 @@ std::string filename; #if defined(OS_WIN) diff --git a/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc b/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc new file mode 100644 index 000000000000..aa64b69696e7 --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc @@ -0,0 +1,11 @@ +--- ./chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-04-30 22:41:58.000000000 +0200 ++++ ./chrome/browser/policy/policy_prefs_browsertest.cc 2014-05-05 18:09:24.000000000 +0200 +@@ -162,6 +162,8 @@ + const std::string os("chromeos"); + #elif defined(OS_LINUX) + const std::string os("linux"); ++#elif defined(OS_FREEBSD) ++ const std::string os("freebsd"); + #else + #error "Unknown platform" + #endif diff --git a/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h b/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h index ac99a611cc62..37a90202b4b6 100644 --- a/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h +++ b/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h @@ -1,5 +1,5 @@ ---- ./chrome/browser/ui/gtk/accelerators_gtk.h.orig 2014-04-24 22:34:59.000000000 +0200 -+++ ./chrome/browser/ui/gtk/accelerators_gtk.h 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/browser/ui/gtk/accelerators_gtk.h.orig 2014-04-30 22:42:07.000000000 +0200 ++++ ./chrome/browser/ui/gtk/accelerators_gtk.h 2014-05-04 14:38:46.000000000 +0200 @@ -10,6 +10,8 @@ #include "base/containers/hash_tables.h" #include "ui/base/accelerators/accelerator.h" diff --git a/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc b/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc index ec6945b8dfb2..2e99214b00c4 100644 --- a/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc +++ b/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/ui/gtk/first_run_dialog.cc.orig 2014-04-24 22:34:59.000000000 +0200 -+++ ./chrome/browser/ui/gtk/first_run_dialog.cc 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/browser/ui/gtk/first_run_dialog.cc.orig 2014-04-30 22:42:07.000000000 +0200 ++++ ./chrome/browser/ui/gtk/first_run_dialog.cc 2014-05-04 14:38:46.000000000 +0200 @@ -132,6 +132,7 @@ if (dialog_) gtk_widget_hide_all(dialog_); diff --git a/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h b/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h new file mode 100644 index 000000000000..58d24462e42c --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h @@ -0,0 +1,11 @@ +--- ./chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h.orig 2014-04-30 22:42:07.000000000 +0200 ++++ ./chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h 2014-05-04 20:49:17.000000000 +0200 +@@ -92,7 +92,7 @@ + const gfx::Rect& initial_pos, + bool user_gesture, + bool* was_blocked) OVERRIDE; +- virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; ++ virtual void LoadingStateChanged(content::WebContents* source) /*OVERRIDE*/; + virtual content::JavaScriptDialogManager* + GetJavaScriptDialogManager() OVERRIDE; + virtual void RequestMediaAccessPermission( diff --git a/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h b/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h new file mode 100644 index 000000000000..f2d889590d16 --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h @@ -0,0 +1,11 @@ +--- ./chrome/browser/ui/gtk/web_dialog_gtk.h.orig 2014-04-30 22:42:07.000000000 +0200 ++++ ./chrome/browser/ui/gtk/web_dialog_gtk.h 2014-05-04 20:50:58.000000000 +0200 +@@ -62,7 +62,7 @@ + const gfx::Rect& initial_pos, + bool user_gesture, + bool* was_blocked) OVERRIDE; +- virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; ++ virtual void LoadingStateChanged(content::WebContents* source) /*OVERRIDE*/; + + private: + CHROMEGTK_CALLBACK_1(WebDialogGtk, void, OnResponse, int); diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc b/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc index 0d6ada8701b6..8cede7c6bdea 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc +++ b/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/ui/webui/about_ui.cc.orig 2014-04-24 22:35:00.000000000 +0200 -+++ ./chrome/browser/ui/webui/about_ui.cc 2014-04-24 23:23:43.000000000 +0200 -@@ -768,7 +768,7 @@ +--- ./chrome/browser/ui/webui/about_ui.cc.orig 2014-04-30 22:42:10.000000000 +0200 ++++ ./chrome/browser/ui/webui/about_ui.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -762,7 +762,7 @@ return data; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -784,6 +784,7 @@ +@@ -778,6 +778,7 @@ return data; } @@ -17,7 +17,7 @@ void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id, bool good) { data->append("<tr><td>"); -@@ -850,6 +851,7 @@ +@@ -848,6 +849,7 @@ return data; } #endif @@ -25,7 +25,7 @@ // AboutMemoryHandler ---------------------------------------------------------- -@@ -1015,7 +1017,7 @@ +@@ -1013,7 +1015,7 @@ } else if (source_name_ == chrome::kChromeUIDNSHost) { AboutDnsHandler::Start(profile(), callback); return; diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc b/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc index e2e06bd11d5d..93b1fac29771 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc +++ b/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc @@ -1,11 +1,11 @@ ---- ./chrome/browser/ui/webui/certificate_viewer_webui.cc.orig 2014-04-24 22:35:00.000000000 +0200 -+++ ./chrome/browser/ui/webui/certificate_viewer_webui.cc 2014-04-24 23:23:43.000000000 +0200 -@@ -229,7 +229,7 @@ +--- ./chrome/browser/ui/webui/certificate_viewer_webui.cc.orig 2014-04-30 22:42:10.000000000 +0200 ++++ ./chrome/browser/ui/webui/certificate_viewer_webui.cc 2014-05-04 20:57:59.000000000 +0200 +@@ -274,7 +274,7 @@ if (cert_index < 0) return; - NativeWebContentsModalDialog window = + _GtkWindow* window = - platform_util::GetTopLevel(dialog_->dialog()->GetNativeDialog()); + platform_util::GetTopLevel(dialog_->GetNativeWebContentsModalDialog()); ShowCertExportDialog(web_ui()->GetWebContents(), window, diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc index 506ad7a4166b..335632d26e80 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc +++ b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2014-04-24 22:35:00.000000000 +0200 -+++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2014-04-24 23:23:43.000000000 +0200 -@@ -466,7 +466,7 @@ +--- ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2014-04-30 22:42:10.000000000 +0200 ++++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -473,7 +473,7 @@ url.host() == chrome::kChromeUIMemoryRedirectHost || url.host() == chrome::kChromeUIStatsHost || url.host() == chrome::kChromeUITermsHost diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc index a2d8a04da9fb..4e2443133edf 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc +++ b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2014-04-24 22:35:00.000000000 +0200 -+++ ./chrome/browser/ui/webui/options/browser_options_handler.cc 2014-04-24 23:23:43.000000000 +0200 -@@ -313,7 +313,8 @@ +--- ./chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2014-04-30 22:42:10.000000000 +0200 ++++ ./chrome/browser/ui/webui/options/browser_options_handler.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -328,7 +328,8 @@ { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, { "translateEnableTranslate", IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE }, @@ -10,7 +10,7 @@ { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, { "themesNativeButton", IDS_THEMES_GTK_BUTTON }, { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, -@@ -620,7 +621,8 @@ +@@ -648,7 +649,8 @@ "requestProfilesInfo", base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo, base::Unretained(this))); @@ -20,7 +20,7 @@ web_ui()->RegisterMessageCallback( "themesSetNative", base::Bind(&BrowserOptionsHandler::ThemesSetNative, -@@ -1204,7 +1206,8 @@ +@@ -1298,7 +1300,8 @@ ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); bool is_native_theme = false; @@ -30,7 +30,7 @@ bool profile_is_managed = profile->IsManaged(); is_native_theme = theme_service->UsingNativeTheme(); base::FundamentalValue native_theme_enabled(!is_native_theme && -@@ -1226,7 +1229,8 @@ +@@ -1320,7 +1323,8 @@ ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme(); } diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h index 4c7f165da8d0..a10a9ab7ba38 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h +++ b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h @@ -1,6 +1,6 @@ ---- ./chrome/browser/ui/webui/options/browser_options_handler.h.orig 2014-04-24 22:35:00.000000000 +0200 -+++ ./chrome/browser/ui/webui/options/browser_options_handler.h 2014-04-24 23:23:43.000000000 +0200 -@@ -168,7 +168,8 @@ +--- ./chrome/browser/ui/webui/options/browser_options_handler.h.orig 2014-04-30 22:42:10.000000000 +0200 ++++ ./chrome/browser/ui/webui/options/browser_options_handler.h 2014-05-04 14:38:46.000000000 +0200 +@@ -183,7 +183,8 @@ void ObserveThemeChanged(); void ThemesReset(const base::ListValue* args); diff --git a/www/chromium/files/patch-chrome__browser__usb__usb_context.cc b/www/chromium/files/patch-chrome__browser__usb__usb_context.cc index fb53e4e96353..c009070f1aae 100644 --- a/www/chromium/files/patch-chrome__browser__usb__usb_context.cc +++ b/www/chromium/files/patch-chrome__browser__usb__usb_context.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/usb/usb_context.cc.orig 2014-04-24 22:35:11.000000000 +0200 -+++ ./chrome/browser/usb/usb_context.cc 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/browser/usb/usb_context.cc.orig 2014-04-30 22:42:13.000000000 +0200 ++++ ./chrome/browser/usb/usb_context.cc 2014-05-04 14:38:46.000000000 +0200 @@ -43,7 +43,9 @@ running_ = false; // Spreading running_ to the UsbEventHandler thread. diff --git a/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc b/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc index 46a192a27e2f..454eac7da571 100644 --- a/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc +++ b/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/web_applications/web_app.cc.orig 2014-04-24 22:35:10.000000000 +0200 -+++ ./chrome/browser/web_applications/web_app.cc 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/browser/web_applications/web_app.cc.orig 2014-04-30 22:42:17.000000000 +0200 ++++ ./chrome/browser/web_applications/web_app.cc 2014-05-04 14:38:46.000000000 +0200 @@ -226,7 +226,7 @@ } #endif diff --git a/www/chromium/files/patch-chrome__browser__web_applications__web_app.h b/www/chromium/files/patch-chrome__browser__web_applications__web_app.h index d22201cb0c96..f4794678daf3 100644 --- a/www/chromium/files/patch-chrome__browser__web_applications__web_app.h +++ b/www/chromium/files/patch-chrome__browser__web_applications__web_app.h @@ -1,5 +1,5 @@ ---- ./chrome/browser/web_applications/web_app.h.orig 2014-04-24 22:35:10.000000000 +0200 -+++ ./chrome/browser/web_applications/web_app.h 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/browser/web_applications/web_app.h.orig 2014-04-30 22:42:17.000000000 +0200 ++++ ./chrome/browser/web_applications/web_app.h 2014-05-04 14:38:46.000000000 +0200 @@ -97,7 +97,7 @@ IconInfoList* icons); #endif diff --git a/www/chromium/files/patch-chrome__chrome_browser.gypi b/www/chromium/files/patch-chrome__chrome_browser.gypi index 7eabd95bdf4e..fa9b2c967224 100644 --- a/www/chromium/files/patch-chrome__chrome_browser.gypi +++ b/www/chromium/files/patch-chrome__chrome_browser.gypi @@ -1,6 +1,17 @@ ---- ./chrome/chrome_browser.gypi.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/chrome_browser.gypi 2014-04-24 23:23:43.000000000 +0200 -@@ -2949,7 +2949,7 @@ +--- ./chrome/chrome_browser.gypi.orig 2014-04-30 22:42:53.000000000 +0200 ++++ ./chrome/chrome_browser.gypi 2014-05-05 20:38:00.000000000 +0200 +@@ -1209,8 +1209,8 @@ + 'browser/media_galleries/imported_media_gallery_registry.h', + 'browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc', + 'browser/media_galleries/linux/mtp_device_delegate_impl_linux.h', +- 'browser/media_galleries/linux/mtp_device_object_enumerator.cc', +- 'browser/media_galleries/linux/mtp_device_object_enumerator.h', ++ #'browser/media_galleries/linux/mtp_device_object_enumerator.cc', ++ #'browser/media_galleries/linux/mtp_device_object_enumerator.h', + 'browser/media_galleries/linux/mtp_device_task_helper.cc', + 'browser/media_galleries/linux/mtp_device_task_helper.h', + 'browser/media_galleries/linux/mtp_device_task_helper_map_service.cc', +@@ -3025,7 +3025,7 @@ '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', ], }], @@ -9,7 +20,7 @@ 'dependencies': [ '../build/linux/system.gyp:libspeechd', ], -@@ -3077,7 +3077,7 @@ +@@ -3166,7 +3166,7 @@ '../build/linux/system.gyp:xscrnsaver', ], }], @@ -18,7 +29,7 @@ 'sources': [ 'app/chrome_breakpad_client.cc', 'app/chrome_breakpad_client.h', -@@ -3345,6 +3345,25 @@ +@@ -3434,6 +3434,25 @@ ['exclude', '^third_party/mozilla_security_manager/'], ], }], diff --git a/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi b/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi index 8f44839e97c1..f982ebae3611 100644 --- a/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi +++ b/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi @@ -1,6 +1,6 @@ ---- ./chrome/chrome_browser_extensions.gypi.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/chrome_browser_extensions.gypi 2014-04-24 23:23:43.000000000 +0200 -@@ -922,6 +922,11 @@ +--- ./chrome/chrome_browser_extensions.gypi.orig 2014-04-30 22:42:53.000000000 +0200 ++++ ./chrome/chrome_browser_extensions.gypi 2014-05-04 14:38:46.000000000 +0200 +@@ -885,6 +885,11 @@ 'browser/extensions/window_controller_list_observer.h', ], 'conditions': [ diff --git a/www/chromium/files/patch-chrome__chrome_tests.gypi b/www/chromium/files/patch-chrome__chrome_tests.gypi new file mode 100644 index 000000000000..67b433abebe5 --- /dev/null +++ b/www/chromium/files/patch-chrome__chrome_tests.gypi @@ -0,0 +1,11 @@ +--- ./chrome/chrome_tests.gypi.orig 2014-04-30 22:42:53.000000000 +0200 ++++ ./chrome/chrome_tests.gypi 2014-05-05 18:29:40.000000000 +0200 +@@ -1628,7 +1628,7 @@ + 'test/remoting/remote_desktop_browsertest.h', + 'test/remoting/waiter.cc', + 'test/remoting/waiter.h', +- 'test/security_tests/sandbox_browsertest_linux.cc', ++ #'test/security_tests/sandbox_browsertest_linux.cc', + 'test/security_tests/sandbox_browsertest_win.cc', + # TODO(craig): Rename this and run from base_unittests when the test + # is safe to run there. See http://crbug.com/78722 for details. diff --git a/www/chromium/files/patch-chrome__chrome_tests_unit.gypi b/www/chromium/files/patch-chrome__chrome_tests_unit.gypi new file mode 100644 index 000000000000..f0dfed2c4d41 --- /dev/null +++ b/www/chromium/files/patch-chrome__chrome_tests_unit.gypi @@ -0,0 +1,36 @@ +--- ./chrome/chrome_tests_unit.gypi.orig 2014-04-30 22:42:53.000000000 +0200 ++++ ./chrome/chrome_tests_unit.gypi 2014-05-05 21:52:34.000000000 +0200 +@@ -518,7 +518,6 @@ + 'test_support_common', + 'test_support_unit', + # 3) anything tests directly depend on +- '../courgette/courgette.gyp:courgette_lib', + '../google_apis/google_apis.gyp:google_apis', + '../skia/skia.gyp:skia', + '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', +@@ -791,12 +790,12 @@ + 'browser/command_updater_unittest.cc', + 'browser/component_updater/test/component_installers_unittest.cc', + 'browser/component_updater/test/component_patcher_mock.h', +- 'browser/component_updater/test/component_patcher_unittest.cc', +- 'browser/component_updater/test/component_updater_ping_manager_unittest.cc', +- 'browser/component_updater/test/component_updater_service_unittest.cc', ++ #'browser/component_updater/test/component_patcher_unittest.cc', ++ #'browser/component_updater/test/component_updater_ping_manager_unittest.cc', ++ #'browser/component_updater/test/component_updater_service_unittest.cc', + 'browser/component_updater/test/crx_downloader_unittest.cc', + 'browser/component_updater/test/test_installer.cc', +- 'browser/component_updater/test/update_checker_unittest.cc', ++ #'browser/component_updater/test/update_checker_unittest.cc', + 'browser/component_updater/test/update_response_unittest.cc', + 'browser/component_updater/test/url_request_post_interceptor.cc', + 'browser/content_settings/content_settings_default_provider_unittest.cc', +@@ -1063,7 +1062,7 @@ + 'browser/media/webrtc_log_uploader_unittest.cc', + 'browser/media/webrtc_log_util_unittest.cc', + 'browser/media_galleries/fileapi/native_media_file_util_unittest.cc', +- 'browser/media_galleries/linux/mtp_device_object_enumerator_unittest.cc', ++ #'browser/media_galleries/linux/mtp_device_object_enumerator_unittest.cc', + 'browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm', + 'browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc', + 'browser/media_galleries/media_file_system_registry_unittest.cc', diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.cc b/www/chromium/files/patch-chrome__common__chrome_paths.cc index fbe15a6a3051..7df0dd0ecdb6 100644 --- a/www/chromium/files/patch-chrome__common__chrome_paths.cc +++ b/www/chromium/files/patch-chrome__common__chrome_paths.cc @@ -1,5 +1,5 @@ ---- ./chrome/common/chrome_paths.cc.orig 2014-04-24 22:34:45.000000000 +0200 -+++ ./chrome/common/chrome_paths.cc 2014-04-24 23:23:48.000000000 +0200 +--- ./chrome/common/chrome_paths.cc.orig 2014-04-30 22:42:23.000000000 +0200 ++++ ./chrome/common/chrome_paths.cc 2014-05-04 14:38:50.000000000 +0200 @@ -440,10 +440,12 @@ if (!base::PathExists(cur)) // We don't want to create this return false; @@ -14,7 +14,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -507,7 +509,7 @@ +@@ -521,7 +523,7 @@ #endif break; @@ -23,7 +23,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) #if defined(GOOGLE_CHROME_BUILD) -@@ -533,7 +535,7 @@ +@@ -547,7 +549,7 @@ return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.h b/www/chromium/files/patch-chrome__common__chrome_paths.h index 2a48de748674..e9744bcc9ec9 100644 --- a/www/chromium/files/patch-chrome__common__chrome_paths.h +++ b/www/chromium/files/patch-chrome__common__chrome_paths.h @@ -1,6 +1,6 @@ ---- ./chrome/common/chrome_paths.h.orig 2014-04-24 22:34:45.000000000 +0200 -+++ ./chrome/common/chrome_paths.h 2014-04-24 23:23:43.000000000 +0200 -@@ -109,7 +109,7 @@ +--- ./chrome/common/chrome_paths.h.orig 2014-04-30 22:42:24.000000000 +0200 ++++ ./chrome/common/chrome_paths.h 2014-05-04 14:38:46.000000000 +0200 +@@ -111,7 +111,7 @@ // files to be installed when managed user // session starts. diff --git a/www/chromium/files/patch-chrome__common__chrome_switches.cc b/www/chromium/files/patch-chrome__common__chrome_switches.cc index 6b743bb94e7e..e538f401dc54 100644 --- a/www/chromium/files/patch-chrome__common__chrome_switches.cc +++ b/www/chromium/files/patch-chrome__common__chrome_switches.cc @@ -1,6 +1,6 @@ ---- ./chrome/common/chrome_switches.cc.orig 2014-04-24 22:34:45.000000000 +0200 -+++ ./chrome/common/chrome_switches.cc 2014-04-24 23:23:43.000000000 +0200 -@@ -1587,7 +1587,7 @@ +--- ./chrome/common/chrome_switches.cc.orig 2014-04-30 22:42:24.000000000 +0200 ++++ ./chrome/common/chrome_switches.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -1448,7 +1448,7 @@ const char kPasswordStore[] = "password-store"; #endif @@ -9,7 +9,7 @@ // 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. -@@ -1598,7 +1598,7 @@ +@@ -1459,7 +1459,7 @@ // Linux speech service. Because it's buggy, the user must explicitly // enable it so that visiting a random webpage can't cause instability. const char kEnableSpeechDispatcher[] = "enable-speech-dispatcher"; diff --git a/www/chromium/files/patch-chrome__common__chrome_switches.h b/www/chromium/files/patch-chrome__common__chrome_switches.h index 42a79daf8926..2d867cf8f742 100644 --- a/www/chromium/files/patch-chrome__common__chrome_switches.h +++ b/www/chromium/files/patch-chrome__common__chrome_switches.h @@ -1,6 +1,6 @@ ---- ./chrome/common/chrome_switches.h.orig 2014-04-24 22:34:45.000000000 +0200 -+++ ./chrome/common/chrome_switches.h 2014-04-24 23:23:43.000000000 +0200 -@@ -440,7 +440,7 @@ +--- ./chrome/common/chrome_switches.h.orig 2014-04-30 22:42:23.000000000 +0200 ++++ ./chrome/common/chrome_switches.h 2014-05-04 14:38:46.000000000 +0200 +@@ -406,7 +406,7 @@ extern const char kPasswordStore[]; #endif diff --git a/www/chromium/files/patch-chrome__common__pref_names.cc b/www/chromium/files/patch-chrome__common__pref_names.cc index e6019e088e04..d69b9eea0b00 100644 --- a/www/chromium/files/patch-chrome__common__pref_names.cc +++ b/www/chromium/files/patch-chrome__common__pref_names.cc @@ -1,6 +1,6 @@ ---- ./chrome/common/pref_names.cc.orig 2014-04-24 22:34:45.000000000 +0200 -+++ ./chrome/common/pref_names.cc 2014-04-24 23:23:43.000000000 +0200 -@@ -963,7 +963,7 @@ +--- ./chrome/common/pref_names.cc.orig 2014-04-30 22:42:23.000000000 +0200 ++++ ./chrome/common/pref_names.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -950,7 +950,7 @@ // Boolean controlling whether SafeSearch is mandatory for Google Web Searches. const char kForceSafeSearch[] = "settings.force_safesearch"; diff --git a/www/chromium/files/patch-chrome__common__pref_names.h b/www/chromium/files/patch-chrome__common__pref_names.h index 5065cc979161..cb63b30caa80 100644 --- a/www/chromium/files/patch-chrome__common__pref_names.h +++ b/www/chromium/files/patch-chrome__common__pref_names.h @@ -1,6 +1,6 @@ ---- ./chrome/common/pref_names.h.orig 2014-04-24 22:34:45.000000000 +0200 -+++ ./chrome/common/pref_names.h 2014-04-24 23:23:43.000000000 +0200 -@@ -306,7 +306,7 @@ +--- ./chrome/common/pref_names.h.orig 2014-04-30 22:42:23.000000000 +0200 ++++ ./chrome/common/pref_names.h 2014-05-04 14:38:46.000000000 +0200 +@@ -305,7 +305,7 @@ extern const char kForceSafeSearch[]; extern const char kDeleteTimePeriod[]; extern const char kLastClearBrowsingDataTime[]; diff --git a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc b/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc index 0ea3ad75973a..17f6312d7d6b 100644 --- a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc +++ b/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc @@ -1,5 +1,5 @@ ---- ./chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2014-04-24 22:34:56.000000000 +0200 -+++ ./chrome/renderer/pepper/pepper_flash_font_file_host.cc 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2014-04-30 22:41:57.000000000 +0200 ++++ ./chrome/renderer/pepper/pepper_flash_font_file_host.cc 2014-05-04 14:38:46.000000000 +0200 @@ -13,7 +13,7 @@ #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/serialized_structs.h" @@ -9,22 +9,24 @@ #include "content/public/common/child_process_sandbox_support_linux.h" #endif -@@ -26,12 +26,12 @@ +@@ -26,14 +26,14 @@ : ResourceHost(host->GetPpapiHost(), instance, resource), renderer_ppapi_host_(host), fd_(-1) { -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) fd_ = content::MatchFontWithFallback( - description.face.c_str(), description.weight >= - PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD, - description.italic, charset); + description.face.c_str(), + description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD, + description.italic, + charset, + PP_BROWSERFONT_TRUSTED_FAMILY_DEFAULT); -#endif // defined(OS_LINUX) || defined(OS_OPENBSD) +#endif // defined(OS_LINUX) || defined(OS_BSD) } PepperFlashFontFileHost::~PepperFlashFontFileHost() { -@@ -52,7 +52,7 @@ +@@ -54,7 +54,7 @@ uint32_t table) { std::string contents; int32_t result = PP_ERROR_FAILED; @@ -33,7 +35,7 @@ if (fd_ != -1) { size_t length = 0; if (content::GetFontTable(fd_, table, 0 /* offset */, NULL, &length)) { -@@ -67,7 +67,7 @@ +@@ -69,7 +69,7 @@ } } } diff --git a/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h b/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h index f4cca5092d05..faf773dc63e4 100644 --- a/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h +++ b/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h @@ -1,6 +1,6 @@ ---- ./chrome/renderer/printing/print_web_view_helper.h.orig 2014-04-24 22:34:55.000000000 +0200 -+++ ./chrome/renderer/printing/print_web_view_helper.h 2014-04-24 23:23:43.000000000 +0200 -@@ -214,7 +214,7 @@ +--- ./chrome/renderer/printing/print_web_view_helper.h.orig 2014-04-30 22:41:57.000000000 +0200 ++++ ./chrome/renderer/printing/print_web_view_helper.h 2014-05-04 14:38:46.000000000 +0200 +@@ -200,7 +200,7 @@ void FinishFramePrinting(); // Prints the page listed in |params|. diff --git a/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc b/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc index d682672e05a4..1e6f3b0a4f99 100644 --- a/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc +++ b/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc @@ -1,5 +1,5 @@ ---- ./chrome/test/base/in_process_browser_test.cc.orig 2014-04-24 22:34:34.000000000 +0200 -+++ ./chrome/test/base/in_process_browser_test.cc 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/test/base/in_process_browser_test.cc.orig 2014-04-30 22:42:44.000000000 +0200 ++++ ./chrome/test/base/in_process_browser_test.cc 2014-05-04 14:38:46.000000000 +0200 @@ -72,6 +72,10 @@ namespace { diff --git a/www/chromium/files/patch-chrome__test__base__testing_browser_process.h b/www/chromium/files/patch-chrome__test__base__testing_browser_process.h index 6b481e2a3c56..9a638978e2c6 100644 --- a/www/chromium/files/patch-chrome__test__base__testing_browser_process.h +++ b/www/chromium/files/patch-chrome__test__base__testing_browser_process.h @@ -1,11 +1,13 @@ ---- ./chrome/test/base/testing_browser_process.h.orig 2014-04-24 22:34:34.000000000 +0200 -+++ ./chrome/test/base/testing_browser_process.h 2014-04-24 23:23:43.000000000 +0200 -@@ -101,7 +101,7 @@ +--- ./chrome/test/base/testing_browser_process.h.orig 2014-04-30 22:42:44.000000000 +0200 ++++ ./chrome/test/base/testing_browser_process.h 2014-05-05 18:01:58.000000000 +0200 +@@ -101,8 +101,8 @@ virtual DownloadStatusUpdater* download_status_updater() OVERRIDE; virtual DownloadRequestLimiter* download_request_limiter() OVERRIDE; -#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) +- virtual void StartAutoupdateTimer() OVERRIDE {} +#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS) - virtual void StartAutoupdateTimer() OVERRIDE {} ++ virtual void StartAutoupdateTimer() /*OVERRIDE*/ {} #endif + virtual ChromeNetLog* net_log() OVERRIDE; diff --git a/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc b/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc new file mode 100644 index 000000000000..217dbe9cc0d6 --- /dev/null +++ b/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc @@ -0,0 +1,20 @@ +--- ./chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2014-04-30 22:42:44.000000000 +0200 ++++ ./chrome/test/chromedriver/chrome/chrome_finder.cc 2014-05-05 14:47:06.000000000 +0200 +@@ -42,7 +42,7 @@ + installation_locations[i].Append(L"Chromium\\Application")); + } + } +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_FREEBSD) + void GetApplicationDirs(std::vector<base::FilePath>* locations) { + locations->push_back(base::FilePath("/opt/google/chrome")); + locations->push_back(base::FilePath("/usr/local/bin")); +@@ -91,7 +91,7 @@ + base::FilePath("Google Chrome.app/Contents/MacOS/Google Chrome"), + base::FilePath("Chromium.app/Contents/MacOS/Chromium") + }; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_FREEBSD) + base::FilePath browser_exes_array[] = { + base::FilePath("google-chrome"), + base::FilePath("chrome"), diff --git a/www/chromium/files/patch-chrome__test__perf__perf_test.cc b/www/chromium/files/patch-chrome__test__perf__perf_test.cc index 3a0464fa04d7..cf1412e34f9f 100644 --- a/www/chromium/files/patch-chrome__test__perf__perf_test.cc +++ b/www/chromium/files/patch-chrome__test__perf__perf_test.cc @@ -1,5 +1,5 @@ ---- ./chrome/test/perf/perf_test.cc.orig 2014-04-24 22:34:37.000000000 +0200 -+++ ./chrome/test/perf/perf_test.cc 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/test/perf/perf_test.cc.orig 2014-04-30 22:42:44.000000000 +0200 ++++ ./chrome/test/perf/perf_test.cc 2014-05-04 14:38:46.000000000 +0200 @@ -352,7 +352,7 @@ AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name, total_working_set_size, "bytes", diff --git a/www/chromium/files/patch-chrome__test__ui__ui_test.cc b/www/chromium/files/patch-chrome__test__ui__ui_test.cc index 6a225535cb2d..559b81e70563 100644 --- a/www/chromium/files/patch-chrome__test__ui__ui_test.cc +++ b/www/chromium/files/patch-chrome__test__ui__ui_test.cc @@ -1,5 +1,5 @@ ---- ./chrome/test/ui/ui_test.cc.orig 2014-04-24 22:34:34.000000000 +0200 -+++ ./chrome/test/ui/ui_test.cc 2014-04-24 23:23:44.000000000 +0200 +--- ./chrome/test/ui/ui_test.cc.orig 2014-04-30 22:42:44.000000000 +0200 ++++ ./chrome/test/ui/ui_test.cc 2014-05-04 14:38:46.000000000 +0200 @@ -68,7 +68,7 @@ L"NOTE: This test is expected to fail if crash_service.exe is not " L"running. Start it manually before running this test (see the build " diff --git a/www/chromium/files/patch-chrome__tools__build__linux__sed.sh b/www/chromium/files/patch-chrome__tools__build__linux__sed.sh index 71de28ec21c7..12ac6d5c6378 100644 --- a/www/chromium/files/patch-chrome__tools__build__linux__sed.sh +++ b/www/chromium/files/patch-chrome__tools__build__linux__sed.sh @@ -1,5 +1,5 @@ ---- ./chrome/tools/build/linux/sed.sh.orig 2014-04-24 22:34:55.000000000 +0200 -+++ ./chrome/tools/build/linux/sed.sh 2014-04-24 23:23:44.000000000 +0200 +--- ./chrome/tools/build/linux/sed.sh.orig 2014-04-30 22:42:24.000000000 +0200 ++++ ./chrome/tools/build/linux/sed.sh 2014-05-04 14:38:46.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash diff --git a/www/chromium/files/patch-components__policy__resources__policy_templates.json b/www/chromium/files/patch-components__policy__resources__policy_templates.json index 4d86d595294e..f82605554471 100644 --- a/www/chromium/files/patch-components__policy__resources__policy_templates.json +++ b/www/chromium/files/patch-components__policy__resources__policy_templates.json @@ -1,6 +1,6 @@ ---- ./components/policy/resources/policy_templates.json.orig 2014-04-24 22:35:25.000000000 +0200 -+++ ./components/policy/resources/policy_templates.json 2014-04-24 23:23:44.000000000 +0200 -@@ -1421,7 +1421,7 @@ +--- ./components/policy/resources/policy_templates.json.orig 2014-04-30 22:43:03.000000000 +0200 ++++ ./components/policy/resources/policy_templates.json 2014-05-04 14:38:46.000000000 +0200 +@@ -1456,7 +1456,7 @@ 'name': 'GSSAPILibraryName', 'type': 'string', 'schema': { 'type': 'string' }, @@ -9,7 +9,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -3543,7 +3543,7 @@ +@@ -3583,7 +3583,7 @@ 'name': 'RequireOnlineRevocationChecksForLocalAnchors', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -4202,7 +4202,7 @@ +@@ -4242,7 +4242,7 @@ 'name': 'BackgroundModeEnabled', 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/files/patch-components__policy__tools__generate_policy_source.py b/www/chromium/files/patch-components__policy__tools__generate_policy_source.py index b52c3f5c9fb2..b86466a76b8b 100644 --- a/www/chromium/files/patch-components__policy__tools__generate_policy_source.py +++ b/www/chromium/files/patch-components__policy__tools__generate_policy_source.py @@ -1,5 +1,5 @@ ---- ./components/policy/tools/generate_policy_source.py.orig 2014-04-24 22:35:24.000000000 +0200 -+++ ./components/policy/tools/generate_policy_source.py 2014-04-24 23:23:44.000000000 +0200 +--- ./components/policy/tools/generate_policy_source.py.orig 2014-04-30 22:43:03.000000000 +0200 ++++ ./components/policy/tools/generate_policy_source.py 2014-05-04 14:38:46.000000000 +0200 @@ -64,7 +64,7 @@ if platform.startswith('chrome.'): platform_sub = platform[7:] diff --git a/www/chromium/files/patch-components__storage_monitor.gypi b/www/chromium/files/patch-components__storage_monitor.gypi index 96d6ce5a68bd..acd736811b98 100644 --- a/www/chromium/files/patch-components__storage_monitor.gypi +++ b/www/chromium/files/patch-components__storage_monitor.gypi @@ -1,5 +1,5 @@ ---- ./components/storage_monitor.gypi.orig 2014-04-24 22:35:26.000000000 +0200 -+++ ./components/storage_monitor.gypi 2014-04-24 23:23:44.000000000 +0200 +--- ./components/storage_monitor.gypi.orig 2014-04-30 22:43:04.000000000 +0200 ++++ ./components/storage_monitor.gypi 2014-05-05 17:54:12.000000000 +0200 @@ -20,10 +20,10 @@ 'storage_monitor/image_capture_device_manager.mm', 'storage_monitor/media_storage_util.cc', @@ -38,3 +38,14 @@ 'storage_monitor/volume_mount_watcher_win.cc', 'storage_monitor/volume_mount_watcher_win.h', ], +@@ -89,8 +91,8 @@ + 'sources': [ + 'storage_monitor/mock_removable_storage_observer.cc', + 'storage_monitor/mock_removable_storage_observer.h', +- 'storage_monitor/test_media_transfer_protocol_manager_linux.cc', +- 'storage_monitor/test_media_transfer_protocol_manager_linux.h', ++ #'storage_monitor/test_media_transfer_protocol_manager_linux.cc', ++ #'storage_monitor/test_media_transfer_protocol_manager_linux.h', + 'storage_monitor/test_portable_device_watcher_win.cc', + 'storage_monitor/test_portable_device_watcher_win.h', + 'storage_monitor/test_storage_monitor.cc', diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc b/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc index b51f6562089e..9aef40a887d3 100644 --- a/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc +++ b/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc @@ -1,6 +1,6 @@ ---- ./components/storage_monitor/storage_monitor.cc.orig 2014-04-24 22:35:25.000000000 +0200 -+++ ./components/storage_monitor/storage_monitor.cc 2014-04-24 23:23:44.000000000 +0200 -@@ -83,6 +83,7 @@ +--- ./components/storage_monitor/storage_monitor.cc.orig 2014-04-30 22:43:01.000000000 +0200 ++++ ./components/storage_monitor/storage_monitor.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -85,6 +85,7 @@ void StorageMonitor::EnsureInitialized(base::Closure callback) { DCHECK(thread_checker_.CalledOnValidThread()); @@ -8,7 +8,7 @@ if (initialized_) { if (!callback.is_null()) callback.Run(); -@@ -98,6 +99,7 @@ +@@ -100,6 +101,7 @@ initializing_ = true; Init(); diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc index 927b3a535e3a..e5ab1c63b297 100644 --- a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc +++ b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc @@ -1,6 +1,6 @@ ---- ./components/storage_monitor/storage_monitor_freebsd.cc.orig 2014-04-24 23:23:44.000000000 +0200 -+++ ./components/storage_monitor/storage_monitor_freebsd.cc 2014-04-24 23:23:44.000000000 +0200 -@@ -0,0 +1,98 @@ +--- ./components/storage_monitor/storage_monitor_freebsd.cc.orig 2014-05-04 14:38:46.000000000 +0200 ++++ ./components/storage_monitor/storage_monitor_freebsd.cc 2014-05-04 15:17:12.000000000 +0200 +@@ -0,0 +1,102 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -28,6 +28,8 @@ + +using content::BrowserThread; + ++namespace storage_monitor { ++ +namespace { + +// udev device property constants. @@ -99,3 +101,5 @@ +StorageMonitor* StorageMonitor::CreateInternal() { + return new StorageMonitorFreeBSD(); +} ++ ++} // namespace storage_monitor diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h index 94d0a359be66..3d6f057c7628 100644 --- a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h +++ b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h @@ -1,6 +1,6 @@ ---- ./components/storage_monitor/storage_monitor_freebsd.h.orig 2014-04-24 23:23:44.000000000 +0200 -+++ ./components/storage_monitor/storage_monitor_freebsd.h 2014-04-24 23:23:44.000000000 +0200 -@@ -0,0 +1,43 @@ +--- ./components/storage_monitor/storage_monitor_freebsd.h.orig 2014-05-04 14:38:47.000000000 +0200 ++++ ./components/storage_monitor/storage_monitor_freebsd.h 2014-05-04 15:15:00.000000000 +0200 +@@ -0,0 +1,47 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -26,6 +26,8 @@ +#include "components/storage_monitor/storage_monitor.h" +#include "content/public/browser/browser_thread.h" + ++namespace storage_monitor { ++ +class StorageMonitorFreeBSD : public StorageMonitor { + public: + // Should only be called by browser start up code. @@ -43,4 +45,6 @@ + DISALLOW_COPY_AND_ASSIGN(StorageMonitorFreeBSD); +}; + ++} // namespace storage_monitor ++ +#endif // COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_ diff --git a/www/chromium/files/patch-content__app__content_main_runner.cc b/www/chromium/files/patch-content__app__content_main_runner.cc index 0a17e1c2c4e7..503f5f71295a 100644 --- a/www/chromium/files/patch-content__app__content_main_runner.cc +++ b/www/chromium/files/patch-content__app__content_main_runner.cc @@ -1,5 +1,5 @@ ---- ./content/app/content_main_runner.cc.orig 2014-04-24 22:35:46.000000000 +0200 -+++ ./content/app/content_main_runner.cc 2014-04-24 23:23:44.000000000 +0200 +--- ./content/app/content_main_runner.cc.orig 2014-04-30 22:41:44.000000000 +0200 ++++ ./content/app/content_main_runner.cc 2014-05-04 14:38:47.000000000 +0200 @@ -86,10 +86,10 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -13,7 +13,7 @@ #include "content/zygote/zygote_main.h" #endif -@@ -339,7 +339,8 @@ +@@ -343,7 +343,8 @@ int (*function)(const MainFunctionParams&); }; @@ -23,7 +23,7 @@ // On platforms that use the zygote, we have a special subset of // subprocesses that are launched via the zygote. This function // fills in some process-launching bits around ZygoteMain(). -@@ -475,7 +476,8 @@ +@@ -471,7 +472,8 @@ } } diff --git a/www/chromium/files/patch-content__browser__browser_main_loop.cc b/www/chromium/files/patch-content__browser__browser_main_loop.cc index d9b8dc24c20f..7aff2b0742a8 100644 --- a/www/chromium/files/patch-content__browser__browser_main_loop.cc +++ b/www/chromium/files/patch-content__browser__browser_main_loop.cc @@ -1,5 +1,5 @@ ---- ./content/browser/browser_main_loop.cc.orig 2014-04-24 22:35:48.000000000 +0200 -+++ ./content/browser/browser_main_loop.cc 2014-04-24 23:23:44.000000000 +0200 +--- ./content/browser/browser_main_loop.cc.orig 2014-04-30 22:41:47.000000000 +0200 ++++ ./content/browser/browser_main_loop.cc 2014-05-04 14:38:47.000000000 +0200 @@ -102,7 +102,7 @@ #include "ui/gfx/gtk_util.h" #endif @@ -27,7 +27,7 @@ // No thread should be created before this call, as SetupSandbox() // will end-up using fork(). SetupSandbox(parsed_command_line_); -@@ -777,7 +777,7 @@ +@@ -780,7 +780,7 @@ } #endif diff --git a/www/chromium/files/patch-content__browser__child_process_launcher.cc b/www/chromium/files/patch-content__browser__child_process_launcher.cc index dac136479364..91a9a2f356de 100644 --- a/www/chromium/files/patch-content__browser__child_process_launcher.cc +++ b/www/chromium/files/patch-content__browser__child_process_launcher.cc @@ -1,6 +1,6 @@ ---- ./content/browser/child_process_launcher.cc.orig 2014-04-24 22:35:48.000000000 +0200 -+++ ./content/browser/child_process_launcher.cc 2014-04-24 23:23:44.000000000 +0200 -@@ -58,7 +58,7 @@ +--- ./content/browser/child_process_launcher.cc.orig 2014-04-30 22:41:47.000000000 +0200 ++++ ./content/browser/child_process_launcher.cc 2014-05-04 14:38:47.000000000 +0200 +@@ -59,7 +59,7 @@ termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION), exit_code_(RESULT_CODE_NORMAL_EXIT), starting_(true) @@ -9,16 +9,16 @@ , zygote_(false) #endif { -@@ -245,7 +245,7 @@ +@@ -231,7 +231,7 @@ // child termination. - file_util::ScopedFD ipcfd_closer(&ipcfd); + base::ScopedFD ipcfd_closer(ipcfd); -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) GetContentClient()->browser()-> GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id, &files_to_register); -@@ -266,7 +266,7 @@ +@@ -252,7 +252,7 @@ base::GlobalDescriptors::kBaseDescriptor)); } @@ -27,7 +27,7 @@ if (process_type == switches::kRendererProcess) { const int sandbox_fd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket(); -@@ -320,7 +320,7 @@ +@@ -306,7 +306,7 @@ base::Bind( &Context::Notify, this_object.get(), @@ -36,7 +36,7 @@ use_zygote, #endif handle)); -@@ -328,7 +328,7 @@ +@@ -314,7 +314,7 @@ } void Notify( @@ -45,7 +45,7 @@ bool zygote, #endif base::ProcessHandle handle) { -@@ -341,7 +341,7 @@ +@@ -327,7 +327,7 @@ if (!handle) LOG(ERROR) << "Failed to launch child process"; @@ -54,7 +54,7 @@ zygote_ = zygote; #endif if (client_) { -@@ -368,7 +368,7 @@ +@@ -354,7 +354,7 @@ BrowserThread::PROCESS_LAUNCHER, FROM_HERE, base::Bind( &Context::TerminateInternal, @@ -63,7 +63,7 @@ zygote_, #endif process_.handle())); -@@ -382,7 +382,7 @@ +@@ -368,7 +368,7 @@ } static void TerminateInternal( @@ -72,7 +72,7 @@ bool zygote, #endif base::ProcessHandle handle) { -@@ -396,7 +396,7 @@ +@@ -382,7 +382,7 @@ process.Terminate(RESULT_CODE_NORMAL_EXIT); // On POSIX, we must additionally reap the child. #if defined(OS_POSIX) @@ -81,7 +81,7 @@ if (zygote) { // If the renderer was created via a zygote, we have to proxy the reaping // through the zygote process. -@@ -423,7 +423,7 @@ +@@ -409,7 +409,7 @@ #if defined(OS_ANDROID) // The fd to close after creating the process. int ipcfd_; @@ -90,7 +90,7 @@ bool zygote_; #endif }; -@@ -481,7 +481,7 @@ +@@ -451,7 +451,7 @@ *exit_code = context_->exit_code_; return context_->termination_status_; } diff --git a/www/chromium/files/patch-content__browser__download__base_file.cc b/www/chromium/files/patch-content__browser__download__base_file.cc index e8bcf66c0191..0344391b9876 100644 --- a/www/chromium/files/patch-content__browser__download__base_file.cc +++ b/www/chromium/files/patch-content__browser__download__base_file.cc @@ -1,5 +1,5 @@ ---- ./content/browser/download/base_file.cc.orig 2014-04-24 22:35:46.000000000 +0200 -+++ ./content/browser/download/base_file.cc 2014-04-24 23:23:44.000000000 +0200 +--- ./content/browser/download/base_file.cc.orig 2014-04-30 22:41:46.000000000 +0200 ++++ ./content/browser/download/base_file.cc 2014-05-04 14:38:47.000000000 +0200 @@ -216,7 +216,8 @@ } diff --git a/www/chromium/files/patch-content__browser__download__base_file_linux.cc b/www/chromium/files/patch-content__browser__download__base_file_linux.cc index eeaaf0243f76..e2e717556787 100644 --- a/www/chromium/files/patch-content__browser__download__base_file_linux.cc +++ b/www/chromium/files/patch-content__browser__download__base_file_linux.cc @@ -1,5 +1,5 @@ ---- ./content/browser/download/base_file_linux.cc.orig 2014-04-24 22:35:46.000000000 +0200 -+++ ./content/browser/download/base_file_linux.cc 2014-04-24 23:23:44.000000000 +0200 +--- ./content/browser/download/base_file_linux.cc.orig 2014-04-30 22:41:46.000000000 +0200 ++++ ./content/browser/download/base_file_linux.cc 2014-05-04 14:38:47.000000000 +0200 @@ -13,7 +13,9 @@ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DCHECK(!detached_); diff --git a/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc b/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc index dfff001f1877..2384efa56bf2 100644 --- a/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc +++ b/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc @@ -1,5 +1,5 @@ ---- ./content/browser/geolocation/location_arbitrator_impl.cc.orig 2014-04-24 22:35:46.000000000 +0200 -+++ ./content/browser/geolocation/location_arbitrator_impl.cc 2014-04-24 23:23:44.000000000 +0200 +--- ./content/browser/geolocation/location_arbitrator_impl.cc.orig 2014-04-30 22:41:44.000000000 +0200 ++++ ./content/browser/geolocation/location_arbitrator_impl.cc 2014-05-04 14:38:47.000000000 +0200 @@ -160,7 +160,7 @@ } diff --git a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc index a1327e86936d..d93baafbcf36 100644 --- a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc +++ b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc @@ -1,5 +1,5 @@ ---- ./content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2014-04-24 23:23:44.000000000 +0200 -+++ ./content/browser/geolocation/wifi_data_provider_freebsd.cc 2014-04-24 23:23:44.000000000 +0200 +--- ./content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2014-05-04 14:38:47.000000000 +0200 ++++ ./content/browser/geolocation/wifi_data_provider_freebsd.cc 2014-05-04 14:38:47.000000000 +0200 @@ -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 diff --git a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h index 822732552c57..d77ad573b955 100644 --- a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h +++ b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h @@ -1,5 +1,5 @@ ---- ./content/browser/geolocation/wifi_data_provider_freebsd.h.orig 2014-04-24 23:23:44.000000000 +0200 -+++ ./content/browser/geolocation/wifi_data_provider_freebsd.h 2014-04-24 23:23:44.000000000 +0200 +--- ./content/browser/geolocation/wifi_data_provider_freebsd.h.orig 2014-05-04 14:38:47.000000000 +0200 ++++ ./content/browser/geolocation/wifi_data_provider_freebsd.h 2014-05-04 14:38:47.000000000 +0200 @@ -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 diff --git a/www/chromium/files/patch-content__common__set_process_title_linux.cc b/www/chromium/files/patch-content__common__set_process_title_linux.cc index bede817822b5..617dccf7e385 100644 --- a/www/chromium/files/patch-content__common__set_process_title_linux.cc +++ b/www/chromium/files/patch-content__common__set_process_title_linux.cc @@ -1,5 +1,5 @@ ---- ./content/common/set_process_title_linux.cc.orig 2014-04-24 22:35:41.000000000 +0200 -+++ ./content/common/set_process_title_linux.cc 2014-04-24 23:23:44.000000000 +0200 +--- ./content/common/set_process_title_linux.cc.orig 2014-04-30 22:41:44.000000000 +0200 ++++ ./content/common/set_process_title_linux.cc 2014-05-04 14:38:47.000000000 +0200 @@ -48,6 +48,8 @@ extern char** environ; diff --git a/www/chromium/files/patch-content__common__set_process_title_linux.h b/www/chromium/files/patch-content__common__set_process_title_linux.h index 6cff5ac871c9..4d0aa17f947c 100644 --- a/www/chromium/files/patch-content__common__set_process_title_linux.h +++ b/www/chromium/files/patch-content__common__set_process_title_linux.h @@ -1,5 +1,5 @@ ---- ./content/common/set_process_title_linux.h.orig 2014-04-24 22:35:41.000000000 +0200 -+++ ./content/common/set_process_title_linux.h 2014-04-24 23:23:44.000000000 +0200 +--- ./content/common/set_process_title_linux.h.orig 2014-04-30 22:41:44.000000000 +0200 ++++ ./content/common/set_process_title_linux.h 2014-05-04 14:38:47.000000000 +0200 @@ -5,6 +5,9 @@ #ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_ #define CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_ diff --git a/www/chromium/files/patch-content__content_browser.gypi b/www/chromium/files/patch-content__content_browser.gypi index 0843ddd7efa8..68f70fbcc150 100644 --- a/www/chromium/files/patch-content__content_browser.gypi +++ b/www/chromium/files/patch-content__content_browser.gypi @@ -1,6 +1,6 @@ ---- ./content/content_browser.gypi.orig 2014-04-24 22:35:48.000000000 +0200 -+++ ./content/content_browser.gypi 2014-04-24 23:23:44.000000000 +0200 -@@ -596,6 +596,8 @@ +--- ./content/content_browser.gypi.orig 2014-04-30 22:41:54.000000000 +0200 ++++ ./content/content_browser.gypi 2014-05-04 14:38:47.000000000 +0200 +@@ -618,6 +618,8 @@ 'browser/geolocation/wifi_data_provider_common_win.cc', 'browser/geolocation/wifi_data_provider_common_win.h', 'browser/geolocation/wifi_data_provider_corewlan_mac.mm', @@ -9,7 +9,7 @@ 'browser/geolocation/wifi_data_provider_linux.cc', 'browser/geolocation/wifi_data_provider_linux.h', 'browser/geolocation/wifi_data_provider_mac.cc', -@@ -1564,8 +1566,18 @@ +@@ -1654,8 +1656,18 @@ ], }], ['os_bsd==1', { @@ -30,7 +30,7 @@ ], }], ['use_aura!=1 and OS!="android"', { -@@ -1647,7 +1659,7 @@ +@@ -1737,7 +1749,7 @@ 'browser/geolocation/empty_wifi_data_provider.cc', ], }], diff --git a/www/chromium/files/patch-content__content_common.gypi b/www/chromium/files/patch-content__content_common.gypi index 9348e5856eda..992b62cd22c7 100644 --- a/www/chromium/files/patch-content__content_common.gypi +++ b/www/chromium/files/patch-content__content_common.gypi @@ -1,6 +1,6 @@ ---- ./content/content_common.gypi.orig 2014-04-24 22:35:48.000000000 +0200 -+++ ./content/content_common.gypi 2014-04-24 23:23:44.000000000 +0200 -@@ -479,6 +479,21 @@ +--- ./content/content_common.gypi.orig 2014-04-30 22:41:54.000000000 +0200 ++++ ./content/content_common.gypi 2014-05-04 14:38:47.000000000 +0200 +@@ -544,6 +544,21 @@ 'content.gyp:common_aidl', ], }], diff --git a/www/chromium/files/patch-content__content_tests.gypi b/www/chromium/files/patch-content__content_tests.gypi index 0922951a4438..62f3deac2e22 100644 --- a/www/chromium/files/patch-content__content_tests.gypi +++ b/www/chromium/files/patch-content__content_tests.gypi @@ -1,6 +1,6 @@ ---- ./content/content_tests.gypi.orig 2014-04-24 22:35:48.000000000 +0200 -+++ ./content/content_tests.gypi 2014-04-24 23:23:44.000000000 +0200 -@@ -818,6 +818,15 @@ +--- ./content/content_tests.gypi.orig 2014-04-30 22:41:54.000000000 +0200 ++++ ./content/content_tests.gypi 2014-05-04 14:38:47.000000000 +0200 +@@ -828,6 +828,15 @@ 'browser/geolocation/wifi_data_provider_linux_unittest.cc', ], }], diff --git a/www/chromium/files/patch-content__plugin__plugin_main_linux.cc b/www/chromium/files/patch-content__plugin__plugin_main_linux.cc index ee77fe39568f..9cfae296dc11 100644 --- a/www/chromium/files/patch-content__plugin__plugin_main_linux.cc +++ b/www/chromium/files/patch-content__plugin__plugin_main_linux.cc @@ -1,5 +1,5 @@ ---- ./content/plugin/plugin_main_linux.cc.orig 2014-04-24 22:35:42.000000000 +0200 -+++ ./content/plugin/plugin_main_linux.cc 2014-04-24 23:23:44.000000000 +0200 +--- ./content/plugin/plugin_main_linux.cc.orig 2014-04-30 22:41:47.000000000 +0200 ++++ ./content/plugin/plugin_main_linux.cc 2014-05-04 14:38:47.000000000 +0200 @@ -5,13 +5,13 @@ #include <signal.h> #include <string.h> diff --git a/www/chromium/files/patch-content__public__test__browser_test_base.cc b/www/chromium/files/patch-content__public__test__browser_test_base.cc index 5333289bb337..270f0ad57f9f 100644 --- a/www/chromium/files/patch-content__public__test__browser_test_base.cc +++ b/www/chromium/files/patch-content__public__test__browser_test_base.cc @@ -1,5 +1,5 @@ ---- ./content/public/test/browser_test_base.cc.orig 2014-04-24 22:35:43.000000000 +0200 -+++ ./content/public/test/browser_test_base.cc 2014-04-24 23:23:45.000000000 +0200 +--- ./content/public/test/browser_test_base.cc.orig 2014-04-30 22:41:51.000000000 +0200 ++++ ./content/public/test/browser_test_base.cc 2014-05-04 14:38:47.000000000 +0200 @@ -4,6 +4,10 @@ #include "content/public/test/browser_test_base.h" diff --git a/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc b/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc index 0a1982ee83ad..d9829b33aff3 100644 --- a/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc +++ b/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc @@ -1,5 +1,5 @@ ---- ./content/renderer/media/webrtc_audio_capturer.cc.orig 2014-04-24 22:35:42.000000000 +0200 -+++ ./content/renderer/media/webrtc_audio_capturer.cc 2014-04-24 23:23:45.000000000 +0200 +--- ./content/renderer/media/webrtc_audio_capturer.cc.orig 2014-04-30 22:41:47.000000000 +0200 ++++ ./content/renderer/media/webrtc_audio_capturer.cc 2014-05-04 14:38:47.000000000 +0200 @@ -29,10 +29,10 @@ // The listed rates below adds restrictions and WebRtcAudioDeviceImpl::Init() // will fail if the user selects any rate outside these ranges. @@ -13,7 +13,7 @@ #else const int kValidInputRates[] = {44100}; #endif -@@ -419,7 +419,7 @@ +@@ -430,7 +430,7 @@ // CaptureCallback. #if defined(OS_WIN) || defined(OS_MACOSX) DCHECK_LE(volume, 1.0); diff --git a/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc b/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc index f4941d7b2b47..0b8655e15e14 100644 --- a/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc +++ b/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc @@ -1,5 +1,5 @@ ---- ./content/renderer/media/webrtc_audio_renderer.cc.orig 2014-04-24 22:35:42.000000000 +0200 -+++ ./content/renderer/media/webrtc_audio_renderer.cc 2014-04-24 23:23:45.000000000 +0200 +--- ./content/renderer/media/webrtc_audio_renderer.cc.orig 2014-04-30 22:41:47.000000000 +0200 ++++ ./content/renderer/media/webrtc_audio_renderer.cc 2014-05-04 14:38:47.000000000 +0200 @@ -34,7 +34,7 @@ // rates below adds restrictions and Initialize() will fail if the user selects // any rate outside these ranges. diff --git a/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc b/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc index c07b8e3a4b59..59df7039deab 100644 --- a/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc +++ b/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc @@ -1,5 +1,5 @@ ---- ./content/renderer/pepper/usb_key_code_conversion.cc.orig 2014-04-24 22:35:42.000000000 +0200 -+++ ./content/renderer/pepper/usb_key_code_conversion.cc 2014-04-24 23:23:45.000000000 +0200 +--- ./content/renderer/pepper/usb_key_code_conversion.cc.orig 2014-04-30 22:41:48.000000000 +0200 ++++ ./content/renderer/pepper/usb_key_code_conversion.cc 2014-05-04 14:38:47.000000000 +0200 @@ -10,7 +10,7 @@ namespace content { diff --git a/www/chromium/files/patch-content__renderer__render_process_impl.cc b/www/chromium/files/patch-content__renderer__render_process_impl.cc index 4fdaf1076efc..42425a7ab8b8 100644 --- a/www/chromium/files/patch-content__renderer__render_process_impl.cc +++ b/www/chromium/files/patch-content__renderer__render_process_impl.cc @@ -1,5 +1,5 @@ ---- ./content/renderer/render_process_impl.cc.orig 2014-04-24 22:35:43.000000000 +0200 -+++ ./content/renderer/render_process_impl.cc 2014-04-24 23:23:45.000000000 +0200 +--- ./content/renderer/render_process_impl.cc.orig 2014-04-30 22:41:48.000000000 +0200 ++++ ./content/renderer/render_process_impl.cc 2014-05-04 14:38:48.000000000 +0200 @@ -155,7 +155,7 @@ int width = rect.width(); int height = rect.height(); diff --git a/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc b/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc index 66c040f15b13..de7431eb3b14 100644 --- a/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc +++ b/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc @@ -1,5 +1,5 @@ ---- ./content/renderer/renderer_main_platform_delegate_linux.cc.orig 2014-04-24 22:35:43.000000000 +0200 -+++ ./content/renderer/renderer_main_platform_delegate_linux.cc 2014-04-24 23:23:45.000000000 +0200 +--- ./content/renderer/renderer_main_platform_delegate_linux.cc.orig 2014-04-30 22:41:48.000000000 +0200 ++++ ./content/renderer/renderer_main_platform_delegate_linux.cc 2014-05-04 14:38:48.000000000 +0200 @@ -50,11 +50,14 @@ // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox // diff --git a/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc b/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc index 31f581bcca69..fe2c2cb42b15 100644 --- a/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc +++ b/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc @@ -1,6 +1,6 @@ ---- ./content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2014-04-24 22:35:43.000000000 +0200 -+++ ./content/renderer/renderer_webkitplatformsupport_impl.cc 2014-04-24 23:23:45.000000000 +0200 -@@ -88,7 +88,7 @@ +--- ./content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2014-04-30 22:41:48.000000000 +0200 ++++ ./content/renderer/renderer_webkitplatformsupport_impl.cc 2014-05-04 14:38:48.000000000 +0200 +@@ -90,7 +90,7 @@ #if defined(OS_POSIX) #include "base/file_descriptor_posix.h" @@ -9,7 +9,7 @@ #include <map> #include <string> -@@ -169,7 +169,7 @@ +@@ -178,7 +178,7 @@ scoped_refptr<ThreadSafeSender> thread_safe_sender_; }; @@ -18,7 +18,7 @@ // WebKit doesn't use WebSandboxSupport on android so we don't need to // implement anything here. class RendererWebKitPlatformSupportImpl::SandboxSupport { -@@ -262,7 +262,7 @@ +@@ -271,7 +271,7 @@ } blink::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() { @@ -27,7 +27,7 @@ // WebKit doesn't use WebSandboxSupport on android. return NULL; #else -@@ -547,7 +547,7 @@ +@@ -588,7 +588,7 @@ return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out); } diff --git a/www/chromium/files/patch-crypto__nss_util.cc b/www/chromium/files/patch-crypto__nss_util.cc index 36df4ba02349..300db0383eec 100644 --- a/www/chromium/files/patch-crypto__nss_util.cc +++ b/www/chromium/files/patch-crypto__nss_util.cc @@ -1,5 +1,5 @@ ---- ./crypto/nss_util.cc.orig 2014-04-24 22:35:50.000000000 +0200 -+++ ./crypto/nss_util.cc 2014-04-24 23:23:45.000000000 +0200 +--- ./crypto/nss_util.cc.orig 2014-04-30 22:41:24.000000000 +0200 ++++ ./crypto/nss_util.cc 2014-05-04 14:38:48.000000000 +0200 @@ -13,7 +13,7 @@ #include <prtime.h> #include <secmod.h> @@ -19,9 +19,9 @@ // // Because this function sets an environment variable it must be run before we @@ -149,10 +149,10 @@ - file_util::FileSystemType fs_type = file_util::FILE_SYSTEM_UNKNOWN; - if (file_util::GetFileSystemType(database_dir, &fs_type)) - db_on_nfs = (fs_type == file_util::FILE_SYSTEM_NFS); + base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN; + if (base::GetFileSystemType(database_dir, &fs_type)) + db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS); -#elif defined(OS_OPENBSD) +#elif defined(OS_BSD) struct statfs buf; diff --git a/www/chromium/files/patch-device__hid__hid.gyp b/www/chromium/files/patch-device__hid__hid.gyp index b095c860a03a..6b5bf5a9366e 100644 --- a/www/chromium/files/patch-device__hid__hid.gyp +++ b/www/chromium/files/patch-device__hid__hid.gyp @@ -1,5 +1,5 @@ ---- ./device/hid/hid.gyp.orig 2014-04-24 22:35:32.000000000 +0200 -+++ ./device/hid/hid.gyp 2014-04-24 23:23:45.000000000 +0200 +--- ./device/hid/hid.gyp.orig 2014-04-30 22:43:21.000000000 +0200 ++++ ./device/hid/hid.gyp 2014-05-04 14:38:48.000000000 +0200 @@ -23,8 +23,8 @@ 'sources': [ 'hid_connection.cc', diff --git a/www/chromium/files/patch-device__serial__serial.gyp b/www/chromium/files/patch-device__serial__serial.gyp index 6827cb18e665..233581bcc8a5 100644 --- a/www/chromium/files/patch-device__serial__serial.gyp +++ b/www/chromium/files/patch-device__serial__serial.gyp @@ -1,5 +1,5 @@ ---- ./device/serial/serial.gyp.orig 2014-04-24 22:35:32.000000000 +0200 -+++ ./device/serial/serial.gyp 2014-04-24 23:23:45.000000000 +0200 +--- ./device/serial/serial.gyp.orig 2014-04-30 22:43:21.000000000 +0200 ++++ ./device/serial/serial.gyp 2014-05-04 14:38:48.000000000 +0200 @@ -23,8 +23,8 @@ 'sources': [ 'serial_device_enumerator.cc', diff --git a/www/chromium/files/patch-gpu__config__gpu_control_list.cc b/www/chromium/files/patch-gpu__config__gpu_control_list.cc index 5614a69c993e..94aa0fd2f960 100644 --- a/www/chromium/files/patch-gpu__config__gpu_control_list.cc +++ b/www/chromium/files/patch-gpu__config__gpu_control_list.cc @@ -1,6 +1,6 @@ ---- ./gpu/config/gpu_control_list.cc.orig 2014-04-24 22:35:32.000000000 +0200 -+++ ./gpu/config/gpu_control_list.cc 2014-04-24 23:23:46.000000000 +0200 -@@ -1344,10 +1344,10 @@ +--- ./gpu/config/gpu_control_list.cc.orig 2014-04-30 22:41:33.000000000 +0200 ++++ ./gpu/config/gpu_control_list.cc 2014-05-04 14:38:48.000000000 +0200 +@@ -1400,10 +1400,10 @@ return kOsWin; #elif defined(OS_ANDROID) return kOsAndroid; diff --git a/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc b/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc index b00df69d7733..ea344173a976 100644 --- a/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc +++ b/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc @@ -1,5 +1,5 @@ ---- ./gpu/config/gpu_control_list_unittest.cc.orig 2014-04-24 22:35:32.000000000 +0200 -+++ ./gpu/config/gpu_control_list_unittest.cc 2014-04-24 23:23:46.000000000 +0200 +--- ./gpu/config/gpu_control_list_unittest.cc.orig 2014-04-30 22:41:33.000000000 +0200 ++++ ./gpu/config/gpu_control_list_unittest.cc 2014-05-04 14:38:48.000000000 +0200 @@ -175,8 +175,7 @@ features = control_list->MakeDecision( GpuControlList::kOsLinux, kOsVersion, gpu_info()); diff --git a/www/chromium/files/patch-gpu__config__gpu_test_config.cc b/www/chromium/files/patch-gpu__config__gpu_test_config.cc index ae6eaae83dcd..a09bfaf65191 100644 --- a/www/chromium/files/patch-gpu__config__gpu_test_config.cc +++ b/www/chromium/files/patch-gpu__config__gpu_test_config.cc @@ -1,5 +1,5 @@ ---- ./gpu/config/gpu_test_config.cc.orig 2014-04-24 22:35:32.000000000 +0200 -+++ ./gpu/config/gpu_test_config.cc 2014-04-24 23:23:46.000000000 +0200 +--- ./gpu/config/gpu_test_config.cc.orig 2014-04-30 22:41:33.000000000 +0200 ++++ ./gpu/config/gpu_test_config.cc 2014-05-04 14:38:48.000000000 +0200 @@ -23,8 +23,6 @@ GPUTestConfig::OS GetCurrentOS() { #if defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-gpu__gpu_config.gypi b/www/chromium/files/patch-gpu__gpu_config.gypi index faa7575aea11..5b2318ae9dcf 100644 --- a/www/chromium/files/patch-gpu__gpu_config.gypi +++ b/www/chromium/files/patch-gpu__gpu_config.gypi @@ -1,5 +1,5 @@ ---- ./gpu/gpu_config.gypi.orig 2014-04-24 22:35:32.000000000 +0200 -+++ ./gpu/gpu_config.gypi 2014-04-24 23:23:46.000000000 +0200 +--- ./gpu/gpu_config.gypi.orig 2014-04-30 22:41:34.000000000 +0200 ++++ ./gpu/gpu_config.gypi 2014-05-04 14:38:48.000000000 +0200 @@ -63,7 +63,7 @@ '../third_party/amd/amd_videocard_info_win.cc', ], diff --git a/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc b/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc index f5c2a07584c6..18a23296334e 100644 --- a/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc +++ b/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc @@ -1,5 +1,5 @@ ---- ./media/audio/audio_input_volume_unittest.cc.orig 2014-04-24 22:35:18.000000000 +0200 -+++ ./media/audio/audio_input_volume_unittest.cc 2014-04-24 23:23:46.000000000 +0200 +--- ./media/audio/audio_input_volume_unittest.cc.orig 2014-04-30 22:41:23.000000000 +0200 ++++ ./media/audio/audio_input_volume_unittest.cc 2014-05-04 14:38:48.000000000 +0200 @@ -74,7 +74,7 @@ params, device_id); EXPECT_TRUE(NULL != ais); diff --git a/www/chromium/files/patch-media__base__audio_splicer.cc b/www/chromium/files/patch-media__base__audio_splicer.cc index 4a8a042c2cee..471cb95f8859 100644 --- a/www/chromium/files/patch-media__base__audio_splicer.cc +++ b/www/chromium/files/patch-media__base__audio_splicer.cc @@ -1,20 +1,20 @@ ---- ./media/base/audio_splicer.cc.orig 2014-04-24 22:35:18.000000000 +0200 -+++ ./media/base/audio_splicer.cc 2014-04-24 23:23:46.000000000 +0200 -@@ -60,7 +60,7 @@ - base::TimeDelta expected_timestamp = output_timestamp_helper_.GetTimestamp(); - base::TimeDelta delta = timestamp - expected_timestamp; +--- ./media/base/audio_splicer.cc.orig 2014-04-30 22:41:24.000000000 +0200 ++++ ./media/base/audio_splicer.cc 2014-05-04 14:38:48.000000000 +0200 +@@ -160,7 +160,7 @@ + output_timestamp_helper_.GetTimestamp(); + const base::TimeDelta delta = timestamp - expected_timestamp; - if (std::abs(delta.InMilliseconds()) > kMaxTimeDeltaInMilliseconds) { + if (std::labs(delta.InMilliseconds()) > kMaxTimeDeltaInMilliseconds) { DVLOG(1) << "Timestamp delta too large: " << delta.InMicroseconds() << "us"; return false; } -@@ -69,7 +69,7 @@ +@@ -169,7 +169,7 @@ if (delta != base::TimeDelta()) frames_to_fill = output_timestamp_helper_.GetFramesToTarget(timestamp); -- if (frames_to_fill == 0 || std::abs(frames_to_fill) < min_gap_size_) { -+ if (frames_to_fill == 0 || std::labs(frames_to_fill) < min_gap_size_) { +- if (frames_to_fill == 0 || std::abs(frames_to_fill) < kMinGapSize) { ++ if (frames_to_fill == 0 || std::labs(frames_to_fill) < kMinGapSize) { AddOutputBuffer(input); return true; } diff --git a/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc b/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc index 6f319847e79d..57eea7861841 100644 --- a/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc +++ b/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc @@ -1,5 +1,5 @@ ---- ./media/filters/decrypting_audio_decoder.cc.orig 2014-04-24 22:35:18.000000000 +0200 -+++ ./media/filters/decrypting_audio_decoder.cc 2014-04-24 23:23:46.000000000 +0200 +--- ./media/filters/decrypting_audio_decoder.cc.orig 2014-04-30 22:41:23.000000000 +0200 ++++ ./media/filters/decrypting_audio_decoder.cc 2014-05-04 14:38:48.000000000 +0200 @@ -30,7 +30,7 @@ // Out of sync of 100ms would be pretty noticeable and we should keep any // drift below that. diff --git a/www/chromium/files/patch-media__media.gyp b/www/chromium/files/patch-media__media.gyp index 99b169b5ac84..3031900836fb 100644 --- a/www/chromium/files/patch-media__media.gyp +++ b/www/chromium/files/patch-media__media.gyp @@ -1,15 +1,15 @@ ---- ./media/media.gyp.orig 2014-04-24 22:35:20.000000000 +0200 -+++ ./media/media.gyp 2014-04-24 23:23:46.000000000 +0200 -@@ -625,7 +625,7 @@ +--- ./media/media.gyp.orig 2014-04-30 22:41:24.000000000 +0200 ++++ ./media/media.gyp 2014-05-04 14:38:48.000000000 +0200 +@@ -641,7 +641,7 @@ 'audio/openbsd/audio_manager_openbsd.h', ], }], - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd"', { - 'variables': { - 'conditions': [ - ['sysroot!=""', { -@@ -885,7 +885,7 @@ + 'conditions': [ + ['use_x11==1', { + 'dependencies': [ +@@ -892,7 +892,7 @@ 'base/simd/convert_yuv_to_rgb_x86.cc', ], }], diff --git a/www/chromium/files/patch-native_client__build__common.gypi b/www/chromium/files/patch-native_client__build__common.gypi index 07be418d7cbf..f27b2760bf2f 100644 --- a/www/chromium/files/patch-native_client__build__common.gypi +++ b/www/chromium/files/patch-native_client__build__common.gypi @@ -1,6 +1,6 @@ ---- ./native_client/build/common.gypi.orig 2014-04-24 22:36:13.000000000 +0200 -+++ ./native_client/build/common.gypi 2014-04-24 23:23:46.000000000 +0200 -@@ -262,7 +262,7 @@ +--- ./native_client/build/common.gypi.orig 2014-04-30 22:43:44.000000000 +0200 ++++ ./native_client/build/common.gypi 2014-05-04 14:38:48.000000000 +0200 +@@ -269,7 +269,7 @@ ], }, 'conditions': [ diff --git a/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp b/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp index ff0cd1d99b05..8592f616ed43 100644 --- a/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp +++ b/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp @@ -1,5 +1,5 @@ ---- ./native_client/src/shared/platform/platform.gyp.orig 2014-04-24 22:36:52.000000000 +0200 -+++ ./native_client/src/shared/platform/platform.gyp 2014-04-24 23:23:46.000000000 +0200 +--- ./native_client/src/shared/platform/platform.gyp.orig 2014-04-30 22:43:43.000000000 +0200 ++++ ./native_client/src/shared/platform/platform.gyp 2014-05-04 14:38:48.000000000 +0200 @@ -36,7 +36,7 @@ 'refcount_base.cc', ], diff --git a/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp b/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp index 895b58945e69..8dda650b7e53 100644 --- a/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp +++ b/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp @@ -1,5 +1,5 @@ ---- ./native_client/src/trusted/debug_stub/debug_stub.gyp.orig 2014-04-24 22:36:36.000000000 +0200 -+++ ./native_client/src/trusted/debug_stub/debug_stub.gyp 2014-04-24 23:23:46.000000000 +0200 +--- ./native_client/src/trusted/debug_stub/debug_stub.gyp.orig 2014-04-30 22:43:33.000000000 +0200 ++++ ./native_client/src/trusted/debug_stub/debug_stub.gyp 2014-05-04 14:38:48.000000000 +0200 @@ -27,7 +27,7 @@ 'test.cc', ], diff --git a/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp b/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp index ab37116e51d9..a652b38645ec 100644 --- a/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp +++ b/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp @@ -1,5 +1,5 @@ ---- ./native_client/src/trusted/service_runtime/service_runtime.gyp.orig 2014-04-24 22:36:36.000000000 +0200 -+++ ./native_client/src/trusted/service_runtime/service_runtime.gyp 2014-04-24 23:23:46.000000000 +0200 +--- ./native_client/src/trusted/service_runtime/service_runtime.gyp.orig 2014-04-30 22:43:32.000000000 +0200 ++++ ./native_client/src/trusted/service_runtime/service_runtime.gyp 2014-05-04 14:38:48.000000000 +0200 @@ -6,7 +6,7 @@ { 'variables': { diff --git a/www/chromium/files/patch-net__base__dns_reloader.cc b/www/chromium/files/patch-net__base__dns_reloader.cc index 794828f3d10d..cab0db14a57d 100644 --- a/www/chromium/files/patch-net__base__dns_reloader.cc +++ b/www/chromium/files/patch-net__base__dns_reloader.cc @@ -1,5 +1,5 @@ ---- ./net/base/dns_reloader.cc.orig 2014-04-24 22:35:53.000000000 +0200 -+++ ./net/base/dns_reloader.cc 2014-04-24 23:23:46.000000000 +0200 +--- ./net/base/dns_reloader.cc.orig 2014-04-30 22:43:05.000000000 +0200 ++++ ./net/base/dns_reloader.cc 2014-05-04 14:38:48.000000000 +0200 @@ -7,6 +7,9 @@ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-net__base__mime_util_unittest.cc b/www/chromium/files/patch-net__base__mime_util_unittest.cc index 8baf04ad373c..2087c2fcc12e 100644 --- a/www/chromium/files/patch-net__base__mime_util_unittest.cc +++ b/www/chromium/files/patch-net__base__mime_util_unittest.cc @@ -1,5 +1,5 @@ ---- ./net/base/mime_util_unittest.cc.orig 2014-04-24 22:35:53.000000000 +0200 -+++ ./net/base/mime_util_unittest.cc 2014-04-24 23:23:46.000000000 +0200 +--- ./net/base/mime_util_unittest.cc.orig 2014-04-30 22:43:05.000000000 +0200 ++++ ./net/base/mime_util_unittest.cc 2014-05-04 14:38:48.000000000 +0200 @@ -260,7 +260,7 @@ { "MeSsAge/*", 1, "eml" }, { "image/bmp", 1, "bmp" }, diff --git a/www/chromium/files/patch-net__base__net_util.h b/www/chromium/files/patch-net__base__net_util.h index 68428e030bf1..17ab034041b0 100644 --- a/www/chromium/files/patch-net__base__net_util.h +++ b/www/chromium/files/patch-net__base__net_util.h @@ -1,5 +1,5 @@ ---- ./net/base/net_util.h.orig 2014-04-24 22:35:53.000000000 +0200 -+++ ./net/base/net_util.h 2014-04-24 23:23:46.000000000 +0200 +--- ./net/base/net_util.h.orig 2014-04-30 22:43:05.000000000 +0200 ++++ ./net/base/net_util.h 2014-05-04 14:38:48.000000000 +0200 @@ -13,6 +13,9 @@ #elif defined(OS_POSIX) #include <sys/types.h> diff --git a/www/chromium/files/patch-net__base__network_change_notifier.cc b/www/chromium/files/patch-net__base__network_change_notifier.cc index 7cbd476e930e..be66e25ecfd1 100644 --- a/www/chromium/files/patch-net__base__network_change_notifier.cc +++ b/www/chromium/files/patch-net__base__network_change_notifier.cc @@ -1,5 +1,5 @@ ---- ./net/base/network_change_notifier.cc.orig 2014-04-24 22:35:53.000000000 +0200 -+++ ./net/base/network_change_notifier.cc 2014-04-24 23:23:46.000000000 +0200 +--- ./net/base/network_change_notifier.cc.orig 2014-04-30 22:43:05.000000000 +0200 ++++ ./net/base/network_change_notifier.cc 2014-05-04 14:38:48.000000000 +0200 @@ -470,7 +470,6 @@ #elif defined(OS_MACOSX) return new NetworkChangeNotifierMac(); diff --git a/www/chromium/files/patch-net__dns__address_sorter_posix.cc b/www/chromium/files/patch-net__dns__address_sorter_posix.cc index c1087267c414..8520e0018cfd 100644 --- a/www/chromium/files/patch-net__dns__address_sorter_posix.cc +++ b/www/chromium/files/patch-net__dns__address_sorter_posix.cc @@ -1,5 +1,5 @@ ---- ./net/dns/address_sorter_posix.cc.orig 2014-04-24 22:35:54.000000000 +0200 -+++ ./net/dns/address_sorter_posix.cc 2014-04-24 23:23:46.000000000 +0200 +--- ./net/dns/address_sorter_posix.cc.orig 2014-04-30 22:43:08.000000000 +0200 ++++ ./net/dns/address_sorter_posix.cc 2014-05-04 14:38:48.000000000 +0200 @@ -10,6 +10,7 @@ #include <sys/socket.h> // Must be included before ifaddrs.h. #include <ifaddrs.h> diff --git a/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc b/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc index 13cb3a2844c1..8e4325cea0ad 100644 --- a/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc +++ b/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc @@ -1,5 +1,5 @@ ---- ./net/dns/dns_config_service_posix_unittest.cc.orig 2014-04-24 22:35:54.000000000 +0200 -+++ ./net/dns/dns_config_service_posix_unittest.cc 2014-04-24 23:23:46.000000000 +0200 +--- ./net/dns/dns_config_service_posix_unittest.cc.orig 2014-04-30 22:43:08.000000000 +0200 ++++ ./net/dns/dns_config_service_posix_unittest.cc 2014-05-04 14:38:48.000000000 +0200 @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/www/chromium/files/patch-net__dns__dns_session.cc b/www/chromium/files/patch-net__dns__dns_session.cc index 6c8f725c9cf3..4c23329ac82d 100644 --- a/www/chromium/files/patch-net__dns__dns_session.cc +++ b/www/chromium/files/patch-net__dns__dns_session.cc @@ -1,5 +1,5 @@ ---- ./net/dns/dns_session.cc.orig 2014-04-24 22:35:54.000000000 +0200 -+++ ./net/dns/dns_session.cc 2014-04-24 23:23:46.000000000 +0200 +--- ./net/dns/dns_session.cc.orig 2014-04-30 22:43:08.000000000 +0200 ++++ ./net/dns/dns_session.cc 2014-05-04 14:38:48.000000000 +0200 @@ -178,7 +178,7 @@ base::TimeDelta current_error = rtt - estimate; estimate += current_error / 8; // * alpha diff --git a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc b/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc index 98fbf8d9d988..7cf32b2fc102 100644 --- a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc +++ b/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc @@ -1,6 +1,6 @@ ---- ./net/http/http_auth_gssapi_posix.cc.orig 2014-04-24 22:35:54.000000000 +0200 -+++ ./net/http/http_auth_gssapi_posix.cc 2014-04-24 23:23:46.000000000 +0200 -@@ -430,8 +430,8 @@ +--- ./net/http/http_auth_gssapi_posix.cc.orig 2014-04-30 22:43:05.000000000 +0200 ++++ ./net/http/http_auth_gssapi_posix.cc 2014-05-04 14:38:48.000000000 +0200 +@@ -431,8 +431,8 @@ static const char* const kDefaultLibraryNames[] = { #if defined(OS_MACOSX) "libgssapi_krb5.dylib" // MIT Kerberos diff --git a/www/chromium/files/patch-net__net.gyp b/www/chromium/files/patch-net__net.gyp index 9cdfa62a9c29..aef4d9115b2f 100644 --- a/www/chromium/files/patch-net__net.gyp +++ b/www/chromium/files/patch-net__net.gyp @@ -1,6 +1,6 @@ ---- ./net/net.gyp.orig 2014-04-24 22:35:55.000000000 +0200 -+++ ./net/net.gyp 2014-04-24 23:23:46.000000000 +0200 -@@ -1435,9 +1435,10 @@ +--- ./net/net.gyp.orig 2014-04-30 22:43:09.000000000 +0200 ++++ ./net/net.gyp 2014-05-04 14:38:48.000000000 +0200 +@@ -1472,9 +1472,10 @@ }], ['os_bsd==1', { 'sources!': [ @@ -12,7 +12,7 @@ ], },{ 'dependencies': [ -@@ -2081,7 +2082,7 @@ +@@ -2130,7 +2131,7 @@ 'websockets/websocket_throttle_test.cc', ], 'conditions': [ @@ -21,7 +21,7 @@ 'dependencies': [ 'balsa', 'epoll_server', -@@ -2359,6 +2360,11 @@ +@@ -2413,6 +2414,11 @@ '../testing/android/native_test.gyp:native_test_native_code', ] }], diff --git a/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc b/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc index 853e858b82f8..b582092a0889 100644 --- a/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc +++ b/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc @@ -1,5 +1,5 @@ ---- ./net/proxy/proxy_config_service_linux.cc.orig 2014-04-24 22:35:54.000000000 +0200 -+++ ./net/proxy/proxy_config_service_linux.cc 2014-04-24 23:23:46.000000000 +0200 +--- ./net/proxy/proxy_config_service_linux.cc.orig 2014-04-30 22:43:07.000000000 +0200 ++++ ./net/proxy/proxy_config_service_linux.cc 2014-05-04 14:38:48.000000000 +0200 @@ -12,7 +12,13 @@ #include <limits.h> #include <stdio.h> @@ -14,7 +14,7 @@ #include <unistd.h> #include <map> -@@ -845,9 +851,10 @@ +@@ -846,9 +852,10 @@ public base::MessagePumpLibevent::Watcher { public: explicit SettingGetterImplKDE(base::Environment* env_var_getter) @@ -28,7 +28,7 @@ // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; -@@ -911,9 +918,10 @@ +@@ -912,9 +919,10 @@ // and pending tasks may then be deleted without being run. // Here in the KDE version, we can safely close the file descriptor // anyway. (Not that it really matters; the process is exiting.) @@ -40,7 +40,7 @@ } virtual bool Init(base::SingleThreadTaskRunner* glib_thread_task_runner, -@@ -921,11 +929,21 @@ +@@ -922,11 +930,21 @@ // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; DCHECK(inotify_fd_ < 0); @@ -62,7 +62,7 @@ int flags = fcntl(inotify_fd_, F_GETFL); if (fcntl(inotify_fd_, F_SETFL, flags | O_NONBLOCK) < 0) { PLOG(ERROR) << "fcntl failed"; -@@ -933,6 +951,7 @@ +@@ -934,6 +952,7 @@ inotify_fd_ = -1; return false; } @@ -70,7 +70,7 @@ file_loop_ = file_loop; // The initial read is done on the current thread, not |file_loop_|, // since we will need to have it for SetUpAndFetchInitialConfig(). -@@ -947,20 +966,38 @@ +@@ -948,20 +967,38 @@ close(inotify_fd_); inotify_fd_ = -1; } @@ -109,7 +109,7 @@ notify_delegate_ = delegate; if (!file_loop_->WatchFileDescriptor(inotify_fd_, true, -@@ -981,7 +1018,19 @@ +@@ -982,7 +1019,19 @@ virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE { DCHECK_EQ(fd, inotify_fd_); DCHECK(base::MessageLoop::current() == file_loop_); @@ -129,7 +129,7 @@ } virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE { NOTREACHED(); -@@ -1260,8 +1309,11 @@ +@@ -1261,8 +1310,11 @@ void OnChangeNotification() { DCHECK_GE(inotify_fd_, 0); DCHECK(base::MessageLoop::current() == file_loop_); @@ -142,7 +142,7 @@ ssize_t r; while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) { // inotify returns variable-length structures, which is why we have -@@ -1298,6 +1350,7 @@ +@@ -1299,6 +1351,7 @@ inotify_fd_ = -1; } } @@ -150,7 +150,7 @@ if (kioslaverc_touched) { // We don't use Reset() because the timer may not yet be running. // (In that case Stop() is a no-op.) -@@ -1313,6 +1366,7 @@ +@@ -1314,6 +1367,7 @@ std::vector<std::string> > strings_map_type; int inotify_fd_; diff --git a/www/chromium/files/patch-net__proxy__proxy_service.cc b/www/chromium/files/patch-net__proxy__proxy_service.cc index 299d6489c973..1d293449c591 100644 --- a/www/chromium/files/patch-net__proxy__proxy_service.cc +++ b/www/chromium/files/patch-net__proxy__proxy_service.cc @@ -1,5 +1,5 @@ ---- ./net/proxy/proxy_service.cc.orig 2014-04-24 22:35:54.000000000 +0200 -+++ ./net/proxy/proxy_service.cc 2014-04-24 23:23:46.000000000 +0200 +--- ./net/proxy/proxy_service.cc.orig 2014-04-30 22:43:07.000000000 +0200 ++++ ./net/proxy/proxy_service.cc 2014-05-04 14:38:48.000000000 +0200 @@ -39,7 +39,7 @@ #elif defined(OS_MACOSX) #include "net/proxy/proxy_config_service_mac.h" @@ -9,7 +9,7 @@ #include "net/proxy/proxy_config_service_linux.h" #elif defined(OS_ANDROID) #include "net/proxy/proxy_config_service_android.h" -@@ -1382,7 +1382,7 @@ +@@ -1376,7 +1376,7 @@ << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return new UnsetProxyConfigService; diff --git a/www/chromium/files/patch-net__quic__congestion_control__tcp_cubic_sender.cc b/www/chromium/files/patch-net__quic__congestion_control__tcp_cubic_sender.cc deleted file mode 100644 index 1eb2d5897ca2..000000000000 --- a/www/chromium/files/patch-net__quic__congestion_control__tcp_cubic_sender.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- net/quic/congestion_control/tcp_cubic_sender.cc.orig 2014-04-24 22:35:53.000000000 +0200 -+++ net/quic/congestion_control/tcp_cubic_sender.cc 2014-05-09 10:57:21.000000000 +0200 -@@ -341,7 +341,7 @@ - mean_deviation_ = QuicTime::Delta::FromMicroseconds( - kOneMinusBeta * mean_deviation_.ToMicroseconds() + - kBeta * -- std::abs(smoothed_rtt_.ToMicroseconds() - rtt.ToMicroseconds())); -+ std::labs(smoothed_rtt_.ToMicroseconds() - rtt.ToMicroseconds())); - smoothed_rtt_ = QuicTime::Delta::FromMicroseconds( - kOneMinusAlpha * smoothed_rtt_.ToMicroseconds() + - kAlpha * rtt.ToMicroseconds()); diff --git a/www/chromium/files/patch-net__socket__socks5_client_socket.cc b/www/chromium/files/patch-net__socket__socks5_client_socket.cc index 53f0b1fbc6e0..1bd34406dbb6 100644 --- a/www/chromium/files/patch-net__socket__socks5_client_socket.cc +++ b/www/chromium/files/patch-net__socket__socks5_client_socket.cc @@ -1,5 +1,5 @@ ---- ./net/socket/socks5_client_socket.cc.orig 2014-04-24 22:35:52.000000000 +0200 -+++ ./net/socket/socks5_client_socket.cc 2014-04-24 23:23:46.000000000 +0200 +--- ./net/socket/socks5_client_socket.cc.orig 2014-04-30 22:43:08.000000000 +0200 ++++ ./net/socket/socks5_client_socket.cc 2014-05-04 14:38:48.000000000 +0200 @@ -4,6 +4,10 @@ #include "net/socket/socks5_client_socket.h" @@ -9,5 +9,5 @@ +#endif + #include "base/basictypes.h" + #include "base/callback_helpers.h" #include "base/compiler_specific.h" - #include "base/debug/trace_event.h" diff --git a/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h b/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h index 2ce21b787204..b71e109dbb50 100644 --- a/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h +++ b/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h @@ -1,5 +1,5 @@ ---- ./net/socket/tcp_listen_socket_unittest.h.orig 2014-04-24 22:35:52.000000000 +0200 -+++ ./net/socket/tcp_listen_socket_unittest.h 2014-04-24 23:23:46.000000000 +0200 +--- ./net/socket/tcp_listen_socket_unittest.h.orig 2014-04-30 22:43:08.000000000 +0200 ++++ ./net/socket/tcp_listen_socket_unittest.h 2014-05-04 14:38:48.000000000 +0200 @@ -13,6 +13,9 @@ #include <arpa/inet.h> #include <errno.h> diff --git a/www/chromium/files/patch-net__udp__udp_socket_unittest.cc b/www/chromium/files/patch-net__udp__udp_socket_unittest.cc index 5458093cc42b..f0358c6243bf 100644 --- a/www/chromium/files/patch-net__udp__udp_socket_unittest.cc +++ b/www/chromium/files/patch-net__udp__udp_socket_unittest.cc @@ -1,5 +1,5 @@ ---- ./net/udp/udp_socket_unittest.cc.orig 2014-04-24 22:35:54.000000000 +0200 -+++ ./net/udp/udp_socket_unittest.cc 2014-04-24 23:23:46.000000000 +0200 +--- ./net/udp/udp_socket_unittest.cc.orig 2014-04-30 22:43:08.000000000 +0200 ++++ ./net/udp/udp_socket_unittest.cc 2014-05-04 14:38:48.000000000 +0200 @@ -202,7 +202,7 @@ client_entries, 5, NetLog::TYPE_SOCKET_ALIVE)); } diff --git a/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc b/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc index 85b32097c013..9a2c175ec642 100644 --- a/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc +++ b/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc @@ -1,5 +1,5 @@ ---- ./ppapi/proxy/file_io_resource.cc.orig 2014-04-24 22:35:39.000000000 +0200 -+++ ./ppapi/proxy/file_io_resource.cc 2014-04-24 23:23:46.000000000 +0200 +--- ./ppapi/proxy/file_io_resource.cc.orig 2014-04-30 22:41:40.000000000 +0200 ++++ ./ppapi/proxy/file_io_resource.cc 2014-05-04 14:38:48.000000000 +0200 @@ -294,15 +294,17 @@ if (check_quota_) { diff --git a/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc b/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc index f943f93e0d92..9742cbe43882 100644 --- a/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc +++ b/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc @@ -1,5 +1,5 @@ ---- ./ppapi/shared_impl/private/net_address_private_impl.cc.orig 2014-04-24 22:35:40.000000000 +0200 -+++ ./ppapi/shared_impl/private/net_address_private_impl.cc 2014-04-24 23:23:46.000000000 +0200 +--- ./ppapi/shared_impl/private/net_address_private_impl.cc.orig 2014-04-30 22:41:41.000000000 +0200 ++++ ./ppapi/shared_impl/private/net_address_private_impl.cc 2014-05-04 14:38:48.000000000 +0200 @@ -14,6 +14,10 @@ #include <sys/types.h> #endif diff --git a/www/chromium/files/patch-printing__printing.gyp b/www/chromium/files/patch-printing__printing.gyp index f9934ad52602..b96d3f3abdb1 100644 --- a/www/chromium/files/patch-printing__printing.gyp +++ b/www/chromium/files/patch-printing__printing.gyp @@ -1,5 +1,5 @@ ---- ./printing/printing.gyp.orig 2014-04-24 22:35:32.000000000 +0200 -+++ ./printing/printing.gyp 2014-04-24 23:23:46.000000000 +0200 +--- ./printing/printing.gyp.orig 2014-04-30 22:43:20.000000000 +0200 ++++ ./printing/printing.gyp 2014-05-04 14:38:48.000000000 +0200 @@ -215,7 +215,7 @@ 'backend/print_backend_chromeos.cc', ], diff --git a/www/chromium/files/patch-skia__skia_common.gypi b/www/chromium/files/patch-skia__skia_common.gypi index 0c39d50229a8..4e0e3fd3dcf5 100644 --- a/www/chromium/files/patch-skia__skia_common.gypi +++ b/www/chromium/files/patch-skia__skia_common.gypi @@ -1,6 +1,6 @@ ---- ./skia/skia_common.gypi.orig 2014-04-24 22:35:56.000000000 +0200 -+++ ./skia/skia_common.gypi 2014-04-24 23:23:47.000000000 +0200 -@@ -61,7 +61,7 @@ +--- ./skia/skia_common.gypi.orig 2014-04-30 22:41:33.000000000 +0200 ++++ ./skia/skia_common.gypi 2014-05-04 14:38:48.000000000 +0200 +@@ -66,7 +66,7 @@ }], #Settings for text blitting, chosen to approximate the system browser. diff --git a/www/chromium/files/patch-sync__util__get_session_name.cc b/www/chromium/files/patch-sync__util__get_session_name.cc index e4ea82bf31d9..9f99ff9ca799 100644 --- a/www/chromium/files/patch-sync__util__get_session_name.cc +++ b/www/chromium/files/patch-sync__util__get_session_name.cc @@ -1,5 +1,5 @@ ---- ./sync/util/get_session_name.cc.orig 2014-04-24 22:35:50.000000000 +0200 -+++ ./sync/util/get_session_name.cc 2014-04-24 23:23:47.000000000 +0200 +--- ./sync/util/get_session_name.cc.orig 2014-04-30 22:41:19.000000000 +0200 ++++ ./sync/util/get_session_name.cc 2014-05-04 14:38:48.000000000 +0200 @@ -11,7 +11,7 @@ #include "base/sys_info.h" #include "base/task_runner.h" diff --git a/www/chromium/files/patch-sync__util__get_session_name_linux.cc b/www/chromium/files/patch-sync__util__get_session_name_linux.cc index 415ba9ec9bf4..5a0f1e3f8cae 100644 --- a/www/chromium/files/patch-sync__util__get_session_name_linux.cc +++ b/www/chromium/files/patch-sync__util__get_session_name_linux.cc @@ -1,5 +1,5 @@ ---- ./sync/util/get_session_name_linux.cc.orig 2014-04-24 22:35:50.000000000 +0200 -+++ ./sync/util/get_session_name_linux.cc 2014-04-24 23:23:47.000000000 +0200 +--- ./sync/util/get_session_name_linux.cc.orig 2014-04-30 22:41:19.000000000 +0200 ++++ ./sync/util/get_session_name_linux.cc 2014-05-04 14:38:48.000000000 +0200 @@ -13,8 +13,9 @@ namespace internal { diff --git a/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h b/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h index 0e8b8936a20c..52a732830cd7 100644 --- a/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h +++ b/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h @@ -1,5 +1,5 @@ ---- ./testing/gtest/include/gtest/internal/gtest-port.h.orig 2014-04-24 22:36:14.000000000 +0200 -+++ ./testing/gtest/include/gtest/internal/gtest-port.h 2014-04-24 23:23:47.000000000 +0200 +--- ./testing/gtest/include/gtest/internal/gtest-port.h.orig 2014-04-30 22:43:26.000000000 +0200 ++++ ./testing/gtest/include/gtest/internal/gtest-port.h 2014-05-04 14:38:48.000000000 +0200 @@ -265,6 +265,8 @@ # define GTEST_OS_NACL 1 #elif defined __OpenBSD__ diff --git a/www/chromium/files/patch-testing__gtest__src__gtest.cc b/www/chromium/files/patch-testing__gtest__src__gtest.cc index 0623a6077f21..89da02d6b859 100644 --- a/www/chromium/files/patch-testing__gtest__src__gtest.cc +++ b/www/chromium/files/patch-testing__gtest__src__gtest.cc @@ -1,5 +1,5 @@ ---- ./testing/gtest/src/gtest.cc.orig 2014-04-24 22:36:14.000000000 +0200 -+++ ./testing/gtest/src/gtest.cc 2014-04-24 23:23:47.000000000 +0200 +--- ./testing/gtest/src/gtest.cc.orig 2014-04-30 22:43:26.000000000 +0200 ++++ ./testing/gtest/src/gtest.cc 2014-05-04 14:38:48.000000000 +0200 @@ -117,6 +117,10 @@ #endif // GTEST_OS_LINUX diff --git a/www/chromium/files/patch-third_party__WebKit__Source__config.h b/www/chromium/files/patch-third_party__WebKit__Source__config.h index a6f15523b4a7..db67ec491d40 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__config.h +++ b/www/chromium/files/patch-third_party__WebKit__Source__config.h @@ -1,10 +1,10 @@ ---- ./third_party/WebKit/Source/config.h.orig 2014-04-24 22:39:59.000000000 +0200 -+++ ./third_party/WebKit/Source/config.h 2014-04-24 23:23:47.000000000 +0200 +--- ./third_party/WebKit/Source/config.h.orig 2014-04-30 22:47:23.000000000 +0200 ++++ ./third_party/WebKit/Source/config.h 2014-05-04 14:38:48.000000000 +0200 @@ -156,6 +156,6 @@ #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1 #endif --#if OS(LINUX) || OS(ANDROID) || ENABLE(HARFBUZZ_ON_WINDOWS) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) || ENABLE(HARFBUZZ_ON_WINDOWS) +-#if OS(LINUX) || OS(ANDROID) || OS(WIN) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) || OS(WIN) #define WTF_USE_HARFBUZZ 1 #endif diff --git a/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp b/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp index 0db6c3cb6c2f..e5924c0da4a2 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp +++ b/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp @@ -1,6 +1,6 @@ ---- ./third_party/WebKit/Source/core/core.gyp.orig 2014-04-24 22:39:54.000000000 +0200 -+++ ./third_party/WebKit/Source/core/core.gyp 2014-04-24 23:23:47.000000000 +0200 -@@ -627,7 +627,7 @@ +--- ./third_party/WebKit/Source/core/core.gyp.orig 2014-04-30 22:47:22.000000000 +0200 ++++ ./third_party/WebKit/Source/core/core.gyp 2014-05-04 14:38:48.000000000 +0200 +@@ -641,7 +641,7 @@ # Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable. 'cflags': ['-Wno-uninitialized'], }], @@ -9,7 +9,7 @@ 'sources/': [ ['exclude', 'Linux\\.cpp$'], ], -@@ -671,7 +671,7 @@ +@@ -685,7 +685,7 @@ ['OS=="win" and buildtype=="Official"', { 'msvs_shard': 19, }], diff --git a/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp b/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp index 354f92c3d719..ee4217ea7cce 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp +++ b/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp @@ -1,5 +1,5 @@ ---- ./third_party/WebKit/Source/heap/ThreadState.cpp.orig 2014-04-24 22:39:56.000000000 +0200 -+++ ./third_party/WebKit/Source/heap/ThreadState.cpp 2014-04-24 23:23:47.000000000 +0200 +--- ./third_party/WebKit/Source/heap/ThreadState.cpp.orig 2014-04-30 22:47:13.000000000 +0200 ++++ ./third_party/WebKit/Source/heap/ThreadState.cpp 2014-05-04 14:38:48.000000000 +0200 @@ -43,13 +43,22 @@ extern "C" void* __libc_stack_end; // NOLINT #endif diff --git a/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp b/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp index 801ce1a2f560..e64e9db31cec 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp +++ b/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp @@ -1,11 +1,11 @@ ---- ./third_party/WebKit/Source/platform/blink_platform.gyp.orig 2014-04-24 22:39:50.000000000 +0200 -+++ ./third_party/WebKit/Source/platform/blink_platform.gyp 2014-04-24 23:23:47.000000000 +0200 +--- ./third_party/WebKit/Source/platform/blink_platform.gyp.orig 2014-04-30 22:47:17.000000000 +0200 ++++ ./third_party/WebKit/Source/platform/blink_platform.gyp 2014-05-04 14:38:48.000000000 +0200 @@ -193,7 +193,7 @@ # compiler optimizations, see crbug.com/237063 'msvs_disabled_warnings': [ 4267, 4334, 4724 ], 'conditions': [ -- ['OS=="linux" or OS=="android"', { -+ ['OS=="linux" or OS=="android" or OS=="freebsd"', { +- ['OS=="linux" or OS=="android" or OS=="win"', { ++ ['OS=="linux" or OS=="android" or OS=="freebsd" or OS=="win"', { 'sources/': [ # Cherry-pick files excluded by the broader regular expressions above. ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'], @@ -13,8 +13,8 @@ ['exclude', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'], ], }], -- ['OS != "linux" and OS != "mac" and (OS != "win" or (OS == "win" and "ENABLE_GDI_FONTS_ON_WINDOWS=1" in feature_defines))', { -+ ['OS != "linux" and OS != "freebsd" and OS != "mac" and (OS != "win" or (OS == "win" and "ENABLE_GDI_FONTS_ON_WINDOWS=1" in feature_defines))', { +- ['OS != "linux" and OS != "mac" and OS != "win"', { ++ ['OS != "linux" and OS != "freebsd" and OS != "mac" and OS != "win"', { 'sources/': [ ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], ], diff --git a/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp b/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp index b71979a1bc24..3166a7622171 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp +++ b/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp @@ -1,5 +1,5 @@ ---- ./third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp.orig 2014-04-24 22:39:57.000000000 +0200 -+++ ./third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp 2014-04-24 23:23:47.000000000 +0200 +--- ./third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp.orig 2014-04-30 22:47:14.000000000 +0200 ++++ ./third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp 2014-05-04 14:38:48.000000000 +0200 @@ -41,6 +41,8 @@ #include <gtk/gtk.h> #include <stdlib.h> diff --git a/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp b/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp index 94b726220bc4..d3e46d62dd4a 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp +++ b/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp @@ -1,5 +1,5 @@ ---- ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp.orig 2014-04-24 22:39:57.000000000 +0200 -+++ ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp 2014-04-24 23:23:47.000000000 +0200 +--- ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp.orig 2014-04-30 22:47:13.000000000 +0200 ++++ ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp 2014-05-04 14:38:48.000000000 +0200 @@ -34,7 +34,7 @@ #include "platform/fonts/FontDescription.h" #include "platform/fonts/FontPlatformData.h" diff --git a/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp b/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp index 1b7ac00e2c94..70c44796b5de 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp +++ b/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp @@ -1,5 +1,5 @@ ---- ./third_party/WebKit/Source/web/web.gyp.orig 2014-04-24 22:39:57.000000000 +0200 -+++ ./third_party/WebKit/Source/web/web.gyp 2014-04-24 23:23:47.000000000 +0200 +--- ./third_party/WebKit/Source/web/web.gyp.orig 2014-04-30 22:47:14.000000000 +0200 ++++ ./third_party/WebKit/Source/web/web.gyp 2014-05-04 14:38:48.000000000 +0200 @@ -149,7 +149,7 @@ }, }, diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp b/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp index 53f2647fba22..26a775a8af48 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp +++ b/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp @@ -1,5 +1,5 @@ ---- ./third_party/WebKit/Source/wtf/Assertions.cpp.orig 2014-04-24 22:39:59.000000000 +0200 -+++ ./third_party/WebKit/Source/wtf/Assertions.cpp 2014-04-24 23:23:47.000000000 +0200 +--- ./third_party/WebKit/Source/wtf/Assertions.cpp.orig 2014-04-30 22:47:16.000000000 +0200 ++++ ./third_party/WebKit/Source/wtf/Assertions.cpp 2014-05-04 14:38:48.000000000 +0200 @@ -38,6 +38,7 @@ #include "OwnPtr.h" #include "PassOwnPtr.h" diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h b/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h index 49b162543d69..694b838a0c48 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h +++ b/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h @@ -1,5 +1,5 @@ ---- ./third_party/WebKit/Source/wtf/ByteSwap.h.orig 2014-04-24 22:39:59.000000000 +0200 -+++ ./third_party/WebKit/Source/wtf/ByteSwap.h 2014-04-24 23:23:47.000000000 +0200 +--- ./third_party/WebKit/Source/wtf/ByteSwap.h.orig 2014-04-30 22:47:16.000000000 +0200 ++++ ./third_party/WebKit/Source/wtf/ByteSwap.h 2014-05-04 14:38:48.000000000 +0200 @@ -52,14 +52,20 @@ #else diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp b/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp index 9a3515932ede..48f212fe4561 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp +++ b/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp @@ -1,5 +1,5 @@ ---- ./third_party/WebKit/Source/wtf/DateMath.cpp.orig 2014-04-24 22:39:59.000000000 +0200 -+++ ./third_party/WebKit/Source/wtf/DateMath.cpp 2014-04-24 23:23:47.000000000 +0200 +--- ./third_party/WebKit/Source/wtf/DateMath.cpp.orig 2014-04-30 22:47:16.000000000 +0200 ++++ ./third_party/WebKit/Source/wtf/DateMath.cpp 2014-05-04 14:38:48.000000000 +0200 @@ -80,6 +80,7 @@ #include "StringExtras.h" diff --git a/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c b/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c index a59f283a7551..a5dd24ee16aa 100644 --- a/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c +++ b/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c @@ -1,5 +1,5 @@ ---- ./third_party/ffmpeg/libavutil/mem.c.orig 2014-04-24 22:36:23.000000000 +0200 -+++ ./third_party/ffmpeg/libavutil/mem.c 2014-04-24 23:23:47.000000000 +0200 +--- ./third_party/ffmpeg/libavutil/mem.c.orig 2014-04-30 22:43:45.000000000 +0200 ++++ ./third_party/ffmpeg/libavutil/mem.c 2014-05-04 14:38:48.000000000 +0200 @@ -32,7 +32,7 @@ #include <stdint.h> #include <stdlib.h> diff --git a/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp b/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp index 9a7be533e54d..5ce448734b89 100644 --- a/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp +++ b/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp @@ -1,5 +1,5 @@ ---- ./third_party/libXNVCtrl/libXNVCtrl.gyp.orig 2014-04-24 22:36:00.000000000 +0200 -+++ ./third_party/libXNVCtrl/libXNVCtrl.gyp 2014-04-24 23:23:47.000000000 +0200 +--- ./third_party/libXNVCtrl/libXNVCtrl.gyp.orig 2014-04-30 22:43:11.000000000 +0200 ++++ ./third_party/libXNVCtrl/libXNVCtrl.gyp 2014-05-04 14:38:48.000000000 +0200 @@ -13,6 +13,9 @@ 'NVCtrlLib.h', 'nv_control.h', diff --git a/www/chromium/files/patch-third_party__libjingle__libjingle.gyp b/www/chromium/files/patch-third_party__libjingle__libjingle.gyp index 48af9629aca2..b1616aa76289 100644 --- a/www/chromium/files/patch-third_party__libjingle__libjingle.gyp +++ b/www/chromium/files/patch-third_party__libjingle__libjingle.gyp @@ -1,15 +1,6 @@ ---- ./third_party/libjingle/libjingle.gyp.orig 2014-04-24 22:35:58.000000000 +0200 -+++ ./third_party/libjingle/libjingle.gyp 2014-04-24 23:23:47.000000000 +0200 -@@ -543,7 +543,7 @@ - '<(libjingle_source)/talk/base/unixfilesystem.h', - ], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'sources': [ - '<(libjingle_source)/talk/base/latebindingsymboltable.cc', - '<(libjingle_source)/talk/base/latebindingsymboltable.h', -@@ -795,7 +795,7 @@ +--- ./third_party/libjingle/libjingle.gyp.orig 2014-04-30 22:43:11.000000000 +0200 ++++ ./third_party/libjingle/libjingle.gyp 2014-05-04 14:38:48.000000000 +0200 +@@ -472,7 +472,7 @@ ], }], # TODO(mallinath) - Enable SCTP for iOS. diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc b/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc index 701a5b9a8ba7..76f7bf3ec3a3 100644 --- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc +++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc @@ -1,5 +1,5 @@ ---- ./third_party/libjingle/source/talk/base/cpumonitor.cc.orig 2014-04-24 22:36:53.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/cpumonitor.cc 2014-04-24 23:23:48.000000000 +0200 +--- ./third_party/libjingle/source/talk/base/cpumonitor.cc.orig 2014-04-30 22:44:03.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/cpumonitor.cc 2014-05-04 14:38:48.000000000 +0200 @@ -52,13 +52,13 @@ #include <mach/task.h> #endif // defined(IOS) || defined(OSX) diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h b/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h index afe9dd124c85..e61921660e33 100644 --- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h +++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h @@ -1,5 +1,5 @@ ---- ./third_party/libjingle/source/talk/base/ipaddress.h.orig 2014-04-24 22:36:53.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/ipaddress.h 2014-04-24 23:23:48.000000000 +0200 +--- ./third_party/libjingle/source/talk/base/ipaddress.h.orig 2014-04-30 22:44:03.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/ipaddress.h 2014-05-04 14:38:48.000000000 +0200 @@ -34,6 +34,9 @@ #include <arpa/inet.h> #include <netdb.h> diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc b/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc index f3c2b89fe97d..5407b03f8a06 100644 --- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc +++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc @@ -1,5 +1,5 @@ ---- ./third_party/libjingle/source/talk/base/linux.cc.orig 2014-04-24 22:36:53.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/linux.cc 2014-04-24 23:23:48.000000000 +0200 +--- ./third_party/libjingle/source/talk/base/linux.cc.orig 2014-04-30 22:44:03.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/linux.cc 2014-05-04 14:38:48.000000000 +0200 @@ -25,7 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h b/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h index 96749b07f5e1..5f54f2b294c0 100644 --- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h +++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h @@ -1,5 +1,5 @@ ---- ./third_party/libjingle/source/talk/base/linux.h.orig 2014-04-24 22:36:53.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/linux.h 2014-04-24 23:23:48.000000000 +0200 +--- ./third_party/libjingle/source/talk/base/linux.h.orig 2014-04-30 22:44:03.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/linux.h 2014-05-04 14:38:48.000000000 +0200 @@ -28,7 +28,7 @@ #ifndef TALK_BASE_LINUX_H_ #define TALK_BASE_LINUX_H_ diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h b/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h index 3feafba616c6..d1c3b2df0e90 100644 --- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h +++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h @@ -1,5 +1,5 @@ ---- ./third_party/libjingle/source/talk/base/network.h.orig 2014-04-24 22:36:53.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/network.h 2014-04-24 23:23:48.000000000 +0200 +--- ./third_party/libjingle/source/talk/base/network.h.orig 2014-04-30 22:44:03.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/network.h 2014-05-04 14:38:48.000000000 +0200 @@ -38,6 +38,10 @@ #include "talk/base/messagehandler.h" #include "talk/base/sigslot.h" diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc b/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc index 899f6d28d601..7e32282e8be0 100644 --- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc +++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc @@ -1,15 +1,20 @@ ---- ./third_party/libjingle/source/talk/base/systeminfo.cc.orig 2014-04-24 22:36:53.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/systeminfo.cc 2014-04-24 23:23:48.000000000 +0200 -@@ -36,7 +36,7 @@ +--- ./third_party/libjingle/source/talk/base/systeminfo.cc.orig 2014-04-30 22:44:03.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/systeminfo.cc 2014-05-04 20:37:54.000000000 +0200 +@@ -36,8 +36,12 @@ #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> ++#if defined(OS_FREEBSD) ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif #endif #if defined(OSX) || defined(IOS) -@@ -48,7 +48,7 @@ + #include <sys/sysctl.h> +@@ -48,7 +52,7 @@ #include "talk/base/win32.h" #elif defined(OSX) #include "talk/base/macconversion.h" @@ -18,3 +23,21 @@ #include "talk/base/linux.h" #endif #include "talk/base/common.h" +@@ -185,6 +189,17 @@ + } + #elif defined(__native_client__) + // TODO(ryanpetrie): Implement this via PPAPI when it's available. ++#elif defined(OS_FREEBSD) ++ void* sysctl_value; ++ size_t length = sizeof(sysctl_value); ++ if (!sysctlbyname("hw.ncpu", &sysctl_value, &length, NULL, 0)) { ++ physical_cpus_ = *static_cast<int*>(sysctl_value); ++ } ++ if (!sysctlbyname("kern.smp.cpus", &sysctl_value, &length, NULL, 0)) { ++ logical_cpus_ = *static_cast<int*>(sysctl_value); ++ } ++ // L3 / L2 cache size? ++ // CPU family/model/stepping (available in dmesg, kernel only TODO) + #else // LINUX || ANDROID + ProcCpuInfo proc_info; + if (proc_info.LoadFromSystem()) { diff --git a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp deleted file mode 100644 index 2ab98c7c03d9..000000000000 --- a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp +++ /dev/null @@ -1,21 +0,0 @@ ---- ./third_party/libjpeg_turbo/libjpeg.gyp.orig 2014-04-24 22:36:33.000000000 +0200 -+++ ./third_party/libjpeg_turbo/libjpeg.gyp 2014-04-24 23:23:48.000000000 +0200 -@@ -240,7 +240,7 @@ - ], - }, - }], -- [ 'OS=="linux" or (OS=="android" and target_arch!="arm")', { -+ [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and target_arch!="arm")', { - 'conditions': [ - [ 'use_system_yasm==0', { - 'dependencies': [ -@@ -271,6 +271,9 @@ - ], - }], - ], -+ 'include_dirs': [ -+ '<(prefix_dir)/include', -+ ], - }, - }], - ], diff --git a/www/chromium/files/patch-third_party__libusb__libusb.gyp b/www/chromium/files/patch-third_party__libusb__libusb.gyp index 15c4e3b1347e..1f2dec9b49d4 100644 --- a/www/chromium/files/patch-third_party__libusb__libusb.gyp +++ b/www/chromium/files/patch-third_party__libusb__libusb.gyp @@ -1,5 +1,5 @@ ---- ./third_party/libusb/libusb.gyp.orig 2014-04-24 22:35:57.000000000 +0200 -+++ ./third_party/libusb/libusb.gyp 2014-04-24 23:23:48.000000000 +0200 +--- ./third_party/libusb/libusb.gyp.orig 2014-04-30 22:43:13.000000000 +0200 ++++ ./third_party/libusb/libusb.gyp 2014-05-04 14:38:48.000000000 +0200 @@ -93,6 +93,19 @@ ], 'msvs_disabled_warnings': [ 4267 ], diff --git a/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh b/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh index 8771dc3fac78..080c54491218 100644 --- a/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh +++ b/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh @@ -1,13 +1,13 @@ ---- ./third_party/libvpx/unpack_lib_posix.sh.orig 2014-04-24 22:36:38.000000000 +0200 -+++ ./third_party/libvpx/unpack_lib_posix.sh 2014-04-24 23:23:48.000000000 +0200 +--- ./third_party/libvpx/unpack_lib_posix.sh.orig 2014-04-30 22:43:59.000000000 +0200 ++++ ./third_party/libvpx/unpack_lib_posix.sh 2014-05-04 14:38:49.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/usr/bin/env bash # # Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be -@@ -48,16 +48,12 @@ - ar=$AR +@@ -52,16 +52,12 @@ + fi fi -obj_list="$($ar t $lib_file | grep '\.o$')" diff --git a/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h b/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h index 0baca757c803..a6b2081ab8d8 100644 --- a/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h +++ b/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h @@ -1,5 +1,5 @@ ---- ./third_party/ots/include/opentype-sanitiser.h.orig 2014-04-24 22:36:47.000000000 +0200 -+++ ./third_party/ots/include/opentype-sanitiser.h 2014-04-24 23:23:48.000000000 +0200 +--- ./third_party/ots/include/opentype-sanitiser.h.orig 2014-04-30 22:43:54.000000000 +0200 ++++ ./third_party/ots/include/opentype-sanitiser.h 2014-05-04 14:38:49.000000000 +0200 @@ -22,6 +22,7 @@ #else #include <arpa/inet.h> diff --git a/www/chromium/files/patch-third_party__webrtc__build__common.gypi b/www/chromium/files/patch-third_party__webrtc__build__common.gypi index 78fd83539d5a..4e3abfc4af13 100644 --- a/www/chromium/files/patch-third_party__webrtc__build__common.gypi +++ b/www/chromium/files/patch-third_party__webrtc__build__common.gypi @@ -1,6 +1,6 @@ ---- ./third_party/webrtc/build/common.gypi.orig 2014-04-24 22:37:12.000000000 +0200 -+++ ./third_party/webrtc/build/common.gypi 2014-04-24 23:23:48.000000000 +0200 -@@ -272,6 +272,13 @@ +--- ./third_party/webrtc/build/common.gypi.orig 2014-04-30 22:44:26.000000000 +0200 ++++ ./third_party/webrtc/build/common.gypi 2014-05-04 14:38:49.000000000 +0200 +@@ -287,6 +287,13 @@ 'WEBRTC_LINUX', ], }], diff --git a/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi b/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi index 568bca343fb7..7ff46767eb6b 100644 --- a/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi +++ b/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi @@ -1,5 +1,5 @@ ---- ./third_party/webrtc/modules/audio_device/audio_device.gypi.orig 2014-04-24 22:37:00.000000000 +0200 -+++ ./third_party/webrtc/modules/audio_device/audio_device.gypi 2014-04-24 23:23:48.000000000 +0200 +--- ./third_party/webrtc/modules/audio_device/audio_device.gypi.orig 2014-04-30 22:44:08.000000000 +0200 ++++ ./third_party/webrtc/modules/audio_device/audio_device.gypi 2014-05-04 14:38:49.000000000 +0200 @@ -47,7 +47,7 @@ 'dummy/audio_device_utility_dummy.h', ], diff --git a/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi b/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi index 7bf99f17b0eb..3dc82226c0ec 100644 --- a/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi +++ b/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi @@ -1,6 +1,6 @@ ---- ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig 2014-04-24 22:37:06.000000000 +0200 -+++ ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi 2014-04-24 23:23:48.000000000 +0200 -@@ -99,6 +99,11 @@ +--- ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig 2014-04-30 22:44:20.000000000 +0200 ++++ ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi 2014-05-04 14:38:49.000000000 +0200 +@@ -101,6 +101,11 @@ ], }, }], diff --git a/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc b/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc index fe5be76e466e..3bac881ddf78 100644 --- a/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc +++ b/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc @@ -1,5 +1,5 @@ ---- ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2014-04-24 22:37:08.000000000 +0200 -+++ ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc 2014-04-24 23:23:48.000000000 +0200 +--- ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2014-04-30 22:44:21.000000000 +0200 ++++ ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc 2014-05-04 14:38:49.000000000 +0200 @@ -15,6 +15,7 @@ #include <string.h> diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc index 1df426ab6f1c..1e8d71f4eac1 100644 --- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc +++ b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc @@ -1,5 +1,5 @@ ---- ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig 2014-04-24 22:37:13.000000000 +0200 -+++ ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc 2014-04-24 23:23:48.000000000 +0200 +--- ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig 2014-04-30 22:44:26.000000000 +0200 ++++ ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc 2014-05-04 14:38:49.000000000 +0200 @@ -12,7 +12,11 @@ #include <assert.h> diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc index 77e369efe635..b1c672b2b28c 100644 --- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc +++ b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc @@ -1,5 +1,5 @@ ---- ./third_party/webrtc/system_wrappers/source/cpu_info.cc.orig 2014-04-24 22:37:13.000000000 +0200 -+++ ./third_party/webrtc/system_wrappers/source/cpu_info.cc 2014-04-24 23:23:48.000000000 +0200 +--- ./third_party/webrtc/system_wrappers/source/cpu_info.cc.orig 2014-04-30 22:44:26.000000000 +0200 ++++ ./third_party/webrtc/system_wrappers/source/cpu_info.cc 2014-05-04 14:38:49.000000000 +0200 @@ -12,7 +12,10 @@ #if defined(_WIN32) diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc index d7223269665e..e28b49200887 100644 --- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc +++ b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc @@ -1,5 +1,5 @@ ---- ./third_party/webrtc/system_wrappers/source/thread_posix.cc.orig 2014-04-24 22:37:13.000000000 +0200 -+++ ./third_party/webrtc/system_wrappers/source/thread_posix.cc 2014-04-24 23:23:48.000000000 +0200 +--- ./third_party/webrtc/system_wrappers/source/thread_posix.cc.orig 2014-04-30 22:44:26.000000000 +0200 ++++ ./third_party/webrtc/system_wrappers/source/thread_posix.cc 2014-05-04 14:38:49.000000000 +0200 @@ -51,9 +51,11 @@ #include <string.h> // strncpy #include <unistd.h> diff --git a/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h b/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h index 85572bac45f2..f781774af944 100644 --- a/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h +++ b/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h @@ -1,5 +1,5 @@ ---- ./third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2014-04-24 22:37:12.000000000 +0200 -+++ ./third_party/webrtc/voice_engine/voice_engine_defines.h 2014-04-24 23:23:48.000000000 +0200 +--- ./third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2014-04-30 22:44:26.000000000 +0200 ++++ ./third_party/webrtc/voice_engine/voice_engine_defines.h 2014-05-04 14:38:49.000000000 +0200 @@ -233,7 +233,7 @@ #include <pthread.h> #include <sys/socket.h> diff --git a/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py b/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py index 1ceecb1425c4..eae2ca7b8fe5 100644 --- a/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py +++ b/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py @@ -1,5 +1,5 @@ ---- ./tools/gyp/pylib/gyp/generator/make.py.orig 2014-04-24 22:36:59.000000000 +0200 -+++ ./tools/gyp/pylib/gyp/generator/make.py 2014-04-24 23:23:48.000000000 +0200 +--- ./tools/gyp/pylib/gyp/generator/make.py.orig 2014-04-30 22:44:16.000000000 +0200 ++++ ./tools/gyp/pylib/gyp/generator/make.py 2014-05-04 14:38:49.000000000 +0200 @@ -87,7 +87,7 @@ else: operating_system = flavor diff --git a/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp b/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp index 2fc9fb4a554c..758f1cd22df6 100644 --- a/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp +++ b/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp @@ -1,5 +1,5 @@ ---- ./tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2014-04-24 22:37:02.000000000 +0200 -+++ ./tools/gyp/test/additional-targets/src/dir1/actions.gyp 2014-04-24 23:23:48.000000000 +0200 +--- ./tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2014-04-30 22:44:27.000000000 +0200 ++++ ./tools/gyp/test/additional-targets/src/dir1/actions.gyp 2014-05-04 14:38:49.000000000 +0200 @@ -47,7 +47,7 @@ }, ], diff --git a/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp b/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp index e30dde921bd5..046fb37604b1 100644 --- a/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp +++ b/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp @@ -1,5 +1,5 @@ ---- ./tools/gyp/test/library/src/library.gyp.orig 2014-04-24 22:37:02.000000000 +0200 -+++ ./tools/gyp/test/library/src/library.gyp 2014-04-24 23:23:48.000000000 +0200 +--- ./tools/gyp/test/library/src/library.gyp.orig 2014-04-30 22:44:27.000000000 +0200 ++++ ./tools/gyp/test/library/src/library.gyp 2014-05-04 14:38:49.000000000 +0200 @@ -48,7 +48,7 @@ }, ], diff --git a/www/chromium/files/patch-ui__events__event_switches.cc b/www/chromium/files/patch-ui__events__event_switches.cc index 91aea61e62dc..4b802135ae42 100644 --- a/www/chromium/files/patch-ui__events__event_switches.cc +++ b/www/chromium/files/patch-ui__events__event_switches.cc @@ -1,5 +1,5 @@ ---- ./ui/events/event_switches.cc.orig 2014-04-24 22:35:16.000000000 +0200 -+++ ./ui/events/event_switches.cc 2014-04-24 23:23:48.000000000 +0200 +--- ./ui/events/event_switches.cc.orig 2014-04-30 22:42:57.000000000 +0200 ++++ ./ui/events/event_switches.cc 2014-05-04 14:38:49.000000000 +0200 @@ -20,7 +20,7 @@ // disabled: touch events are disabled. const char kTouchEventsDisabled[] = "disabled"; diff --git a/www/chromium/files/patch-ui__events__event_switches.h b/www/chromium/files/patch-ui__events__event_switches.h index 21f0e8088368..c64dbd03aea0 100644 --- a/www/chromium/files/patch-ui__events__event_switches.h +++ b/www/chromium/files/patch-ui__events__event_switches.h @@ -1,5 +1,5 @@ ---- ./ui/events/event_switches.h.orig 2014-04-24 22:35:16.000000000 +0200 -+++ ./ui/events/event_switches.h 2014-04-24 23:23:48.000000000 +0200 +--- ./ui/events/event_switches.h.orig 2014-04-30 22:42:57.000000000 +0200 ++++ ./ui/events/event_switches.h 2014-05-04 14:38:49.000000000 +0200 @@ -16,7 +16,7 @@ EVENTS_BASE_EXPORT extern const char kTouchEventsEnabled[]; EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[]; diff --git a/www/chromium/files/patch-ui__gl__gl.gyp b/www/chromium/files/patch-ui__gl__gl.gyp index e05cbc48e2c9..c971af923cb0 100644 --- a/www/chromium/files/patch-ui__gl__gl.gyp +++ b/www/chromium/files/patch-ui__gl__gl.gyp @@ -1,6 +1,6 @@ ---- ./ui/gl/gl.gyp.orig 2014-04-24 22:35:14.000000000 +0200 -+++ ./ui/gl/gl.gyp 2014-04-24 23:23:48.000000000 +0200 -@@ -170,7 +170,7 @@ +--- ./ui/gl/gl.gyp.orig 2014-04-30 22:42:53.000000000 +0200 ++++ ./ui/gl/gl.gyp 2014-05-04 17:23:38.000000000 +0200 +@@ -171,7 +171,7 @@ }, ], 'conditions': [ @@ -9,3 +9,12 @@ 'sources': [ 'egl_util.cc', 'egl_util.h', +@@ -190,7 +190,7 @@ + '<(DEPTH)/third_party/khronos', + ], + }], +- ['OS in ("android", "linux")', { ++ ['OS in ("android", "linux", "freebsd")', { + 'sources': [ + 'gl_implementation_osmesa.cc', + 'gl_implementation_osmesa.h', diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 4e86c936de41..6bb693397ad5 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -75,6 +75,7 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/cmdevtools.css %%DATADIR%%/resources/inspector/codemirror.css %%DATADIR%%/resources/inspector/CodeMirrorTextEditor.js +%%DATADIR%%/resources/inspector/ConsolePanel.js %%DATADIR%%/resources/inspector/dataGrid.css %%DATADIR%%/resources/inspector/devtools.html %%DATADIR%%/resources/inspector/devtools_extension_api.js @@ -87,7 +88,6 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/HeapSnapshotWorker.js %%DATADIR%%/resources/inspector/helpScreen.css %%DATADIR%%/resources/inspector/inspector.css -%%DATADIR%%/resources/inspector/inspector.js %%DATADIR%%/resources/inspector/Images/addIcon.png %%DATADIR%%/resources/inspector/Images/applicationCache.png %%DATADIR%%/resources/inspector/Images/back.png @@ -135,10 +135,6 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/sessionStorage.png %%DATADIR%%/resources/inspector/Images/settingsListRemove.png %%DATADIR%%/resources/inspector/Images/settingsListRemove_2x.png -%%DATADIR%%/resources/inspector/Images/spinnerActive.gif -%%DATADIR%%/resources/inspector/Images/spinnerActiveSelected.gif -%%DATADIR%%/resources/inspector/Images/spinnerInactive.gif -%%DATADIR%%/resources/inspector/Images/spinnerInactiveSelected.gif %%DATADIR%%/resources/inspector/Images/statusbarButtonGlyphs.png %%DATADIR%%/resources/inspector/Images/statusbarButtonGlyphs_2x.png %%DATADIR%%/resources/inspector/Images/statusbarResizerHorizontal.png @@ -156,6 +152,7 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/inspectorCommon.css %%DATADIR%%/resources/inspector/LayersPanel.js %%DATADIR%%/resources/inspector/layersPanel.css +%%DATADIR%%/resources/inspector/Main.js %%DATADIR%%/resources/inspector/navigatorView.css %%DATADIR%%/resources/inspector/networkLogView.css %%DATADIR%%/resources/inspector/networkPanel.css |