kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update www/chromium to 37.0.2062.94

Browse source 
Obtained from:	freebsd-chromium@ (especially Carlos Medina)
MFH:		2014Q3
Security:	http://www.vuxml.org/freebsd/fd5f305d-2d3d-11e4-aa3d-00262d5ed8ee.html
This commit is contained in:
Rene Ladan 2014-08-26 17:09:02 +00:00
parent 7a6d6a26ac
commit b88b94b93e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=366226
226 changed files with 1098 additions and 760 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
www/chromium/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= chromium PORTNAME= chromium
PORTVERSION= 36.0.1985.143 PORTVERSION= 37.0.2062.94
PORTREVISION= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@ -244,8 +243,10 @@ post-patch:
pre-configure: pre-configure:
# phajdan-jr: list of things *not* to remove, so maybe the script # phajdan-jr: list of things *not* to remove, so maybe the script
# should be called "keep_bundled_libraries.py" # should be called "keep_bundled_libraries.py"
# keep third_party/protobuf to ease debugging
cd ${WRKSRC} && ${PYTHON_CMD} \ cd ${WRKSRC} && ${PYTHON_CMD} \
./build/linux/unbundle/remove_bundled_libraries.py \ ./build/linux/unbundle/remove_bundled_libraries.py \
'third_party/protobuf' \
'base/third_party/dmg_fp' \ 'base/third_party/dmg_fp' \
'base/third_party/dynamic_annotations' \ 'base/third_party/dynamic_annotations' \
'base/third_party/icu' \ 'base/third_party/icu' \
@ -269,6 +270,7 @@ pre-configure:
'third_party/cros_system_api' \ 'third_party/cros_system_api' \
'third_party/dom_distiller_js' \ 'third_party/dom_distiller_js' \
'third_party/ffmpeg' \ 'third_party/ffmpeg' \
'third_party/fips181' \
'third_party/flot' \ 'third_party/flot' \
'third_party/hunspell' \ 'third_party/hunspell' \
'third_party/iccjpeg' \ 'third_party/iccjpeg' \
@ -295,8 +297,9 @@ pre-configure:
'third_party/npapi' \ 'third_party/npapi' \
'third_party/opus' \ 'third_party/opus' \
'third_party/ots' \ 'third_party/ots' \
'third_party/polymer' \ 'third_party/pdfium' \
'third_party/ply' \ 'third_party/ply' \
'third_party/polymer' \
'third_party/pywebsocket' \ 'third_party/pywebsocket' \
'third_party/qcms' \ 'third_party/qcms' \
'third_party/readability' \ 'third_party/readability' \
@ -344,16 +347,20 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \
${STAGEDIR}${DATADIR} ${STAGEDIR}${DATADIR}
.for p in chrome_100_percent content_resources keyboard_resources resources .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 .endfor
${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \
${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libffmpegsumo.so ${STAGEDIR}${DATADIR} ${STAGEDIR}${DATADIR}
${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libffmpegsumo.so \
${STAGEDIR}${DATADIR}
cd ${WRKSRC}/out/${BUILDTYPE} && \ cd ${WRKSRC}/out/${BUILDTYPE} && \
${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR}
@${MKDIR} ${STAGEDIR}${DESKTOPDIR} @${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_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 ${STAGEDIR}${DATADIR}/mksnapshot
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

8
www/chromium/distinfo
View file

@ -1,4 +1,4 @@
SHA256 (chromium-36.0.1985.143.tar.xz) = 0631d7442991f0b4b942477c58a9294e9e3eb21ffd3c8626e4ab663b8345c316 SHA256 (chromium-37.0.2062.94.tar.xz) = d27c19580b74cbe143131f0bc097557b3b2fb3d2be966e688d8af51a779ce533
SIZE (chromium-36.0.1985.143.tar.xz) = 205456928 SIZE (chromium-37.0.2062.94.tar.xz) = 220064328
SHA256 (chromium-36.0.1985.143-testdata.tar.xz) = 7af27696a1d30a2acd29ffa331c956f58d82080905b73ad9259f7d6ad2784277 SHA256 (chromium-37.0.2062.94-testdata.tar.xz) = 055ff2df325a20b03e12eae3b553e126eb5c63144fe9184a07d8d2f4db3fb9b4
SIZE (chromium-36.0.1985.143-testdata.tar.xz) = 111519392 SIZE (chromium-37.0.2062.94-testdata.tar.xz) = 114484240

22
www/chromium/files/extra-patch-clang
View file

@ -133,17 +133,6 @@
Stop(); 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-03 23:52:32.000000000 -0400
+++ third_party/hunspell/src/hunspell/affentry.hxx 2013-07-19 01:31:57.000000000 -0400 +++ third_party/hunspell/src/hunspell/affentry.hxx 2013-07-19 01:31:57.000000000 -0400
@@ -27,7 +27,7 @@ @@ -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());

4
www/chromium/files/patch-base__base.gyp
View file

@ -1,5 +1,5 @@
--- ./base/base.gyp.orig 2014-08-12 21:01:28.000000000 +0200 --- ./base/base.gyp.orig 2014-08-20 21:02:42.000000000 +0200
+++ ./base/base.gyp 2014-08-13 09:57:00.000000000 +0200 +++ ./base/base.gyp 2014-08-22 15:06:27.000000000 +0200
@@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@
], ],
'link_settings': { 'link_settings': {

8
www/chromium/files/patch-base__base.gypi
View file

@ -1,6 +1,6 @@
--- ./base/base.gypi.orig 2014-08-12 21:01:28.000000000 +0200 --- ./base/base.gypi.orig 2014-08-20 21:02:42.000000000 +0200
+++ ./base/base.gypi 2014-08-13 09:56:56.000000000 +0200 +++ ./base/base.gypi 2014-08-22 18:33:25.000000000 +0200
@@ -912,11 +912,14 @@ @@ -942,11 +942,16 @@
'process/memory_stubs.cc', 'process/memory_stubs.cc',
], ],
'sources/': [ 'sources/': [
@ -13,6 +13,8 @@
['exclude', '^sys_info_linux\\.cc$'], ['exclude', '^sys_info_linux\\.cc$'],
+ ['exclude', '^process/process_iterator_linux\\.cc$'], + ['exclude', '^process/process_iterator_linux\\.cc$'],
+ ['exclude', '^process/process_metrics_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 # Remove all unnecessary files for build_nexe.py to avoid exceeding

4
www/chromium/files/patch-base__debug__stack_trace_posix.cc
View file

@ -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.orig 2014-08-20 21:02:42.000000000 +0200
+++ ./base/debug/stack_trace_posix.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./base/debug/stack_trace_posix.cc 2014-08-22 15:06:24.000000000 +0200
@@ -590,6 +590,10 @@ @@ -590,6 +590,10 @@
// for the modules that are loaded in the current process. // for the modules that are loaded in the current process.
// Returns true on success. // Returns true on success.

13
www/chromium/files/patch-base__files__file_path_watcher_kqueue.h Normal file
View file

@ -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>

4
www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc
View file

@ -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.orig 2014-08-20 21:02:41.000000000 +0200
+++ ./base/posix/unix_domain_socket_linux.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./base/posix/unix_domain_socket_linux.cc 2014-08-22 15:06:24.000000000 +0200
@@ -18,6 +18,15 @@ @@ -18,6 +18,15 @@
#include "base/posix/eintr_wrapper.h" #include "base/posix/eintr_wrapper.h"
#include "base/stl_util.h" #include "base/stl_util.h"

4
www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
View file

@ -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.orig 2014-08-20 21:02:41.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 2014-08-22 15:06:24.000000000 +0200
@@ -2,8 +2,13 @@ @@ -2,8 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.

4
www/chromium/files/patch-base__process__internal_linux.h
View file

@ -1,5 +1,5 @@
--- ./base/process/internal_linux.h.orig 2014-08-12 21:01:27.000000000 +0200 --- ./base/process/internal_linux.h.orig 2014-08-20 21:02:41.000000000 +0200
+++ ./base/process/internal_linux.h 2014-08-13 09:56:56.000000000 +0200 +++ ./base/process/internal_linux.h 2014-08-22 15:06:24.000000000 +0200
@@ -12,6 +12,8 @@ @@ -12,6 +12,8 @@
#include "base/files/file_path.h" #include "base/files/file_path.h"

6
www/chromium/files/patch-base__process__launch.cc
View file

@ -1,6 +1,6 @@
--- ./base/process/launch.cc.orig 2014-08-12 21:01:27.000000000 +0200 --- ./base/process/launch.cc.orig 2014-08-20 21:02:41.000000000 +0200
+++ ./base/process/launch.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./base/process/launch.cc 2014-08-22 15:06:24.000000000 +0200
@@ -23,10 +23,10 @@ @@ -24,10 +24,10 @@
fds_to_remap(NULL), fds_to_remap(NULL),
maximize_rlimits(NULL), maximize_rlimits(NULL),
new_process_group(false) new_process_group(false)

6
www/chromium/files/patch-base__process__launch.h
View file

@ -1,6 +1,6 @@
--- ./base/process/launch.h.orig 2014-08-12 21:01:27.000000000 +0200 --- ./base/process/launch.h.orig 2014-08-20 21:02:41.000000000 +0200
+++ ./base/process/launch.h 2014-08-13 09:56:56.000000000 +0200 +++ ./base/process/launch.h 2014-08-22 15:06:24.000000000 +0200
@@ -108,14 +108,14 @@ @@ -113,14 +113,14 @@
// will be the same as its pid. // will be the same as its pid.
bool new_process_group; bool new_process_group;

4
www/chromium/files/patch-base__process__memory_unittest.cc
View file

@ -1,5 +1,5 @@
--- ./base/process/memory_unittest.cc.orig 2014-08-12 21:01:27.000000000 +0200 --- ./base/process/memory_unittest.cc.orig 2014-08-20 21:02:41.000000000 +0200
+++ ./base/process/memory_unittest.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./base/process/memory_unittest.cc 2014-08-22 15:06:24.000000000 +0200
@@ -151,9 +151,9 @@ @@ -151,9 +151,9 @@
// Android doesn't implement set_new_handler, so we can't use the // Android doesn't implement set_new_handler, so we can't use the

4
www/chromium/files/patch-base__process__process_iterator_freebsd.cc
View file

@ -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.orig 2014-08-20 21:02:41.000000000 +0200
+++ ./base/process/process_iterator_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./base/process/process_iterator_freebsd.cc 2014-08-22 15:06:24.000000000 +0200
@@ -8,6 +8,10 @@ @@ -8,6 +8,10 @@
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <unistd.h> #include <unistd.h>

6
www/chromium/files/patch-base__process__process_metrics.h
View file

@ -1,5 +1,5 @@
--- ./base/process/process_metrics.h.orig 2014-08-12 21:01:27.000000000 +0200 --- ./base/process/process_metrics.h.orig 2014-08-20 21:02:41.000000000 +0200
+++ ./base/process/process_metrics.h 2014-08-13 09:56:56.000000000 +0200 +++ ./base/process/process_metrics.h 2014-08-22 15:06:24.000000000 +0200
@@ -17,6 +17,13 @@ @@ -17,6 +17,13 @@
#include "base/time/time.h" #include "base/time/time.h"
#include "base/values.h" #include "base/values.h"
@ -14,7 +14,7 @@
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
#include <mach/mach.h> #include <mach/mach.h>
#endif #endif
@@ -242,13 +249,17 @@ @@ -246,13 +253,17 @@
// CPU-related ticks. Returns -1 on parse error. // CPU-related ticks. Returns -1 on parse error.
// Exposed for testing. // Exposed for testing.
BASE_EXPORT int ParseProcStatCPU(const std::string& input); BASE_EXPORT int ParseProcStatCPU(const std::string& input);

4
www/chromium/files/patch-base__process__process_metrics_freebsd.cc
View file

@ -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.orig 2014-08-20 21:02:41.000000000 +0200
+++ ./base/process/process_metrics_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./base/process/process_metrics_freebsd.cc 2014-08-22 15:06:24.000000000 +0200
@@ -10,6 +10,9 @@ @@ -10,6 +10,9 @@
#include "base/sys_info.h" #include "base/sys_info.h"

4
www/chromium/files/patch-base__security_unittest.cc
View file

@ -1,5 +1,5 @@
--- ./base/security_unittest.cc.orig 2014-08-12 21:01:28.000000000 +0200 --- ./base/security_unittest.cc.orig 2014-08-20 21:02:42.000000000 +0200
+++ ./base/security_unittest.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./base/security_unittest.cc 2014-08-22 15:06:24.000000000 +0200
@@ -160,7 +160,7 @@ @@ -160,7 +160,7 @@
// FAILS_ is too clunky. // FAILS_ is too clunky.
void OverflowTestsSoftExpectTrue(bool overflow_detected) { void OverflowTestsSoftExpectTrue(bool overflow_detected) {

4
www/chromium/files/patch-base__strings__safe_sprintf.cc
View file

@ -1,5 +1,5 @@
--- ./base/strings/safe_sprintf.cc.orig 2014-08-12 21:01:27.000000000 +0200 --- ./base/strings/safe_sprintf.cc.orig 2014-08-20 21:02:42.000000000 +0200
+++ ./base/strings/safe_sprintf.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./base/strings/safe_sprintf.cc 2014-08-22 15:06:24.000000000 +0200
@@ -107,11 +107,11 @@ @@ -107,11 +107,11 @@
: buffer_(buffer), : buffer_(buffer),
size_(size - 1), // Account for trailing NUL byte size_(size - 1), // Account for trailing NUL byte

4
www/chromium/files/patch-base__sys_info_freebsd.cc
View file

@ -1,5 +1,5 @@
--- ./base/sys_info_freebsd.cc.orig 2014-08-12 21:01:28.000000000 +0200 --- ./base/sys_info_freebsd.cc.orig 2014-08-20 21:02:42.000000000 +0200
+++ ./base/sys_info_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./base/sys_info_freebsd.cc 2014-08-22 15:06:24.000000000 +0200
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
#include "base/sys_info.h" #include "base/sys_info.h"

4
www/chromium/files/patch-base__sys_info_posix.cc
View file

@ -1,5 +1,5 @@
--- ./base/sys_info_posix.cc.orig 2014-08-12 21:01:28.000000000 +0200 --- ./base/sys_info_posix.cc.orig 2014-08-20 21:02:42.000000000 +0200
+++ ./base/sys_info_posix.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./base/sys_info_posix.cc 2014-08-22 15:06:24.000000000 +0200
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
namespace base { namespace base {

4
www/chromium/files/patch-base__test__expectations__expectation.cc
View file

@ -1,5 +1,5 @@
--- ./base/test/expectations/expectation.cc.orig 2014-08-12 21:01:28.000000000 +0200 --- ./base/test/expectations/expectation.cc.orig 2014-08-20 21:02:41.000000000 +0200
+++ ./base/test/expectations/expectation.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./base/test/expectations/expectation.cc 2014-08-22 15:06:24.000000000 +0200
@@ -60,6 +60,7 @@ @@ -60,6 +60,7 @@
variant != "64") { variant != "64") {
return false; return false;

8
www/chromium/files/patch-base__test__launcher__test_launcher.cc
View file

@ -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.orig 2014-08-20 21:02:41.000000000 +0200
+++ ./base/test/launcher/test_launcher.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./base/test/launcher/test_launcher.cc 2014-08-22 15:06:24.000000000 +0200
@@ -40,6 +40,10 @@ @@ -41,6 +41,10 @@
#include "base/mac/scoped_nsautorelease_pool.h" #include "base/mac/scoped_nsautorelease_pool.h"
#endif #endif
@ -10,4 +10,4 @@
+ +
namespace base { 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

4
www/chromium/files/patch-base__threading__platform_thread_linux.cc
View file

@ -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.orig 2014-08-20 21:02:41.000000000 +0200
+++ ./base/threading/platform_thread_linux.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./base/threading/platform_thread_linux.cc 2014-08-22 15:06:24.000000000 +0200
@@ -16,7 +16,9 @@ @@ -16,7 +16,9 @@
#include "base/tracked_objects.h" #include "base/tracked_objects.h"

4
www/chromium/files/patch-breakpad__breakpad.gyp
View file

@ -1,5 +1,5 @@
--- ./breakpad/breakpad.gyp.orig 2014-08-12 21:02:55.000000000 +0200 --- ./breakpad/breakpad.gyp.orig 2014-08-20 21:02:30.000000000 +0200
+++ ./breakpad/breakpad.gyp 2014-08-13 09:56:56.000000000 +0200 +++ ./breakpad/breakpad.gyp 2014-08-22 15:06:24.000000000 +0200
@@ -340,7 +340,7 @@ @@ -340,7 +340,7 @@
}, },
], ],

27
www/chromium/files/patch-build__common.gypi
View file

@ -1,15 +1,15 @@
--- ./build/common.gypi.orig 2014-08-12 21:02:52.000000000 +0200 --- ./build/common.gypi.orig 2014-08-20 21:02:29.000000000 +0200
+++ ./build/common.gypi 2014-08-13 09:56:56.000000000 +0200 +++ ./build/common.gypi 2014-08-22 15:06:24.000000000 +0200
@@ -101,7 +101,7 @@ @@ -87,7 +87,7 @@
#
# TODO(erg): Merge this into the previous block once compiling with 'conditions': [
# aura safely implies including ash capabilities. # ChromeOS and Windows use Aura and Ash.
- ['OS=="linux"', { - ['chromeos==1 or OS=="win" or OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd"', { + ['chromeos==1 or OS=="win" or OS=="linux" or OS=="freebsd"', {
'use_ash%': 1,
'use_aura%': 1, 'use_aura%': 1,
}], }],
@@ -645,7 +645,7 @@
@@ -622,7 +622,7 @@
}], }],
# DBus usage. # DBus usage.
@ -18,7 +18,7 @@
'use_dbus%': 1, 'use_dbus%': 1,
}, { }, {
'use_dbus%': 0, 'use_dbus%': 0,
@@ -896,7 +896,7 @@ @@ -926,7 +926,7 @@
# except when building Android WebView. # except when building Android WebView.
# TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium).
# Set the data reduction proxy origin for Android Webview. # Set the data reduction proxy origin for Android Webview.
@ -27,17 +27,18 @@
'icu_use_data_file_flag%' : 1, 'icu_use_data_file_flag%' : 1,
'spdy_proxy_auth_origin%': '', 'spdy_proxy_auth_origin%': '',
'data_reduction_proxy_probe_url%': '', 'data_reduction_proxy_probe_url%': '',
@@ -1106,6 +1106,9 @@ @@ -1153,6 +1153,10 @@
# able to turn it off for various reasons. # able to turn it off for various reasons.
'linux_disable_pie%': 0, 'linux_disable_pie%': 0,
+ # XXX(rene) More options, keep them?
+ 'os_ver%': 0, + 'os_ver%': 0,
+ 'use_system_libjpeg%': 0, + 'use_system_libjpeg%': 0,
+ +
# The release channel that this build targets. This is used to restrict # The release channel that this build targets. This is used to restrict
# channel-specific build options, like which installer packages to create. # channel-specific build options, like which installer packages to create.
# The default is 'all', which does no channel-specific filtering. # The default is 'all', which does no channel-specific filtering.
@@ -3960,6 +3963,13 @@ @@ -4150,6 +4154,13 @@
'ldflags': [ 'ldflags': [
'-Wl,--no-keep-memory', '-Wl,--no-keep-memory',
], ],

4
www/chromium/files/patch-build__filename_rules.gypi
View file

@ -1,5 +1,5 @@
--- ./build/filename_rules.gypi.orig 2014-08-12 21:02:52.000000000 +0200 --- ./build/filename_rules.gypi.orig 2014-08-20 21:02:29.000000000 +0200
+++ ./build/filename_rules.gypi 2014-08-13 09:56:56.000000000 +0200 +++ ./build/filename_rules.gypi 2014-08-22 15:06:24.000000000 +0200
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
['<(use_aura)==0 or OS!="win" or >(nacl_untrusted_build)==1', { ['<(use_aura)==0 or OS!="win" or >(nacl_untrusted_build)==1', {
'sources/': [ ['exclude', '_aurawin\\.(h|cc)$'] ] 'sources/': [ ['exclude', '_aurawin\\.(h|cc)$'] ]

6
www/chromium/files/patch-build__linux__system.gyp
View file

@ -1,6 +1,6 @@
--- ./build/linux/system.gyp.orig 2014-08-12 21:02:52.000000000 +0200 --- ./build/linux/system.gyp.orig 2014-08-20 21:02:29.000000000 +0200
+++ ./build/linux/system.gyp 2014-08-13 09:56:56.000000000 +0200 +++ ./build/linux/system.gyp 2014-08-22 15:06:24.000000000 +0200
@@ -885,6 +885,13 @@ @@ -881,6 +881,13 @@
'include_dirs': [ 'include_dirs': [
'../..', '../..',
], ],

4
www/chromium/files/patch-build__linux__unbundle__libwebp.gyp
View file

@ -1,5 +1,5 @@
--- ./build/linux/unbundle/libwebp.gyp.orig 2014-08-12 21:02:52.000000000 +0200 --- ./build/linux/unbundle/libwebp.gyp.orig 2014-08-20 21:02:29.000000000 +0200
+++ ./build/linux/unbundle/libwebp.gyp 2014-08-13 09:56:56.000000000 +0200 +++ ./build/linux/unbundle/libwebp.gyp 2014-08-22 15:06:24.000000000 +0200
@@ -14,13 +14,7 @@ @@ -14,13 +14,7 @@
}, },
'link_settings': { 'link_settings': {

4
www/chromium/files/patch-build__linux__unbundle__openssl.gyp
View file

@ -1,5 +1,5 @@
--- build/linux/unbundle/openssl.gyp.orig 2014-08-12 21:02:52.000000000 +0200 --- ./build/linux/unbundle/openssl.gyp.orig 2014-08-20 21:02:29.000000000 +0200
+++ build/linux/unbundle/openssl.gyp 2014-08-18 17:16:23.000000000 +0200 +++ ./build/linux/unbundle/openssl.gyp 2014-08-22 15:06:24.000000000 +0200
@@ -9,15 +9,15 @@ @@ -9,15 +9,15 @@
'type': 'none', 'type': 'none',
'direct_dependent_settings': { 'direct_dependent_settings': {

6
www/chromium/files/patch-cc__layers__layer_impl.cc
View file

@ -1,6 +1,6 @@
--- ./cc/layers/layer_impl.cc.orig 2014-08-12 21:03:00.000000000 +0200 --- ./cc/layers/layer_impl.cc.orig 2014-08-20 21:02:36.000000000 +0200
+++ ./cc/layers/layer_impl.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./cc/layers/layer_impl.cc 2014-08-22 15:06:24.000000000 +0200
@@ -1215,21 +1215,23 @@ @@ -1190,21 +1190,23 @@
scale_factor * scaled_scroll_bounds.height()); scale_factor * scaled_scroll_bounds.height());
scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds); scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds);

28
www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
View file

@ -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.orig 2014-08-20 21:01:26.000000000 +0200
+++ ./chrome/app/chrome_main_delegate.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/app/chrome_main_delegate.cc 2014-08-22 15:06:24.000000000 +0200
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
#include "ui/base/x/x11_util.h" #include "ui/base/x/x11_util.h"
#endif #endif
@ -18,7 +18,7 @@
base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky
g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER;
#endif #endif
@@ -245,7 +245,7 @@ @@ -226,7 +226,7 @@
// Needed for scrollbar related images. // Needed for scrollbar related images.
process_type == switches::kWorkerProcess || process_type == switches::kWorkerProcess ||
#endif #endif
@ -27,7 +27,7 @@
// The zygote process opens the resources for the renderers. // The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess || process_type == switches::kZygoteProcess ||
#endif #endif
@@ -459,7 +459,7 @@ @@ -440,7 +440,7 @@
std::string format_str = std::string format_str =
command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
if (format_str == "machine") { if (format_str == "machine") {
@ -36,7 +36,7 @@
} else if (format_str == "log") { } else if (format_str == "log") {
format = diagnostics::DiagnosticsWriter::LOG; format = diagnostics::DiagnosticsWriter::LOG;
} else { } else {
@@ -500,7 +500,7 @@ @@ -491,7 +491,7 @@
std::string format_str = std::string format_str =
command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
if (format_str == "machine") { if (format_str == "machine") {
@ -45,7 +45,7 @@
} else if (format_str == "human") { } else if (format_str == "human") {
format = diagnostics::DiagnosticsWriter::HUMAN; format = diagnostics::DiagnosticsWriter::HUMAN;
} else { } else {
@@ -632,7 +632,7 @@ @@ -621,7 +621,7 @@
std::string process_type = std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType); command_line.GetSwitchValueASCII(switches::kProcessType);
@ -54,30 +54,30 @@
breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer());
#endif #endif
@@ -757,7 +757,7 @@ @@ -743,7 +743,7 @@
#endif #endif
} }
-#if defined(OS_POSIX) && !defined(OS_MACOSX) -#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(). // Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) { if (process_type != switches::kZygoteProcess) {
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
@@ -769,7 +769,7 @@ @@ -755,7 +755,7 @@
breakpad::InitCrashReporter(process_type); breakpad::InitCrashReporter(process_type);
#endif // defined(OS_ANDROID) #endif // defined(OS_ANDROID)
} }
-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) -#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 // After all the platform Breakpads have been initialized, store the command
// line for crash reporting. // line for crash reporting.
@@ -854,7 +854,7 @@ @@ -840,7 +840,7 @@
return process_type == switches::kNaClLoaderProcess || return process_type == switches::kNaClLoaderProcess ||
process_type == switches::kRelauncherProcess; process_type == switches::kRelauncherProcess;
} }
-#elif defined(OS_POSIX) && !defined(OS_ANDROID) -#elif defined(OS_POSIX) && !defined(OS_ANDROID)
+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) +#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
content::ZygoteForkDelegate* ChromeMainDelegate::ZygoteStarting() { void ChromeMainDelegate::ZygoteStarting(
#if defined(DISABLE_NACL) ScopedVector<content::ZygoteForkDelegate>* delegates) {
return NULL; #if !defined(DISABLE_NACL)

10
www/chromium/files/patch-chrome__app__chrome_main_delegate.h
View file

@ -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.orig 2014-08-20 21:01:26.000000000 +0200
+++ ./chrome/app/chrome_main_delegate.h 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/app/chrome_main_delegate.h 2014-08-22 15:06:24.000000000 +0200
@@ -35,7 +35,7 @@ @@ -38,7 +38,7 @@
virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE;
virtual bool DelaySandboxInitialization( virtual bool DelaySandboxInitialization(
const std::string& process_type) OVERRIDE; const std::string& process_type) OVERRIDE;
-#elif defined(OS_POSIX) && !defined(OS_ANDROID) -#elif defined(OS_POSIX) && !defined(OS_ANDROID)
+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) +#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; virtual void ZygoteForked() OVERRIDE;
#endif

6
www/chromium/files/patch-chrome__app__chromium_strings.grd
View file

@ -1,6 +1,6 @@
--- ./chrome/app/chromium_strings.grd.orig 2014-08-12 21:02:25.000000000 +0200 --- ./chrome/app/chromium_strings.grd.orig 2014-08-20 21:01:26.000000000 +0200
+++ ./chrome/app/chromium_strings.grd 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/app/chromium_strings.grd 2014-08-22 15:06:24.000000000 +0200
@@ -1099,7 +1099,7 @@ @@ -1102,7 +1102,7 @@
</message> </message>
<!-- ProcessSingleton --> <!-- ProcessSingleton -->

11
www/chromium/files/patch-chrome__app__resources__locale_settings.grd Normal file
View file

@ -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

6
www/chromium/files/patch-chrome__browser__about_flags.cc
View file

@ -1,6 +1,6 @@
--- ./chrome/browser/about_flags.cc.orig 2014-08-12 21:01:48.000000000 +0200 --- ./chrome/browser/about_flags.cc.orig 2014-08-20 21:02:13.000000000 +0200
+++ ./chrome/browser/about_flags.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/browser/about_flags.cc 2014-08-22 15:06:24.000000000 +0200
@@ -2183,7 +2183,7 @@ @@ -2263,7 +2263,7 @@
return kOsWin; return kOsWin;
#elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check.
return kOsCrOS; return kOsCrOS;

6
www/chromium/files/patch-chrome__browser__browser_process_impl.cc
View file

@ -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.orig 2014-08-20 21:02:13.000000000 +0200
+++ ./chrome/browser/browser_process_impl.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/browser/browser_process_impl.cc 2014-08-22 15:06:24.000000000 +0200
@@ -239,7 +239,7 @@ @@ -248,7 +248,7 @@
ExtensionRendererState::GetInstance()->Shutdown(); ExtensionRendererState::GetInstance()->Shutdown();

6
www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
View file

@ -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.orig 2014-08-20 21:02:13.000000000 +0200
+++ ./chrome/browser/chrome_browser_main.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/browser/chrome_browser_main.cc 2014-08-22 15:06:24.000000000 +0200
@@ -926,7 +926,7 @@ @@ -925,7 +925,7 @@
} }
#endif #endif

8
www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
View file

@ -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.orig 2014-08-20 21:02:13.000000000 +0200
+++ ./chrome/browser/chrome_browser_main_posix.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/browser/chrome_browser_main_posix.cc 2014-08-22 15:06:24.000000000 +0200
@@ -305,6 +305,11 @@ @@ -270,6 +270,11 @@
g_pipe_pid = getpid(); g_pipe_pid = getpid();
g_shutdown_pipe_read_fd = pipefd[0]; g_shutdown_pipe_read_fd = pipefd[0];
g_shutdown_pipe_write_fd = pipefd[1]; g_shutdown_pipe_write_fd = pipefd[1];
@ -12,7 +12,7 @@
#if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS) #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
#else #else
@@ -313,6 +318,7 @@ @@ -278,6 +283,7 @@
// size to avoid hitting the guard page. // size to avoid hitting the guard page.
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
#endif #endif

14
www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
View file

@ -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.orig 2014-08-20 21:02:13.000000000 +0200
+++ ./chrome/browser/chrome_content_browser_client.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/browser/chrome_content_browser_client.cc 2014-08-22 15:06:24.000000000 +0200
@@ -492,7 +492,7 @@ @@ -509,7 +509,7 @@
} }
} }
@ -9,7 +9,7 @@
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
const std::string& process_type) { const std::string& process_type) {
base::FilePath dumps_path; base::FilePath dumps_path;
@@ -548,7 +548,7 @@ @@ -566,7 +566,7 @@
return -1; return -1;
} }
@ -18,7 +18,7 @@
#endif // !defined(OS_ANDROID) #endif // !defined(OS_ANDROID)
#if !defined(OS_CHROMEOS) #if !defined(OS_CHROMEOS)
@@ -1459,7 +1459,7 @@ @@ -1533,7 +1533,7 @@
void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
CommandLine* command_line, int child_process_id) { CommandLine* command_line, int child_process_id) {
@ -27,7 +27,7 @@
if (breakpad::IsCrashReporterEnabled()) { if (breakpad::IsCrashReporterEnabled()) {
std::string enable_crash_reporter; std::string enable_crash_reporter;
GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter); GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter);
@@ -2563,7 +2563,7 @@ @@ -2683,7 +2683,7 @@
#endif #endif
} }
@ -36,7 +36,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const CommandLine& command_line, const CommandLine& command_line,
int child_process_id, int child_process_id,
@@ -2617,7 +2617,7 @@ @@ -2749,7 +2749,7 @@
} }
#endif // defined(OS_ANDROID) #endif // defined(OS_ANDROID)
} }

10
www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
View file

@ -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.orig 2014-08-20 21:02:13.000000000 +0200
+++ ./chrome/browser/chrome_content_browser_client.h 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/browser/chrome_content_browser_client.h 2014-08-22 15:06:24.000000000 +0200
@@ -260,7 +260,7 @@ @@ -288,7 +288,7 @@
const base::FilePath& storage_partition_path, virtual net::CookieStore* OverrideCookieStoreForRenderProcess(
ScopedVector<fileapi::FileSystemBackend>* additional_backends) OVERRIDE; int render_process_id) OVERRIDE;
-#if defined(OS_POSIX) && !defined(OS_MACOSX) -#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)

4
www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
View file

@ -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.orig 2014-08-20 21:02:00.000000000 +0200
+++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-08-22 15:06:24.000000000 +0200
@@ -268,7 +268,7 @@ @@ -268,7 +268,7 @@
console_->SetColor(color); console_->SetColor(color);
console_->Write(base::ASCIIToUTF16(result)); console_->Write(base::ASCIIToUTF16(result));

4
www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
View file

@ -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.orig 2014-08-20 21:02:00.000000000 +0200
+++ ./chrome/browser/diagnostics/diagnostics_writer.h 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/browser/diagnostics/diagnostics_writer.h 2014-08-22 15:06:24.000000000 +0200
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
public: public:
// The type of formatting done by this writer. // The type of formatting done by this writer.

4
www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
View file

@ -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.orig 2014-08-20 21:01:58.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 2014-08-22 15:06:24.000000000 +0200
@@ -167,10 +167,12 @@ @@ -167,10 +167,12 @@
} }

4
www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
View file

@ -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.orig 2014-08-20 21:01:57.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 2014-08-22 15:06:24.000000000 +0200
@@ -4,6 +4,10 @@ @@ -4,6 +4,10 @@
#include "chrome/browser/extensions/api/music_manager_private/device_id.h" #include "chrome/browser/extensions/api/music_manager_private/device_id.h"

17
www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc
View file

@ -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.orig 2014-08-20 21:01:58.000000000 +0200
+++ ./chrome/browser/extensions/api/serial/serial_api.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/browser/extensions/api/serial/serial_api.cc 2014-08-22 15:06:24.000000000 +0200
@@ -84,7 +84,7 @@ @@ -85,11 +85,13 @@
void SerialGetDevicesFunction::Work() { void SerialGetDevicesFunction::Work() {
DCHECK_CURRENTLY_ON(BrowserThread::FILE); DCHECK_CURRENTLY_ON(BrowserThread::FILE);
-
+#if !defined(OS_FREEBSD) //XXX(rene) quick hack +#if !defined(OS_FREEBSD) //XXX(rene) quick hack
device::SerialDeviceInfoList devices;
scoped_ptr<device::SerialDeviceEnumerator> enumerator = scoped_ptr<device::SerialDeviceEnumerator> enumerator =
device::SerialDeviceEnumerator::Create(); device::SerialDeviceEnumerator::Create();
@@ -106,6 +106,7 @@ mojo::Array<device::SerialDeviceInfoPtr> devices = enumerator->GetDevices();
} results_ = serial::GetDevices::Results::Create(
devices.To<std::vector<linked_ptr<serial::DeviceInfo> > >());
results_ = serial::GetDevices::Results::Create(out_devices);
+#endif +#endif
} }

4
www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc
View file

@ -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.orig 2014-08-20 21:01:58.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 2014-08-22 15:06:24.000000000 +0200
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(9600)
BITRATE_TO_SPEED_CASE(19200) BITRATE_TO_SPEED_CASE(19200)

4
www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc
View file

@ -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.orig 2014-08-20 21:02:06.000000000 +0200
+++ ./chrome/browser/gpu/gl_string_manager.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/browser/gpu/gl_string_manager.cc 2014-08-22 15:06:24.000000000 +0200
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
void GLStringManager::Initialize() { void GLStringManager::Initialize() {

4
www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc
View file

@ -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.orig 2014-08-20 21:02:06.000000000 +0200
+++ ./chrome/browser/gpu/gpu_feature_checker.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/browser/gpu/gpu_feature_checker.cc 2014-08-22 15:06:24.000000000 +0200
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

6
www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc
View file

@ -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.orig 2014-08-20 21:02:12.000000000 +0200
+++ ./chrome/browser/media/webrtc_log_uploader.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/browser/media/webrtc_log_uploader.cc 2014-08-22 15:06:24.000000000 +0200
@@ -196,6 +196,8 @@ @@ -233,6 +233,8 @@
const char product[] = "Chrome_Android"; const char product[] = "Chrome_Android";
#elif defined(OS_CHROMEOS) #elif defined(OS_CHROMEOS)
const char product[] = "Chrome_ChromeOS"; const char product[] = "Chrome_ChromeOS";

4
www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
View file

@ -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.orig 2014-08-20 21:01:59.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 2014-08-22 15:06:24.000000000 +0200
@@ -33,9 +33,11 @@ @@ -33,9 +33,11 @@
// Note that this initializes the delegate asynchronously, but since // Note that this initializes the delegate asynchronously, but since
// the delegate will only be used from the IO thread, it is guaranteed // the delegate will only be used from the IO thread, it is guaranteed

4
www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
View file

@ -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.orig 2014-08-20 21:01:59.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 2014-08-22 15:06:24.000000000 +0200
@@ -724,7 +724,10 @@ @@ -724,7 +724,10 @@
// Constructor in 'private' section because depends on private class definition. // Constructor in 'private' section because depends on private class definition.
MediaFileSystemRegistry::MediaFileSystemRegistry() MediaFileSystemRegistry::MediaFileSystemRegistry()

4
www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc
View file

@ -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.orig 2014-08-20 21:01:59.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 2014-08-22 15:06:24.000000000 +0200
@@ -50,10 +50,10 @@ @@ -50,10 +50,10 @@
chrome::DIR_USER_APPLICATIONS, chrome::DIR_USER_APPLICATIONS,
chrome::DIR_USER_LIBRARY, chrome::DIR_USER_LIBRARY,

12
www/chromium/files/patch-chrome__browser__memory_details.cc
View file

@ -1,5 +1,5 @@
--- ./chrome/browser/memory_details.cc.orig 2014-08-12 21:01:47.000000000 +0200 --- ./chrome/browser/memory_details.cc.orig 2014-08-20 21:02:13.000000000 +0200
+++ ./chrome/browser/memory_details.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/browser/memory_details.cc 2014-08-22 15:06:25.000000000 +0200
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
#include "grit/generated_resources.h" #include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.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)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) +#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 zygote_pid = content::ZygoteHost::GetInstance()->GetPid();
const pid_t sandbox_helper_pid = #endif
content::ZygoteHost::GetInstance()->GetSandboxHelperPid();
@@ -336,7 +336,7 @@ @@ -334,7 +334,7 @@
} }
} }
@ -26,4 +26,4 @@
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
if (process.pid == zygote_pid) { if (process.pid == zygote_pid) {
process.process_type = content::PROCESS_TYPE_ZYGOTE; process.process_type = content::PROCESS_TYPE_ZYGOTE;
} else if (process.pid == sandbox_helper_pid) { }

6
www/chromium/files/patch-chrome__browser__net__connection_tester.cc
View file

@ -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.orig 2014-08-20 21:02:09.000000000 +0200
+++ ./chrome/browser/net/connection_tester.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/browser/net/connection_tester.cc 2014-08-22 15:06:25.000000000 +0200
@@ -213,7 +213,7 @@ @@ -217,7 +217,7 @@
// Otherwise returns a network error code. // Otherwise returns a network error code.
int CreateSystemProxyConfigService( int CreateSystemProxyConfigService(
scoped_ptr<net::ProxyConfigService>* config_service) { scoped_ptr<net::ProxyConfigService>* config_service) {

4
www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc
View file

@ -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.orig 2014-08-20 21:02:00.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 2014-08-22 15:06:25.000000000 +0200
@@ -29,6 +29,8 @@ @@ -29,6 +29,8 @@
"linux"; "linux";
#elif defined(OS_OPENBSD) #elif defined(OS_OPENBSD)

4
www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
View file

@ -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.orig 2014-08-20 21:02:13.000000000 +0200
+++ ./chrome/browser/plugins/plugins_resource_service.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/browser/plugins/plugins_resource_service.cc 2014-08-22 15:06:25.000000000 +0200
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
std::string filename; std::string filename;
#if defined(OS_WIN) #if defined(OS_WIN)

4
www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc
View file

@ -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.orig 2014-08-20 21:02:01.000000000 +0200
+++ ./chrome/browser/policy/policy_prefs_browsertest.cc 2014-08-13 09:56:56.000000000 +0200 +++ ./chrome/browser/policy/policy_prefs_browsertest.cc 2014-08-22 15:06:25.000000000 +0200
@@ -169,6 +169,8 @@ @@ -169,6 +169,8 @@
const std::string os("chromeos"); const std::string os("chromeos");
#elif defined(OS_LINUX) #elif defined(OS_LINUX)

4
www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc
View file

@ -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.orig 2014-08-20 21:02:04.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 2014-08-22 15:06:25.000000000 +0200
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
#include "chromeos/chromeos_switches.h" #include "chromeos/chromeos_switches.h"
#endif #endif

4
www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc
View file

@ -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.orig 2014-08-20 21:02:04.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 2014-08-22 15:06:25.000000000 +0200
@@ -124,12 +124,16 @@ @@ -124,12 +124,16 @@
bool FirstRunDialog::Accept() { bool FirstRunDialog::Accept() {
GetWidget()->Hide(); GetWidget()->Hide();

12
www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
View file

@ -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.orig 2014-08-20 21:02:03.000000000 +0200
+++ ./chrome/browser/ui/webui/about_ui.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/browser/ui/webui/about_ui.cc 2014-08-22 15:06:25.000000000 +0200
@@ -763,7 +763,7 @@ @@ -761,7 +761,7 @@
return data; return data;
} }
@ -9,7 +9,7 @@
std::string AboutLinuxProxyConfig() { std::string AboutLinuxProxyConfig() {
std::string data; std::string data;
AppendHeader(&data, 0, AppendHeader(&data, 0,
@@ -779,6 +779,7 @@ @@ -777,6 +777,7 @@
return data; return data;
} }
@ -17,7 +17,7 @@
void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id, void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id,
bool good) { bool good) {
data->append("<tr><td>"); data->append("<tr><td>");
@@ -849,6 +850,7 @@ @@ -847,6 +848,7 @@
return data; return data;
} }
#endif #endif
@ -25,7 +25,7 @@
// AboutMemoryHandler ---------------------------------------------------------- // AboutMemoryHandler ----------------------------------------------------------
@@ -1019,7 +1021,7 @@ @@ -1017,7 +1019,7 @@
} else if (source_name_ == chrome::kChromeUIDNSHost) { } else if (source_name_ == chrome::kChromeUIDNSHost) {
AboutDnsHandler::Start(profile(), callback); AboutDnsHandler::Start(profile(), callback);
return; return;

6
www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
View file

@ -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.orig 2014-08-20 21:02:03.000000000 +0200
+++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2014-08-22 15:06:25.000000000 +0200
@@ -488,7 +488,7 @@ @@ -493,7 +493,7 @@
url.host() == chrome::kChromeUIMemoryRedirectHost || url.host() == chrome::kChromeUIMemoryRedirectHost ||
url.host() == chrome::kChromeUIStatsHost || url.host() == chrome::kChromeUIStatsHost ||
url.host() == chrome::kChromeUITermsHost url.host() == chrome::kChromeUITermsHost

20
www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
View file

@ -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.orig 2014-08-20 21:02:02.000000000 +0200
+++ ./chrome/browser/ui/webui/options/browser_options_handler.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/browser/ui/webui/options/browser_options_handler.cc 2014-08-22 15:06:25.000000000 +0200
@@ -333,7 +333,8 @@ @@ -332,7 +332,8 @@
{ "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
{ "translateEnableTranslate", { "translateEnableTranslate",
IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE }, IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
@ -10,7 +10,7 @@
{ "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
{ "themesNativeButton", IDS_THEMES_GTK_BUTTON }, { "themesNativeButton", IDS_THEMES_GTK_BUTTON },
{ "themesSetClassic", IDS_THEMES_SET_CLASSIC }, { "themesSetClassic", IDS_THEMES_SET_CLASSIC },
@@ -640,7 +641,8 @@ @@ -647,7 +648,8 @@
"requestProfilesInfo", "requestProfilesInfo",
base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo, base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
base::Unretained(this))); base::Unretained(this)));
@ -20,17 +20,17 @@
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
"themesSetNative", "themesSetNative",
base::Bind(&BrowserOptionsHandler::ThemesSetNative, base::Bind(&BrowserOptionsHandler::ThemesSetNative,
@@ -1269,7 +1271,8 @@ @@ -1272,7 +1274,8 @@
ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); 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_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
+ !defined(OS_ANDROID) + !defined(OS_ANDROID)
bool profile_is_managed = profile->IsManaged(); bool profile_is_supervised = profile->IsSupervised();
is_native_theme = theme_service->UsingNativeTheme(); is_system_theme = theme_service->UsingSystemTheme();
base::FundamentalValue native_theme_enabled(!is_native_theme && base::FundamentalValue native_theme_enabled(!is_system_theme &&
@@ -1291,7 +1294,8 @@ @@ -1294,7 +1297,8 @@
ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme(); ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
} }

4
www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
View file

@ -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.orig 2014-08-20 21:02:02.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 2014-08-22 15:06:25.000000000 +0200
@@ -197,7 +197,8 @@ @@ -197,7 +197,8 @@
void ObserveThemeChanged(); void ObserveThemeChanged();

6
www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
View file

@ -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.orig 2014-08-20 21:02:13.000000000 +0200
+++ ./chrome/browser/web_applications/web_app.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/browser/web_applications/web_app.cc 2014-08-22 15:06:25.000000000 +0200
@@ -472,7 +472,7 @@ @@ -441,7 +441,7 @@
} }
#endif #endif

8
www/chromium/files/patch-chrome__browser__web_applications__web_app.h
View file

@ -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.orig 2014-08-20 21:02:13.000000000 +0200
+++ ./chrome/browser/web_applications/web_app.h 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/browser/web_applications/web_app.h 2014-08-22 15:06:25.000000000 +0200
@@ -188,7 +188,7 @@ @@ -193,7 +193,7 @@
IconInfoList* icons); void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons);
#endif #endif
-#if defined(OS_LINUX) -#if defined(OS_LINUX)

12
www/chromium/files/patch-chrome__chrome_browser.gypi
View file

@ -1,6 +1,6 @@
--- ./chrome/chrome_browser.gypi.orig 2014-08-12 21:02:25.000000000 +0200 --- ./chrome/chrome_browser.gypi.orig 2014-08-20 21:02:14.000000000 +0200
+++ ./chrome/chrome_browser.gypi 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/chrome_browser.gypi 2014-08-22 15:06:25.000000000 +0200
@@ -2923,7 +2923,7 @@ @@ -2979,7 +2979,7 @@
'../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
], ],
}], }],
@ -9,7 +9,7 @@
'dependencies': [ 'dependencies': [
'../build/linux/system.gyp:libspeechd', '../build/linux/system.gyp:libspeechd',
], ],
@@ -3046,7 +3046,7 @@ @@ -3106,7 +3106,7 @@
'../build/linux/system.gyp:xscrnsaver', '../build/linux/system.gyp:xscrnsaver',
], ],
}], }],
@ -18,7 +18,7 @@
'sources': [ 'sources': [
'app/chrome_breakpad_client.cc', 'app/chrome_breakpad_client.cc',
'app/chrome_breakpad_client.h', 'app/chrome_breakpad_client.h',
@@ -3281,6 +3281,13 @@ @@ -3365,6 +3365,13 @@
['exclude', '^third_party/mozilla_security_manager/'], ['exclude', '^third_party/mozilla_security_manager/'],
], ],
}], }],
@ -32,7 +32,7 @@
['OS=="mac"', { ['OS=="mac"', {
'dependencies': [ 'dependencies': [
'../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
@@ -3390,7 +3397,7 @@ @@ -3465,7 +3472,7 @@
}], }],
], ],
}], }],

6
www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
View file

@ -1,6 +1,6 @@
--- ./chrome/chrome_browser_extensions.gypi.orig 2014-08-12 21:02:25.000000000 +0200 --- ./chrome/chrome_browser_extensions.gypi.orig 2014-08-20 21:02:14.000000000 +0200
+++ ./chrome/chrome_browser_extensions.gypi 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/chrome_browser_extensions.gypi 2014-08-22 15:06:25.000000000 +0200
@@ -921,6 +921,11 @@ @@ -958,6 +958,11 @@
'browser/extensions/window_controller_list_observer.h', 'browser/extensions/window_controller_list_observer.h',
], ],
'conditions': [ 'conditions': [

16
www/chromium/files/patch-chrome__chrome_browser_ui.gypi
View file

@ -1,15 +1,15 @@
--- ./chrome/chrome_browser_ui.gypi.orig 2014-08-12 21:02:25.000000000 +0200 --- ./chrome/chrome_browser_ui.gypi.orig 2014-08-20 21:02:14.000000000 +0200
+++ ./chrome/chrome_browser_ui.gypi 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/chrome_browser_ui.gypi 2014-08-22 15:06:25.000000000 +0200
@@ -2665,7 +2665,7 @@ @@ -2673,7 +2673,7 @@
'browser/ui/views/message_center/web_notification_tray.cc', '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 chromeos==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" or os_bsd==1)', {
'dependencies': [ 'dependencies': [
# gtk2 is the only component that can interact with gtk2 in our new # gtk2 is the only component that can interact with gtk2 in our new
# world. # world.
@@ -2673,7 +2673,7 @@ @@ -2681,7 +2681,7 @@
'../build/linux/system.gyp:gio', '../build/linux/system.gyp:gio',
], ],
}], }],
@ -18,7 +18,7 @@
'sources!': [ 'sources!': [
'browser/ui/views/first_run_dialog.cc', 'browser/ui/views/first_run_dialog.cc',
'browser/ui/views/first_run_dialog.h', 'browser/ui/views/first_run_dialog.h',
@@ -3042,7 +3042,7 @@ @@ -3047,7 +3047,7 @@
}], }],
], ],
}], }],
@ -27,7 +27,7 @@
'conditions': [ 'conditions': [
['use_aura==1', { ['use_aura==1', {
'dependencies': [ 'dependencies': [
@@ -3135,7 +3135,7 @@ @@ -3140,7 +3140,7 @@
'browser/ui/webui/local_discovery/local_discovery_ui_handler.h', 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
], ],
}], }],

11
www/chromium/files/patch-chrome__chrome_tests.gypi
View file

@ -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.

30
www/chromium/files/patch-chrome__common__chrome_paths.cc
View file

@ -1,6 +1,6 @@
--- ./chrome/common/chrome_paths.cc.orig 2014-08-12 21:02:17.000000000 +0200 --- ./chrome/common/chrome_paths.cc.orig 2014-08-20 21:01:56.000000000 +0200
+++ ./chrome/common/chrome_paths.cc 2014-08-13 09:57:00.000000000 +0200 +++ ./chrome/common/chrome_paths.cc 2014-08-22 15:06:27.000000000 +0200
@@ -471,10 +471,12 @@ @@ -469,10 +469,12 @@
if (!base::PathExists(cur)) // We don't want to create this if (!base::PathExists(cur)) // We don't want to create this
return false; return false;
break; break;
@ -14,21 +14,31 @@
#else #else
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
#endif #endif
@@ -552,7 +554,7 @@ @@ -550,7 +552,7 @@
#endif #endif
break; break;
-#if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) -#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: case chrome::DIR_NATIVE_MESSAGING:
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
#if defined(GOOGLE_CHROME_BUILD) #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; return false;
cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
break; break;
-#endif // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) -#endif // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
+#endif // defined(OS_LINUX) || defined(OS_FREEBSD) || (defined(OS_MACOSX) && !defined(OS_IOS)) +#endif // defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_MACOSX) && !defined(OS_IOS))
#if !defined(OS_ANDROID)
default: case chrome::DIR_GLOBAL_GCM_STORE:
return false; if (!PathService::Get(chrome::DIR_USER_DATA, &cur))

14
www/chromium/files/patch-chrome__common__chrome_paths.h
View file

@ -1,11 +1,11 @@
--- ./chrome/common/chrome_paths.h.orig 2014-08-12 21:02:17.000000000 +0200 --- ./chrome/common/chrome_paths.h.orig 2014-08-20 21:01:56.000000000 +0200
+++ ./chrome/common/chrome_paths.h 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/common/chrome_paths.h 2014-08-22 15:06:25.000000000 +0200
@@ -116,7 +116,7 @@ @@ -115,7 +115,7 @@
// files to be installed when managed user DIR_SUPERVISED_USERS_DEFAULT_APPS, // Directory where installer places .crx
// session starts. // 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_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 DIR_NATIVE_MESSAGING, // System directory where native messaging host
// manifest files are stored. // manifest files are stored.
DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts

8
www/chromium/files/patch-chrome__common__chrome_switches.cc
View file

@ -1,6 +1,6 @@
--- ./chrome/common/chrome_switches.cc.orig 2014-08-12 21:02:17.000000000 +0200 --- ./chrome/common/chrome_switches.cc.orig 2014-08-20 21:01:56.000000000 +0200
+++ ./chrome/common/chrome_switches.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/common/chrome_switches.cc 2014-08-22 15:06:25.000000000 +0200
@@ -1375,7 +1375,7 @@ @@ -1319,7 +1319,7 @@
const char kPasswordStore[] = "password-store"; const char kPasswordStore[] = "password-store";
#endif #endif
@ -9,7 +9,7 @@
// Triggers migration of user data directory to another directory // Triggers migration of user data directory to another directory
// specified as a parameter. The migration is done under singleton lock, // specified as a parameter. The migration is done under singleton lock,
// and sanity checks are made to avoid corrupting the profile. // 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 // Linux speech service. Because it's buggy, the user must explicitly
// enable it so that visiting a random webpage can't cause instability. // enable it so that visiting a random webpage can't cause instability.
const char kEnableSpeechDispatcher[] = "enable-speech-dispatcher"; const char kEnableSpeechDispatcher[] = "enable-speech-dispatcher";

6
www/chromium/files/patch-chrome__common__chrome_switches.h
View file

@ -1,6 +1,6 @@
--- ./chrome/common/chrome_switches.h.orig 2014-08-12 21:02:17.000000000 +0200 --- ./chrome/common/chrome_switches.h.orig 2014-08-20 21:01:56.000000000 +0200
+++ ./chrome/common/chrome_switches.h 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/common/chrome_switches.h 2014-08-22 15:06:25.000000000 +0200
@@ -386,7 +386,7 @@ @@ -378,7 +378,7 @@
extern const char kPasswordStore[]; extern const char kPasswordStore[];
#endif #endif

6
www/chromium/files/patch-chrome__common__pref_names.cc
View file

@ -1,6 +1,6 @@
--- ./chrome/common/pref_names.cc.orig 2014-08-12 21:02:17.000000000 +0200 --- ./chrome/common/pref_names.cc.orig 2014-08-20 21:01:56.000000000 +0200
+++ ./chrome/common/pref_names.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/common/pref_names.cc 2014-08-22 15:06:25.000000000 +0200
@@ -923,7 +923,7 @@ @@ -957,7 +957,7 @@
// Boolean controlling whether SafeSearch is mandatory for Google Web Searches. // Boolean controlling whether SafeSearch is mandatory for Google Web Searches.
const char kForceSafeSearch[] = "settings.force_safesearch"; const char kForceSafeSearch[] = "settings.force_safesearch";

6
www/chromium/files/patch-chrome__common__pref_names.h
View file

@ -1,6 +1,6 @@
--- ./chrome/common/pref_names.h.orig 2014-08-12 21:02:17.000000000 +0200 --- ./chrome/common/pref_names.h.orig 2014-08-20 21:01:56.000000000 +0200
+++ ./chrome/common/pref_names.h 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/common/pref_names.h 2014-08-22 15:06:25.000000000 +0200
@@ -298,7 +298,7 @@ @@ -304,7 +304,7 @@
extern const char kForceSafeSearch[]; extern const char kForceSafeSearch[];
extern const char kDeleteTimePeriod[]; extern const char kDeleteTimePeriod[];
extern const char kLastClearBrowsingDataTime[]; extern const char kLastClearBrowsingDataTime[];

4
www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
View file

@ -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.orig 2014-08-20 21:02:14.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 2014-08-22 15:06:25.000000000 +0200
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
#include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/ppapi_messages.h"
#include "ppapi/proxy/serialized_structs.h" #include "ppapi/proxy/serialized_structs.h"

4
www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h
View file

@ -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.orig 2014-08-20 21:02:13.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 2014-08-22 15:06:25.000000000 +0200
@@ -201,7 +201,7 @@ @@ -201,7 +201,7 @@
void FinishFramePrinting(); void FinishFramePrinting();

4
www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
View file

@ -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.orig 2014-08-20 21:01:48.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 2014-08-22 15:06:25.000000000 +0200
@@ -72,6 +72,10 @@ @@ -72,6 +72,10 @@
namespace { namespace {

6
www/chromium/files/patch-chrome__test__base__testing_browser_process.h
View file

@ -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.orig 2014-08-20 21:01:48.000000000 +0200
+++ ./chrome/test/base/testing_browser_process.h 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/test/base/testing_browser_process.h 2014-08-22 15:06:25.000000000 +0200
@@ -100,8 +100,8 @@ @@ -105,8 +105,8 @@
virtual DownloadStatusUpdater* download_status_updater() OVERRIDE; virtual DownloadStatusUpdater* download_status_updater() OVERRIDE;
virtual DownloadRequestLimiter* download_request_limiter() OVERRIDE; virtual DownloadRequestLimiter* download_request_limiter() OVERRIDE;

4
www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc
View file

@ -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.orig 2014-08-20 21:01:27.000000000 +0200
+++ ./chrome/test/chromedriver/chrome/chrome_finder.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/test/chromedriver/chrome/chrome_finder.cc 2014-08-22 15:06:25.000000000 +0200
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
installation_locations[i].Append(L"Chromium\\Application")); installation_locations[i].Append(L"Chromium\\Application"));
} }

4
www/chromium/files/patch-chrome__test__perf__perf_test.cc
View file

@ -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.orig 2014-08-20 21:01:27.000000000 +0200
+++ ./chrome/test/perf/perf_test.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/test/perf/perf_test.cc 2014-08-22 15:06:25.000000000 +0200
@@ -352,7 +352,7 @@ @@ -352,7 +352,7 @@
AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name, AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name,
total_working_set_size, "bytes", total_working_set_size, "bytes",

4
www/chromium/files/patch-chrome__tools__build__linux__sed.sh
View file

@ -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.orig 2014-08-20 21:01:27.000000000 +0200
+++ ./chrome/tools/build/linux/sed.sh 2014-08-13 09:56:57.000000000 +0200 +++ ./chrome/tools/build/linux/sed.sh 2014-08-22 15:06:25.000000000 +0200
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/bin/sh -#!/bin/sh
+#!/usr/bin/env bash +#!/usr/bin/env bash

8
www/chromium/files/patch-components__policy__resources__policy_templates.json
View file

@ -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.orig 2014-08-20 21:02:55.000000000 +0200
+++ ./components/policy/resources/policy_templates.json 2014-08-13 09:56:57.000000000 +0200 +++ ./components/policy/resources/policy_templates.json 2014-08-22 15:06:25.000000000 +0200
@@ -1513,7 +1513,7 @@ @@ -1513,7 +1513,7 @@
'name': 'GSSAPILibraryName', 'name': 'GSSAPILibraryName',
'type': 'string', 'type': 'string',
@ -9,7 +9,7 @@
'features': { 'features': {
'dynamic_refresh': False, 'dynamic_refresh': False,
'per_profile': False, 'per_profile': False,
@@ -3643,7 +3643,7 @@ @@ -3697,7 +3697,7 @@
'name': 'RequireOnlineRevocationChecksForLocalAnchors', 'name': 'RequireOnlineRevocationChecksForLocalAnchors',
'type': 'main', 'type': 'main',
'schema': { 'type': 'boolean' }, 'schema': { 'type': 'boolean' },
@ -18,7 +18,7 @@
'features': { 'features': {
'dynamic_refresh': True, 'dynamic_refresh': True,
'per_profile': False, 'per_profile': False,
@@ -4305,7 +4305,7 @@ @@ -4377,7 +4377,7 @@
'name': 'BackgroundModeEnabled', 'name': 'BackgroundModeEnabled',
'type': 'main', 'type': 'main',
'schema': { 'type': 'boolean' }, 'schema': { 'type': 'boolean' },

4
www/chromium/files/patch-components__policy__tools__generate_policy_source.py
View file

@ -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.orig 2014-08-20 21:02:53.000000000 +0200
+++ ./components/policy/tools/generate_policy_source.py 2014-08-13 09:56:57.000000000 +0200 +++ ./components/policy/tools/generate_policy_source.py 2014-08-22 15:06:25.000000000 +0200
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
if platform.startswith('chrome.'): if platform.startswith('chrome.'):
platform_sub = platform[7:] platform_sub = platform[7:]

4
www/chromium/files/patch-components__storage_monitor.gypi
View file

@ -1,5 +1,5 @@
--- ./components/storage_monitor.gypi.orig 2014-08-12 21:02:37.000000000 +0200 --- ./components/storage_monitor.gypi.orig 2014-08-20 21:02:56.000000000 +0200
+++ ./components/storage_monitor.gypi 2014-08-13 09:56:57.000000000 +0200 +++ ./components/storage_monitor.gypi 2014-08-22 15:06:25.000000000 +0200
@@ -49,6 +49,24 @@ @@ -49,6 +49,24 @@
'storage_monitor/volume_mount_watcher_win.h', 'storage_monitor/volume_mount_watcher_win.h',
], ],

4
www/chromium/files/patch-components__storage_monitor__storage_monitor.cc
View file

@ -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.orig 2014-08-20 21:02:53.000000000 +0200
+++ ./components/storage_monitor/storage_monitor.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./components/storage_monitor/storage_monitor.cc 2014-08-22 15:06:25.000000000 +0200
@@ -85,6 +85,7 @@ @@ -85,6 +85,7 @@
void StorageMonitor::EnsureInitialized(base::Closure callback) { void StorageMonitor::EnsureInitialized(base::Closure callback) {

4
www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
View file

@ -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.orig 2014-08-22 15:06:25.000000000 +0200
+++ ./components/storage_monitor/storage_monitor_freebsd.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./components/storage_monitor/storage_monitor_freebsd.cc 2014-08-22 15:06:25.000000000 +0200
@@ -0,0 +1,102 @@ @@ -0,0 +1,102 @@
+// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be +// Use of this source code is governed by a BSD-style license that can be

4
www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h
View file

@ -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.orig 2014-08-22 15:06:25.000000000 +0200
+++ ./components/storage_monitor/storage_monitor_freebsd.h 2014-08-13 09:56:57.000000000 +0200 +++ ./components/storage_monitor/storage_monitor_freebsd.h 2014-08-22 15:06:25.000000000 +0200
@@ -0,0 +1,47 @@ @@ -0,0 +1,47 @@
+// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be +// Use of this source code is governed by a BSD-style license that can be

6
www/chromium/files/patch-components__usb_service.gypi
View file

@ -1,6 +1,6 @@
--- ./components/usb_service.gypi.orig 2014-08-12 21:02:37.000000000 +0200 --- ./components/usb_service.gypi.orig 2014-08-20 21:02:56.000000000 +0200
+++ ./components/usb_service.gypi 2014-08-13 09:56:57.000000000 +0200 +++ ./components/usb_service.gypi 2014-08-22 15:06:25.000000000 +0200
@@ -37,6 +37,11 @@ @@ -41,6 +41,11 @@
'dependencies': [ 'dependencies': [
'../build/linux/system.gyp:udev', '../build/linux/system.gyp:udev',
], ],

10
www/chromium/files/patch-components__usb_service__usb_context.cc
View file

@ -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.orig 2014-08-20 21:02:55.000000000 +0200
+++ ./components/usb_service/usb_context.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./components/usb_service/usb_context.cc 2014-08-22 15:06:25.000000000 +0200
@@ -7,8 +7,13 @@ @@ -8,8 +8,13 @@
#include "base/logging.h"
#include "base/synchronization/waitable_event.h" #include "base/synchronization/waitable_event.h"
#include "base/threading/platform_thread.h" #include "base/threading/platform_thread.h"
#include "components/usb_service/usb_error.h"
+#if defined(OS_FREEBSD) +#if defined(OS_FREEBSD)
+#include "libusb.h" +#include "libusb.h"
+#define LIBUSB_CALL +#define LIBUSB_CALL
@ -14,7 +14,7 @@
namespace usb_service { namespace usb_service {
@@ -45,7 +50,9 @@ @@ -46,7 +51,9 @@
running_ = false; running_ = false;
// Spreading running_ to the UsbEventHandler thread. // Spreading running_ to the UsbEventHandler thread.
base::subtle::MemoryBarrier(); base::subtle::MemoryBarrier();

4
www/chromium/files/patch-components__usb_service__usb_context_unittest.cc
View file

@ -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.orig 2014-08-20 21:02:55.000000000 +0200
+++ ./components/usb_service/usb_context_unittest.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./components/usb_service/usb_context_unittest.cc 2014-08-22 15:06:25.000000000 +0200
@@ -6,7 +6,11 @@ @@ -6,7 +6,11 @@
#include "build/build_config.h" #include "build/build_config.h"
#include "components/usb_service/usb_context.h" #include "components/usb_service/usb_context.h"

11
www/chromium/files/patch-components__usb_service__usb_device_handle.cc → www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc
View file

@ -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_impl.cc.orig 2014-08-20 21:02:55.000000000 +0200
+++ ./components/usb_service/usb_device_handle.cc 2014-08-17 16:54:01.000000000 +0200 +++ ./components/usb_service/usb_device_handle_impl.cc 2014-08-22 15:06:25.000000000 +0200
@@ -16,7 +16,24 @@ @@ -17,8 +17,25 @@
#include "components/usb_service/usb_interface.h" #include "components/usb_service/usb_interface.h"
#include "components/usb_service/usb_service.h" #include "components/usb_service/usb_service.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
@ -10,7 +10,7 @@
+#else +#else
#include "third_party/libusb/src/libusb/libusb.h" #include "third_party/libusb/src/libusb/libusb.h"
+#endif +#endif
+
+/* Define for FreeBSD < 9.3, thanks to db@freebsd.org */ +/* Define for FreeBSD < 9.3, thanks to db@freebsd.org */
+#if defined(OS_FREEBSD) && __FreeBSD_version < 903000 +#if defined(OS_FREEBSD) && __FreeBSD_version < 903000
+int libusb_get_string_descriptor(libusb_device_handle *dev, +int libusb_get_string_descriptor(libusb_device_handle *dev,
@ -22,6 +22,7 @@
+ lang_id, data, (uint16_t)length, 1000); + lang_id, data, (uint16_t)length, 1000);
+} +}
+#endif +#endif
+
using content::BrowserThread; using content::BrowserThread;
namespace usb_service {

10
www/chromium/files/patch-components__usb_service__usb_device_impl.cc
View file

@ -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.orig 2014-08-20 21:02:55.000000000 +0200
+++ ./components/usb_service/usb_device_impl.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./components/usb_service/usb_device_impl.cc 2014-08-22 15:06:25.000000000 +0200
@@ -10,7 +10,11 @@ @@ -12,7 +12,11 @@
#include "components/usb_service/usb_context.h" #include "components/usb_service/usb_error.h"
#include "components/usb_service/usb_device_handle.h" #include "components/usb_service/usb_interface_impl.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
+#if defined(OS_FREEBSD) +#if defined(OS_FREEBSD)
+#include "libusb.h" +#include "libusb.h"

14
www/chromium/files/patch-components__usb_service__usb_error.cc Normal file
View file

@ -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 {

14
www/chromium/files/patch-components__usb_service__usb_interface.cc
View file

@ -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 {

14
www/chromium/files/patch-components__usb_service__usb_interface_impl.cc Normal file
View file

@ -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 {

8
www/chromium/files/patch-components__usb_service__usb_service_impl.cc
View file

@ -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.orig 2014-08-20 21:02:55.000000000 +0200
+++ ./components/usb_service/usb_service_impl.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./components/usb_service/usb_service_impl.cc 2014-08-22 15:06:25.000000000 +0200
@@ -13,7 +13,11 @@ @@ -14,7 +14,11 @@
#include "components/usb_service/usb_context.h"
#include "components/usb_service/usb_device_impl.h" #include "components/usb_service/usb_device_impl.h"
#include "components/usb_service/usb_error.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
+#if defined(OS_FREEBSD) +#if defined(OS_FREEBSD)
+#include "libusb.h" +#include "libusb.h"

10
www/chromium/files/patch-content__app__content_main_runner.cc
View file

@ -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.orig 2014-08-20 21:02:47.000000000 +0200
+++ ./content/app/content_main_runner.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./content/app/content_main_runner.cc 2014-08-22 15:06:25.000000000 +0200
@@ -88,10 +88,10 @@ @@ -95,10 +95,10 @@
#include "base/posix/global_descriptors.h" #include "base/posix/global_descriptors.h"
#include "content/public/common/content_descriptors.h" #include "content/public/common/content_descriptors.h"
@ -13,7 +13,7 @@
#include "content/zygote/zygote_main.h" #include "content/zygote/zygote_main.h"
#endif #endif
@@ -282,7 +282,8 @@ @@ -287,7 +287,8 @@
int (*function)(const MainFunctionParams&); int (*function)(const MainFunctionParams&);
}; };
@ -23,7 +23,7 @@
// On platforms that use the zygote, we have a special subset of // On platforms that use the zygote, we have a special subset of
// subprocesses that are launched via the zygote. This function // subprocesses that are launched via the zygote. This function
// fills in some process-launching bits around ZygoteMain(). // fills in some process-launching bits around ZygoteMain().
@@ -412,7 +413,8 @@ @@ -417,7 +418,8 @@
} }
} }

10
www/chromium/files/patch-content__browser__browser_main_loop.cc
View file

@ -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.orig 2014-08-20 21:02:49.000000000 +0200
+++ ./content/browser/browser_main_loop.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./content/browser/browser_main_loop.cc 2014-08-22 15:06:25.000000000 +0200
@@ -135,7 +135,7 @@ @@ -133,7 +133,7 @@
namespace content { namespace content {
namespace { namespace {
@ -9,7 +9,7 @@
void SetupSandbox(const CommandLine& parsed_command_line) { void SetupSandbox(const CommandLine& parsed_command_line) {
TRACE_EVENT0("startup", "SetupSandbox"); TRACE_EVENT0("startup", "SetupSandbox");
base::FilePath sandbox_binary; base::FilePath sandbox_binary;
@@ -336,7 +336,7 @@ @@ -334,7 +334,7 @@
void BrowserMainLoop::EarlyInitialization() { void BrowserMainLoop::EarlyInitialization() {
TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
@ -18,7 +18,7 @@
// No thread should be created before this call, as SetupSandbox() // No thread should be created before this call, as SetupSandbox()
// will end-up using fork(). // will end-up using fork().
SetupSandbox(parsed_command_line_); SetupSandbox(parsed_command_line_);
@@ -762,9 +762,9 @@ @@ -764,9 +764,9 @@
} }
#endif #endif

30
www/chromium/files/patch-content__browser__child_process_launcher.cc
View file

@ -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.orig 2014-08-20 21:02:49.000000000 +0200
+++ ./content/browser/child_process_launcher.cc 2014-08-13 09:56:57.000000000 +0200 +++ ./content/browser/child_process_launcher.cc 2014-08-22 15:06:25.000000000 +0200
@@ -66,7 +66,7 @@ @@ -68,7 +68,7 @@
#else #else
terminate_child_on_shutdown_(true) terminate_child_on_shutdown_(true)
#endif #endif
@ -9,7 +9,7 @@
, zygote_(false) , zygote_(false)
#endif #endif
{ {
@@ -232,7 +232,7 @@ @@ -234,7 +234,7 @@
// child termination. // child termination.
base::ScopedFD ipcfd_closer(ipcfd); base::ScopedFD ipcfd_closer(ipcfd);
@ -18,7 +18,7 @@
GetContentClient()->browser()-> GetContentClient()->browser()->
GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id, GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id,
&files_to_register); &files_to_register);
@@ -242,7 +242,7 @@ @@ -244,7 +244,7 @@
process_type); process_type);
} else } else
// Fall through to the normal posix case below when we're not zygoting. // Fall through to the normal posix case below when we're not zygoting.
@ -27,7 +27,7 @@
{ {
// Convert FD mapping to FileHandleMappingVector // Convert FD mapping to FileHandleMappingVector
base::FileHandleMappingVector fds_to_map; base::FileHandleMappingVector fds_to_map;
@@ -253,7 +253,7 @@ @@ -255,7 +255,7 @@
base::GlobalDescriptors::kBaseDescriptor)); base::GlobalDescriptors::kBaseDescriptor));
} }
@ -36,7 +36,7 @@
if (process_type == switches::kRendererProcess) { if (process_type == switches::kRendererProcess) {
const int sandbox_fd = const int sandbox_fd =
RenderSandboxHostLinux::GetInstance()->GetRendererSocket(); RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
@@ -261,7 +261,7 @@ @@ -263,7 +263,7 @@
sandbox_fd, sandbox_fd,
GetSandboxFD())); GetSandboxFD()));
} }
@ -45,7 +45,7 @@
// Actually launch the app. // Actually launch the app.
base::LaunchOptions options; base::LaunchOptions options;
@@ -307,7 +307,7 @@ @@ -322,7 +322,7 @@
base::Bind( base::Bind(
&Context::Notify, &Context::Notify,
this_object.get(), this_object.get(),
@ -54,7 +54,7 @@
use_zygote, use_zygote,
#endif #endif
handle)); handle));
@@ -315,7 +315,7 @@ @@ -330,7 +330,7 @@
} }
void Notify( void Notify(
@ -63,7 +63,7 @@
bool zygote, bool zygote,
#endif #endif
base::ProcessHandle handle) { base::ProcessHandle handle) {
@@ -328,7 +328,7 @@ @@ -343,7 +343,7 @@
if (!handle) if (!handle)
LOG(ERROR) << "Failed to launch child process"; LOG(ERROR) << "Failed to launch child process";
@ -72,7 +72,7 @@
zygote_ = zygote; zygote_ = zygote;
#endif #endif
if (client_) { if (client_) {
@@ -355,7 +355,7 @@ @@ -370,7 +370,7 @@
BrowserThread::PROCESS_LAUNCHER, FROM_HERE, BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
base::Bind( base::Bind(
&Context::TerminateInternal, &Context::TerminateInternal,
@ -81,7 +81,7 @@
zygote_, zygote_,
#endif #endif
process_.handle())); process_.handle()));
@@ -372,7 +372,7 @@ @@ -387,7 +387,7 @@
} }
static void TerminateInternal( static void TerminateInternal(
@ -90,7 +90,7 @@
bool zygote, bool zygote,
#endif #endif
base::ProcessHandle handle) { base::ProcessHandle handle) {
@@ -386,13 +386,13 @@ @@ -401,13 +401,13 @@
process.Terminate(RESULT_CODE_NORMAL_EXIT); process.Terminate(RESULT_CODE_NORMAL_EXIT);
// On POSIX, we must additionally reap the child. // On POSIX, we must additionally reap the child.
#if defined(OS_POSIX) #if defined(OS_POSIX)
@ -106,7 +106,7 @@
{ {
base::EnsureProcessTerminated(handle); base::EnsureProcessTerminated(handle);
} }
@@ -413,7 +413,7 @@ @@ -428,7 +428,7 @@
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
// The fd to close after creating the process. // The fd to close after creating the process.
int ipcfd_; int ipcfd_;
@ -115,7 +115,7 @@
bool zygote_; bool zygote_;
#endif #endif
}; };
@@ -455,7 +455,7 @@ @@ -470,7 +470,7 @@
*exit_code = context_->exit_code_; *exit_code = context_->exit_code_;
return context_->termination_status_; return context_->termination_status_;
} }

Some files were not shown because too many files have changed in this diff Show more