diff options
| author | rene <rene@FreeBSD.org> | 2014-08-27 01:09:02 +0800 |
|---|---|---|
| committer | rene <rene@FreeBSD.org> | 2014-08-27 01:09:02 +0800 |
| commit | b289ff7477b43c118c70bedfe1a0c628add0ccc4 (patch) | |
| tree | c3ccf772a3d86897da74898d1bbad2b036954bac /www | |
| parent | 6fb3612082fa3139182c9234083414d3cd304e34 (diff) | |
| download | freebsd-ports-gnome-b289ff7477b43c118c70bedfe1a0c628add0ccc4.tar.gz freebsd-ports-gnome-b289ff7477b43c118c70bedfe1a0c628add0ccc4.tar.zst freebsd-ports-gnome-b289ff7477b43c118c70bedfe1a0c628add0ccc4.zip | |
Update www/chromium to 37.0.2062.94
Obtained from: freebsd-chromium@ (especially Carlos Medina)
MFH: 2014Q3
Security: http://www.vuxml.org/freebsd/fd5f305d-2d3d-11e4-aa3d-00262d5ed8ee.html
Diffstat (limited to 'www')
226 files changed, 1098 insertions, 760 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 6b531d8c6a03..4a43d18d51a3 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 36.0.1985.143 -PORTREVISION= 1 +PORTVERSION= 37.0.2062.94 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -244,8 +243,10 @@ post-patch: pre-configure: # phajdan-jr: list of things *not* to remove, so maybe the script # should be called "keep_bundled_libraries.py" + # keep third_party/protobuf to ease debugging cd ${WRKSRC} && ${PYTHON_CMD} \ ./build/linux/unbundle/remove_bundled_libraries.py \ + 'third_party/protobuf' \ 'base/third_party/dmg_fp' \ 'base/third_party/dynamic_annotations' \ 'base/third_party/icu' \ @@ -269,6 +270,7 @@ pre-configure: 'third_party/cros_system_api' \ 'third_party/dom_distiller_js' \ 'third_party/ffmpeg' \ + 'third_party/fips181' \ 'third_party/flot' \ 'third_party/hunspell' \ 'third_party/iccjpeg' \ @@ -295,8 +297,9 @@ pre-configure: 'third_party/npapi' \ 'third_party/opus' \ 'third_party/ots' \ - 'third_party/polymer' \ + 'third_party/pdfium' \ 'third_party/ply' \ + 'third_party/polymer' \ 'third_party/pywebsocket' \ 'third_party/qcms' \ 'third_party/readability' \ @@ -344,16 +347,20 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${STAGEDIR}${DATADIR} .for p in chrome_100_percent content_resources keyboard_resources resources - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak \ + ${STAGEDIR}${DATADIR} .endfor - ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome ${STAGEDIR}${DATADIR} - ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libffmpegsumo.so ${STAGEDIR}${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ + ${STAGEDIR}${DATADIR} + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libffmpegsumo.so \ + ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DESKTOPDIR} - ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop ${STAGEDIR}${DESKTOPDIR} + ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \ + ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot.${ARCH:S/i386/ia32/:S/amd64/x64/} \ + ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \ ${STAGEDIR}${DATADIR}/mksnapshot .include <bsd.port.post.mk> diff --git a/www/chromium/distinfo b/www/chromium/distinfo index e2911b50f548..285c5a40108b 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,4 +1,4 @@ -SHA256 (chromium-36.0.1985.143.tar.xz) = 0631d7442991f0b4b942477c58a9294e9e3eb21ffd3c8626e4ab663b8345c316 -SIZE (chromium-36.0.1985.143.tar.xz) = 205456928 -SHA256 (chromium-36.0.1985.143-testdata.tar.xz) = 7af27696a1d30a2acd29ffa331c956f58d82080905b73ad9259f7d6ad2784277 -SIZE (chromium-36.0.1985.143-testdata.tar.xz) = 111519392 +SHA256 (chromium-37.0.2062.94.tar.xz) = d27c19580b74cbe143131f0bc097557b3b2fb3d2be966e688d8af51a779ce533 +SIZE (chromium-37.0.2062.94.tar.xz) = 220064328 +SHA256 (chromium-37.0.2062.94-testdata.tar.xz) = 055ff2df325a20b03e12eae3b553e126eb5c63144fe9184a07d8d2f4db3fb9b4 +SIZE (chromium-37.0.2062.94-testdata.tar.xz) = 114484240 diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang index 6373e21396c8..fe598858ae0a 100644 --- a/www/chromium/files/extra-patch-clang +++ b/www/chromium/files/extra-patch-clang @@ -133,17 +133,6 @@ Stop(); } ---- net/url_request/view_cache_helper_unittest.cc.orig 2013-09-01 00:33:32.000000000 +0300 -+++ net/url_request/view_cache_helper_unittest.cc 2013-09-01 00:34:02.000000000 +0300 -@@ -29,7 +29,7 @@ - }; - - TestURLRequestContext::TestURLRequestContext() -- : cache_(reinterpret_cast<HttpTransactionFactory*>(NULL), NULL, -+ : cache_(static_cast<HttpTransactionFactory*>(NULL), NULL, - HttpCache::DefaultBackend::InMemory(0)) { - set_http_transaction_factory(&cache_); - } --- third_party/hunspell/src/hunspell/affentry.hxx 2013-07-03 23:52:32.000000000 -0400 +++ third_party/hunspell/src/hunspell/affentry.hxx 2013-07-19 01:31:57.000000000 -0400 @@ -27,7 +27,7 @@ @@ -278,3 +267,14 @@ } - +--- ./third_party/webrtc/base/taskrunner.cc.orig 2014-08-20 21:04:28.000000000 +0200 ++++ ./third_party/webrtc/base/taskrunner.cc 2014-08-22 18:55:46.000000000 +0200 +@@ -102,7 +102,7 @@ + std::vector<Task *>::iterator it; + it = std::remove(tasks_.begin(), + tasks_.end(), +- reinterpret_cast<Task *>(NULL)); ++ static_cast<Task *>(NULL)); + + tasks_.erase(it, tasks_.end()); + diff --git a/www/chromium/files/patch-base__base.gyp b/www/chromium/files/patch-base__base.gyp index 8b11ef5b3e4e..3f1135058dfa 100644 --- a/www/chromium/files/patch-base__base.gyp +++ b/www/chromium/files/patch-base__base.gyp @@ -1,5 +1,5 @@ ---- ./base/base.gyp.orig 2014-08-12 21:01:28.000000000 +0200 -+++ ./base/base.gyp 2014-08-13 09:57:00.000000000 +0200 +--- ./base/base.gyp.orig 2014-08-20 21:02:42.000000000 +0200 ++++ ./base/base.gyp 2014-08-22 15:06:27.000000000 +0200 @@ -129,7 +129,7 @@ ], 'link_settings': { diff --git a/www/chromium/files/patch-base__base.gypi b/www/chromium/files/patch-base__base.gypi index 635979397e12..0216b20af4b6 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-08-12 21:01:28.000000000 +0200 -+++ ./base/base.gypi 2014-08-13 09:56:56.000000000 +0200 -@@ -912,11 +912,14 @@ +--- ./base/base.gypi.orig 2014-08-20 21:02:42.000000000 +0200 ++++ ./base/base.gypi 2014-08-22 18:33:25.000000000 +0200 +@@ -942,11 +942,16 @@ 'process/memory_stubs.cc', ], 'sources/': [ @@ -13,6 +13,8 @@ ['exclude', '^sys_info_linux\\.cc$'], + ['exclude', '^process/process_iterator_linux\\.cc$'], + ['exclude', '^process/process_metrics_linux\\.cc$'], ++ ['exclude', '^files/file_path_watcher_fsevents\\.cc$'], ++ ['exclude', '^files/file_path_watcher_fsevents\\.h$'], ], }], # Remove all unnecessary files for build_nexe.py to avoid exceeding 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 3e5f120a5f79..f6b155907113 100644 --- a/www/chromium/files/patch-base__debug__stack_trace_posix.cc +++ b/www/chromium/files/patch-base__debug__stack_trace_posix.cc @@ -1,5 +1,5 @@ ---- ./base/debug/stack_trace_posix.cc.orig 2014-08-12 21:01:27.000000000 +0200 -+++ ./base/debug/stack_trace_posix.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/debug/stack_trace_posix.cc.orig 2014-08-20 21:02:42.000000000 +0200 ++++ ./base/debug/stack_trace_posix.cc 2014-08-22 15:06:24.000000000 +0200 @@ -590,6 +590,10 @@ // for the modules that are loaded in the current process. // Returns true on success. diff --git a/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h b/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h new file mode 100644 index 000000000000..59476112ba11 --- /dev/null +++ b/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h @@ -0,0 +1,13 @@ +--- ./base/files/file_path_watcher_kqueue.h.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/files/file_path_watcher_kqueue.h 2014-08-23 19:32:36.000000000 +0200 +@@ -5,6 +5,10 @@ + #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ + #define BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ + ++#ifdef __FreeBSD__ ++#include <sys/stdint.h> ++#include <sys/types.h> ++#endif + #include <sys/event.h> + #include <vector> + diff --git a/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc b/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc index 8268fb3cbf8f..8415f3539199 100644 --- a/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc +++ b/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc @@ -1,5 +1,5 @@ ---- ./base/posix/unix_domain_socket_linux.cc.orig 2014-08-12 21:01:28.000000000 +0200 -+++ ./base/posix/unix_domain_socket_linux.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/posix/unix_domain_socket_linux.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/posix/unix_domain_socket_linux.cc 2014-08-22 15:06:24.000000000 +0200 @@ -18,6 +18,15 @@ #include "base/posix/eintr_wrapper.h" #include "base/stl_util.h" 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 067c28fdec2a..bfacd385c999 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-08-12 21:01:28.000000000 +0200 -+++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-08-22 15:06:24.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 fee33208d7d0..89a7b7c8ea87 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-08-12 21:01:27.000000000 +0200 -+++ ./base/process/internal_linux.h 2014-08-13 09:56:56.000000000 +0200 +--- ./base/process/internal_linux.h.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/process/internal_linux.h 2014-08-22 15:06:24.000000000 +0200 @@ -12,6 +12,8 @@ #include "base/files/file_path.h" diff --git a/www/chromium/files/patch-base__process__launch.cc b/www/chromium/files/patch-base__process__launch.cc index 6785d64861c0..ca562b45303e 100644 --- a/www/chromium/files/patch-base__process__launch.cc +++ b/www/chromium/files/patch-base__process__launch.cc @@ -1,6 +1,6 @@ ---- ./base/process/launch.cc.orig 2014-08-12 21:01:27.000000000 +0200 -+++ ./base/process/launch.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -23,10 +23,10 @@ +--- ./base/process/launch.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/process/launch.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -24,10 +24,10 @@ fds_to_remap(NULL), maximize_rlimits(NULL), new_process_group(false) diff --git a/www/chromium/files/patch-base__process__launch.h b/www/chromium/files/patch-base__process__launch.h index 001b25e3f56d..55b6ced74bf9 100644 --- a/www/chromium/files/patch-base__process__launch.h +++ b/www/chromium/files/patch-base__process__launch.h @@ -1,6 +1,6 @@ ---- ./base/process/launch.h.orig 2014-08-12 21:01:27.000000000 +0200 -+++ ./base/process/launch.h 2014-08-13 09:56:56.000000000 +0200 -@@ -108,14 +108,14 @@ +--- ./base/process/launch.h.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/process/launch.h 2014-08-22 15:06:24.000000000 +0200 +@@ -113,14 +113,14 @@ // will be the same as its pid. bool new_process_group; diff --git a/www/chromium/files/patch-base__process__memory_unittest.cc b/www/chromium/files/patch-base__process__memory_unittest.cc index 52fe0abd33e7..be5b4236ca45 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-08-12 21:01:27.000000000 +0200 -+++ ./base/process/memory_unittest.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/process/memory_unittest.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/process/memory_unittest.cc 2014-08-22 15:06:24.000000000 +0200 @@ -151,9 +151,9 @@ // Android doesn't implement set_new_handler, so we can't use the 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 93c0b7f7b3f2..d09bdacdadbc 100644 --- a/www/chromium/files/patch-base__process__process_iterator_freebsd.cc +++ b/www/chromium/files/patch-base__process__process_iterator_freebsd.cc @@ -1,5 +1,5 @@ ---- ./base/process/process_iterator_freebsd.cc.orig 2014-08-12 21:01:27.000000000 +0200 -+++ ./base/process/process_iterator_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/process/process_iterator_freebsd.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/process/process_iterator_freebsd.cc 2014-08-22 15:06:24.000000000 +0200 @@ -8,6 +8,10 @@ #include <sys/sysctl.h> #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 e993a64b45f0..58a4f5457994 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-08-12 21:01:27.000000000 +0200 -+++ ./base/process/process_metrics.h 2014-08-13 09:56:56.000000000 +0200 +--- ./base/process/process_metrics.h.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/process/process_metrics.h 2014-08-22 15:06:24.000000000 +0200 @@ -17,6 +17,13 @@ #include "base/time/time.h" #include "base/values.h" @@ -14,7 +14,7 @@ #if defined(OS_MACOSX) #include <mach/mach.h> #endif -@@ -242,13 +249,17 @@ +@@ -246,13 +253,17 @@ // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. BASE_EXPORT int ParseProcStatCPU(const std::string& input); 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 f6e0df0aca38..27a904bc5110 100644 --- a/www/chromium/files/patch-base__process__process_metrics_freebsd.cc +++ b/www/chromium/files/patch-base__process__process_metrics_freebsd.cc @@ -1,5 +1,5 @@ ---- ./base/process/process_metrics_freebsd.cc.orig 2014-08-12 21:01:27.000000000 +0200 -+++ ./base/process/process_metrics_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/process/process_metrics_freebsd.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/process/process_metrics_freebsd.cc 2014-08-22 15:06:24.000000000 +0200 @@ -10,6 +10,9 @@ #include "base/sys_info.h" diff --git a/www/chromium/files/patch-base__security_unittest.cc b/www/chromium/files/patch-base__security_unittest.cc index c863a480994b..5e6d38cd6fbd 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-08-12 21:01:28.000000000 +0200 -+++ ./base/security_unittest.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/security_unittest.cc.orig 2014-08-20 21:02:42.000000000 +0200 ++++ ./base/security_unittest.cc 2014-08-22 15:06:24.000000000 +0200 @@ -160,7 +160,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 b5104ef3cc42..f1f5f83cc1fb 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-08-12 21:01:27.000000000 +0200 -+++ ./base/strings/safe_sprintf.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/strings/safe_sprintf.cc.orig 2014-08-20 21:02:42.000000000 +0200 ++++ ./base/strings/safe_sprintf.cc 2014-08-22 15:06:24.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 319855663abf..1c2eaff505b7 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-08-12 21:01:28.000000000 +0200 -+++ ./base/sys_info_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/sys_info_freebsd.cc.orig 2014-08-20 21:02:42.000000000 +0200 ++++ ./base/sys_info_freebsd.cc 2014-08-22 15:06:24.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 7d281280506d..7aa60420f8bf 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-08-12 21:01:28.000000000 +0200 -+++ ./base/sys_info_posix.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/sys_info_posix.cc.orig 2014-08-20 21:02:42.000000000 +0200 ++++ ./base/sys_info_posix.cc 2014-08-22 15:06:24.000000000 +0200 @@ -64,7 +64,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 b2b614088efb..4784145e9109 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-08-12 21:01:28.000000000 +0200 -+++ ./base/test/expectations/expectation.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/test/expectations/expectation.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/test/expectations/expectation.cc 2014-08-22 15:06:24.000000000 +0200 @@ -60,6 +60,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 5c0569a057ef..a187f386bb18 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-08-12 21:01:28.000000000 +0200 -+++ ./base/test/launcher/test_launcher.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -40,6 +40,10 @@ +--- ./base/test/launcher/test_launcher.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/test/launcher/test_launcher.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -41,6 +41,10 @@ #include "base/mac/scoped_nsautorelease_pool.h" #endif @@ -10,4 +10,4 @@ + namespace base { - // See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nkdTP7sstSc/uT3FaE_sgkAJ . + // Launches a child process using |command_line|. If the child process is still 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 66c52d30a68d..0f317abe4f44 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-08-12 21:01:27.000000000 +0200 -+++ ./base/threading/platform_thread_linux.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/threading/platform_thread_linux.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/threading/platform_thread_linux.cc 2014-08-22 15:06:24.000000000 +0200 @@ -16,7 +16,9 @@ #include "base/tracked_objects.h" diff --git a/www/chromium/files/patch-breakpad__breakpad.gyp b/www/chromium/files/patch-breakpad__breakpad.gyp index 0c06bbe56b05..0dc7ed16fae5 100644 --- a/www/chromium/files/patch-breakpad__breakpad.gyp +++ b/www/chromium/files/patch-breakpad__breakpad.gyp @@ -1,5 +1,5 @@ ---- ./breakpad/breakpad.gyp.orig 2014-08-12 21:02:55.000000000 +0200 -+++ ./breakpad/breakpad.gyp 2014-08-13 09:56:56.000000000 +0200 +--- ./breakpad/breakpad.gyp.orig 2014-08-20 21:02:30.000000000 +0200 ++++ ./breakpad/breakpad.gyp 2014-08-22 15:06:24.000000000 +0200 @@ -340,7 +340,7 @@ }, ], diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi index 94bcad570f7f..ba2473963b2e 100644 --- a/www/chromium/files/patch-build__common.gypi +++ b/www/chromium/files/patch-build__common.gypi @@ -1,15 +1,15 @@ ---- ./build/common.gypi.orig 2014-08-12 21:02:52.000000000 +0200 -+++ ./build/common.gypi 2014-08-13 09:56:56.000000000 +0200 -@@ -101,7 +101,7 @@ - # - # TODO(erg): Merge this into the previous block once compiling with - # aura safely implies including ash capabilities. -- ['OS=="linux"', { -+ ['OS=="linux" or OS=="freebsd"', { +--- ./build/common.gypi.orig 2014-08-20 21:02:29.000000000 +0200 ++++ ./build/common.gypi 2014-08-22 15:06:24.000000000 +0200 +@@ -87,7 +87,7 @@ + + 'conditions': [ + # ChromeOS and Windows use Aura and Ash. +- ['chromeos==1 or OS=="win" or OS=="linux"', { ++ ['chromeos==1 or OS=="win" or OS=="linux" or OS=="freebsd"', { + 'use_ash%': 1, 'use_aura%': 1, }], - -@@ -622,7 +622,7 @@ +@@ -645,7 +645,7 @@ }], # DBus usage. @@ -18,7 +18,7 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -896,7 +896,7 @@ +@@ -926,7 +926,7 @@ # except when building Android WebView. # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). # Set the data reduction proxy origin for Android Webview. @@ -27,17 +27,18 @@ 'icu_use_data_file_flag%' : 1, 'spdy_proxy_auth_origin%': '', 'data_reduction_proxy_probe_url%': '', -@@ -1106,6 +1106,9 @@ +@@ -1153,6 +1153,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, ++ # XXX(rene) More options, keep them? + 'os_ver%': 0, + '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. -@@ -3960,6 +3963,13 @@ +@@ -4150,6 +4154,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], diff --git a/www/chromium/files/patch-build__filename_rules.gypi b/www/chromium/files/patch-build__filename_rules.gypi index d26c7e46e7e0..1b28c26d8624 100644 --- a/www/chromium/files/patch-build__filename_rules.gypi +++ b/www/chromium/files/patch-build__filename_rules.gypi @@ -1,5 +1,5 @@ ---- ./build/filename_rules.gypi.orig 2014-08-12 21:02:52.000000000 +0200 -+++ ./build/filename_rules.gypi 2014-08-13 09:56:56.000000000 +0200 +--- ./build/filename_rules.gypi.orig 2014-08-20 21:02:29.000000000 +0200 ++++ ./build/filename_rules.gypi 2014-08-22 15:06:24.000000000 +0200 @@ -85,7 +85,7 @@ ['<(use_aura)==0 or OS!="win" or >(nacl_untrusted_build)==1', { 'sources/': [ ['exclude', '_aurawin\\.(h|cc)$'] ] diff --git a/www/chromium/files/patch-build__linux__system.gyp b/www/chromium/files/patch-build__linux__system.gyp index cd9bfb4eb4ce..4e872b96b436 100644 --- a/www/chromium/files/patch-build__linux__system.gyp +++ b/www/chromium/files/patch-build__linux__system.gyp @@ -1,6 +1,6 @@ ---- ./build/linux/system.gyp.orig 2014-08-12 21:02:52.000000000 +0200 -+++ ./build/linux/system.gyp 2014-08-13 09:56:56.000000000 +0200 -@@ -885,6 +885,13 @@ +--- ./build/linux/system.gyp.orig 2014-08-20 21:02:29.000000000 +0200 ++++ ./build/linux/system.gyp 2014-08-22 15:06:24.000000000 +0200 +@@ -881,6 +881,13 @@ 'include_dirs': [ '../..', ], diff --git a/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp b/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp index cb47550a24de..630a4cfe2f0e 100644 --- a/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp +++ b/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp @@ -1,5 +1,5 @@ ---- ./build/linux/unbundle/libwebp.gyp.orig 2014-08-12 21:02:52.000000000 +0200 -+++ ./build/linux/unbundle/libwebp.gyp 2014-08-13 09:56:56.000000000 +0200 +--- ./build/linux/unbundle/libwebp.gyp.orig 2014-08-20 21:02:29.000000000 +0200 ++++ ./build/linux/unbundle/libwebp.gyp 2014-08-22 15:06:24.000000000 +0200 @@ -14,13 +14,7 @@ }, 'link_settings': { diff --git a/www/chromium/files/patch-build__linux__unbundle__openssl.gyp b/www/chromium/files/patch-build__linux__unbundle__openssl.gyp index 3492f02d91f6..25643a23a58f 100644 --- a/www/chromium/files/patch-build__linux__unbundle__openssl.gyp +++ b/www/chromium/files/patch-build__linux__unbundle__openssl.gyp @@ -1,5 +1,5 @@ ---- build/linux/unbundle/openssl.gyp.orig 2014-08-12 21:02:52.000000000 +0200 -+++ build/linux/unbundle/openssl.gyp 2014-08-18 17:16:23.000000000 +0200 +--- ./build/linux/unbundle/openssl.gyp.orig 2014-08-20 21:02:29.000000000 +0200 ++++ ./build/linux/unbundle/openssl.gyp 2014-08-22 15:06:24.000000000 +0200 @@ -9,15 +9,15 @@ 'type': 'none', 'direct_dependent_settings': { diff --git a/www/chromium/files/patch-cc__layers__layer_impl.cc b/www/chromium/files/patch-cc__layers__layer_impl.cc index 0de4e61f6d02..85afd46665a4 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-08-12 21:03:00.000000000 +0200 -+++ ./cc/layers/layer_impl.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -1215,21 +1215,23 @@ +--- ./cc/layers/layer_impl.cc.orig 2014-08-20 21:02:36.000000000 +0200 ++++ ./cc/layers/layer_impl.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -1190,21 +1190,23 @@ scale_factor * scaled_scroll_bounds.height()); scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds); 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 7fdbc736cf86..9284576fdbe7 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-08-12 21:02:25.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/app/chrome_main_delegate.cc.orig 2014-08-20 21:01:26.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.cc 2014-08-22 15:06:24.000000000 +0200 @@ -96,7 +96,7 @@ #include "ui/base/x/x11_util.h" #endif @@ -18,7 +18,7 @@ base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; #endif -@@ -245,7 +245,7 @@ +@@ -226,7 +226,7 @@ // Needed for scrollbar related images. process_type == switches::kWorkerProcess || #endif @@ -27,7 +27,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -459,7 +459,7 @@ +@@ -440,7 +440,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -36,7 +36,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -500,7 +500,7 @@ +@@ -491,7 +491,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -45,7 +45,7 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -632,7 +632,7 @@ +@@ -621,7 +621,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -54,30 +54,30 @@ breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); #endif -@@ -757,7 +757,7 @@ +@@ -743,7 +743,7 @@ #endif } -#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -769,7 +769,7 @@ +@@ -755,7 +755,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) ++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -854,7 +854,7 @@ +@@ -840,7 +840,7 @@ return process_type == switches::kNaClLoaderProcess || process_type == switches::kRelauncherProcess; } -#elif defined(OS_POSIX) && !defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) - content::ZygoteForkDelegate* ChromeMainDelegate::ZygoteStarting() { - #if defined(DISABLE_NACL) - return NULL; + void ChromeMainDelegate::ZygoteStarting( + ScopedVector<content::ZygoteForkDelegate>* delegates) { + #if !defined(DISABLE_NACL) 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 9381efcc77f0..c0fc34899a90 100644 --- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.h +++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.h @@ -1,11 +1,11 @@ ---- ./chrome/app/chrome_main_delegate.h.orig 2014-08-12 21:02:25.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.h 2014-08-13 09:56:56.000000000 +0200 -@@ -35,7 +35,7 @@ +--- ./chrome/app/chrome_main_delegate.h.orig 2014-08-20 21:01:26.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.h 2014-08-22 15:06:24.000000000 +0200 +@@ -38,7 +38,7 @@ virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; virtual bool DelaySandboxInitialization( const std::string& process_type) OVERRIDE; -#elif defined(OS_POSIX) && !defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) - virtual content::ZygoteForkDelegate* ZygoteStarting() OVERRIDE; + virtual void ZygoteStarting( + ScopedVector<content::ZygoteForkDelegate>* delegates) OVERRIDE; virtual void ZygoteForked() OVERRIDE; - #endif diff --git a/www/chromium/files/patch-chrome__app__chromium_strings.grd b/www/chromium/files/patch-chrome__app__chromium_strings.grd index 9dceb862ba27..559b6d3a6e5d 100644 --- a/www/chromium/files/patch-chrome__app__chromium_strings.grd +++ b/www/chromium/files/patch-chrome__app__chromium_strings.grd @@ -1,6 +1,6 @@ ---- ./chrome/app/chromium_strings.grd.orig 2014-08-12 21:02:25.000000000 +0200 -+++ ./chrome/app/chromium_strings.grd 2014-08-13 09:56:56.000000000 +0200 -@@ -1099,7 +1099,7 @@ +--- ./chrome/app/chromium_strings.grd.orig 2014-08-20 21:01:26.000000000 +0200 ++++ ./chrome/app/chromium_strings.grd 2014-08-22 15:06:24.000000000 +0200 +@@ -1102,7 +1102,7 @@ </message> <!-- ProcessSingleton --> diff --git a/www/chromium/files/patch-chrome__app__resources__locale_settings.grd b/www/chromium/files/patch-chrome__app__resources__locale_settings.grd new file mode 100644 index 000000000000..acb543118ccd --- /dev/null +++ b/www/chromium/files/patch-chrome__app__resources__locale_settings.grd @@ -0,0 +1,11 @@ +--- ./chrome/app/resources/locale_settings.grd.orig 2014-08-20 21:01:26.000000000 +0200 ++++ ./chrome/app/resources/locale_settings.grd 2014-08-23 15:49:37.000000000 +0200 +@@ -264,7 +264,7 @@ + 55 + </message> + +- <if expr="is_win or is_linux or chromeos"> ++ <if expr="is_win or is_linux or chromeos or is_bsd"> + <!-- The width of the ash/ChromeOS system tray menu in pixels. --> + <message name="IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS" use_name_for_id="true"> + 300 diff --git a/www/chromium/files/patch-chrome__browser__about_flags.cc b/www/chromium/files/patch-chrome__browser__about_flags.cc index 6982b1545635..6867ad730dca 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-08-12 21:01:48.000000000 +0200 -+++ ./chrome/browser/about_flags.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -2183,7 +2183,7 @@ +--- ./chrome/browser/about_flags.cc.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/about_flags.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -2263,7 +2263,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 90c50221b3dc..30279a6c96e3 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-08-12 21:01:48.000000000 +0200 -+++ ./chrome/browser/browser_process_impl.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -239,7 +239,7 @@ +--- ./chrome/browser/browser_process_impl.cc.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/browser_process_impl.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -248,7 +248,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 45799dbc79e0..f2225ad5a254 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-08-12 21:01:47.000000000 +0200 -+++ ./chrome/browser/chrome_browser_main.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -926,7 +926,7 @@ +--- ./chrome/browser/chrome_browser_main.cc.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/chrome_browser_main.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -925,7 +925,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 11a9be705f5a..7550e7c0e504 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,6 +1,6 @@ ---- ./chrome/browser/chrome_browser_main_posix.cc.orig 2014-08-12 21:01:48.000000000 +0200 -+++ ./chrome/browser/chrome_browser_main_posix.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -305,6 +305,11 @@ +--- ./chrome/browser/chrome_browser_main_posix.cc.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/chrome_browser_main_posix.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -270,6 +270,11 @@ g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; g_shutdown_pipe_write_fd = pipefd[1]; @@ -12,7 +12,7 @@ #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS) const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; #else -@@ -313,6 +318,7 @@ +@@ -278,6 +283,7 @@ // size to avoid hitting the guard page. const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; #endif 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 04e415e2b7e6..1f0f05746186 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-08-12 21:01:48.000000000 +0200 -+++ ./chrome/browser/chrome_content_browser_client.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -492,7 +492,7 @@ +--- ./chrome/browser/chrome_content_browser_client.cc.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/chrome_content_browser_client.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -509,7 +509,7 @@ } } @@ -9,7 +9,7 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -548,7 +548,7 @@ +@@ -566,7 +566,7 @@ return -1; } @@ -18,7 +18,7 @@ #endif // !defined(OS_ANDROID) #if !defined(OS_CHROMEOS) -@@ -1459,7 +1459,7 @@ +@@ -1533,7 +1533,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( CommandLine* command_line, int child_process_id) { @@ -27,7 +27,7 @@ if (breakpad::IsCrashReporterEnabled()) { std::string enable_crash_reporter; GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter); -@@ -2563,7 +2563,7 @@ +@@ -2683,7 +2683,7 @@ #endif } @@ -36,7 +36,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const CommandLine& command_line, int child_process_id, -@@ -2617,7 +2617,7 @@ +@@ -2749,7 +2749,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 b8b26fb245f2..9aef82e08f9b 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,8 +1,8 @@ ---- ./chrome/browser/chrome_content_browser_client.h.orig 2014-08-12 21:01:48.000000000 +0200 -+++ ./chrome/browser/chrome_content_browser_client.h 2014-08-13 09:56:56.000000000 +0200 -@@ -260,7 +260,7 @@ - const base::FilePath& storage_partition_path, - ScopedVector<fileapi::FileSystemBackend>* additional_backends) OVERRIDE; +--- ./chrome/browser/chrome_content_browser_client.h.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/chrome_content_browser_client.h 2014-08-22 15:06:24.000000000 +0200 +@@ -288,7 +288,7 @@ + virtual net::CookieStore* OverrideCookieStoreForRenderProcess( + int render_process_id) OVERRIDE; -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) 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 ece47c907bf6..c401b7c8fd1e 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-08-12 21:01:46.000000000 +0200 -+++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-08-20 21:02:00.000000000 +0200 ++++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-08-22 15:06:24.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 0d0b435f90d0..b65f51cb371c 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-08-12 21:01:46.000000000 +0200 -+++ ./chrome/browser/diagnostics/diagnostics_writer.h 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-08-20 21:02:00.000000000 +0200 ++++ ./chrome/browser/diagnostics/diagnostics_writer.h 2014-08-22 15:06:24.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 c828b2f4640e..6cc4c7db5aae 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,5 +1,5 @@ ---- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-08-12 21:01:44.000000000 +0200 -+++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-08-20 21:01:58.000000000 +0200 ++++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2014-08-22 15:06:24.000000000 +0200 @@ -167,10 +167,12 @@ } 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 1a1c3448f9b0..8e0c3a7577eb 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-08-12 21:01:44.000000000 +0200 -+++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-08-20 21:01:57.000000000 +0200 ++++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-08-22 15:06:24.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 87a42f0f2ce9..546fd8014c11 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,18 +1,15 @@ ---- ./chrome/browser/extensions/api/serial/serial_api.cc.orig 2014-08-12 21:01:44.000000000 +0200 -+++ ./chrome/browser/extensions/api/serial/serial_api.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -84,7 +84,7 @@ - +--- ./chrome/browser/extensions/api/serial/serial_api.cc.orig 2014-08-20 21:01:58.000000000 +0200 ++++ ./chrome/browser/extensions/api/serial/serial_api.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -85,11 +85,13 @@ void SerialGetDevicesFunction::Work() { DCHECK_CURRENTLY_ON(BrowserThread::FILE); -- + +#if !defined(OS_FREEBSD) //XXX(rene) quick hack - device::SerialDeviceInfoList devices; scoped_ptr<device::SerialDeviceEnumerator> enumerator = device::SerialDeviceEnumerator::Create(); -@@ -106,6 +106,7 @@ - } - - results_ = serial::GetDevices::Results::Create(out_devices); + mojo::Array<device::SerialDeviceInfoPtr> devices = enumerator->GetDevices(); + results_ = serial::GetDevices::Results::Create( + devices.To<std::vector<linked_ptr<serial::DeviceInfo> > >()); +#endif } 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 79f2beaa61a8..eb175647068f 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-08-12 21:01:44.000000000 +0200 -+++ ./chrome/browser/extensions/api/serial/serial_connection_posix.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2014-08-20 21:01:58.000000000 +0200 ++++ ./chrome/browser/extensions/api/serial/serial_connection_posix.cc 2014-08-22 15:06:24.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 a174756b6f4e..f94b12b6de6a 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-08-12 21:01:33.000000000 +0200 -+++ ./chrome/browser/gpu/gl_string_manager.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/gpu/gl_string_manager.cc.orig 2014-08-20 21:02:06.000000000 +0200 ++++ ./chrome/browser/gpu/gl_string_manager.cc 2014-08-22 15:06:24.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 badb103b890a..1fffd9567753 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-08-12 21:01:33.000000000 +0200 -+++ ./chrome/browser/gpu/gpu_feature_checker.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-08-20 21:02:06.000000000 +0200 ++++ ./chrome/browser/gpu/gpu_feature_checker.cc 2014-08-22 15:06:24.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 0299a81a64cd..555c764d71be 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-08-12 21:01:33.000000000 +0200 -+++ ./chrome/browser/media/webrtc_log_uploader.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -196,6 +196,8 @@ +--- ./chrome/browser/media/webrtc_log_uploader.cc.orig 2014-08-20 21:02:12.000000000 +0200 ++++ ./chrome/browser/media/webrtc_log_uploader.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -233,6 +233,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 ea8128a82bad..8f7191df4d8e 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-08-12 21:01:32.000000000 +0200 -+++ ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-08-20 21:01:59.000000000 +0200 ++++ ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc 2014-08-22 15:06:24.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 8d0ae092256f..53e0c76e5340 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,5 +1,5 @@ ---- ./chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-08-12 21:01:33.000000000 +0200 -+++ ./chrome/browser/media_galleries/media_file_system_registry.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-08-20 21:01:59.000000000 +0200 ++++ ./chrome/browser/media_galleries/media_file_system_registry.cc 2014-08-22 15:06:24.000000000 +0200 @@ -724,7 +724,10 @@ // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() 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 index 5685f191af33..b131389b3de4 100644 --- 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 @@ -1,5 +1,5 @@ ---- ./chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-08-12 21:01:33.000000000 +0200 -+++ ./chrome/browser/media_galleries/media_folder_finder.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-08-20 21:01:59.000000000 +0200 ++++ ./chrome/browser/media_galleries/media_folder_finder.cc 2014-08-22 15:06:24.000000000 +0200 @@ -50,10 +50,10 @@ chrome::DIR_USER_APPLICATIONS, chrome::DIR_USER_LIBRARY, diff --git a/www/chromium/files/patch-chrome__browser__memory_details.cc b/www/chromium/files/patch-chrome__browser__memory_details.cc index 717588a987ca..bc2e112b791b 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-08-12 21:01:47.000000000 +0200 -+++ ./chrome/browser/memory_details.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/memory_details.cc.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/memory_details.cc 2014-08-22 15:06:25.000000000 +0200 @@ -32,7 +32,7 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -16,9 +16,9 @@ -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid(); - const pid_t sandbox_helper_pid = - content::ZygoteHost::GetInstance()->GetSandboxHelperPid(); -@@ -336,7 +336,7 @@ + #endif + +@@ -334,7 +334,7 @@ } } @@ -26,4 +26,4 @@ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) if (process.pid == zygote_pid) { process.process_type = content::PROCESS_TYPE_ZYGOTE; - } else if (process.pid == sandbox_helper_pid) { + } 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 52cb0fce8a71..687bd50fac17 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-08-12 21:01:39.000000000 +0200 -+++ ./chrome/browser/net/connection_tester.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -213,7 +213,7 @@ +--- ./chrome/browser/net/connection_tester.cc.orig 2014-08-20 21:02:09.000000000 +0200 ++++ ./chrome/browser/net/connection_tester.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -217,7 +217,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 97879d89b089..b68d974e4b3e 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-08-12 21:01:47.000000000 +0200 -+++ ./chrome/browser/omaha_query_params/omaha_query_params.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/omaha_query_params/omaha_query_params.cc.orig 2014-08-20 21:02:00.000000000 +0200 ++++ ./chrome/browser/omaha_query_params/omaha_query_params.cc 2014-08-22 15:06:25.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 1c8ec7b90037..f89454f4d74e 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-08-12 21:01:47.000000000 +0200 -+++ ./chrome/browser/plugins/plugins_resource_service.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/plugins/plugins_resource_service.cc.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/plugins/plugins_resource_service.cc 2014-08-22 15:06:25.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 index 752a790f3801..0b862ebbf4ce 100644 --- a/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc +++ b/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-08-12 21:01:40.000000000 +0200 -+++ ./chrome/browser/policy/policy_prefs_browsertest.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-08-20 21:02:01.000000000 +0200 ++++ ./chrome/browser/policy/policy_prefs_browsertest.cc 2014-08-22 15:06:25.000000000 +0200 @@ -169,6 +169,8 @@ const std::string os("chromeos"); #elif defined(OS_LINUX) diff --git a/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc b/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc index 481591eee1d1..7cbfe8b71476 100644 --- a/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc +++ b/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/ui/startup/startup_browser_creator.cc.orig 2014-08-12 21:01:35.000000000 +0200 -+++ ./chrome/browser/ui/startup/startup_browser_creator.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/ui/startup/startup_browser_creator.cc.orig 2014-08-20 21:02:04.000000000 +0200 ++++ ./chrome/browser/ui/startup/startup_browser_creator.cc 2014-08-22 15:06:25.000000000 +0200 @@ -81,7 +81,7 @@ #include "chromeos/chromeos_switches.h" #endif diff --git a/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc b/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc index 07e98d131cd9..6bc9c2e3fb70 100644 --- a/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc +++ b/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/ui/views/first_run_dialog.cc.orig 2014-08-12 21:01:38.000000000 +0200 -+++ ./chrome/browser/ui/views/first_run_dialog.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/ui/views/first_run_dialog.cc.orig 2014-08-20 21:02:04.000000000 +0200 ++++ ./chrome/browser/ui/views/first_run_dialog.cc 2014-08-22 15:06:25.000000000 +0200 @@ -124,12 +124,16 @@ bool FirstRunDialog::Accept() { GetWidget()->Hide(); 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 2b5a82a3074b..e9ccde8c14fa 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-08-12 21:01:37.000000000 +0200 -+++ ./chrome/browser/ui/webui/about_ui.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -763,7 +763,7 @@ +--- ./chrome/browser/ui/webui/about_ui.cc.orig 2014-08-20 21:02:03.000000000 +0200 ++++ ./chrome/browser/ui/webui/about_ui.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -761,7 +761,7 @@ return data; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -779,6 +779,7 @@ +@@ -777,6 +777,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>"); -@@ -849,6 +850,7 @@ +@@ -847,6 +848,7 @@ return data; } #endif @@ -25,7 +25,7 @@ // AboutMemoryHandler ---------------------------------------------------------- -@@ -1019,7 +1021,7 @@ +@@ -1017,7 +1019,7 @@ } else if (source_name_ == chrome::kChromeUIDNSHost) { AboutDnsHandler::Start(profile(), callback); return; 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 6562084ea7f8..6b681e50e053 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-08-12 21:01:37.000000000 +0200 -+++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -488,7 +488,7 @@ +--- ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2014-08-20 21:02:03.000000000 +0200 ++++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -493,7 +493,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 7a95d54cee08..8dc1de76113c 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-08-12 21:01:37.000000000 +0200 -+++ ./chrome/browser/ui/webui/options/browser_options_handler.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -333,7 +333,8 @@ +--- ./chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2014-08-20 21:02:02.000000000 +0200 ++++ ./chrome/browser/ui/webui/options/browser_options_handler.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -332,7 +332,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 }, -@@ -640,7 +641,8 @@ +@@ -647,7 +648,8 @@ "requestProfilesInfo", base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo, base::Unretained(this))); @@ -20,17 +20,17 @@ web_ui()->RegisterMessageCallback( "themesSetNative", base::Bind(&BrowserOptionsHandler::ThemesSetNative, -@@ -1269,7 +1271,8 @@ +@@ -1272,7 +1274,8 @@ ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); - bool is_native_theme = false; + bool is_system_theme = false; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ + !defined(OS_ANDROID) - bool profile_is_managed = profile->IsManaged(); - is_native_theme = theme_service->UsingNativeTheme(); - base::FundamentalValue native_theme_enabled(!is_native_theme && -@@ -1291,7 +1294,8 @@ + bool profile_is_supervised = profile->IsSupervised(); + is_system_theme = theme_service->UsingSystemTheme(); + base::FundamentalValue native_theme_enabled(!is_system_theme && +@@ -1294,7 +1297,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 9842296832e2..8cdbfd218155 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,5 +1,5 @@ ---- ./chrome/browser/ui/webui/options/browser_options_handler.h.orig 2014-08-12 21:01:37.000000000 +0200 -+++ ./chrome/browser/ui/webui/options/browser_options_handler.h 2014-08-13 09:56:57.000000000 +0200 +--- ./chrome/browser/ui/webui/options/browser_options_handler.h.orig 2014-08-20 21:02:02.000000000 +0200 ++++ ./chrome/browser/ui/webui/options/browser_options_handler.h 2014-08-22 15:06:25.000000000 +0200 @@ -197,7 +197,8 @@ void ObserveThemeChanged(); 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 f61ca44088a9..171cea600d4f 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,6 +1,6 @@ ---- ./chrome/browser/web_applications/web_app.cc.orig 2014-08-12 21:01:47.000000000 +0200 -+++ ./chrome/browser/web_applications/web_app.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -472,7 +472,7 @@ +--- ./chrome/browser/web_applications/web_app.cc.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/web_applications/web_app.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -441,7 +441,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 bfbe7eb180d8..66de6ad23546 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,7 +1,7 @@ ---- ./chrome/browser/web_applications/web_app.h.orig 2014-08-12 21:01:47.000000000 +0200 -+++ ./chrome/browser/web_applications/web_app.h 2014-08-13 09:56:57.000000000 +0200 -@@ -188,7 +188,7 @@ - IconInfoList* icons); +--- ./chrome/browser/web_applications/web_app.h.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/web_applications/web_app.h 2014-08-22 15:06:25.000000000 +0200 +@@ -193,7 +193,7 @@ + void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons); #endif -#if defined(OS_LINUX) diff --git a/www/chromium/files/patch-chrome__chrome_browser.gypi b/www/chromium/files/patch-chrome__chrome_browser.gypi index 226bdad96233..c0e6c83a5fe1 100644 --- a/www/chromium/files/patch-chrome__chrome_browser.gypi +++ b/www/chromium/files/patch-chrome__chrome_browser.gypi @@ -1,6 +1,6 @@ ---- ./chrome/chrome_browser.gypi.orig 2014-08-12 21:02:25.000000000 +0200 -+++ ./chrome/chrome_browser.gypi 2014-08-13 09:56:57.000000000 +0200 -@@ -2923,7 +2923,7 @@ +--- ./chrome/chrome_browser.gypi.orig 2014-08-20 21:02:14.000000000 +0200 ++++ ./chrome/chrome_browser.gypi 2014-08-22 15:06:25.000000000 +0200 +@@ -2979,7 +2979,7 @@ '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', ], }], @@ -9,7 +9,7 @@ 'dependencies': [ '../build/linux/system.gyp:libspeechd', ], -@@ -3046,7 +3046,7 @@ +@@ -3106,7 +3106,7 @@ '../build/linux/system.gyp:xscrnsaver', ], }], @@ -18,7 +18,7 @@ 'sources': [ 'app/chrome_breakpad_client.cc', 'app/chrome_breakpad_client.h', -@@ -3281,6 +3281,13 @@ +@@ -3365,6 +3365,13 @@ ['exclude', '^third_party/mozilla_security_manager/'], ], }], @@ -32,7 +32,7 @@ ['OS=="mac"', { 'dependencies': [ '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', -@@ -3390,7 +3397,7 @@ +@@ -3465,7 +3472,7 @@ }], ], }], diff --git a/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi b/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi index 8dcd4a81332d..ae9bfa32fcf8 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-08-12 21:02:25.000000000 +0200 -+++ ./chrome/chrome_browser_extensions.gypi 2014-08-13 09:56:57.000000000 +0200 -@@ -921,6 +921,11 @@ +--- ./chrome/chrome_browser_extensions.gypi.orig 2014-08-20 21:02:14.000000000 +0200 ++++ ./chrome/chrome_browser_extensions.gypi 2014-08-22 15:06:25.000000000 +0200 +@@ -958,6 +958,11 @@ 'browser/extensions/window_controller_list_observer.h', ], 'conditions': [ diff --git a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi index 9ce3be250c12..b24cb7627a6d 100644 --- a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi +++ b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi @@ -1,15 +1,15 @@ ---- ./chrome/chrome_browser_ui.gypi.orig 2014-08-12 21:02:25.000000000 +0200 -+++ ./chrome/chrome_browser_ui.gypi 2014-08-13 09:56:57.000000000 +0200 -@@ -2665,7 +2665,7 @@ +--- ./chrome/chrome_browser_ui.gypi.orig 2014-08-20 21:02:14.000000000 +0200 ++++ ./chrome/chrome_browser_ui.gypi 2014-08-22 15:06:25.000000000 +0200 +@@ -2673,7 +2673,7 @@ 'browser/ui/views/message_center/web_notification_tray.cc', ], }], -- ['use_aura==1 and use_ash==0 and use_ozone==0 and OS=="linux"', { -+ ['use_aura==1 and use_ash==0 and use_ozone==0 and (OS=="linux" or os_bsd==1)', { +- ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', { ++ ['use_aura==1 and chromeos==0 and use_ozone==0 and (OS=="linux" or os_bsd==1)', { 'dependencies': [ # gtk2 is the only component that can interact with gtk2 in our new # world. -@@ -2673,7 +2673,7 @@ +@@ -2681,7 +2681,7 @@ '../build/linux/system.gyp:gio', ], }], @@ -18,7 +18,7 @@ 'sources!': [ 'browser/ui/views/first_run_dialog.cc', 'browser/ui/views/first_run_dialog.h', -@@ -3042,7 +3042,7 @@ +@@ -3047,7 +3047,7 @@ }], ], }], @@ -27,7 +27,7 @@ 'conditions': [ ['use_aura==1', { 'dependencies': [ -@@ -3135,7 +3135,7 @@ +@@ -3140,7 +3140,7 @@ 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h', ], }], diff --git a/www/chromium/files/patch-chrome__chrome_tests.gypi b/www/chromium/files/patch-chrome__chrome_tests.gypi deleted file mode 100644 index 5b97b3766514..000000000000 --- a/www/chromium/files/patch-chrome__chrome_tests.gypi +++ /dev/null @@ -1,11 +0,0 @@ ---- ./chrome/chrome_tests.gypi.orig 2014-08-12 21:02:25.000000000 +0200 -+++ ./chrome/chrome_tests.gypi 2014-08-13 09:56:57.000000000 +0200 -@@ -1548,7 +1548,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__common__chrome_paths.cc b/www/chromium/files/patch-chrome__common__chrome_paths.cc index eac5cea3b606..5bafb63e3637 100644 --- a/www/chromium/files/patch-chrome__common__chrome_paths.cc +++ b/www/chromium/files/patch-chrome__common__chrome_paths.cc @@ -1,6 +1,6 @@ ---- ./chrome/common/chrome_paths.cc.orig 2014-08-12 21:02:17.000000000 +0200 -+++ ./chrome/common/chrome_paths.cc 2014-08-13 09:57:00.000000000 +0200 -@@ -471,10 +471,12 @@ +--- ./chrome/common/chrome_paths.cc.orig 2014-08-20 21:01:56.000000000 +0200 ++++ ./chrome/common/chrome_paths.cc 2014-08-22 15:06:27.000000000 +0200 +@@ -469,10 +469,12 @@ if (!base::PathExists(cur)) // We don't want to create this return false; break; @@ -14,21 +14,31 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -552,7 +554,7 @@ +@@ -550,7 +552,7 @@ #endif break; -#if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) || (defined(OS_MACOSX) && !defined(OS_IOS)) ++#if defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_MACOSX) && !defined(OS_IOS)) case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) #if defined(GOOGLE_CHROME_BUILD) -@@ -578,7 +580,7 @@ +@@ -564,6 +566,9 @@ + #if defined(GOOGLE_CHROME_BUILD) + cur = base::FilePath(FILE_PATH_LITERAL( + "/etc/opt/chrome/native-messaging-hosts")); ++#elif defined(OS_BSD) ++ cur = base::FilePath(FILE_PATH_LITERAL( ++ "/usr/local/etc/chrome/native-messaging-hosts")); + #else + cur = base::FilePath(FILE_PATH_LITERAL( + "/etc/chromium/native-messaging-hosts")); +@@ -576,7 +581,7 @@ return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; -#endif // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) -+#endif // defined(OS_LINUX) || defined(OS_FREEBSD) || (defined(OS_MACOSX) && !defined(OS_IOS)) - - default: - return false; ++#endif // defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_MACOSX) && !defined(OS_IOS)) + #if !defined(OS_ANDROID) + case chrome::DIR_GLOBAL_GCM_STORE: + if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.h b/www/chromium/files/patch-chrome__common__chrome_paths.h index cff08aac2524..dc664418824a 100644 --- a/www/chromium/files/patch-chrome__common__chrome_paths.h +++ b/www/chromium/files/patch-chrome__common__chrome_paths.h @@ -1,11 +1,11 @@ ---- ./chrome/common/chrome_paths.h.orig 2014-08-12 21:02:17.000000000 +0200 -+++ ./chrome/common/chrome_paths.h 2014-08-13 09:56:57.000000000 +0200 -@@ -116,7 +116,7 @@ - // files to be installed when managed user - // session starts. - +--- ./chrome/common/chrome_paths.h.orig 2014-08-20 21:01:56.000000000 +0200 ++++ ./chrome/common/chrome_paths.h 2014-08-22 15:06:25.000000000 +0200 +@@ -115,7 +115,7 @@ + DIR_SUPERVISED_USERS_DEFAULT_APPS, // Directory where installer places .crx + // files to be installed when managed user + // session starts. -#if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) || (defined(OS_MACOSX) && !defined(OS_IOS)) ++#if defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_MACOSX) && !defined(OS_IOS)) DIR_NATIVE_MESSAGING, // System directory where native messaging host // manifest files are stored. DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts diff --git a/www/chromium/files/patch-chrome__common__chrome_switches.cc b/www/chromium/files/patch-chrome__common__chrome_switches.cc index 92ba65bd4baa..e4ea5685fb70 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-08-12 21:02:17.000000000 +0200 -+++ ./chrome/common/chrome_switches.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -1375,7 +1375,7 @@ +--- ./chrome/common/chrome_switches.cc.orig 2014-08-20 21:01:56.000000000 +0200 ++++ ./chrome/common/chrome_switches.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -1319,7 +1319,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. -@@ -1386,7 +1386,7 @@ +@@ -1330,7 +1330,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 5d0a5f7d068d..2c155ea0da03 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-08-12 21:02:17.000000000 +0200 -+++ ./chrome/common/chrome_switches.h 2014-08-13 09:56:57.000000000 +0200 -@@ -386,7 +386,7 @@ +--- ./chrome/common/chrome_switches.h.orig 2014-08-20 21:01:56.000000000 +0200 ++++ ./chrome/common/chrome_switches.h 2014-08-22 15:06:25.000000000 +0200 +@@ -378,7 +378,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 8c640a40ddaf..43300cd093aa 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-08-12 21:02:17.000000000 +0200 -+++ ./chrome/common/pref_names.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -923,7 +923,7 @@ +--- ./chrome/common/pref_names.cc.orig 2014-08-20 21:01:56.000000000 +0200 ++++ ./chrome/common/pref_names.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -957,7 +957,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 9b3fe2602946..c65965ca6db2 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-08-12 21:02:17.000000000 +0200 -+++ ./chrome/common/pref_names.h 2014-08-13 09:56:57.000000000 +0200 -@@ -298,7 +298,7 @@ +--- ./chrome/common/pref_names.h.orig 2014-08-20 21:01:56.000000000 +0200 ++++ ./chrome/common/pref_names.h 2014-08-22 15:06:25.000000000 +0200 +@@ -304,7 +304,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 e8fd4b2e75d3..d3a711242be8 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-08-12 21:02:25.000000000 +0200 -+++ ./chrome/renderer/pepper/pepper_flash_font_file_host.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2014-08-20 21:02:14.000000000 +0200 ++++ ./chrome/renderer/pepper/pepper_flash_font_file_host.cc 2014-08-22 15:06:25.000000000 +0200 @@ -13,7 +13,7 @@ #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/serialized_structs.h" 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 c697e348f397..4cdfe5afb830 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,5 +1,5 @@ ---- ./chrome/renderer/printing/print_web_view_helper.h.orig 2014-08-12 21:02:25.000000000 +0200 -+++ ./chrome/renderer/printing/print_web_view_helper.h 2014-08-13 09:56:57.000000000 +0200 +--- ./chrome/renderer/printing/print_web_view_helper.h.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/renderer/printing/print_web_view_helper.h 2014-08-22 15:06:25.000000000 +0200 @@ -201,7 +201,7 @@ void FinishFramePrinting(); 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 5787c2db76a6..1984b0e07445 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-08-12 21:02:10.000000000 +0200 -+++ ./chrome/test/base/in_process_browser_test.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./chrome/test/base/in_process_browser_test.cc.orig 2014-08-20 21:01:48.000000000 +0200 ++++ ./chrome/test/base/in_process_browser_test.cc 2014-08-22 15:06:25.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 0c672f956b63..93a06024307b 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,6 +1,6 @@ ---- ./chrome/test/base/testing_browser_process.h.orig 2014-08-12 21:02:10.000000000 +0200 -+++ ./chrome/test/base/testing_browser_process.h 2014-08-13 09:56:57.000000000 +0200 -@@ -100,8 +100,8 @@ +--- ./chrome/test/base/testing_browser_process.h.orig 2014-08-20 21:01:48.000000000 +0200 ++++ ./chrome/test/base/testing_browser_process.h 2014-08-22 15:06:25.000000000 +0200 +@@ -105,8 +105,8 @@ virtual DownloadStatusUpdater* download_status_updater() OVERRIDE; virtual DownloadRequestLimiter* download_request_limiter() 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 index c8cc5e8e8c6d..934932905836 100644 --- a/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc +++ b/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc @@ -1,5 +1,5 @@ ---- ./chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2014-08-12 21:02:10.000000000 +0200 -+++ ./chrome/test/chromedriver/chrome/chrome_finder.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2014-08-20 21:01:27.000000000 +0200 ++++ ./chrome/test/chromedriver/chrome/chrome_finder.cc 2014-08-22 15:06:25.000000000 +0200 @@ -42,7 +42,7 @@ installation_locations[i].Append(L"Chromium\\Application")); } 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 1b992a7841d8..09520940a6f8 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-08-12 21:02:10.000000000 +0200 -+++ ./chrome/test/perf/perf_test.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./chrome/test/perf/perf_test.cc.orig 2014-08-20 21:01:27.000000000 +0200 ++++ ./chrome/test/perf/perf_test.cc 2014-08-22 15:06:25.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__tools__build__linux__sed.sh b/www/chromium/files/patch-chrome__tools__build__linux__sed.sh index 4743076512c7..ae71b11fb555 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-08-12 21:02:25.000000000 +0200 -+++ ./chrome/tools/build/linux/sed.sh 2014-08-13 09:56:57.000000000 +0200 +--- ./chrome/tools/build/linux/sed.sh.orig 2014-08-20 21:01:27.000000000 +0200 ++++ ./chrome/tools/build/linux/sed.sh 2014-08-22 15:06:25.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 24e567054f76..aeece673918b 100644 --- a/www/chromium/files/patch-components__policy__resources__policy_templates.json +++ b/www/chromium/files/patch-components__policy__resources__policy_templates.json @@ -1,5 +1,5 @@ ---- ./components/policy/resources/policy_templates.json.orig 2014-08-12 21:02:36.000000000 +0200 -+++ ./components/policy/resources/policy_templates.json 2014-08-13 09:56:57.000000000 +0200 +--- ./components/policy/resources/policy_templates.json.orig 2014-08-20 21:02:55.000000000 +0200 ++++ ./components/policy/resources/policy_templates.json 2014-08-22 15:06:25.000000000 +0200 @@ -1513,7 +1513,7 @@ 'name': 'GSSAPILibraryName', 'type': 'string', @@ -9,7 +9,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -3643,7 +3643,7 @@ +@@ -3697,7 +3697,7 @@ 'name': 'RequireOnlineRevocationChecksForLocalAnchors', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -4305,7 +4305,7 @@ +@@ -4377,7 +4377,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 103c99130c86..7b79cca14567 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-08-12 21:02:35.000000000 +0200 -+++ ./components/policy/tools/generate_policy_source.py 2014-08-13 09:56:57.000000000 +0200 +--- ./components/policy/tools/generate_policy_source.py.orig 2014-08-20 21:02:53.000000000 +0200 ++++ ./components/policy/tools/generate_policy_source.py 2014-08-22 15:06:25.000000000 +0200 @@ -66,7 +66,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 d94350e19591..7f114a8f1439 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-08-12 21:02:37.000000000 +0200 -+++ ./components/storage_monitor.gypi 2014-08-13 09:56:57.000000000 +0200 +--- ./components/storage_monitor.gypi.orig 2014-08-20 21:02:56.000000000 +0200 ++++ ./components/storage_monitor.gypi 2014-08-22 15:06:25.000000000 +0200 @@ -49,6 +49,24 @@ 'storage_monitor/volume_mount_watcher_win.h', ], 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 88606c6de649..1565b09496d4 100644 --- a/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc +++ b/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc @@ -1,5 +1,5 @@ ---- ./components/storage_monitor/storage_monitor.cc.orig 2014-08-12 21:02:37.000000000 +0200 -+++ ./components/storage_monitor/storage_monitor.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./components/storage_monitor/storage_monitor.cc.orig 2014-08-20 21:02:53.000000000 +0200 ++++ ./components/storage_monitor/storage_monitor.cc 2014-08-22 15:06:25.000000000 +0200 @@ -85,6 +85,7 @@ void StorageMonitor::EnsureInitialized(base::Closure callback) { 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 c915b3e3d083..20d037712d4a 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,5 +1,5 @@ ---- ./components/storage_monitor/storage_monitor_freebsd.cc.orig 2014-08-13 09:56:57.000000000 +0200 -+++ ./components/storage_monitor/storage_monitor_freebsd.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./components/storage_monitor/storage_monitor_freebsd.cc.orig 2014-08-22 15:06:25.000000000 +0200 ++++ ./components/storage_monitor/storage_monitor_freebsd.cc 2014-08-22 15:06:25.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 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 3cdc22276461..0bc47aa3d87a 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,5 +1,5 @@ ---- ./components/storage_monitor/storage_monitor_freebsd.h.orig 2014-08-13 09:56:57.000000000 +0200 -+++ ./components/storage_monitor/storage_monitor_freebsd.h 2014-08-13 09:56:57.000000000 +0200 +--- ./components/storage_monitor/storage_monitor_freebsd.h.orig 2014-08-22 15:06:25.000000000 +0200 ++++ ./components/storage_monitor/storage_monitor_freebsd.h 2014-08-22 15:06:25.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 diff --git a/www/chromium/files/patch-components__usb_service.gypi b/www/chromium/files/patch-components__usb_service.gypi index 5977c1168f86..00a9749a395a 100644 --- a/www/chromium/files/patch-components__usb_service.gypi +++ b/www/chromium/files/patch-components__usb_service.gypi @@ -1,6 +1,6 @@ ---- ./components/usb_service.gypi.orig 2014-08-12 21:02:37.000000000 +0200 -+++ ./components/usb_service.gypi 2014-08-13 09:56:57.000000000 +0200 -@@ -37,6 +37,11 @@ +--- ./components/usb_service.gypi.orig 2014-08-20 21:02:56.000000000 +0200 ++++ ./components/usb_service.gypi 2014-08-22 15:06:25.000000000 +0200 +@@ -41,6 +41,11 @@ 'dependencies': [ '../build/linux/system.gyp:udev', ], diff --git a/www/chromium/files/patch-components__usb_service__usb_context.cc b/www/chromium/files/patch-components__usb_service__usb_context.cc index 3ba5e9430483..2c31e3ddf03c 100644 --- a/www/chromium/files/patch-components__usb_service__usb_context.cc +++ b/www/chromium/files/patch-components__usb_service__usb_context.cc @@ -1,9 +1,9 @@ ---- ./components/usb_service/usb_context.cc.orig 2014-08-12 21:02:37.000000000 +0200 -+++ ./components/usb_service/usb_context.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -7,8 +7,13 @@ - #include "base/logging.h" +--- ./components/usb_service/usb_context.cc.orig 2014-08-20 21:02:55.000000000 +0200 ++++ ./components/usb_service/usb_context.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -8,8 +8,13 @@ #include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" + #include "components/usb_service/usb_error.h" +#if defined(OS_FREEBSD) +#include "libusb.h" +#define LIBUSB_CALL @@ -14,7 +14,7 @@ namespace usb_service { -@@ -45,7 +50,9 @@ +@@ -46,7 +51,9 @@ running_ = false; // Spreading running_ to the UsbEventHandler thread. base::subtle::MemoryBarrier(); diff --git a/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc b/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc index 46a5c6fd9e4d..f3efa5206c1a 100644 --- a/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc +++ b/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc @@ -1,5 +1,5 @@ ---- ./components/usb_service/usb_context_unittest.cc.orig 2014-08-12 21:02:37.000000000 +0200 -+++ ./components/usb_service/usb_context_unittest.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./components/usb_service/usb_context_unittest.cc.orig 2014-08-20 21:02:55.000000000 +0200 ++++ ./components/usb_service/usb_context_unittest.cc 2014-08-22 15:06:25.000000000 +0200 @@ -6,7 +6,11 @@ #include "build/build_config.h" #include "components/usb_service/usb_context.h" diff --git a/www/chromium/files/patch-components__usb_service__usb_device_handle.cc b/www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc index f8d2f74e5866..c80cf4c1ae3f 100644 --- a/www/chromium/files/patch-components__usb_service__usb_device_handle.cc +++ b/www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc @@ -1,6 +1,6 @@ ---- ./components/usb_service/usb_device_handle.cc.orig 2014-08-12 21:02:37.000000000 +0200 -+++ ./components/usb_service/usb_device_handle.cc 2014-08-17 16:54:01.000000000 +0200 -@@ -16,7 +16,24 @@ +--- ./components/usb_service/usb_device_handle_impl.cc.orig 2014-08-20 21:02:55.000000000 +0200 ++++ ./components/usb_service/usb_device_handle_impl.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -17,8 +17,25 @@ #include "components/usb_service/usb_interface.h" #include "components/usb_service/usb_service.h" #include "content/public/browser/browser_thread.h" @@ -10,7 +10,7 @@ +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif -+ + +/* Define for FreeBSD < 9.3, thanks to db@freebsd.org */ +#if defined(OS_FREEBSD) && __FreeBSD_version < 903000 +int libusb_get_string_descriptor(libusb_device_handle *dev, @@ -22,6 +22,7 @@ + lang_id, data, (uint16_t)length, 1000); +} +#endif - ++ using content::BrowserThread; + namespace usb_service { diff --git a/www/chromium/files/patch-components__usb_service__usb_device_impl.cc b/www/chromium/files/patch-components__usb_service__usb_device_impl.cc index fe362308602f..4c3f2e6ac883 100644 --- a/www/chromium/files/patch-components__usb_service__usb_device_impl.cc +++ b/www/chromium/files/patch-components__usb_service__usb_device_impl.cc @@ -1,8 +1,8 @@ ---- ./components/usb_service/usb_device_impl.cc.orig 2014-08-12 21:02:37.000000000 +0200 -+++ ./components/usb_service/usb_device_impl.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -10,7 +10,11 @@ - #include "components/usb_service/usb_context.h" - #include "components/usb_service/usb_device_handle.h" +--- ./components/usb_service/usb_device_impl.cc.orig 2014-08-20 21:02:55.000000000 +0200 ++++ ./components/usb_service/usb_device_impl.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -12,7 +12,11 @@ + #include "components/usb_service/usb_error.h" + #include "components/usb_service/usb_interface_impl.h" #include "content/public/browser/browser_thread.h" +#if defined(OS_FREEBSD) +#include "libusb.h" diff --git a/www/chromium/files/patch-components__usb_service__usb_error.cc b/www/chromium/files/patch-components__usb_service__usb_error.cc new file mode 100644 index 000000000000..28670f0d4cf0 --- /dev/null +++ b/www/chromium/files/patch-components__usb_service__usb_error.cc @@ -0,0 +1,14 @@ +--- ./components/usb_service/usb_error.cc.orig 2014-08-20 21:02:55.000000000 +0200 ++++ ./components/usb_service/usb_error.cc 2014-08-23 00:55:43.000000000 +0200 +@@ -4,7 +4,11 @@ + + #include "components/usb_service/usb_error.h" + ++#if defined(__FreeBSD__) ++#include "libusb.h" ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + namespace usb_service { + diff --git a/www/chromium/files/patch-components__usb_service__usb_interface.cc b/www/chromium/files/patch-components__usb_service__usb_interface.cc deleted file mode 100644 index b77c5c70f8ec..000000000000 --- a/www/chromium/files/patch-components__usb_service__usb_interface.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- ./components/usb_service/usb_interface.cc.orig 2014-08-12 21:02:37.000000000 +0200 -+++ ./components/usb_service/usb_interface.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -5,7 +5,11 @@ - #include "components/usb_service/usb_interface.h" - - #include "base/logging.h" -+#if defined(OS_FREEBSD) -+#include "libusb.h" -+#else - #include "third_party/libusb/src/libusb/libusb.h" -+#endif - - namespace usb_service { - diff --git a/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc b/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc new file mode 100644 index 000000000000..cec15dd2fe84 --- /dev/null +++ b/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc @@ -0,0 +1,14 @@ +--- ./components/usb_service/usb_interface_impl.cc.orig 2014-08-20 21:02:55.000000000 +0200 ++++ ./components/usb_service/usb_interface_impl.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -5,7 +5,11 @@ + #include "components/usb_service/usb_interface_impl.h" + + #include "base/logging.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + namespace usb_service { + diff --git a/www/chromium/files/patch-components__usb_service__usb_service_impl.cc b/www/chromium/files/patch-components__usb_service__usb_service_impl.cc index 38386ffe3737..1332e5f68045 100644 --- a/www/chromium/files/patch-components__usb_service__usb_service_impl.cc +++ b/www/chromium/files/patch-components__usb_service__usb_service_impl.cc @@ -1,8 +1,8 @@ ---- ./components/usb_service/usb_service_impl.cc.orig 2014-08-12 21:02:37.000000000 +0200 -+++ ./components/usb_service/usb_service_impl.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -13,7 +13,11 @@ - #include "components/usb_service/usb_context.h" +--- ./components/usb_service/usb_service_impl.cc.orig 2014-08-20 21:02:55.000000000 +0200 ++++ ./components/usb_service/usb_service_impl.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -14,7 +14,11 @@ #include "components/usb_service/usb_device_impl.h" + #include "components/usb_service/usb_error.h" #include "content/public/browser/browser_thread.h" +#if defined(OS_FREEBSD) +#include "libusb.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 c791b624f6db..8cd5755c6e85 100644 --- a/www/chromium/files/patch-content__app__content_main_runner.cc +++ b/www/chromium/files/patch-content__app__content_main_runner.cc @@ -1,6 +1,6 @@ ---- ./content/app/content_main_runner.cc.orig 2014-08-12 21:01:22.000000000 +0200 -+++ ./content/app/content_main_runner.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -88,10 +88,10 @@ +--- ./content/app/content_main_runner.cc.orig 2014-08-20 21:02:47.000000000 +0200 ++++ ./content/app/content_main_runner.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -95,10 +95,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 -@@ -282,7 +282,8 @@ +@@ -287,7 +287,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(). -@@ -412,7 +413,8 @@ +@@ -417,7 +418,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 ce0ddb6ec0d0..05f0df49a9d6 100644 --- a/www/chromium/files/patch-content__browser__browser_main_loop.cc +++ b/www/chromium/files/patch-content__browser__browser_main_loop.cc @@ -1,6 +1,6 @@ ---- ./content/browser/browser_main_loop.cc.orig 2014-08-12 21:01:25.000000000 +0200 -+++ ./content/browser/browser_main_loop.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -135,7 +135,7 @@ +--- ./content/browser/browser_main_loop.cc.orig 2014-08-20 21:02:49.000000000 +0200 ++++ ./content/browser/browser_main_loop.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -133,7 +133,7 @@ namespace content { namespace { @@ -9,7 +9,7 @@ void SetupSandbox(const CommandLine& parsed_command_line) { TRACE_EVENT0("startup", "SetupSandbox"); base::FilePath sandbox_binary; -@@ -336,7 +336,7 @@ +@@ -334,7 +334,7 @@ void BrowserMainLoop::EarlyInitialization() { TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); @@ -18,7 +18,7 @@ // No thread should be created before this call, as SetupSandbox() // will end-up using fork(). SetupSandbox(parsed_command_line_); -@@ -762,9 +762,9 @@ +@@ -764,9 +764,9 @@ } #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 d206ddce079c..7ef6ef9b6499 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-08-12 21:01:25.000000000 +0200 -+++ ./content/browser/child_process_launcher.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -66,7 +66,7 @@ +--- ./content/browser/child_process_launcher.cc.orig 2014-08-20 21:02:49.000000000 +0200 ++++ ./content/browser/child_process_launcher.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -68,7 +68,7 @@ #else terminate_child_on_shutdown_(true) #endif @@ -9,7 +9,7 @@ , zygote_(false) #endif { -@@ -232,7 +232,7 @@ +@@ -234,7 +234,7 @@ // child termination. base::ScopedFD ipcfd_closer(ipcfd); @@ -18,7 +18,7 @@ GetContentClient()->browser()-> GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id, &files_to_register); -@@ -242,7 +242,7 @@ +@@ -244,7 +244,7 @@ process_type); } else // Fall through to the normal posix case below when we're not zygoting. @@ -27,7 +27,7 @@ { // Convert FD mapping to FileHandleMappingVector base::FileHandleMappingVector fds_to_map; -@@ -253,7 +253,7 @@ +@@ -255,7 +255,7 @@ base::GlobalDescriptors::kBaseDescriptor)); } @@ -36,7 +36,7 @@ if (process_type == switches::kRendererProcess) { const int sandbox_fd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket(); -@@ -261,7 +261,7 @@ +@@ -263,7 +263,7 @@ sandbox_fd, GetSandboxFD())); } @@ -45,7 +45,7 @@ // Actually launch the app. base::LaunchOptions options; -@@ -307,7 +307,7 @@ +@@ -322,7 +322,7 @@ base::Bind( &Context::Notify, this_object.get(), @@ -54,7 +54,7 @@ use_zygote, #endif handle)); -@@ -315,7 +315,7 @@ +@@ -330,7 +330,7 @@ } void Notify( @@ -63,7 +63,7 @@ bool zygote, #endif base::ProcessHandle handle) { -@@ -328,7 +328,7 @@ +@@ -343,7 +343,7 @@ if (!handle) LOG(ERROR) << "Failed to launch child process"; @@ -72,7 +72,7 @@ zygote_ = zygote; #endif if (client_) { -@@ -355,7 +355,7 @@ +@@ -370,7 +370,7 @@ BrowserThread::PROCESS_LAUNCHER, FROM_HERE, base::Bind( &Context::TerminateInternal, @@ -81,7 +81,7 @@ zygote_, #endif process_.handle())); -@@ -372,7 +372,7 @@ +@@ -387,7 +387,7 @@ } static void TerminateInternal( @@ -90,7 +90,7 @@ bool zygote, #endif base::ProcessHandle handle) { -@@ -386,13 +386,13 @@ +@@ -401,13 +401,13 @@ process.Terminate(RESULT_CODE_NORMAL_EXIT); // On POSIX, we must additionally reap the child. #if defined(OS_POSIX) @@ -106,7 +106,7 @@ { base::EnsureProcessTerminated(handle); } -@@ -413,7 +413,7 @@ +@@ -428,7 +428,7 @@ #if defined(OS_ANDROID) // The fd to close after creating the process. int ipcfd_; @@ -115,7 +115,7 @@ bool zygote_; #endif }; -@@ -455,7 +455,7 @@ +@@ -470,7 +470,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 9e0879e1ad24..6afbe29f93ec 100644 --- a/www/chromium/files/patch-content__browser__download__base_file.cc +++ b/www/chromium/files/patch-content__browser__download__base_file.cc @@ -1,6 +1,6 @@ ---- ./content/browser/download/base_file.cc.orig 2014-08-12 21:01:23.000000000 +0200 -+++ ./content/browser/download/base_file.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -204,7 +204,8 @@ +--- ./content/browser/download/base_file.cc.orig 2014-08-20 21:02:49.000000000 +0200 ++++ ./content/browser/download/base_file.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -205,7 +205,8 @@ } // OS_WIN, OS_MACOSX and OS_LINUX have specialized implementations. 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 fa1b140d5a45..88c47756d528 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-08-12 21:01:23.000000000 +0200 -+++ ./content/browser/download/base_file_linux.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./content/browser/download/base_file_linux.cc.orig 2014-08-20 21:02:49.000000000 +0200 ++++ ./content/browser/download/base_file_linux.cc 2014-08-22 15:06:25.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 407b23275f75..bbfd69b929eb 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-08-12 21:01:23.000000000 +0200 -+++ ./content/browser/geolocation/location_arbitrator_impl.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./content/browser/geolocation/location_arbitrator_impl.cc.orig 2014-08-20 21:02:48.000000000 +0200 ++++ ./content/browser/geolocation/location_arbitrator_impl.cc 2014-08-22 15:06:25.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 baa537cb2a8d..b6c97f8c9ca3 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-08-13 09:56:57.000000000 +0200 -+++ ./content/browser/geolocation/wifi_data_provider_freebsd.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2014-08-22 15:06:25.000000000 +0200 ++++ ./content/browser/geolocation/wifi_data_provider_freebsd.cc 2014-08-22 15:06:25.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 f9ff50794e61..eccea9507f4d 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-08-13 09:56:57.000000000 +0200 -+++ ./content/browser/geolocation/wifi_data_provider_freebsd.h 2014-08-13 09:56:57.000000000 +0200 +--- ./content/browser/geolocation/wifi_data_provider_freebsd.h.orig 2014-08-22 15:06:25.000000000 +0200 ++++ ./content/browser/geolocation/wifi_data_provider_freebsd.h 2014-08-22 15:06:25.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__browser__indexed_db__indexed_db_backing_store.cc b/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc new file mode 100644 index 000000000000..87e6c61ddaeb --- /dev/null +++ b/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc @@ -0,0 +1,11 @@ +--- ./content/browser/indexed_db/indexed_db_backing_store.cc.orig 2014-08-20 21:02:48.000000000 +0200 ++++ ./content/browser/indexed_db/indexed_db_backing_store.cc 2014-08-24 10:58:24.000000000 +0200 +@@ -2329,7 +2329,7 @@ + // The round-trip can be lossy; round to nearest millisecond. + int64 delta = (descriptor.last_modified() - + info.last_modified).InMilliseconds(); +- if (std::abs(delta) > 1) ++ if (std::labs(delta) > 1) + return false; + } + if (!base::TouchFile(path, info.last_accessed, info.last_modified)) { diff --git a/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc b/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc index f28a4aba0b1f..10f5178c4911 100644 --- a/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc +++ b/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc @@ -1,6 +1,6 @@ ---- ./content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2014-08-12 21:01:24.000000000 +0200 -+++ ./content/browser/renderer_host/render_widget_host_view_aura.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -626,7 +626,7 @@ +--- ./content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2014-08-20 21:02:48.000000000 +0200 ++++ ./content/browser/renderer_host/render_widget_host_view_aura.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -631,7 +631,7 @@ if (host) return reinterpret_cast<gfx::NativeViewId>(host->GetAcceleratedWidget()); #endif 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 c9771442c3bd..da98b7fb7d28 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-08-12 21:01:26.000000000 +0200 -+++ ./content/common/set_process_title_linux.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./content/common/set_process_title_linux.cc.orig 2014-08-20 21:02:50.000000000 +0200 ++++ ./content/common/set_process_title_linux.cc 2014-08-22 15:06:25.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 2f8318ce1eb5..a30137726c42 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-08-12 21:01:26.000000000 +0200 -+++ ./content/common/set_process_title_linux.h 2014-08-13 09:56:57.000000000 +0200 +--- ./content/common/set_process_title_linux.h.orig 2014-08-20 21:02:50.000000000 +0200 ++++ ./content/common/set_process_title_linux.h 2014-08-22 15:06:25.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 5ae931f418a0..544cffcb44db 100644 --- a/www/chromium/files/patch-content__content_browser.gypi +++ b/www/chromium/files/patch-content__content_browser.gypi @@ -1,15 +1,15 @@ ---- ./content/content_browser.gypi.orig 2014-08-12 21:01:27.000000000 +0200 -+++ ./content/content_browser.gypi 2014-08-13 09:56:57.000000000 +0200 -@@ -631,6 +631,8 @@ - 'browser/geolocation/wifi_data_provider_common_win.cc', - 'browser/geolocation/wifi_data_provider_common_win.h', - 'browser/geolocation/wifi_data_provider_corewlan_mac.mm', -+ 'browser/geolocation/wifi_data_provider_freebsd.cc', -+ 'browser/geolocation/wifi_data_provider_freebsd.h', - 'browser/geolocation/wifi_data_provider_linux.cc', - 'browser/geolocation/wifi_data_provider_linux.h', - 'browser/geolocation/wifi_data_provider_mac.cc', -@@ -1652,8 +1654,18 @@ +--- ./content/content_browser.gypi.orig 2014-08-20 21:02:50.000000000 +0200 ++++ ./content/content_browser.gypi 2014-08-22 15:06:25.000000000 +0200 +@@ -615,6 +615,8 @@ + 'browser/geolocation/wifi_data_provider_common_win.cc', + 'browser/geolocation/wifi_data_provider_common_win.h', + 'browser/geolocation/wifi_data_provider_corewlan_mac.mm', ++ 'browser/geolocation/wifi_data_provider_freebsd.cc', ++ 'browser/geolocation/wifi_data_provider_freebsd.h', + 'browser/geolocation/wifi_data_provider_linux.cc', + 'browser/geolocation/wifi_data_provider_linux.h', + 'browser/geolocation/wifi_data_provider_mac.cc', +@@ -1709,8 +1711,18 @@ ], }], ['os_bsd==1', { @@ -30,7 +30,7 @@ ], }], ['use_aura==1', { -@@ -1717,7 +1729,7 @@ +@@ -1758,7 +1770,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 1116c8386b95..a42ac93e2075 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-08-12 21:01:27.000000000 +0200 -+++ ./content/content_common.gypi 2014-08-13 09:56:57.000000000 +0200 -@@ -559,6 +559,21 @@ +--- ./content/content_common.gypi.orig 2014-08-20 21:02:50.000000000 +0200 ++++ ./content/content_common.gypi 2014-08-22 15:06:25.000000000 +0200 +@@ -598,6 +598,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 259270337004..083983701a5f 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-08-12 21:01:27.000000000 +0200 -+++ ./content/content_tests.gypi 2014-08-13 09:56:57.000000000 +0200 -@@ -872,6 +872,15 @@ +--- ./content/content_tests.gypi.orig 2014-08-20 21:02:50.000000000 +0200 ++++ ./content/content_tests.gypi 2014-08-22 15:06:25.000000000 +0200 +@@ -889,6 +889,15 @@ 'browser/geolocation/wifi_data_provider_linux_unittest.cc', ], }], 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 4a7001c3466e..99940ecb2f54 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-08-12 21:01:19.000000000 +0200 -+++ ./content/public/test/browser_test_base.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./content/public/test/browser_test_base.cc.orig 2014-08-20 21:02:44.000000000 +0200 ++++ ./content/public/test/browser_test_base.cc 2014-08-22 15:06:25.000000000 +0200 @@ -4,6 +4,10 @@ #include "content/public/test/browser_test_base.h" diff --git a/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc b/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc index 2333ff649fe5..a8c4e5452c02 100644 --- a/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc +++ b/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc @@ -1,6 +1,6 @@ ---- ./content/renderer/accessibility/blink_ax_tree_source.cc.orig 2014-08-12 21:01:18.000000000 +0200 -+++ ./content/renderer/accessibility/blink_ax_tree_source.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -431,13 +431,15 @@ +--- ./content/renderer/accessibility/blink_ax_tree_source.cc.orig 2014-08-20 21:02:43.000000000 +0200 ++++ ./content/renderer/accessibility/blink_ax_tree_source.cc 2014-08-22 15:06:26.000000000 +0200 +@@ -441,13 +441,15 @@ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X, scroll_offset.width()); dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y, scroll_offset.height()); 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 896a67619025..3dc38f8e8291 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-08-12 21:01:18.000000000 +0200 -+++ ./content/renderer/media/webrtc_audio_capturer.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./content/renderer/media/webrtc_audio_capturer.cc.orig 2014-08-20 21:02:43.000000000 +0200 ++++ ./content/renderer/media/webrtc_audio_capturer.cc 2014-08-22 15:06:26.000000000 +0200 @@ -31,9 +31,7 @@ // will fail if the user selects any rate outside these ranges. const int kValidInputRates[] = @@ -11,13 +11,13 @@ const int kValidInputRates[] = {48000, 44100}; #else const int kValidInputRates[] = {44100}; -@@ -452,8 +450,8 @@ +@@ -457,8 +455,8 @@ // CaptureCallback. #if defined(OS_WIN) || defined(OS_MACOSX) DCHECK_LE(volume, 1.0); --#elif defined(OS_LINUX) || defined(OS_OPENBSD) +-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD) - // We have a special situation on Linux where the microphone volume can be -+#elif defined(OS_POSIX) && !defined(OS_ANDROID) ++#elif defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) + // We have a special situation on POSIX where the microphone volume can be // "higher than maximum". The input volume slider in the sound preference // allows the user to set a scaling that is higher than 100%. It means that 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 741ca5afaac7..731179e921a4 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-08-12 21:01:18.000000000 +0200 -+++ ./content/renderer/media/webrtc_audio_renderer.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./content/renderer/media/webrtc_audio_renderer.cc.orig 2014-08-20 21:02:43.000000000 +0200 ++++ ./content/renderer/media/webrtc_audio_renderer.cc 2014-08-22 15:06:26.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 b29105878ab8..70b7941e7450 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-08-12 21:01:19.000000000 +0200 -+++ ./content/renderer/pepper/usb_key_code_conversion.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./content/renderer/pepper/usb_key_code_conversion.cc.orig 2014-08-20 21:02:43.000000000 +0200 ++++ ./content/renderer/pepper/usb_key_code_conversion.cc 2014-08-22 15:06:26.000000000 +0200 @@ -10,7 +10,7 @@ namespace content { 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 ae06e82afee8..77b812062a83 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,25 +1,19 @@ ---- ./content/renderer/renderer_main_platform_delegate_linux.cc.orig 2014-08-12 21:01:19.000000000 +0200 -+++ ./content/renderer/renderer_main_platform_delegate_linux.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -50,11 +50,14 @@ - // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox - // - // Anything else is started in InitializeSandbox(). -+#if !defined(OS_BSD) - LinuxSandbox::InitializeSandbox(); -+#endif - return true; +--- ./content/renderer/renderer_main_platform_delegate_linux.cc.orig 2014-08-20 21:02:43.000000000 +0200 ++++ ./content/renderer/renderer_main_platform_delegate_linux.cc 2014-08-22 15:06:26.000000000 +0200 +@@ -40,6 +40,7 @@ } - void RendererMainPlatformDelegate::RunSandboxTests(bool no_sandbox) { + bool RendererMainPlatformDelegate::EnableSandbox() { +#if !defined(OS_BSD) - // The LinuxSandbox class requires going through initialization before - // GetStatus() and others can be used. When we are not launched through the - // Zygote, this initialization will only happen in the renderer process if -@@ -89,6 +92,7 @@ + // The setuid sandbox is started in the zygote process: zygote_main_linux.cc + // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox + // +@@ -70,7 +71,7 @@ CHECK_EQ(errno, EPERM); } #endif // __x86_64__ -+#endif +- ++#endif // ! OS_BSD + return true; } - } // namespace content 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 a4538877e0db..b1cffbad9b89 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-08-12 21:01:19.000000000 +0200 -+++ ./content/renderer/renderer_webkitplatformsupport_impl.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -91,7 +91,7 @@ +--- ./content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2014-08-20 21:02:43.000000000 +0200 ++++ ./content/renderer/renderer_webkitplatformsupport_impl.cc 2014-08-22 15:06:26.000000000 +0200 +@@ -92,7 +92,7 @@ #if defined(OS_POSIX) #include "base/file_descriptor_posix.h" @@ -9,7 +9,7 @@ #include <map> #include <string> -@@ -179,7 +179,7 @@ +@@ -183,7 +183,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 { -@@ -272,7 +272,7 @@ +@@ -277,7 +277,7 @@ } blink::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() { @@ -27,7 +27,7 @@ // WebKit doesn't use WebSandboxSupport on android. return NULL; #else -@@ -590,7 +590,7 @@ +@@ -595,7 +595,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 2cd6f50db3c5..e0f048451120 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-08-12 21:03:00.000000000 +0200 -+++ ./crypto/nss_util.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./crypto/nss_util.cc.orig 2014-08-20 21:03:15.000000000 +0200 ++++ ./crypto/nss_util.cc 2014-08-22 15:06:26.000000000 +0200 @@ -13,7 +13,7 @@ #include <prtime.h> #include <secmod.h> @@ -9,7 +9,7 @@ #include <sys/mount.h> #include <sys/param.h> #endif -@@ -138,7 +138,7 @@ +@@ -141,7 +141,7 @@ // detection when database_dir is on NFS. See http://crbug.com/48585. // // TODO(wtc): port this function to other USE_NSS platforms. It is defined @@ -18,7 +18,7 @@ // is OS-specific. // // Because this function sets an environment variable it must be run before we -@@ -149,10 +149,10 @@ +@@ -152,10 +152,10 @@ base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN; if (base::GetFileSystemType(database_dir, &fs_type)) db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS); diff --git a/www/chromium/files/patch-device__hid__hid.gyp b/www/chromium/files/patch-device__hid__hid.gyp index d810374b8906..e8cdd82f9410 100644 --- a/www/chromium/files/patch-device__hid__hid.gyp +++ b/www/chromium/files/patch-device__hid__hid.gyp @@ -1,7 +1,7 @@ ---- ./device/hid/hid.gyp.orig 2014-08-12 21:02:53.000000000 +0200 -+++ ./device/hid/hid.gyp 2014-08-13 09:56:57.000000000 +0200 -@@ -19,6 +19,18 @@ - '../../build/linux/system.gyp:udev', +--- ./device/hid/hid.gyp.orig 2014-08-20 21:03:08.000000000 +0200 ++++ ./device/hid/hid.gyp 2014-08-22 15:06:26.000000000 +0200 +@@ -61,6 +61,18 @@ + 'input_service_linux.h', ], }], + ['os_bsd==1', { @@ -17,5 +17,5 @@ + ], + }], ], - 'sources': [ - 'device_monitor_linux.cc', + }, + ], diff --git a/www/chromium/files/patch-device__serial__serial.gyp b/www/chromium/files/patch-device__serial__serial.gyp index a066d30d74df..28e30e0b1f0e 100644 --- a/www/chromium/files/patch-device__serial__serial.gyp +++ b/www/chromium/files/patch-device__serial__serial.gyp @@ -1,6 +1,6 @@ ---- ./device/serial/serial.gyp.orig 2014-08-12 21:02:53.000000000 +0200 -+++ ./device/serial/serial.gyp 2014-08-13 09:56:57.000000000 +0200 -@@ -19,6 +19,12 @@ +--- ./device/serial/serial.gyp.orig 2014-08-20 21:03:08.000000000 +0200 ++++ ./device/serial/serial.gyp 2014-08-22 15:06:26.000000000 +0200 +@@ -20,6 +20,12 @@ '../../build/linux/system.gyp:udev', ], }], @@ -11,5 +11,5 @@ + ], + }], ], - 'sources': [ - 'serial_device_enumerator.cc', + 'variables': { + 'mojom_base_output_dir': 'device/serial', 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 6b781484968d..76248d6db94d 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-08-12 21:01:10.000000000 +0200 -+++ ./gpu/config/gpu_control_list.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -1512,10 +1512,10 @@ +--- ./gpu/config/gpu_control_list.cc.orig 2014-08-20 21:02:37.000000000 +0200 ++++ ./gpu/config/gpu_control_list.cc 2014-08-22 15:06:26.000000000 +0200 +@@ -1539,10 +1539,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 e5af94d2bb18..63548bf48b54 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,6 +1,6 @@ ---- ./gpu/config/gpu_control_list_unittest.cc.orig 2014-08-12 21:01:09.000000000 +0200 -+++ ./gpu/config/gpu_control_list_unittest.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -176,8 +176,7 @@ +--- ./gpu/config/gpu_control_list_unittest.cc.orig 2014-08-20 21:02:37.000000000 +0200 ++++ ./gpu/config/gpu_control_list_unittest.cc 2014-08-22 15:06:26.000000000 +0200 +@@ -177,8 +177,7 @@ features = control_list->MakeDecision( GpuControlList::kOsLinux, kOsVersion, gpu_info()); EXPECT_SINGLE_FEATURE(features, TEST_FEATURE_0); 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 ed7604f212a1..2f8ac611623b 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-08-12 21:01:09.000000000 +0200 -+++ ./gpu/config/gpu_test_config.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./gpu/config/gpu_test_config.cc.orig 2014-08-20 21:02:37.000000000 +0200 ++++ ./gpu/config/gpu_test_config.cc 2014-08-22 15:06:26.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 e64ba0a31136..68dcb3b79f26 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-08-12 21:01:10.000000000 +0200 -+++ ./gpu/gpu_config.gypi 2014-08-13 09:56:57.000000000 +0200 +--- ./gpu/gpu_config.gypi.orig 2014-08-20 21:02:38.000000000 +0200 ++++ ./gpu/gpu_config.gypi 2014-08-22 15:06:26.000000000 +0200 @@ -63,7 +63,7 @@ '../third_party/amd/amd_videocard_info_win.cc', ], diff --git a/www/chromium/files/patch-manual-build b/www/chromium/files/patch-manual-build new file mode 100644 index 000000000000..fa2df019ef24 --- /dev/null +++ b/www/chromium/files/patch-manual-build @@ -0,0 +1,90 @@ +--- ./gpu/command_buffer/common/gles2_cmd_format.h.orig 2014-08-20 21:02:37.000000000 +0200 ++++ ./gpu/command_buffer/common/gles2_cmd_format.h 2014-08-25 23:47:01.000000000 +0200 +@@ -39,8 +39,8 @@ + typedef double GLdouble; + typedef double GLclampd; + typedef void GLvoid; +-typedef khronos_intptr_t GLintptr; +-typedef khronos_ssize_t GLsizeiptr; ++typedef ptrdiff_t GLintptr; ++typedef ptrdiff_t GLsizeiptr; + + namespace gpu { + namespace gles2 { +--- ./gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc.orig 2014-08-24 12:26:40.000000000 +0200 ++++ ./gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc 2014-08-24 12:33:01.000000000 +0200 +@@ -31,8 +31,8 @@ + functions->fBindVertexArray = glBindVertexArrayOES; + functions->fBlendColor = glBlendColor; + functions->fBlendFunc = glBlendFunc; +- functions->fBufferData = glBufferData; +- functions->fBufferSubData = glBufferSubData; ++ functions->fBufferData = (GrGLBufferDataProc)glBufferData; ++ functions->fBufferSubData = (GrGLBufferSubDataProc)glBufferSubData; + functions->fClear = glClear; + functions->fClearColor = glClearColor; + functions->fClearStencil = glClearStencil; +@@ -74,7 +74,7 @@ + functions->fInsertEventMarker = glInsertEventMarkerEXT; + functions->fLineWidth = glLineWidth; + functions->fLinkProgram = glLinkProgram; +- functions->fMapBufferSubData = glMapBufferSubDataCHROMIUM; ++ functions->fMapBufferSubData = (GrGLMapBufferSubDataProc)glMapBufferSubDataCHROMIUM; + functions->fMapTexSubImage2D = glMapTexSubImage2DCHROMIUM; + functions->fPixelStorei = glPixelStorei; + functions->fPopGroupMarker = glPopGroupMarkerEXT; +--- ./ppapi/c/ppb_opengles2.h.orig 2014-08-25 23:42:52.000000000 +0200 ++++ ./ppapi/c/ppb_opengles2.h 2014-08-25 23:44:21.000000000 +0200 +@@ -34,8 +34,8 @@ + typedef long long int GLintptr; + typedef long long int GLsizeiptr; + #else +-typedef long int GLintptr; +-typedef long int GLsizeiptr; ++typedef __ptrdiff_t GLintptr; ++typedef __ptrdiff_t GLsizeiptr; + #endif // _WIN64 + #endif // __gl2_h_ + +--- ./third_party/khronos/GLES2/gl2.h.orig 2014-08-20 21:03:05.000000000 +0200 ++++ ./third_party/khronos/GLES2/gl2.h 2014-08-25 23:48:36.000000000 +0200 +@@ -38,6 +38,7 @@ + + #include <GLES2/gl2chromium.h> + #include <GLES2/gl2platform.h> ++#include <cstddef> + + /* Generated on date 20131202 */ + +@@ -67,8 +68,8 @@ + typedef unsigned int GLuint; + typedef char GLchar; + typedef khronos_float_t GLfloat; +-typedef khronos_ssize_t GLsizeiptr; +-typedef khronos_intptr_t GLintptr; ++typedef ptrdiff_t GLintptr; ++typedef ptrdiff_t GLsizeiptr; + typedef unsigned int GLbitfield; + typedef int GLint; + typedef unsigned char GLboolean; +--- ./third_party/mesa/src/include/GLES2/gl2.h.orig 2014-08-20 21:03:54.000000000 +0200 ++++ ./third_party/mesa/src/include/GLES2/gl2.h 2014-08-25 23:50:18.000000000 +0200 +@@ -4,6 +4,7 @@ + /* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */ + + #include <GLES2/gl2platform.h> ++#include <cstddef> + + #ifdef __cplusplus + extern "C" { +@@ -35,8 +36,8 @@ + typedef khronos_int32_t GLfixed; + + /* GL types for handling large vertex buffer objects */ +-typedef khronos_intptr_t GLintptr; +-typedef khronos_ssize_t GLsizeiptr; ++typedef ptrdiff_t GLintptr; ++typedef ptrdiff_t GLsizeiptr; + + /* OpenGL ES core versions */ + #define GL_ES_VERSION_2_0 1 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 4dbe8ebcbc7e..4f144bbdb7ef 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-08-12 21:02:56.000000000 +0200 -+++ ./media/audio/audio_input_volume_unittest.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./media/audio/audio_input_volume_unittest.cc.orig 2014-08-20 21:03:15.000000000 +0200 ++++ ./media/audio/audio_input_volume_unittest.cc 2014-08-22 15:06:26.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 987ece05fd93..95ebda22f7be 100644 --- a/www/chromium/files/patch-media__base__audio_splicer.cc +++ b/www/chromium/files/patch-media__base__audio_splicer.cc @@ -1,15 +1,15 @@ ---- ./media/base/audio_splicer.cc.orig 2014-08-12 21:02:57.000000000 +0200 -+++ ./media/base/audio_splicer.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -143,7 +143,7 @@ +--- ./media/base/audio_splicer.cc.orig 2014-08-20 21:03:11.000000000 +0200 ++++ ./media/base/audio_splicer.cc 2014-08-22 15:06:26.000000000 +0200 +@@ -137,7 +137,7 @@ output_timestamp_helper_.GetTimestamp(); const base::TimeDelta delta = timestamp - expected_timestamp; -- if (std::abs(delta.InMilliseconds()) > kMaxTimeDeltaInMilliseconds) { -+ if (std::labs(delta.InMilliseconds()) > kMaxTimeDeltaInMilliseconds) { +- if (std::abs(delta.InMilliseconds()) > ++ if (std::labs(delta.InMilliseconds()) > + AudioSplicer::kMaxTimeDeltaInMilliseconds) { DVLOG(1) << "Timestamp delta too large: " << delta.InMicroseconds() << "us"; return false; - } -@@ -152,7 +152,7 @@ +@@ -147,7 +147,7 @@ if (delta != base::TimeDelta()) frames_to_fill = output_timestamp_helper_.GetFramesToTarget(timestamp); diff --git a/www/chromium/files/patch-media__cast__rtcp__rtcp.cc b/www/chromium/files/patch-media__cast__rtcp__rtcp.cc deleted file mode 100644 index d8e9881a9548..000000000000 --- a/www/chromium/files/patch-media__cast__rtcp__rtcp.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ./media/cast/rtcp/rtcp.cc.orig 2014-08-12 21:02:56.000000000 +0200 -+++ ./media/cast/rtcp/rtcp.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -361,7 +361,7 @@ - int64 rtp_time_diff_ms = rtp_timestamp_diff / frequency_khz; - - // Sanity check. -- if (std::abs(rtp_time_diff_ms) > kMaxDiffSinceReceivedRtcpMs) -+ if (std::labs(rtp_time_diff_ms) > kMaxDiffSinceReceivedRtcpMs) - return false; - - *rtp_timestamp_in_ticks = ConvertNtpToTimeTicks(last_received_ntp_seconds_, 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 d1482a2ea99c..e3121851bd25 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-08-12 21:02:56.000000000 +0200 -+++ ./media/filters/decrypting_audio_decoder.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./media/filters/decrypting_audio_decoder.cc.orig 2014-08-20 21:03:15.000000000 +0200 ++++ ./media/filters/decrypting_audio_decoder.cc 2014-08-22 15:06:26.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 5a759be94a09..0c1a628b0fdd 100644 --- a/www/chromium/files/patch-media__media.gyp +++ b/www/chromium/files/patch-media__media.gyp @@ -1,6 +1,6 @@ ---- ./media/media.gyp.orig 2014-08-12 21:03:00.000000000 +0200 -+++ ./media/media.gyp 2014-08-13 09:56:57.000000000 +0200 -@@ -658,7 +658,7 @@ +--- ./media/media.gyp.orig 2014-08-20 21:03:15.000000000 +0200 ++++ ./media/media.gyp 2014-08-22 15:06:26.000000000 +0200 +@@ -683,7 +683,7 @@ 'audio/openbsd/audio_manager_openbsd.h', ], }], @@ -9,7 +9,7 @@ 'conditions': [ ['use_x11==1', { 'dependencies': [ -@@ -917,7 +917,7 @@ +@@ -984,7 +984,7 @@ 'base/simd/convert_yuv_to_rgb_x86.cc', ], }], diff --git a/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc b/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc new file mode 100644 index 000000000000..5dca2f20ce7f --- /dev/null +++ b/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc @@ -0,0 +1,20 @@ +--- ./media/video/capture/video_capture_device_factory.cc.orig 2014-08-20 21:03:15.000000000 +0200 ++++ ./media/video/capture/video_capture_device_factory.cc 2014-08-22 22:39:36.000000000 +0200 +@@ -11,7 +11,7 @@ + + #if defined(OS_MACOSX) + #include "media/video/capture/mac/video_capture_device_factory_mac.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) + #include "media/video/capture/linux/video_capture_device_factory_linux.h" + #elif defined(OS_ANDROID) + #include "media/video/capture/android/video_capture_device_factory_android.h" +@@ -41,7 +41,7 @@ + #if defined(OS_MACOSX) + return scoped_ptr<VideoCaptureDeviceFactory>(new + VideoCaptureDeviceFactoryMac(ui_task_runner)); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) + return scoped_ptr<VideoCaptureDeviceFactory>(new + VideoCaptureDeviceFactoryLinux(ui_task_runner)); + #elif defined(OS_ANDROID) diff --git a/www/chromium/files/patch-native_client__build__common.gypi b/www/chromium/files/patch-native_client__build__common.gypi index 4b048ce9863a..c12709df1a8e 100644 --- a/www/chromium/files/patch-native_client__build__common.gypi +++ b/www/chromium/files/patch-native_client__build__common.gypi @@ -1,11 +1,11 @@ ---- ./native_client/build/common.gypi.orig 2014-08-12 21:03:33.000000000 +0200 -+++ ./native_client/build/common.gypi 2014-08-13 09:56:57.000000000 +0200 -@@ -269,7 +269,7 @@ +--- ./native_client/build/common.gypi.orig 2014-08-20 21:03:22.000000000 +0200 ++++ ./native_client/build/common.gypi 2014-08-22 15:06:26.000000000 +0200 +@@ -286,7 +286,7 @@ ], }, 'conditions': [ -- ['OS=="linux"', { -+ ['OS=="linux" or OS=="freebsd"', { +- ['OS=="linux" or OS=="android"', { ++ ['OS=="linux" or OS=="android" or OS=="freebsd"', { 'target_defaults': { # Enable -Werror by default, but put it in a variable so it can # be disabled in ~/.gyp/include.gypi on the valgrind builders. 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 98507023f782..d03feb7c4f60 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,11 +1,11 @@ ---- ./native_client/src/shared/platform/platform.gyp.orig 2014-08-12 21:03:09.000000000 +0200 -+++ ./native_client/src/shared/platform/platform.gyp 2014-08-13 09:56:57.000000000 +0200 +--- ./native_client/src/shared/platform/platform.gyp.orig 2014-08-20 21:03:23.000000000 +0200 ++++ ./native_client/src/shared/platform/platform.gyp 2014-08-22 15:06:26.000000000 +0200 @@ -36,7 +36,7 @@ 'refcount_base.cc', ], 'conditions': [ -- ['OS=="linux"', { -+ ['OS=="linux" or OS=="freebsd"', { +- ['OS=="linux" or OS=="android"', { ++ ['OS=="linux" or OS=="android" or OS=="freebsd"', { 'platform_sources': [ 'linux/nacl_clock.c', 'linux/nacl_host_dir.c', 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 deleted file mode 100644 index 0c13f108b645..000000000000 --- a/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp +++ /dev/null @@ -1,20 +0,0 @@ ---- ./native_client/src/trusted/debug_stub/debug_stub.gyp.orig 2014-08-12 21:03:10.000000000 +0200 -+++ ./native_client/src/trusted/debug_stub/debug_stub.gyp 2014-08-13 09:56:57.000000000 +0200 -@@ -27,7 +27,7 @@ - 'test.cc', - ], - 'conditions': [ -- ['OS=="linux" or OS=="mac"', { -+ ['OS=="linux" or OS=="freebsd" or OS=="mac"', { - 'platform_sources': [ - 'posix/debug_stub_posix.cc', - 'posix/platform_impl.cc', -@@ -49,7 +49,7 @@ - 'target_base': 'none', - }, - 'target_conditions': [ -- ['OS=="linux" or OS=="mac"', { -+ ['OS=="linux" or OS=="freebsd" or OS=="mac"', { - 'cflags': [ - '-fexceptions', - ], 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 deleted file mode 100644 index ffa618b4f19b..000000000000 --- a/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./native_client/src/trusted/service_runtime/service_runtime.gyp.orig 2014-08-12 21:03:22.000000000 +0200 -+++ ./native_client/src/trusted/service_runtime/service_runtime.gyp 2014-08-13 09:56:57.000000000 +0200 -@@ -6,7 +6,7 @@ - { - 'variables': { - 'conditions': [ -- ['OS=="linux"', { -+ ['OS=="linux" or OS=="freebsd"', { - 'syscall_handler': [ - 'posix/nacl_syscall_impl.c' - ], diff --git a/www/chromium/files/patch-net__base__address_tracker_linux.h b/www/chromium/files/patch-net__base__address_tracker_linux.h index 4ae62843fb9c..cfcb7e3ef4a5 100644 --- a/www/chromium/files/patch-net__base__address_tracker_linux.h +++ b/www/chromium/files/patch-net__base__address_tracker_linux.h @@ -1,5 +1,5 @@ ---- ./net/base/address_tracker_linux.h.orig 2014-08-12 21:02:39.000000000 +0200 -+++ ./net/base/address_tracker_linux.h 2014-08-13 09:56:57.000000000 +0200 +--- ./net/base/address_tracker_linux.h.orig 2014-08-20 21:02:28.000000000 +0200 ++++ ./net/base/address_tracker_linux.h 2014-08-22 15:06:26.000000000 +0200 @@ -6,10 +6,12 @@ #define NET_BASE_ADDRESS_TRACKER_LINUX_H_ diff --git a/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc b/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc index 25eb840a58cf..c090844e77ce 100644 --- a/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc +++ b/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc @@ -1,5 +1,5 @@ ---- ./net/base/address_tracker_linux_unittest.cc.orig 2014-08-12 21:02:39.000000000 +0200 -+++ ./net/base/address_tracker_linux_unittest.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./net/base/address_tracker_linux_unittest.cc.orig 2014-08-20 21:02:28.000000000 +0200 ++++ ./net/base/address_tracker_linux_unittest.cc 2014-08-22 15:06:26.000000000 +0200 @@ -4,7 +4,11 @@ #include "net/base/address_tracker_linux.h" diff --git a/www/chromium/files/patch-net__base__dns_reloader.cc b/www/chromium/files/patch-net__base__dns_reloader.cc index 26507afd26f5..b0fe597da4b4 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-08-12 21:02:39.000000000 +0200 -+++ ./net/base/dns_reloader.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./net/base/dns_reloader.cc.orig 2014-08-20 21:02:28.000000000 +0200 ++++ ./net/base/dns_reloader.cc 2014-08-22 15:06:26.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 6ed09939c84c..d564b3f50ea6 100644 --- a/www/chromium/files/patch-net__base__mime_util_unittest.cc +++ b/www/chromium/files/patch-net__base__mime_util_unittest.cc @@ -1,6 +1,6 @@ ---- ./net/base/mime_util_unittest.cc.orig 2014-08-12 21:02:39.000000000 +0200 -+++ ./net/base/mime_util_unittest.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -291,7 +291,7 @@ +--- ./net/base/mime_util_unittest.cc.orig 2014-08-20 21:02:28.000000000 +0200 ++++ ./net/base/mime_util_unittest.cc 2014-08-22 15:06:26.000000000 +0200 +@@ -385,7 +385,7 @@ { "MeSsAge/*", 1, "eml" }, { "image/bmp", 1, "bmp" }, { "video/*", 6, "mp4" }, diff --git a/www/chromium/files/patch-net__base__net_util.h b/www/chromium/files/patch-net__base__net_util.h index add2d33d0431..cab50bca09ef 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-08-12 21:02:39.000000000 +0200 -+++ ./net/base/net_util.h 2014-08-13 09:56:57.000000000 +0200 +--- ./net/base/net_util.h.orig 2014-08-20 21:02:28.000000000 +0200 ++++ ./net/base/net_util.h 2014-08-22 15:06:26.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 7894169039ef..460677c5a8b7 100644 --- a/www/chromium/files/patch-net__base__network_change_notifier.cc +++ b/www/chromium/files/patch-net__base__network_change_notifier.cc @@ -1,6 +1,6 @@ ---- ./net/base/network_change_notifier.cc.orig 2014-08-12 21:02:39.000000000 +0200 -+++ ./net/base/network_change_notifier.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -508,7 +508,6 @@ +--- ./net/base/network_change_notifier.cc.orig 2014-08-20 21:02:28.000000000 +0200 ++++ ./net/base/network_change_notifier.cc 2014-08-22 15:06:26.000000000 +0200 +@@ -521,7 +521,6 @@ #elif defined(OS_MACOSX) return new NetworkChangeNotifierMac(); #else 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 bda561fedf0c..085dcdeed2fd 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-08-12 21:02:40.000000000 +0200 -+++ ./net/dns/address_sorter_posix.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./net/dns/address_sorter_posix.cc.orig 2014-08-20 21:02:28.000000000 +0200 ++++ ./net/dns/address_sorter_posix.cc 2014-08-22 15:06:26.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 12f774f1bc1b..8316bc889442 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-08-12 21:02:40.000000000 +0200 -+++ ./net/dns/dns_config_service_posix_unittest.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./net/dns/dns_config_service_posix_unittest.cc.orig 2014-08-20 21:02:28.000000000 +0200 ++++ ./net/dns/dns_config_service_posix_unittest.cc 2014-08-22 15:06:26.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 2bca4438fd50..601d353ac327 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-08-12 21:02:40.000000000 +0200 -+++ ./net/dns/dns_session.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./net/dns/dns_session.cc.orig 2014-08-20 21:02:28.000000000 +0200 ++++ ./net/dns/dns_session.cc 2014-08-22 15:06:26.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 3d1b78a6ddc9..5a20ad1dbb33 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,5 +1,5 @@ ---- ./net/http/http_auth_gssapi_posix.cc.orig 2014-08-12 21:02:39.000000000 +0200 -+++ ./net/http/http_auth_gssapi_posix.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./net/http/http_auth_gssapi_posix.cc.orig 2014-08-20 21:02:28.000000000 +0200 ++++ ./net/http/http_auth_gssapi_posix.cc 2014-08-22 15:06:26.000000000 +0200 @@ -431,8 +431,8 @@ static const char* const kDefaultLibraryNames[] = { #if defined(OS_MACOSX) diff --git a/www/chromium/files/patch-net__net.gyp b/www/chromium/files/patch-net__net.gyp index 4b46e9d34fdc..c88c8bc3aed0 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-08-12 21:02:41.000000000 +0200 -+++ ./net/net.gyp 2014-08-13 09:56:57.000000000 +0200 -@@ -277,9 +277,10 @@ +--- ./net/net.gyp.orig 2014-08-20 21:02:28.000000000 +0200 ++++ ./net/net.gyp 2014-08-22 15:06:26.000000000 +0200 +@@ -317,9 +317,10 @@ }], ['os_bsd==1', { 'sources!': [ @@ -12,16 +12,16 @@ ], },{ 'dependencies': [ -@@ -509,7 +510,7 @@ +@@ -551,7 +552,7 @@ '<@(net_test_sources)', ], 'conditions': [ - ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { + ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and os_bsd != 1', { 'dependencies': [ - 'balsa', 'epoll_server', -@@ -973,6 +974,11 @@ + 'flip_in_mem_edsm_server_base', +@@ -1016,6 +1017,11 @@ 'dns/mock_mdns_socket_factory.h' ] }], diff --git a/www/chromium/files/patch-net__net.gypi b/www/chromium/files/patch-net__net.gypi index 4aa949558139..1c8751baa180 100644 --- a/www/chromium/files/patch-net__net.gypi +++ b/www/chromium/files/patch-net__net.gypi @@ -1,6 +1,6 @@ ---- ./net/net.gypi.orig 2014-08-12 21:02:41.000000000 +0200 -+++ ./net/net.gypi 2014-08-13 09:56:58.000000000 +0200 -@@ -167,8 +167,8 @@ +--- ./net/net.gypi.orig 2014-08-20 21:02:28.000000000 +0200 ++++ ./net/net.gypi 2014-08-22 15:06:26.000000000 +0200 +@@ -171,8 +171,8 @@ 'android/network_change_notifier_factory_android.h', 'android/network_library.cc', 'android/network_library.h', @@ -11,7 +11,7 @@ 'base/backoff_entry.cc', 'base/backoff_entry.h', 'base/bandwidth_metrics.cc', -@@ -1229,7 +1229,7 @@ +@@ -1221,7 +1221,7 @@ 'android/keystore_unittest.cc', 'android/network_change_notifier_android_unittest.cc', 'base/address_list_unittest.cc', 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 d75286357e34..113958549b29 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-08-12 21:02:40.000000000 +0200 -+++ ./net/proxy/proxy_config_service_linux.cc 2014-08-13 09:56:58.000000000 +0200 +--- ./net/proxy/proxy_config_service_linux.cc.orig 2014-08-20 21:02:28.000000000 +0200 ++++ ./net/proxy/proxy_config_service_linux.cc 2014-08-22 15:06:26.000000000 +0200 @@ -21,7 +21,13 @@ #include <limits.h> #include <stdio.h> @@ -14,7 +14,7 @@ #include <unistd.h> #include <map> -@@ -855,9 +861,10 @@ +@@ -861,9 +867,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; -@@ -921,9 +928,10 @@ +@@ -927,9 +934,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, -@@ -931,11 +939,21 @@ +@@ -937,11 +945,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"; -@@ -943,6 +961,7 @@ +@@ -949,6 +967,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(). -@@ -957,20 +976,38 @@ +@@ -963,20 +982,38 @@ close(inotify_fd_); inotify_fd_ = -1; } @@ -109,7 +109,7 @@ notify_delegate_ = delegate; if (!file_loop_->WatchFileDescriptor(inotify_fd_, true, -@@ -991,7 +1028,19 @@ +@@ -997,7 +1034,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(); -@@ -1270,8 +1319,11 @@ +@@ -1276,8 +1325,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 -@@ -1308,6 +1360,7 @@ +@@ -1314,6 +1366,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.) -@@ -1323,6 +1376,7 @@ +@@ -1329,6 +1382,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 1d4e5f263a93..add6510d9d5d 100644 --- a/www/chromium/files/patch-net__proxy__proxy_service.cc +++ b/www/chromium/files/patch-net__proxy__proxy_service.cc @@ -1,6 +1,6 @@ ---- ./net/proxy/proxy_service.cc.orig 2014-08-12 21:02:40.000000000 +0200 -+++ ./net/proxy/proxy_service.cc 2014-08-13 09:56:58.000000000 +0200 -@@ -39,7 +39,7 @@ +--- ./net/proxy/proxy_service.cc.orig 2014-08-20 21:02:28.000000000 +0200 ++++ ./net/proxy/proxy_service.cc 2014-08-22 15:06:26.000000000 +0200 +@@ -41,7 +41,7 @@ #elif defined(OS_MACOSX) #include "net/proxy/proxy_config_service_mac.h" #include "net/proxy/proxy_resolver_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 @@ +@@ -1379,7 +1379,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__rtt_stats.cc b/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc index 2702a5218d6b..d770c8b10656 100644 --- a/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc +++ b/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc @@ -1,5 +1,5 @@ ---- ./net/quic/congestion_control/rtt_stats.cc.orig 2014-08-12 21:02:38.000000000 +0200 -+++ ./net/quic/congestion_control/rtt_stats.cc 2014-08-13 09:56:58.000000000 +0200 +--- ./net/quic/congestion_control/rtt_stats.cc.orig 2014-08-20 21:02:27.000000000 +0200 ++++ ./net/quic/congestion_control/rtt_stats.cc 2014-08-22 15:06:26.000000000 +0200 @@ -73,7 +73,7 @@ } else { mean_deviation_ = QuicTime::Delta::FromMicroseconds( 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 f0cae1462b2c..965c418fb79a 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-08-12 21:02:38.000000000 +0200 -+++ ./net/socket/socks5_client_socket.cc 2014-08-13 09:56:58.000000000 +0200 +--- ./net/socket/socks5_client_socket.cc.orig 2014-08-20 21:02:27.000000000 +0200 ++++ ./net/socket/socks5_client_socket.cc 2014-08-22 15:06:26.000000000 +0200 @@ -4,6 +4,10 @@ #include "net/socket/socks5_client_socket.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 40eda478127d..2fde666e8c50 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-08-12 21:02:38.000000000 +0200 -+++ ./net/socket/tcp_listen_socket_unittest.h 2014-08-13 09:56:58.000000000 +0200 +--- ./net/socket/tcp_listen_socket_unittest.h.orig 2014-08-20 21:02:27.000000000 +0200 ++++ ./net/socket/tcp_listen_socket_unittest.h 2014-08-22 15:06:26.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 7676abd3ce0d..63b31e3bc9e2 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-08-12 21:02:40.000000000 +0200 -+++ ./net/udp/udp_socket_unittest.cc 2014-08-13 09:56:58.000000000 +0200 +--- ./net/udp/udp_socket_unittest.cc.orig 2014-08-20 21:02:28.000000000 +0200 ++++ ./net/udp/udp_socket_unittest.cc 2014-08-22 15:06:26.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 54c342951c34..52a0af7381cd 100644 --- a/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc +++ b/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc @@ -1,6 +1,6 @@ ---- ./ppapi/proxy/file_io_resource.cc.orig 2014-08-12 21:01:17.000000000 +0200 -+++ ./ppapi/proxy/file_io_resource.cc 2014-08-13 09:56:58.000000000 +0200 -@@ -294,15 +294,17 @@ +--- ./ppapi/proxy/file_io_resource.cc.orig 2014-08-20 21:02:40.000000000 +0200 ++++ ./ppapi/proxy/file_io_resource.cc 2014-08-22 15:06:26.000000000 +0200 +@@ -283,15 +283,17 @@ if (check_quota_) { int64_t increase = 0; @@ -22,7 +22,7 @@ } if (increase > 0) { -@@ -319,7 +321,7 @@ +@@ -315,7 +317,7 @@ if (append) append_mode_write_amount_ += bytes_to_write; else @@ -31,7 +31,7 @@ } } return WriteValidated(offset, buffer, bytes_to_write, callback); -@@ -597,9 +599,9 @@ +@@ -593,9 +595,9 @@ } else { DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted); @@ -43,4 +43,4 @@ + max_written_offset_ = _max_offset; } - int32_t result = WriteValidated(offset, buffer, bytes_to_write, callback); + if (callback->is_blocking()) { 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 21d669fd198e..c852111d7747 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-08-12 21:01:16.000000000 +0200 -+++ ./ppapi/shared_impl/private/net_address_private_impl.cc 2014-08-13 09:56:58.000000000 +0200 +--- ./ppapi/shared_impl/private/net_address_private_impl.cc.orig 2014-08-20 21:02:39.000000000 +0200 ++++ ./ppapi/shared_impl/private/net_address_private_impl.cc 2014-08-22 15:06:26.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 39c42fe111ef..bb66ec040011 100644 --- a/www/chromium/files/patch-printing__printing.gyp +++ b/www/chromium/files/patch-printing__printing.gyp @@ -1,6 +1,6 @@ ---- ./printing/printing.gyp.orig 2014-08-12 21:02:51.000000000 +0200 -+++ ./printing/printing.gyp 2014-08-13 09:56:58.000000000 +0200 -@@ -193,7 +193,7 @@ +--- ./printing/printing.gyp.orig 2014-08-20 21:03:08.000000000 +0200 ++++ ./printing/printing.gyp 2014-08-22 15:06:26.000000000 +0200 +@@ -187,7 +187,7 @@ 'backend/print_backend_chromeos.cc', ], }], diff --git a/www/chromium/files/patch-remoting__remoting_host.gypi b/www/chromium/files/patch-remoting__remoting_host.gypi index 4b9caaffc603..a0d59ea427ee 100644 --- a/www/chromium/files/patch-remoting__remoting_host.gypi +++ b/www/chromium/files/patch-remoting__remoting_host.gypi @@ -1,5 +1,5 @@ ---- ./remoting/remoting_host.gypi.orig 2014-08-12 21:02:33.000000000 +0200 -+++ ./remoting/remoting_host.gypi 2014-08-13 09:56:58.000000000 +0200 +--- ./remoting/remoting_host.gypi.orig 2014-08-20 21:02:52.000000000 +0200 ++++ ./remoting/remoting_host.gypi 2014-08-22 15:06:26.000000000 +0200 @@ -12,7 +12,7 @@ 'variables': { 'conditions': [ @@ -9,7 +9,7 @@ 'enable_remoting_host': 1, }, { 'enable_remoting_host': 0, -@@ -266,7 +266,7 @@ +@@ -270,7 +270,7 @@ 'host/win/wts_terminal_observer.h', ], 'conditions': [ diff --git a/www/chromium/files/patch-skia__skia_chrome.gypi b/www/chromium/files/patch-skia__skia_chrome.gypi index ec2872ec33f3..ea9f653372fe 100644 --- a/www/chromium/files/patch-skia__skia_chrome.gypi +++ b/www/chromium/files/patch-skia__skia_chrome.gypi @@ -1,6 +1,6 @@ ---- ./skia/skia_chrome.gypi.orig 2014-08-12 21:03:06.000000000 +0200 -+++ ./skia/skia_chrome.gypi 2014-08-13 09:56:58.000000000 +0200 -@@ -78,6 +78,11 @@ +--- ./skia/skia_chrome.gypi.orig 2014-08-20 21:03:15.000000000 +0200 ++++ ./skia/skia_chrome.gypi 2014-08-22 15:06:26.000000000 +0200 +@@ -80,6 +80,11 @@ 'ext/vector_platform_device_skia.h', ], 'conditions': [ diff --git a/www/chromium/files/patch-skia__skia_common.gypi b/www/chromium/files/patch-skia__skia_common.gypi index a932813ee08b..e8cb9f4c48f2 100644 --- a/www/chromium/files/patch-skia__skia_common.gypi +++ b/www/chromium/files/patch-skia__skia_common.gypi @@ -1,5 +1,5 @@ ---- ./skia/skia_common.gypi.orig 2014-08-12 21:03:06.000000000 +0200 -+++ ./skia/skia_common.gypi 2014-08-13 09:56:58.000000000 +0200 +--- ./skia/skia_common.gypi.orig 2014-08-20 21:03:15.000000000 +0200 ++++ ./skia/skia_common.gypi 2014-08-22 15:06:26.000000000 +0200 @@ -66,7 +66,7 @@ }], 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 9fcb996748c0..4084676e9d7c 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-08-12 21:02:55.000000000 +0200 -+++ ./sync/util/get_session_name.cc 2014-08-13 09:56:58.000000000 +0200 +--- ./sync/util/get_session_name.cc.orig 2014-08-20 21:02:30.000000000 +0200 ++++ ./sync/util/get_session_name.cc 2014-08-22 15:06:26.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 89133eeeeb20..9d58d18eae92 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-08-12 21:02:55.000000000 +0200 -+++ ./sync/util/get_session_name_linux.cc 2014-08-13 09:56:58.000000000 +0200 +--- ./sync/util/get_session_name_linux.cc.orig 2014-08-20 21:02:30.000000000 +0200 ++++ ./sync/util/get_session_name_linux.cc 2014-08-22 15:06:26.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 dc0486033bbd..99b987d85b4a 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-08-12 21:03:10.000000000 +0200 -+++ ./testing/gtest/include/gtest/internal/gtest-port.h 2014-08-13 09:56:58.000000000 +0200 +--- ./testing/gtest/include/gtest/internal/gtest-port.h.orig 2014-08-20 21:03:23.000000000 +0200 ++++ ./testing/gtest/include/gtest/internal/gtest-port.h 2014-08-22 15:06:26.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 14d62d46c08b..1bfdfb397906 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-08-12 21:03:10.000000000 +0200 -+++ ./testing/gtest/src/gtest.cc 2014-08-13 09:56:58.000000000 +0200 +--- ./testing/gtest/src/gtest.cc.orig 2014-08-20 21:03:23.000000000 +0200 ++++ ./testing/gtest/src/gtest.cc 2014-08-22 15:06:26.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 94a7cdf17cfd..53ebc30584b5 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__config.h +++ b/www/chromium/files/patch-third_party__WebKit__Source__config.h @@ -1,6 +1,6 @@ ---- ./third_party/WebKit/Source/config.h.orig 2014-08-12 21:07:17.000000000 +0200 -+++ ./third_party/WebKit/Source/config.h 2014-08-13 09:56:58.000000000 +0200 -@@ -156,6 +156,6 @@ +--- ./third_party/WebKit/Source/config.h.orig 2014-08-20 21:08:07.000000000 +0200 ++++ ./third_party/WebKit/Source/config.h 2014-08-22 15:06:26.000000000 +0200 +@@ -155,6 +155,6 @@ #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 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 b72e3b3289f2..063cbcc8ee30 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-08-12 21:07:11.000000000 +0200 -+++ ./third_party/WebKit/Source/core/core.gyp 2014-08-13 09:56:58.000000000 +0200 -@@ -636,7 +636,7 @@ +--- ./third_party/WebKit/Source/core/core.gyp.orig 2014-08-20 21:08:03.000000000 +0200 ++++ ./third_party/WebKit/Source/core/core.gyp 2014-08-22 15:06:26.000000000 +0200 +@@ -650,7 +650,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$'], ], -@@ -675,7 +675,7 @@ +@@ -690,7 +690,7 @@ ['OS=="win" and buildtype=="Official"', { 'msvs_shard': 19, }], 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 614cea2a810f..a71e504b10b6 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,5 +1,5 @@ ---- ./third_party/WebKit/Source/platform/blink_platform.gyp.orig 2014-08-12 21:07:17.000000000 +0200 -+++ ./third_party/WebKit/Source/platform/blink_platform.gyp 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/WebKit/Source/platform/blink_platform.gyp.orig 2014-08-20 21:07:58.000000000 +0200 ++++ ./third_party/WebKit/Source/platform/blink_platform.gyp 2014-08-22 15:06:26.000000000 +0200 @@ -38,6 +38,9 @@ 'targets': [{ 'target_name': 'blink_common', @@ -10,7 +10,7 @@ 'variables': { 'enable_wexit_time_destructors': 1 }, 'dependencies': [ '../config.gyp:config', -@@ -246,7 +249,7 @@ +@@ -249,7 +252,7 @@ # compiler optimizations, see crbug.com/237063 'msvs_disabled_warnings': [ 4267, 4334, 4724 ], 'conditions': [ @@ -19,7 +19,7 @@ 'sources/': [ # Cherry-pick files excluded by the broader regular expressions above. ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'], -@@ -266,7 +269,7 @@ +@@ -269,7 +272,7 @@ ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'], ], }], @@ -28,7 +28,7 @@ 'sources/': [ ['include', 'fonts/linux/FontPlatformDataLinuxHarfBuzz\\.cpp$'], ] -@@ -363,7 +366,7 @@ +@@ -366,7 +369,7 @@ ['exclude', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'], ], }], @@ -37,7 +37,7 @@ 'sources/': [ ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], ], -@@ -409,7 +412,7 @@ +@@ -412,7 +415,7 @@ ['exclude', 'Android\\.cpp$'], ], }], diff --git a/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp b/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp index afa8e1862695..2b17eecd10cb 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp +++ b/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp @@ -1,7 +1,7 @@ ---- ./third_party/WebKit/Source/platform/heap/ThreadState.cpp.orig 2014-08-12 21:07:16.000000000 +0200 -+++ ./third_party/WebKit/Source/platform/heap/ThreadState.cpp 2014-08-13 09:56:58.000000000 +0200 -@@ -45,13 +45,22 @@ - extern "C" void* __libc_stack_end; // NOLINT +--- ./third_party/WebKit/Source/platform/heap/ThreadState.cpp.orig 2014-08-20 21:07:57.000000000 +0200 ++++ ./third_party/WebKit/Source/platform/heap/ThreadState.cpp 2014-08-22 15:06:26.000000000 +0200 +@@ -50,13 +50,22 @@ + #include <sanitizer/msan_interface.h> #endif +#if OS(FREEBSD) @@ -24,7 +24,7 @@ void* base; size_t size; int error = pthread_attr_getstack(&attr, &base, &size); -@@ -59,6 +68,9 @@ +@@ -64,6 +73,9 @@ pthread_attr_destroy(&attr); return reinterpret_cast<Address>(base) + size; } 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 57a3718ae32c..9b8bba75e1f7 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-08-12 21:07:15.000000000 +0200 -+++ ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp.orig 2014-08-20 21:07:56.000000000 +0200 ++++ ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp 2014-08-22 15:06:26.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 a58fa9b50332..172eac3c7583 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-08-12 21:07:15.000000000 +0200 -+++ ./third_party/WebKit/Source/web/web.gyp 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/WebKit/Source/web/web.gyp.orig 2014-08-20 21:07:57.000000000 +0200 ++++ ./third_party/WebKit/Source/web/web.gyp 2014-08-22 15:06:26.000000000 +0200 @@ -142,7 +142,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 2ae09af423d0..09df9bd36abc 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-08-12 21:07:13.000000000 +0200 -+++ ./third_party/WebKit/Source/wtf/Assertions.cpp 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/WebKit/Source/wtf/Assertions.cpp.orig 2014-08-20 21:08:05.000000000 +0200 ++++ ./third_party/WebKit/Source/wtf/Assertions.cpp 2014-08-22 15:06:26.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 06c797400d14..3351611a1f0a 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-08-12 21:07:13.000000000 +0200 -+++ ./third_party/WebKit/Source/wtf/ByteSwap.h 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/WebKit/Source/wtf/ByteSwap.h.orig 2014-08-20 21:08:05.000000000 +0200 ++++ ./third_party/WebKit/Source/wtf/ByteSwap.h 2014-08-22 15:06:26.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 5c6c06bebb2c..fea54f26d9f8 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-08-12 21:07:13.000000000 +0200 -+++ ./third_party/WebKit/Source/wtf/DateMath.cpp 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/WebKit/Source/wtf/DateMath.cpp.orig 2014-08-20 21:08:05.000000000 +0200 ++++ ./third_party/WebKit/Source/wtf/DateMath.cpp 2014-08-22 15:06:26.000000000 +0200 @@ -80,6 +80,7 @@ #include "StringExtras.h" diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp b/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp index 4ebf6fc7224e..5ecf252cbf3f 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp +++ b/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp @@ -1,5 +1,5 @@ ---- ./third_party/WebKit/Source/wtf/wtf.gyp.orig 2014-08-12 21:07:13.000000000 +0200 -+++ ./third_party/WebKit/Source/wtf/wtf.gyp 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/WebKit/Source/wtf/wtf.gyp.orig 2014-08-20 21:08:05.000000000 +0200 ++++ ./third_party/WebKit/Source/wtf/wtf.gyp 2014-08-22 15:06:26.000000000 +0200 @@ -70,7 +70,7 @@ 'target_name': 'wtf', 'type': '<(component)', diff --git a/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h b/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h index bb4a711859fa..62b469c01f39 100644 --- a/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h +++ b/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h @@ -1,11 +1,11 @@ ---- ./third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.orig 2014-08-12 21:03:19.000000000 +0200 -+++ ./third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.orig 2014-08-20 21:04:24.000000000 +0200 ++++ ./third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h 2014-08-22 15:06:26.000000000 +0200 @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H --#define FFMPEG_CONFIGURATION "--disable-everything --disable-avdevice --disable-avfilter --disable-bzlib --disable-doc --disable-ffprobe --disable-lzo --disable-network --disable-postproc --disable-swresample --disable-swscale --disable-zlib --enable-fft --enable-rdft --enable-shared --disable-iconv --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --optflags=-O2 --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='vp3,vorbis,vp8' --arch=i686 --enable-yasm --extra-cflags=-m32 --extra-ldflags=-m32 --enable-pic --disable-error-resilience" -+#define FFMPEG_CONFIGURATION "--disable-everything --disable-avdevice --disable-avfilter --disable-bzlib --disable-doc --disable-ffprobe --disable-lzo --disable-network --disable-postproc --disable-swresample --disable-swscale --disable-zlib --enable-fft --enable-rdft --enable-shared --disable-iconv --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --optflags=-O2 --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='vp3,vorbis,vp8' --arch=i686 --enable-yasm --extra-cflags=-m32,-mstack-alignment=16,-mstackrealign --extra-ldflags=-m32 --enable-pic --disable-error-resilience" +-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --arch=i686 --enable-yasm --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-pic" ++#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --arch=i686 --enable-yasm --extra-cflags='\"-m32,-mstack-alignment=16,-mstackrealign\"' --extra-ldflags='\"-m32\"' --enable-pic" #define FFMPEG_LICENSE "LGPL version 2.1 or later" - #define CONFIG_THIS_YEAR 2013 + #define CONFIG_THIS_YEAR 2014 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" 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 c8011dbd1441..6ee064303f84 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-08-12 21:03:23.000000000 +0200 -+++ ./third_party/ffmpeg/libavutil/mem.c 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/ffmpeg/libavutil/mem.c.orig 2014-08-20 21:04:28.000000000 +0200 ++++ ./third_party/ffmpeg/libavutil/mem.c 2014-08-22 15:06:26.000000000 +0200 @@ -32,7 +32,7 @@ #include <stdint.h> #include <stdlib.h> diff --git a/www/chromium/files/patch-third_party__khronos__khronos.gyp b/www/chromium/files/patch-third_party__khronos__khronos.gyp index 791d6bb917a9..0790d80fb187 100644 --- a/www/chromium/files/patch-third_party__khronos__khronos.gyp +++ b/www/chromium/files/patch-third_party__khronos__khronos.gyp @@ -1,5 +1,5 @@ ---- ./third_party/khronos/khronos.gyp.orig 2014-08-12 21:02:46.000000000 +0200 -+++ ./third_party/khronos/khronos.gyp 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/khronos/khronos.gyp.orig 2014-08-20 21:03:05.000000000 +0200 ++++ ./third_party/khronos/khronos.gyp 2014-08-22 15:06:26.000000000 +0200 @@ -11,6 +11,7 @@ 'include_dirs': [ '.', diff --git a/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp b/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp index d14bd115dfa6..c4440a1d27e0 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-08-12 21:02:42.000000000 +0200 -+++ ./third_party/libXNVCtrl/libXNVCtrl.gyp 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/libXNVCtrl/libXNVCtrl.gyp.orig 2014-08-20 21:03:03.000000000 +0200 ++++ ./third_party/libXNVCtrl/libXNVCtrl.gyp 2014-08-22 15:06:26.000000000 +0200 @@ -13,6 +13,9 @@ 'NVCtrlLib.h', 'nv_control.h', diff --git a/www/chromium/files/patch-third_party__libexif__libexif.gyp b/www/chromium/files/patch-third_party__libexif__libexif.gyp index 7276998e3d65..6c63f8028938 100644 --- a/www/chromium/files/patch-third_party__libexif__libexif.gyp +++ b/www/chromium/files/patch-third_party__libexif__libexif.gyp @@ -1,5 +1,5 @@ ---- ./third_party/libexif/libexif.gyp.orig 2014-07-15 21:03:04.000000000 +0200 -+++ ./third_party/libexif/libexif.gyp 2014-08-11 15:06:34.000000000 +0200 +--- ./third_party/libexif/libexif.gyp.orig 2014-08-20 21:03:07.000000000 +0200 ++++ ./third_party/libexif/libexif.gyp 2014-08-21 23:18:11.000000000 +0200 @@ -5,9 +5,9 @@ { 'variables': { diff --git a/www/chromium/files/patch-third_party__libjingle__libjingle.gyp b/www/chromium/files/patch-third_party__libjingle__libjingle.gyp index 8a583f8ff5e0..5f62c637485a 100644 --- a/www/chromium/files/patch-third_party__libjingle__libjingle.gyp +++ b/www/chromium/files/patch-third_party__libjingle__libjingle.gyp @@ -1,6 +1,6 @@ ---- ./third_party/libjingle/libjingle.gyp.orig 2014-08-12 21:02:51.000000000 +0200 -+++ ./third_party/libjingle/libjingle.gyp 2014-08-13 09:56:58.000000000 +0200 -@@ -473,7 +473,7 @@ +--- ./third_party/libjingle/libjingle.gyp.orig 2014-08-20 21:03:06.000000000 +0200 ++++ ./third_party/libjingle/libjingle.gyp 2014-08-22 15:06:26.000000000 +0200 +@@ -477,7 +477,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 4a7f3d332d04..01812f20d781 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,6 +1,6 @@ ---- ./third_party/libjingle/source/talk/base/cpumonitor.cc.orig 2014-08-12 21:03:39.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/cpumonitor.cc 2014-08-13 09:56:58.000000000 +0200 -@@ -52,13 +52,13 @@ +--- ./third_party/libjingle/source/talk/base/cpumonitor.cc.orig 2014-08-20 21:03:47.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/cpumonitor.cc 2014-08-22 15:06:26.000000000 +0200 +@@ -53,13 +53,13 @@ #include <mach/task.h> #endif // defined(IOS) || defined(OSX) @@ -16,7 +16,7 @@ #if defined(IOS) || defined(OSX) static uint64 TimeValueTToInt64(const time_value_t &time_value) { -@@ -281,6 +281,11 @@ +@@ -285,6 +285,11 @@ const uint64 cpu_times = nice + system + user; const uint64 total_times = cpu_times + idle; #endif // defined(LINUX) || defined(ANDROID) @@ -28,7 +28,7 @@ #if defined(__native_client__) // TODO(ryanpetrie): Implement this via PPAPI when it's available. -@@ -355,7 +360,7 @@ +@@ -359,7 +364,7 @@ TimeValueTToInt64(task_term_info.system_time)); #endif // defined(IOS) || defined(OSX) @@ -37,7 +37,7 @@ rusage usage; if (getrusage(RUSAGE_SELF, &usage) < 0) { LOG_ERR(LS_ERROR) << "getrusage failed"; -@@ -365,7 +370,7 @@ +@@ -369,7 +374,7 @@ const uint64 cpu_times = (usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) * kNumMicrosecsPerSec + usage.ru_utime.tv_usec + usage.ru_stime.tv_usec; 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 827f7585335b..b19dd21df383 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-08-12 21:03:39.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/ipaddress.h 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/libjingle/source/talk/base/ipaddress.h.orig 2014-08-20 21:03:47.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/ipaddress.h 2014-08-22 15:06:26.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 bed02519389c..02906e449552 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-08-12 21:03:39.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/linux.cc 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/libjingle/source/talk/base/linux.cc.orig 2014-08-20 21:03:47.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/linux.cc 2014-08-22 15:06:27.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 6154553b011f..417b583219a8 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-08-12 21:03:34.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/linux.h 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/libjingle/source/talk/base/linux.h.orig 2014-08-20 21:03:46.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/linux.h 2014-08-22 15:06:27.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 fb4f69f74e95..4da5983af68d 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-08-12 21:03:39.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/network.h 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/libjingle/source/talk/base/network.h.orig 2014-08-20 21:03:47.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/network.h 2014-08-22 15:06:27.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 bb1a7c467ba2..2c2649660efb 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,5 +1,5 @@ ---- ./third_party/libjingle/source/talk/base/systeminfo.cc.orig 2014-08-12 21:03:39.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/systeminfo.cc 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/libjingle/source/talk/base/systeminfo.cc.orig 2014-08-20 21:03:47.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/systeminfo.cc 2014-08-22 15:06:27.000000000 +0200 @@ -36,8 +36,12 @@ #elif defined(OSX) #include <ApplicationServices/ApplicationServices.h> diff --git a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp index d6525b6ee5ff..ae0078659196 100644 --- a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp +++ b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp @@ -1,5 +1,5 @@ ---- third_party/libjpeg_turbo/libjpeg.gyp.orig 2014-07-15 21:03:36.000000000 +0200 -+++ third_party/libjpeg_turbo/libjpeg.gyp 2014-08-12 22:43:14.000000000 +0200 +--- ./third_party/libjpeg_turbo/libjpeg.gyp.orig 2014-08-20 21:03:45.000000000 +0200 ++++ ./third_party/libjpeg_turbo/libjpeg.gyp 2014-08-21 23:18:11.000000000 +0200 @@ -245,7 +245,7 @@ ], }, diff --git a/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp b/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp index 8fbe5ffb0cc1..d6bda31ede72 100644 --- a/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp +++ b/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp @@ -1,5 +1,5 @@ ---- ./third_party/libphonenumber/libphonenumber.gyp.orig 2014-08-12 21:02:49.000000000 +0200 -+++ ./third_party/libphonenumber/libphonenumber.gyp 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/libphonenumber/libphonenumber.gyp.orig 2014-08-20 21:02:59.000000000 +0200 ++++ ./third_party/libphonenumber/libphonenumber.gyp 2014-08-22 15:06:27.000000000 +0200 @@ -11,6 +11,7 @@ # generated protocol headers to be available with "phonenumbers" include # path, e.g. #include "phonenumbers/foo.pb.h". 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 bff7f4e20d65..903b4fc9d022 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,5 +1,5 @@ ---- ./third_party/libvpx/unpack_lib_posix.sh.orig 2014-08-12 21:03:39.000000000 +0200 -+++ ./third_party/libvpx/unpack_lib_posix.sh 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/libvpx/unpack_lib_posix.sh.orig 2014-08-20 21:03:55.000000000 +0200 ++++ ./third_party/libvpx/unpack_lib_posix.sh 2014-08-22 15:06:27.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/usr/bin/env bash 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 9ac2433f8fc7..389b937a949b 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-08-12 21:03:34.000000000 +0200 -+++ ./third_party/ots/include/opentype-sanitiser.h 2014-08-13 09:56:58.000000000 +0200 +--- ./third_party/ots/include/opentype-sanitiser.h.orig 2014-08-20 21:03:55.000000000 +0200 ++++ ./third_party/ots/include/opentype-sanitiser.h 2014-08-22 15:06:27.000000000 +0200 @@ -22,6 +22,7 @@ #else #include <arpa/inet.h> diff --git a/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi b/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi new file mode 100644 index 000000000000..ebd428eed88f --- /dev/null +++ b/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi @@ -0,0 +1,27 @@ +--- ./third_party/pdfium/build/standalone.gypi.orig 2014-08-20 21:03:59.000000000 +0200 ++++ ./third_party/pdfium/build/standalone.gypi 2014-08-22 17:00:23.000000000 +0200 +@@ -13,7 +13,7 @@ + 'variables': { + 'variables': { + 'conditions': [ +- ['OS=="linux" or OS=="mac"', { ++ ['OS=="linux" or OS=="mac" or OS=="freebsd"', { + # This handles the Unix platforms we generally deal with. + # Anything else gets passed through, which probably won't work + # very well; such hosts should pass an explicit target_arch +@@ -26,7 +26,7 @@ + s/aarch64/arm64/;\ + s/mips.*/mipsel/")', + }, { +- # OS!="linux" and OS!="mac" ++ # OS!="linux" and OS!="mac" and OS!="freebsd" + 'host_arch%': 'ia32', + }], + ], +@@ -250,4 +250,4 @@ + # See comment in Chromium's common.gypi for why this is needed. + 'SYMROOT': '<(DEPTH)/xcodebuild', + } +-} +\ No newline at end of file ++} diff --git a/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h b/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h new file mode 100644 index 000000000000..889bf0bbf209 --- /dev/null +++ b/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h @@ -0,0 +1,11 @@ +--- ./third_party/pdfium/core/include/fxcrt/fx_system.h.orig 2014-08-20 21:03:59.000000000 +0200 ++++ ./third_party/pdfium/core/include/fxcrt/fx_system.h 2014-08-22 15:13:48.000000000 +0200 +@@ -21,7 +21,7 @@ + #elif defined(_WIN32) || defined(_WIN64) + #define _FX_OS_ _FX_WIN32_DESKTOP_ + #define _FXM_PLATFORM_ _FXM_PLATFORM_WINDOWS_ +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__FreeBSD__) + #define _FX_OS_ _FX_LINUX_DESKTOP_ + #define _FXM_PLATFORM_ _FXM_PLATFORM_LINUX_ + #elif defined(__APPLE__) diff --git a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp new file mode 100644 index 000000000000..53950176e79e --- /dev/null +++ b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp @@ -0,0 +1,20 @@ +--- ./third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig 2014-08-20 21:04:00.000000000 +0200 ++++ ./third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp 2014-08-22 22:27:31.000000000 +0200 +@@ -1062,7 +1062,7 @@ + //function AFNumber_Format(nDec, sepStyle, negStyle, currStyle, strCurrency, bCurrencyPrepend) + FX_BOOL CJS_PublicMethods::AFNumber_Format(OBJ_METHOD_PARAMS) + { +-#if _FX_OS_ != _FX_ANDROID_ ++#if _FX_OS_ != _FX_ANDROID_ && _FX_OS_ != _FX_LINUX_DESKTOP_ + v8::Isolate* isolate = ::GetIsolate(cc); + CJS_Context* pContext = (CJS_Context *)cc; + ASSERT(pContext != NULL); +@@ -1403,7 +1403,7 @@ + //function AFPercent_Format(nDec, sepStyle) + FX_BOOL CJS_PublicMethods::AFPercent_Format(OBJ_METHOD_PARAMS) + { +-#if _FX_OS_ != _FX_ANDROID_ ++#if _FX_OS_ != _FX_ANDROID_ && _FX_OS_ != _FX_LINUX_DESKTOP_ + CJS_Context* pContext = (CJS_Context *)cc; + ASSERT(pContext != NULL); + CJS_EventHandler* pEvent = pContext->GetEventHandler(); diff --git a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp new file mode 100644 index 000000000000..fffe1c0a4675 --- /dev/null +++ b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp @@ -0,0 +1,21 @@ +--- ./third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp.orig 2014-08-20 21:04:00.000000000 +0200 ++++ ./third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp 2014-08-22 19:48:05.000000000 +0200 +@@ -753,12 +753,17 @@ + + double _getLocalTZA() + { ++ struct tm *lt; + if(!FSDK_IsSandBoxPolicyEnabled(FPDF_POLICY_MACHINETIME_ACCESS)) + return 0; + time_t t = 0; + time(&t); +- localtime(&t); ++ lt = localtime(&t); ++#ifdef __FreeBSD__ ++ return (double)(-(lt->tm_gmtoff * 1000)); ++#else + return (double)(-(timezone * 1000)); ++#endif + } + + int _getDaylightSavingTA(double d) diff --git a/www/chromium/files/patch-third_party__pdfium__pdfium.gyp b/www/chromium/files/patch-third_party__pdfium__pdfium.gyp new file mode 100644 index 000000000000..ea43f69b97e9 --- /dev/null +++ b/www/chromium/files/patch-third_party__pdfium__pdfium.gyp @@ -0,0 +1,11 @@ +--- ./third_party/pdfium/pdfium.gyp.orig 2014-08-20 21:04:00.000000000 +0200 ++++ ./third_party/pdfium/pdfium.gyp 2014-08-22 16:59:52.000000000 +0200 +@@ -14,7 +14,7 @@ + ['pdf_use_skia==1', { + 'defines': ['_SKIA_SUPPORT_'], + }], +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="freebsd"', { + 'cflags!': [ + '-fno-exceptions', + ], diff --git a/www/chromium/files/patch-third_party__sfntly__sfntly.gyp b/www/chromium/files/patch-third_party__sfntly__sfntly.gyp index cc5a6729cad9..cfe61867d02f 100644 --- a/www/chromium/files/patch-third_party__sfntly__sfntly.gyp +++ b/www/chromium/files/patch-third_party__sfntly__sfntly.gyp @@ -1,5 +1,5 @@ ---- ./third_party/sfntly/sfntly.gyp.orig 2014-08-12 21:02:45.000000000 +0200 -+++ ./third_party/sfntly/sfntly.gyp 2014-08-13 09:56:59.000000000 +0200 +--- ./third_party/sfntly/sfntly.gyp.orig 2014-08-20 21:03:05.000000000 +0200 ++++ ./third_party/sfntly/sfntly.gyp 2014-08-22 15:06:27.000000000 +0200 @@ -126,7 +126,7 @@ 'cpp/src/sample/chromium/subsetter_impl.h', ], diff --git a/www/chromium/files/patch-third_party__sqlite__sqlite.gyp b/www/chromium/files/patch-third_party__sqlite__sqlite.gyp index 9b44c36320cf..def88d45a9e1 100644 --- a/www/chromium/files/patch-third_party__sqlite__sqlite.gyp +++ b/www/chromium/files/patch-third_party__sqlite__sqlite.gyp @@ -1,5 +1,5 @@ ---- ./third_party/sqlite/sqlite.gyp.orig 2014-08-12 21:02:44.000000000 +0200 -+++ ./third_party/sqlite/sqlite.gyp 2014-08-13 09:56:59.000000000 +0200 +--- ./third_party/sqlite/sqlite.gyp.orig 2014-08-20 21:03:05.000000000 +0200 ++++ ./third_party/sqlite/sqlite.gyp 2014-08-22 15:06:27.000000000 +0200 @@ -105,6 +105,8 @@ 'amalgamation', # Needed for fts2 to build. diff --git a/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc b/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc new file mode 100644 index 000000000000..9591db5fa0bd --- /dev/null +++ b/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc @@ -0,0 +1,11 @@ +--- ./third_party/webrtc/base/httpcommon.cc.orig 2014-08-20 21:04:28.000000000 +0200 ++++ ./third_party/webrtc/base/httpcommon.cc 2014-08-22 18:44:03.000000000 +0200 +@@ -382,7 +382,7 @@ + gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60; + } + // TODO: Android should support timezone, see b/2441195 +-#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID) || defined(BSD) ++#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD) + tm *tm_for_timezone = localtime((time_t *)&gmt); + *seconds = gmt + tm_for_timezone->tm_gmtoff; + #else diff --git a/www/chromium/files/patch-third_party__webrtc__base__network.cc b/www/chromium/files/patch-third_party__webrtc__base__network.cc new file mode 100644 index 000000000000..4f74d9ff7ee3 --- /dev/null +++ b/www/chromium/files/patch-third_party__webrtc__base__network.cc @@ -0,0 +1,29 @@ +--- ./third_party/webrtc/base/network.cc.orig 2014-08-20 21:04:28.000000000 +0200 ++++ ./third_party/webrtc/base/network.cc 2014-08-22 18:51:07.000000000 +0200 +@@ -18,7 +18,7 @@ + // linux/if.h can't be included at the same time as the posix sys/if.h, and + // it's transitively required by linux/route.h, so include that version on + // linux instead of the standard posix one. +-#if defined(WEBRTC_LINUX) ++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) + #include <linux/if.h> + #include <linux/route.h> + #elif !defined(__native_client__) +@@ -462,7 +462,7 @@ + } + #endif // WEBRTC_WIN + +-#if defined(WEBRTC_LINUX) ++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) + bool IsDefaultRoute(const std::string& network_name) { + FileStream fs; + if (!fs.Open("/proc/net/route", "r", NULL)) { +@@ -502,7 +502,7 @@ + strncmp(network.name().c_str(), "vnic", 4) == 0) { + return true; + } +-#if defined(WEBRTC_LINUX) ++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) + // Make sure this is a default route, if we're ignoring non-defaults. + if (ignore_non_default_routes_ && !IsDefaultRoute(network.name())) { + return true; diff --git a/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc b/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc new file mode 100644 index 000000000000..e1af1ce4eb16 --- /dev/null +++ b/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc @@ -0,0 +1,33 @@ +--- ./third_party/webrtc/base/physicalsocketserver.cc.orig 2014-08-20 21:04:28.000000000 +0200 ++++ ./third_party/webrtc/base/physicalsocketserver.cc 2014-08-22 18:54:07.000000000 +0200 +@@ -240,7 +240,7 @@ + socklen_t optlen = sizeof(*value); + int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen); + if (ret != -1 && opt == OPT_DONTFRAGMENT) { +-#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) ++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) + *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; + #endif + } +@@ -253,7 +253,7 @@ + if (TranslateOption(opt, &slevel, &sopt) == -1) + return -1; + if (opt == OPT_DONTFRAGMENT) { +-#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) ++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) + value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; + #endif + } +@@ -503,10 +503,10 @@ + *slevel = IPPROTO_IP; + *sopt = IP_DONTFRAGMENT; + break; +-#elif defined(WEBRTC_MAC) || defined(BSD) || defined(__native_client__) ++#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) || defined(__native_client__) + LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported."; + return -1; +-#elif defined(WEBRTC_POSIX) ++#elif defined(WEBRTC_POSIX) && !defined(WEBRTC_BSD) + *slevel = IPPROTO_IP; + *sopt = IP_MTU_DISCOVER; + break; diff --git a/www/chromium/files/patch-third_party__webrtc__base__stringutils.h b/www/chromium/files/patch-third_party__webrtc__base__stringutils.h new file mode 100644 index 000000000000..912bcace4a48 --- /dev/null +++ b/www/chromium/files/patch-third_party__webrtc__base__stringutils.h @@ -0,0 +1,17 @@ +--- ./third_party/webrtc/base/stringutils.h.orig 2014-08-20 21:04:28.000000000 +0200 ++++ ./third_party/webrtc/base/stringutils.h 2014-08-22 18:44:28.000000000 +0200 +@@ -23,11 +23,11 @@ + #endif // WEBRTC_WIN + + #if defined(WEBRTC_POSIX) +-#ifdef BSD ++#ifdef WEBRTC_BSD + #include <stdlib.h> +-#else // BSD ++#else // WEBRTC_BSD + #include <alloca.h> +-#endif // !BSD ++#endif // !WEBRTC_BSD + #endif // WEBRTC_POSIX + + #include <string> 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 3772a5d2cb48..5c64a9b8bae1 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-08-12 21:04:14.000000000 +0200 -+++ ./third_party/webrtc/build/common.gypi 2014-08-13 09:56:59.000000000 +0200 -@@ -286,6 +286,13 @@ +--- ./third_party/webrtc/build/common.gypi.orig 2014-08-20 21:04:25.000000000 +0200 ++++ ./third_party/webrtc/build/common.gypi 2014-08-23 16:42:44.000000000 +0200 +@@ -321,6 +321,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 9edd59bf3f30..3dc87795e9b0 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,7 +1,7 @@ ---- ./third_party/webrtc/modules/audio_device/audio_device.gypi.orig 2014-08-12 21:03:58.000000000 +0200 -+++ ./third_party/webrtc/modules/audio_device/audio_device.gypi 2014-08-13 09:56:59.000000000 +0200 -@@ -47,7 +47,7 @@ - 'dummy/audio_device_utility_dummy.h', +--- ./third_party/webrtc/modules/audio_device/audio_device.gypi.orig 2014-08-20 21:04:06.000000000 +0200 ++++ ./third_party/webrtc/modules/audio_device/audio_device.gypi 2014-08-22 15:06:27.000000000 +0200 +@@ -49,7 +49,7 @@ + 'dummy/file_audio_device.h', ], 'conditions': [ - ['OS=="linux"', { @@ -9,7 +9,7 @@ 'include_dirs': [ 'linux', ], -@@ -141,7 +141,7 @@ +@@ -150,7 +150,7 @@ ], }, }], 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 8087edfaed5b..7015d8530b42 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,5 +1,5 @@ ---- ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig 2014-08-12 21:04:10.000000000 +0200 -+++ ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi 2014-08-13 09:57:00.000000000 +0200 +--- ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig 2014-08-20 21:04:19.000000000 +0200 ++++ ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi 2014-08-22 15:06:27.000000000 +0200 @@ -107,6 +107,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 965514b0e932..f33da8cfd0d6 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-08-12 21:04:11.000000000 +0200 -+++ ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc 2014-08-13 09:57:00.000000000 +0200 +--- ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2014-08-20 21:04:19.000000000 +0200 ++++ ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc 2014-08-22 15:06:27.000000000 +0200 @@ -15,6 +15,7 @@ #include <string.h> diff --git a/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc b/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc index b57a60708258..8819aeaee6dc 100644 --- a/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc +++ b/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc @@ -1,5 +1,5 @@ ---- ./third_party/webrtc/modules/video_coding/main/source/receiver.cc.orig 2014-08-12 21:04:10.000000000 +0200 -+++ ./third_party/webrtc/modules/video_coding/main/source/receiver.cc 2014-08-13 09:57:00.000000000 +0200 +--- ./third_party/webrtc/modules/video_coding/main/source/receiver.cc.orig 2014-08-20 21:04:18.000000000 +0200 ++++ ./third_party/webrtc/modules/video_coding/main/source/receiver.cc 2014-08-22 15:06:27.000000000 +0200 @@ -134,8 +134,8 @@ // Assume that render timing errors are due to changes in the video stream. if (next_render_time_ms < 0) { 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 af5095ac26df..6dde8fdd8447 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-08-12 21:04:15.000000000 +0200 -+++ ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc 2014-08-13 09:57:00.000000000 +0200 +--- ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig 2014-08-20 21:04:27.000000000 +0200 ++++ ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc 2014-08-22 15:06:27.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 a8b927db0e05..6f03a3bc066c 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-08-12 21:04:15.000000000 +0200 -+++ ./third_party/webrtc/system_wrappers/source/cpu_info.cc 2014-08-13 09:57:00.000000000 +0200 +--- ./third_party/webrtc/system_wrappers/source/cpu_info.cc.orig 2014-08-20 21:04:27.000000000 +0200 ++++ ./third_party/webrtc/system_wrappers/source/cpu_info.cc 2014-08-22 15:06:27.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 89a773aa7995..0a36fc24289e 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-08-12 21:04:15.000000000 +0200 -+++ ./third_party/webrtc/system_wrappers/source/thread_posix.cc 2014-08-13 09:57:00.000000000 +0200 +--- ./third_party/webrtc/system_wrappers/source/thread_posix.cc.orig 2014-08-20 21:04:27.000000000 +0200 ++++ ./third_party/webrtc/system_wrappers/source/thread_posix.cc 2014-08-22 15:06:27.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 53065c58f01e..b97af8be5dc8 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-08-12 21:04:14.000000000 +0200 -+++ ./third_party/webrtc/voice_engine/voice_engine_defines.h 2014-08-13 09:57:00.000000000 +0200 +--- ./third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2014-08-20 21:04:25.000000000 +0200 ++++ ./third_party/webrtc/voice_engine/voice_engine_defines.h 2014-08-22 15:06:27.000000000 +0200 @@ -237,7 +237,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 182d76eaa2f6..4d8632efc42d 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-08-12 21:03:54.000000000 +0200 -+++ ./tools/gyp/pylib/gyp/generator/make.py 2014-08-13 09:57:00.000000000 +0200 +--- ./tools/gyp/pylib/gyp/generator/make.py.orig 2014-08-20 21:04:05.000000000 +0200 ++++ ./tools/gyp/pylib/gyp/generator/make.py 2014-08-22 15:06:27.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 0b12237b180d..0ef63f92ba6d 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-08-12 21:04:03.000000000 +0200 -+++ ./tools/gyp/test/additional-targets/src/dir1/actions.gyp 2014-08-13 09:57:00.000000000 +0200 +--- ./tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2014-08-20 21:04:18.000000000 +0200 ++++ ./tools/gyp/test/additional-targets/src/dir1/actions.gyp 2014-08-22 15:06:27.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 a4d68943ca95..93aa591819a8 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-08-12 21:04:03.000000000 +0200 -+++ ./tools/gyp/test/library/src/library.gyp 2014-08-13 09:57:00.000000000 +0200 +--- ./tools/gyp/test/library/src/library.gyp.orig 2014-08-20 21:04:18.000000000 +0200 ++++ ./tools/gyp/test/library/src/library.gyp 2014-08-22 15:06:27.000000000 +0200 @@ -48,7 +48,7 @@ }, ], diff --git a/www/chromium/files/patch-ui__app_list__app_list_constants.cc b/www/chromium/files/patch-ui__app_list__app_list_constants.cc index 171a3648f7ee..de20c5751d6a 100644 --- a/www/chromium/files/patch-ui__app_list__app_list_constants.cc +++ b/www/chromium/files/patch-ui__app_list__app_list_constants.cc @@ -1,6 +1,6 @@ ---- ./ui/app_list/app_list_constants.cc.orig 2014-08-12 21:02:31.000000000 +0200 -+++ ./ui/app_list/app_list_constants.cc 2014-08-13 09:57:00.000000000 +0200 -@@ -81,7 +81,7 @@ +--- ./ui/app_list/app_list_constants.cc.orig 2014-08-20 21:02:20.000000000 +0200 ++++ ./ui/app_list/app_list_constants.cc 2014-08-22 15:06:27.000000000 +0200 +@@ -88,7 +88,7 @@ const ui::ResourceBundle::FontStyle kItemTextFontStyle = ui::ResourceBundle::SmallBoldFont; diff --git a/www/chromium/files/patch-ui__app_list__app_list_constants.h b/www/chromium/files/patch-ui__app_list__app_list_constants.h index e65f5cee00fd..5d32e886dbfd 100644 --- a/www/chromium/files/patch-ui__app_list__app_list_constants.h +++ b/www/chromium/files/patch-ui__app_list__app_list_constants.h @@ -1,6 +1,6 @@ ---- ./ui/app_list/app_list_constants.h.orig 2014-08-12 21:02:31.000000000 +0200 -+++ ./ui/app_list/app_list_constants.h 2014-08-13 09:57:00.000000000 +0200 -@@ -57,8 +57,8 @@ +--- ./ui/app_list/app_list_constants.h.orig 2014-08-20 21:02:20.000000000 +0200 ++++ ./ui/app_list/app_list_constants.h 2014-08-22 15:06:27.000000000 +0200 +@@ -62,8 +62,8 @@ APP_LIST_EXPORT extern const ui::ResourceBundle::FontStyle kItemTextFontStyle; diff --git a/www/chromium/files/patch-ui__base__ui_base.gyp b/www/chromium/files/patch-ui__base__ui_base.gyp index 301d02481f8c..e5379f85e76a 100644 --- a/www/chromium/files/patch-ui__base__ui_base.gyp +++ b/www/chromium/files/patch-ui__base__ui_base.gyp @@ -1,5 +1,5 @@ ---- ./ui/base/ui_base.gyp.orig 2014-08-12 21:02:27.000000000 +0200 -+++ ./ui/base/ui_base.gyp 2014-08-13 09:57:00.000000000 +0200 +--- ./ui/base/ui_base.gyp.orig 2014-08-20 21:02:15.000000000 +0200 ++++ ./ui/base/ui_base.gyp 2014-08-22 15:06:27.000000000 +0200 @@ -366,7 +366,7 @@ 'x/selection_utils.h', ] diff --git a/www/chromium/files/patch-ui__events__event_switches.cc b/www/chromium/files/patch-ui__events__event_switches.cc index 1276f53a21c9..b5692997715c 100644 --- a/www/chromium/files/patch-ui__events__event_switches.cc +++ b/www/chromium/files/patch-ui__events__event_switches.cc @@ -1,8 +1,8 @@ ---- ./ui/events/event_switches.cc.orig 2014-08-12 21:02:29.000000000 +0200 -+++ ./ui/events/event_switches.cc 2014-08-13 09:57:00.000000000 +0200 -@@ -22,7 +22,7 @@ - // Use the unified gesture detector, instead of the aura gesture detector. - const char kUseUnifiedGestureDetector[] = "use-unified-gesture-detector"; +--- ./ui/events/event_switches.cc.orig 2014-08-20 21:02:18.000000000 +0200 ++++ ./ui/events/event_switches.cc 2014-08-22 15:06:27.000000000 +0200 +@@ -32,7 +32,7 @@ + // disabled: Use the aura gesture detector. + const char kUnifiedGestureDetectorDisabled[] = "disabled"; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) diff --git a/www/chromium/files/patch-ui__events__event_switches.h b/www/chromium/files/patch-ui__events__event_switches.h index c42467768871..dd7952be42ac 100644 --- a/www/chromium/files/patch-ui__events__event_switches.h +++ b/www/chromium/files/patch-ui__events__event_switches.h @@ -1,8 +1,8 @@ ---- ./ui/events/event_switches.h.orig 2014-08-12 21:02:29.000000000 +0200 -+++ ./ui/events/event_switches.h 2014-08-13 09:57:00.000000000 +0200 -@@ -17,7 +17,7 @@ - EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[]; - EVENTS_BASE_EXPORT extern const char kUseUnifiedGestureDetector[]; +--- ./ui/events/event_switches.h.orig 2014-08-20 21:02:18.000000000 +0200 ++++ ./ui/events/event_switches.h 2014-08-22 15:06:27.000000000 +0200 +@@ -20,7 +20,7 @@ + EVENTS_BASE_EXPORT extern const char kUnifiedGestureDetectorEnabled[]; + EVENTS_BASE_EXPORT extern const char kUnifiedGestureDetectorDisabled[]; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) diff --git a/www/chromium/files/patch-ui__gl__gl.gyp b/www/chromium/files/patch-ui__gl__gl.gyp index 168d7f969449..9e422eb6e602 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-08-12 21:02:27.000000000 +0200 -+++ ./ui/gl/gl.gyp 2014-08-13 09:57:00.000000000 +0200 -@@ -173,7 +173,7 @@ +--- ./ui/gl/gl.gyp.orig 2014-08-20 21:02:15.000000000 +0200 ++++ ./ui/gl/gl.gyp 2014-08-22 15:06:27.000000000 +0200 +@@ -171,7 +171,7 @@ }, ], 'conditions': [ @@ -9,7 +9,7 @@ 'sources': [ 'egl_util.cc', 'egl_util.h', -@@ -192,7 +192,7 @@ +@@ -190,7 +190,7 @@ '<(DEPTH)/third_party/khronos', ], }], diff --git a/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc b/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc index c61c4c22a313..8b086bae6f79 100644 --- a/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc +++ b/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc @@ -1,11 +1,11 @@ ---- ui/shell_dialogs/select_file_dialog.cc.orig 2014-08-12 21:02:27.000000000 +0200 -+++ ui/shell_dialogs/select_file_dialog.cc 2014-08-17 19:43:29.000000000 +0200 +--- ./ui/shell_dialogs/select_file_dialog.cc.orig 2014-08-20 21:02:18.000000000 +0200 ++++ ./ui/shell_dialogs/select_file_dialog.cc 2014-08-22 15:06:27.000000000 +0200 @@ -20,7 +20,7 @@ #include "ui/shell_dialogs/select_file_dialog_mac.h" #elif defined(OS_ANDROID) #include "ui/shell_dialogs/select_file_dialog_android.h" --#elif defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX) -+#elif defined(USE_AURA) && !defined(USE_ASH) && (defined(OS_LINUX) || defined(OS_FREEBSD)) +-#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif defined(USE_AURA) && (defined(OS_FREEBSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))) #include "ui/shell_dialogs/linux_shell_dialog.h" #endif @@ -13,8 +13,8 @@ return dialog; } --#if defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX) -+#if defined(USE_AURA) && !defined(USE_ASH) && (defined(OS_LINUX) || defined(OS_FREEBSD)) +-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(USE_AURA) && (defined(OS_FREEBSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))) const ui::LinuxShellDialog* shell_dialogs = ui::LinuxShellDialog::instance(); if (shell_dialogs) return shell_dialogs->CreateSelectFileDialog(listener, policy); diff --git a/www/chromium/files/patch-ui__views__views.gyp b/www/chromium/files/patch-ui__views__views.gyp index 315487821a53..9a05d9004926 100644 --- a/www/chromium/files/patch-ui__views__views.gyp +++ b/www/chromium/files/patch-ui__views__views.gyp @@ -1,6 +1,6 @@ ---- ./ui/views/views.gyp.orig 2014-08-12 21:02:26.000000000 +0200 -+++ ./ui/views/views.gyp 2014-08-13 09:57:00.000000000 +0200 -@@ -461,7 +461,7 @@ +--- ./ui/views/views.gyp.orig 2014-08-20 21:02:18.000000000 +0200 ++++ ./ui/views/views.gyp 2014-08-22 15:06:27.000000000 +0200 +@@ -490,7 +490,7 @@ '../display/display.gyp:display_util', ], }], diff --git a/www/chromium/files/patch-ui__views__views_delegate.cc b/www/chromium/files/patch-ui__views__views_delegate.cc index 587202e80e68..dcccda1ed2f9 100644 --- a/www/chromium/files/patch-ui__views__views_delegate.cc +++ b/www/chromium/files/patch-ui__views__views_delegate.cc @@ -1,5 +1,5 @@ ---- ./ui/views/views_delegate.cc.orig 2014-08-12 21:02:26.000000000 +0200 -+++ ./ui/views/views_delegate.cc 2014-08-13 09:57:00.000000000 +0200 +--- ./ui/views/views_delegate.cc.orig 2014-08-20 21:02:18.000000000 +0200 ++++ ./ui/views/views_delegate.cc 2014-08-22 15:06:27.000000000 +0200 @@ -50,7 +50,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { return false; diff --git a/www/chromium/files/patch-ui__views__views_delegate.h b/www/chromium/files/patch-ui__views__views_delegate.h index 13091850cd9e..fcf56090bc95 100644 --- a/www/chromium/files/patch-ui__views__views_delegate.h +++ b/www/chromium/files/patch-ui__views__views_delegate.h @@ -1,6 +1,6 @@ ---- ./ui/views/views_delegate.h.orig 2014-08-12 21:02:26.000000000 +0200 -+++ ./ui/views/views_delegate.h 2014-08-13 09:57:00.000000000 +0200 -@@ -94,7 +94,7 @@ +--- ./ui/views/views_delegate.h.orig 2014-08-20 21:02:18.000000000 +0200 ++++ ./ui/views/views_delegate.h 2014-08-22 15:06:27.000000000 +0200 +@@ -98,7 +98,7 @@ // Returns true if the window passed in is in the Windows 8 metro // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; diff --git a/www/chromium/files/patch-v8__src__platform-freebsd.cc b/www/chromium/files/patch-v8__src__platform-freebsd.cc new file mode 100644 index 000000000000..493b2e470d13 --- /dev/null +++ b/www/chromium/files/patch-v8__src__platform-freebsd.cc @@ -0,0 +1,34 @@ +--- ./v8/src/platform-freebsd.cc.orig 2014-08-20 21:04:33.000000000 +0200 ++++ ./v8/src/platform-freebsd.cc 2014-08-22 18:16:57.000000000 +0200 +@@ -130,14 +130,14 @@ + addr_buffer[0] = '0'; + addr_buffer[1] = 'x'; + addr_buffer[10] = 0; +- int result = read(fd, addr_buffer + 2, 8); +- if (result < 8) break; ++ int resultread = read(fd, addr_buffer + 2, 8); ++ if (resultread < 8) break; + unsigned start = StringToLong(addr_buffer); +- result = read(fd, addr_buffer + 2, 1); +- if (result < 1) break; ++ resultread = read(fd, addr_buffer + 2, 1); ++ if (resultread < 1) break; + if (addr_buffer[2] != '-') break; +- result = read(fd, addr_buffer + 2, 8); +- if (result < 8) break; ++ resultread = read(fd, addr_buffer + 2, 8); ++ if (resultread < 8) break; + unsigned end = StringToLong(addr_buffer); + char buffer[MAP_LENGTH]; + int bytes_read = -1; +@@ -145,8 +145,8 @@ + bytes_read++; + if (bytes_read >= MAP_LENGTH - 1) + break; +- result = read(fd, buffer + bytes_read, 1); +- if (result < 1) break; ++ resultread = read(fd, buffer + bytes_read, 1); ++ if (resultread < 1) break; + } while (buffer[bytes_read] != '\n'); + buffer[bytes_read] = 0; + // Ignore mappings that are not executable. diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index b8eaa77e768a..0793ed3770eb 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -105,6 +105,8 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/resourcePlainIcon.png %%DATADIR%%/resources/inspector/Images/resourcePlainIconSmall.png %%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.png +%%DATADIR%%/resources/inspector/Images/responsiveDesign.png +%%DATADIR%%/resources/inspector/Images/responsiveDesign_2x.png %%DATADIR%%/resources/inspector/Images/searchNext.png %%DATADIR%%/resources/inspector/Images/searchPrev.png %%DATADIR%%/resources/inspector/Images/sessionStorage.png @@ -123,16 +125,14 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/toolbarItemSelected.png %%DATADIR%%/resources/inspector/Images/trackHoriz.png %%DATADIR%%/resources/inspector/Images/trackVert.png -%%DATADIR%%/resources/inspector/Main.js %%DATADIR%%/resources/inspector/accelerometer.css %%DATADIR%%/resources/inspector/audits/AuditsPanel.js %%DATADIR%%/resources/inspector/auditsPanel.css %%DATADIR%%/resources/inspector/breadcrumbList.css %%DATADIR%%/resources/inspector/breakpointsList.css -%%DATADIR%%/resources/inspector/buildSystemOnly.js %%DATADIR%%/resources/inspector/canvasProfiler.css -%%DATADIR%%/resources/inspector/cmdevtools.css -%%DATADIR%%/resources/inspector/codemirror.css +%%DATADIR%%/resources/inspector/cm/cmdevtools.css +%%DATADIR%%/resources/inspector/cm/codemirror.css %%DATADIR%%/resources/inspector/console/ConsolePanel.js %%DATADIR%%/resources/inspector/dataGrid.css %%DATADIR%%/resources/inspector/devices/DevicesView.js @@ -152,6 +152,7 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/inspectorCommon.css %%DATADIR%%/resources/inspector/layers/LayersPanel.js %%DATADIR%%/resources/inspector/layersPanel.css +%%DATADIR%%/resources/inspector/main/Main.js %%DATADIR%%/resources/inspector/navigatorView.css %%DATADIR%%/resources/inspector/network/NetworkPanel.js %%DATADIR%%/resources/inspector/networkLogView.css @@ -164,10 +165,12 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/resourceView.css %%DATADIR%%/resources/inspector/resources/ResourcesPanel.js %%DATADIR%%/resources/inspector/resourcesPanel.css +%%DATADIR%%/resources/inspector/responsiveDesignView.css %%DATADIR%%/resources/inspector/revisionHistory.css %%DATADIR%%/resources/inspector/screencastView.css %%DATADIR%%/resources/inspector/script_formatter_worker/ScriptFormatterWorker.js %%DATADIR%%/resources/inspector/search/AdvancedSearchView.js +%%DATADIR%%/resources/inspector/settings/SettingsScreen.js %%DATADIR%%/resources/inspector/sidebarPane.css %%DATADIR%%/resources/inspector/source_frame/SourceFrame.js %%DATADIR%%/resources/inspector/sources/SourcesPanel.js @@ -190,17 +193,20 @@ share/icons/hicolor/64x64/apps/chrome.png @dirrmtry %%DATADIR%%/resources/extension @dirrmtry %%DATADIR%%/resources/inspector/Images @dirrmtry %%DATADIR%%/resources/inspector/audits +@dirrmtry %%DATADIR%%/resources/inspector/cm @dirrmtry %%DATADIR%%/resources/inspector/console @dirrmtry %%DATADIR%%/resources/inspector/devices @dirrmtry %%DATADIR%%/resources/inspector/elements @dirrmtry %%DATADIR%%/resources/inspector/extensions @dirrmtry %%DATADIR%%/resources/inspector/layers +@dirrmtry %%DATADIR%%/resources/inspector/main @dirrmtry %%DATADIR%%/resources/inspector/network @dirrmtry %%DATADIR%%/resources/inspector/profiler/heap_snapshot_worker @dirrmtry %%DATADIR%%/resources/inspector/profiler @dirrmtry %%DATADIR%%/resources/inspector/resources @dirrmtry %%DATADIR%%/resources/inspector/script_formatter_worker @dirrmtry %%DATADIR%%/resources/inspector/search +@dirrmtry %%DATADIR%%/resources/inspector/settings @dirrmtry %%DATADIR%%/resources/inspector/source_frame @dirrmtry %%DATADIR%%/resources/inspector/sources @dirrmtry %%DATADIR%%/resources/inspector/temp_storage_shared_worker |