diff options
| author | rene <rene@FreeBSD.org> | 2014-08-15 05:48:32 +0800 |
|---|---|---|
| committer | rene <rene@FreeBSD.org> | 2014-08-15 05:48:32 +0800 |
| commit | 8174837a64f2c9e478bdeaea68c126181f7fe27d (patch) | |
| tree | d388d9f9b91dda05ab0d7e300a11f3844d1dbc08 | |
| parent | 5b8b5e688defa193e99b100d6a242f3b7d763894 (diff) | |
| download | freebsd-ports-gnome-8174837a64f2c9e478bdeaea68c126181f7fe27d.tar.gz freebsd-ports-gnome-8174837a64f2c9e478bdeaea68c126181f7fe27d.tar.zst freebsd-ports-gnome-8174837a64f2c9e478bdeaea68c126181f7fe27d.zip | |
- Update to 36.0.1985.143 and unforbid
- Use a lot of ports dependencies instead of bundled versions
(idea from Gentoo Linux)
- Make patches more compatible with OpenBSD
- Add note about Python (only relevant for DIY builds)
- Install more icons into PREFIX/share/icons/hicolor/XxY/apps/
- Mute mkdir in installation
- Install mksnapshot binary
- Do not install bundled protoc binary
Obtained from: Gentoo, OpenBSD, various contributors in freebsd-chromium@
MFH: 2014Q3
Security: http://www.vuxml.org/freebsd/df7754c0-2294-11e4-b505-000c6e25e3e9.html
220 files changed, 1536 insertions, 982 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index b21539658193..468bc55aff16 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,11 +1,8 @@ # Created by: Florent Thoumie <flz@FreeBSD.org> # $FreeBSD$ -#TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3 - PORTNAME= chromium -PORTVERSION= 35.0.1916.153 -PORTREVISION= 3 +PORTVERSION= 36.0.1985.143 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -16,15 +13,15 @@ COMMENT= Mostly BSD-licensed web browser based on WebKit and Gtk+ LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi -FORBIDDEN= http://www.vuxml.org/freebsd/3718833e-0d27-11e4-89db-000c6e25e3e9.html - CFLAGS+= -fno-stack-protector BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ bash:${PORTSDIR}/shells/bash \ yasm:${PORTSDIR}/devel/yasm \ flock:${PORTSDIR}/sysutils/flock \ - ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat + ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \ + protoc:${PORTSDIR}/devel/protobuf \ + ${LOCALBASE}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libdbus-1.so:${PORTSDIR}/devel/dbus \ @@ -32,52 +29,95 @@ LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libasound.so:${PORTSDIR}/audio/alsa-lib \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libnss3.so:${PORTSDIR}/security/nss \ + libFLAC.so:${PORTSDIR}/audio/flac \ libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \ + libharfbuzz.so:${PORTSDIR}/print/harfbuzz \ libcups.so:${PORTSDIR}/print/cups-client \ libevent.so:${PORTSDIR}/devel/libevent2 \ + libexif.so:${PORTSDIR}/graphics/libexif \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libpci.so:${PORTSDIR}/devel/libpci \ - libdrm.so:${PORTSDIR}/graphics/libdrm + libdrm.so:${PORTSDIR}/graphics/libdrm \ + libicuuc.so:${PORTSDIR}/devel/icu \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \ + libminizip.so:${PORTSDIR}/archivers/minizip \ + libnspr4.so:${PORTSDIR}/devel/nspr \ + libpng.so:${PORTSDIR}/graphics/png \ + libre2.so:${PORTSDIR}/devel/re2 \ + libsnappy.so:${PORTSDIR}/archivers/snappy \ + libspeechd.so:${PORTSDIR}/accessibility/speech-dispatcher \ + libspeex.so:${PORTSDIR}/audio/speex \ + libxml2.so:${PORTSDIR}/textproc/libxml2 \ + libwebp.so:${PORTSDIR}/graphics/webp RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \ - ${LOCALBASE}/lib/X11/fonts/Droid/fonts.dir:${PORTSDIR}/x11-fonts/droid-fonts-ttf + ${LOCALBASE}/lib/X11/fonts/Droid/fonts.dir:${PORTSDIR}/x11-fonts/droid-fonts-ttf \ + xdg-open:${PORTSDIR}/devel/xdg-utils ONLY_FOR_ARCHS= i386 amd64 USES= bison compiler:c++11-lib cpe desktop-file-utils pkgconfig \ - perl5 shebangfix ninja tar:xz + perl5 shebangfix ninja tar:xz python:2,build execinfo CPE_VENDOR= google CPE_PRODUCT= chrome USE_PERL5= build -USE_PYTHON_BUILD= 2 USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst USE_GNOME= glib20 gtk20 dconf libxslt - +USE_OPENSSL= yes +WITH_OPENSSL_PORT= yes # simplify for pkg-config in configure phase SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome +INSTALLS_ICONS= yes # See build/common.gypi for all the available variables. -GYP_DEFINES+= use_cups=1 \ - use_system_yasm=1 \ - use_system_libxml=1 \ - use_system_ffmpeg=0 \ - use_system_libusb=1 \ - use_system_libevent=1 \ - use_system_libvpx=0 \ +GYP_DEFINES+= \ + clang_use_chrome_plugins=0 \ linux_breakpad=0 \ - linux_strip_binary=1 \ - linux_use_tcmalloc=0 \ linux_use_heapchecker=0 \ + linux_strip_binary=1 \ test_isolation_mode=noop \ - clang_use_chrome_plugins=0 \ disable_nacl=1 \ - enable_webrtc=1 \ - enable_openmax=1 \ enable_one_click_signin=1 \ + enable_openmax=1 \ + enable_webrtc=1 \ werror= \ no_gc_sections=1 \ os_ver=${OSVERSION} \ prefix_dir=${LOCALBASE} \ - python_ver=${PYTHON_VER} + python_ver=${PYTHON_VER} \ + use_allocator=none \ + use_cups=1 \ + linux_link_gsettings=1 \ + linux_link_libpci=1 \ + linux_link_libspeechd=1 \ + libspeechd_h_prefix=speech-dispatcher/ \ + usb_ids_path=${LOCALBASE}/share/usbids/usb.ids \ + want_separate_host_toolset=0 \ + use_system_bzip2=1 \ + use_system_flac=1 \ + use_system_harfbuzz=1 \ + use_system_icu=1 \ + use_system_jsoncpp=1 \ + use_system_libevent=1 \ + use_system_libexif=1 \ + use_system_libjpeg=1 \ + use_system_libpng=1 \ + use_system_libusb=1 \ + use_system_libwebp=1 \ + use_system_libxml=1 \ + use_system_libxslt=1 \ + use_system_minizip=1 \ + use_system_nspr=1 \ + use_system_openssl=1 \ + use_system_protobuf=1 \ + use_system_re2=1 \ + use_system_snappy=1 \ + use_system_speex=1 \ + use_system_xdg_utils=1 \ + use_system_yasm=1 \ + use_system_zlib=1 +# allow removal of third_party/adobe +GYP_DEFINES+= flapper_version_h_file='${WRKSRC}/flapper_version.h' # FreeBSD Chromium Api Key # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . @@ -110,7 +150,9 @@ GYP_DEFINES+= ffmpeg_branding=Chromium GYP_DEFINES+= proprietary_codecs=0 .endif -.if ! ${PORT_OPTIONS:MGCONF} +.if ${PORT_OPTIONS:MGCONF} +GYP_DEFINES+= use_gconf=1 +.else GYP_DEFINES+= use_gconf=0 .endif @@ -127,9 +169,6 @@ GYP_DEFINES+= disable_sse2=1 .if ${OSVERSION} >= 1000052 && !exists(${LOCALBASE}/include/execinfo.h) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-execinfo .endif -.if ${OSVERSION} < 1000052 -LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo -.endif .if ${PORT_OPTIONS:MTEST} .include "Makefile.tests" @@ -141,11 +180,11 @@ DEBUG_MAKE_ENV= V=1 BUILDTYPE= Debug .else BUILDTYPE= Release -GYP_DEFINES+= buildtype=Official .endif CONFIGURE_ENV+= CC="${CC}" \ CXX="${CXX}" \ + GYP_GENERATORS=ninja \ GYP_DEFINES="${GYP_DEFINES}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF="${LOCALBASE}/bin/gperf" @@ -180,6 +219,8 @@ pre-everything:: @${ECHO_MSG} "and a fair amount of free diskspace (~ 3.7GB)." .endif @${ECHO_MSG} + @${ECHO_MSG} "Make sure you have Python build with the SEM option ON" + @${ECHO_MSG} "(default in python27-2.7.8 since r361735)" post-patch: @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \ @@ -187,10 +228,95 @@ post-patch: ${WRKSRC}/v8/tools/gyp/v8.gyp \ ${WRKSRC}/v8/build/toolchain.gypi @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \ - ${WRKSRC}/chrome/common/chrome_paths.cc + ${WRKSRC}/chrome/common/chrome_paths.cc \ + ${WRKSRC}/base/base.gyp @${REINPLACE_CMD} -e "s|/usr/bin/gcc|${CC}|" \ ${WRKSRC}/third_party/WebKit/Source/build/scripts/preprocessor.pm \ ${WRKSRC}/third_party/WebKit/Source/build/scripts/scripts.gypi + @${REINPLACE_CMD} -e "s|g++|${CXX}|" \ + ${WRKSRC}/tools/compile_test/compile_test.py + +pre-configure: + # phajdan-jr: list of things *not* to remove, so maybe the script + # should be called "keep_bundled_libraries.py" + cd ${WRKSRC} && ${PYTHON_CMD} \ + ./build/linux/unbundle/remove_bundled_libraries.py \ + 'base/third_party/dmg_fp' \ + 'base/third_party/dynamic_annotations' \ + 'base/third_party/icu' \ + 'base/third_party/nspr' \ + 'base/third_party/superfasthash' \ + 'base/third_party/symbolize' \ + 'base/third_party/valgrind' \ + 'base/third_party/xdg_mime' \ + 'base/third_party/xdg_user_dirs' \ + 'breakpad/src/third_party/curl' \ + 'chrome/third_party/mozilla_security_manager' \ + 'courgette/third_party' \ + 'crypto/third_party/nss' \ + 'net/third_party/mozilla_security_manager' \ + 'net/third_party/nss' \ + 'third_party/WebKit' \ + 'third_party/angle' \ + 'third_party/brotli' \ + 'third_party/cacheinvalidation' \ + 'third_party/cld' \ + 'third_party/cros_system_api' \ + 'third_party/dom_distiller_js' \ + 'third_party/ffmpeg' \ + 'third_party/flot' \ + 'third_party/hunspell' \ + 'third_party/iccjpeg' \ + 'third_party/icu/icu.isolate' \ + 'third_party/jinja2' \ + 'third_party/jstemplate' \ + 'third_party/khronos' \ + 'third_party/leveldatabase' \ + 'third_party/libaddressinput' \ + 'third_party/libjingle' \ + 'third_party/libphonenumber' \ + 'third_party/libsrtp' \ + 'third_party/libvpx' \ + 'third_party/libwebm' \ + 'third_party/libxml/chromium' \ + 'third_party/libXNVCtrl' \ + 'third_party/libyuv' \ + 'third_party/lss' \ + 'third_party/lzma_sdk' \ + 'third_party/markupsafe' \ + 'third_party/mesa' \ + 'third_party/modp_b64' \ + 'third_party/mt19937ar' \ + 'third_party/npapi' \ + 'third_party/opus' \ + 'third_party/ots' \ + 'third_party/polymer' \ + 'third_party/ply' \ + 'third_party/pywebsocket' \ + 'third_party/qcms' \ + 'third_party/readability' \ + 'third_party/sfntly' \ + 'third_party/skia' \ + 'third_party/smhasher' \ + 'third_party/sqlite' \ + 'third_party/tcmalloc' \ + 'third_party/tlslite' \ + 'third_party/trace-viewer' \ + 'third_party/undoview' \ + 'third_party/usrsctp' \ + 'third_party/webdriver' \ + 'third_party/webrtc' \ + 'third_party/widevine' \ + 'third_party/x86inc' \ + 'third_party/zlib/google' \ + 'url/third_party/mozilla' \ + 'v8/src/third_party/valgrind' \ + --do-remove || ${FALSE} + cd ${WRKSRC} && ${PYTHON_CMD} \ + ./build/linux/unbundle/replace_gyp_files.py \ + ${GYP_DEFINES:C/^/-D/} || ${FALSE} + # allow removal of third_party/adobe + ${ECHO_CMD} > ${WRKSRC}/flapper_version.h do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ @@ -203,21 +329,26 @@ test regression-test: build .endfor do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${STAGEDIR}${MANPREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/product_logo_48.png ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/out/${BUILDTYPE}/chrome-wrapper \ - ${WRKSRC}/out/${BUILDTYPE}/xdg-settings ${STAGEDIR}${DATADIR} -.for p in chrome_100_percent content_resources resources - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak ${STAGEDIR}${DATADIR} +.for s in 22 24 48 64 128 256 + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps + ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png .endfor -.for f in chrome libffmpegsumo.so protoc - ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ + ${STAGEDIR}${DATADIR} +.for p in chrome_100_percent content_resources keyboard_resources resources + ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak ${STAGEDIR}${DATADIR} .endfor + ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome ${STAGEDIR}${DATADIR} + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libffmpegsumo.so ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} - ${MKDIR} ${STAGEDIR}${DESKTOPDIR} + @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot.${ARCH:S/i386/x86/:S/amd64/x64/} \ + ${STAGEDIR}${DATADIR}/mksnapshot .include <bsd.port.post.mk> diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 3d72ff1ba308..e2911b50f548 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,4 +1,4 @@ -SHA256 (chromium-35.0.1916.153.tar.xz) = 280ceb4307ba334918aacd1c5672e6ce6538bf229f90415245ede5b569e5e70e -SIZE (chromium-35.0.1916.153.tar.xz) = 206225052 -SHA256 (chromium-35.0.1916.153-testdata.tar.xz) = b3b977312a7a57f53cd8a02ab59480509ab39ea66130855da16438de888d92f4 -SIZE (chromium-35.0.1916.153-testdata.tar.xz) = 109105000 +SHA256 (chromium-36.0.1985.143.tar.xz) = 0631d7442991f0b4b942477c58a9294e9e3eb21ffd3c8626e4ab663b8345c316 +SIZE (chromium-36.0.1985.143.tar.xz) = 205456928 +SHA256 (chromium-36.0.1985.143-testdata.tar.xz) = 7af27696a1d30a2acd29ffa331c956f58d82080905b73ad9259f7d6ad2784277 +SIZE (chromium-36.0.1985.143-testdata.tar.xz) = 111519392 diff --git a/www/chromium/files/patch-base__base.gyp b/www/chromium/files/patch-base__base.gyp index 691ba8c76ea8..8b11ef5b3e4e 100644 --- a/www/chromium/files/patch-base__base.gyp +++ b/www/chromium/files/patch-base__base.gyp @@ -1,14 +1,11 @@ ---- ./base/base.gyp.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/base.gyp 2014-05-04 14:38:46.000000000 +0200 -@@ -803,6 +803,11 @@ - ['include', '^debug/proc_maps_linux_unittest\\.cc$'], +--- ./base/base.gyp.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/base.gyp 2014-08-13 09:57:00.000000000 +0200 +@@ -129,7 +129,7 @@ ], + 'link_settings': { + 'libraries': [ +- '-L/usr/local/lib -lexecinfo', ++ '-L/usr/local/lib -lexecinfo -lkvm', + ], + }, }], -+ ['<(os_bsd) == 1', { -+ 'sources/': [ -+ ['exclude', '^debug/proc_maps_linux_unittest\\.cc$'], -+ ], -+ }], - ], # target_conditions - }, - { diff --git a/www/chromium/files/patch-base__base.gypi b/www/chromium/files/patch-base__base.gypi index 3276135948ed..635979397e12 100644 --- a/www/chromium/files/patch-base__base.gypi +++ b/www/chromium/files/patch-base__base.gypi @@ -1,12 +1,12 @@ ---- ./base/base.gypi.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/base.gypi 2014-05-04 14:38:46.000000000 +0200 -@@ -915,11 +915,15 @@ +--- ./base/base.gypi.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/base.gypi 2014-08-13 09:56:56.000000000 +0200 +@@ -912,11 +912,14 @@ 'process/memory_stubs.cc', ], 'sources/': [ + ['exclude', '^debug/proc_maps_linux\\.cc$'], ['exclude', '^files/file_path_watcher_linux\\.cc$'], - ['exclude', '^files/file_path_watcher_stub\\.cc$'], +- ['exclude', '^files/file_path_watcher_stub\\.cc$'], ['exclude', '^file_util_linux\\.cc$'], + ['exclude', '^process/memory_linux\\.cc$'], ['exclude', '^process/process_linux\\.cc$'], diff --git a/www/chromium/files/patch-base__debug__stack_trace_posix.cc b/www/chromium/files/patch-base__debug__stack_trace_posix.cc index 5ce9fd639fea..3e5f120a5f79 100644 --- a/www/chromium/files/patch-base__debug__stack_trace_posix.cc +++ b/www/chromium/files/patch-base__debug__stack_trace_posix.cc @@ -1,6 +1,6 @@ ---- ./base/debug/stack_trace_posix.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/debug/stack_trace_posix.cc 2014-05-04 15:46:56.000000000 +0200 -@@ -586,6 +586,10 @@ +--- ./base/debug/stack_trace_posix.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/debug/stack_trace_posix.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -590,6 +590,10 @@ // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -11,7 +11,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -601,6 +605,7 @@ +@@ -605,6 +609,7 @@ is_initialized_ = true; return true; diff --git a/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc b/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc new file mode 100644 index 000000000000..8268fb3cbf8f --- /dev/null +++ b/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc @@ -0,0 +1,44 @@ +--- ./base/posix/unix_domain_socket_linux.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/posix/unix_domain_socket_linux.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -18,6 +18,15 @@ + #include "base/posix/eintr_wrapper.h" + #include "base/stl_util.h" + ++#if defined(__FreeBSD__) ++// Port over Linux ucred structure ++struct ucred { ++ pid_t pid; // process ID of the sending process ++ uid_t uid; // user ID of the sending process ++ gid_t gid; // group ID of the sending process ++}; ++#endif ++ + const size_t UnixDomainSocket::kMaxFileDescriptors = 16; + + // Creates a connected pair of UNIX-domain SOCK_SEQPACKET sockets, and passes +@@ -35,7 +44,13 @@ + // static + bool UnixDomainSocket::EnableReceiveProcessId(int fd) { + const int enable = 1; ++#if defined(__FreeBSD__) ++ // XXX(rene) do this? : ++ // taken from dbus, Academic Free License 2.1 / GPL 2+ ++ return 0; // fake OK ++#else + return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; ++#endif + } + + // static +@@ -131,7 +146,11 @@ + wire_fds_len = payload_len / sizeof(int); + } + if (cmsg->cmsg_level == SOL_SOCKET && ++#if defined(__FreeBSD__) ++ 1) { // XXX(rene) carpet getting full ... ++#else + cmsg->cmsg_type == SCM_CREDENTIALS) { ++#endif + DCHECK(payload_len == sizeof(struct ucred)); + DCHECK(pid == -1); + pid = reinterpret_cast<struct ucred*>(CMSG_DATA(cmsg))->pid; diff --git a/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc b/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc index af7a17e909cc..067c28fdec2a 100644 --- a/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc +++ b/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc @@ -1,5 +1,5 @@ ---- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-04-30 22:41:41.000000000 +0200 -+++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-08-13 09:56:56.000000000 +0200 @@ -2,8 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/www/chromium/files/patch-base__process__internal_linux.h b/www/chromium/files/patch-base__process__internal_linux.h index faf2e218e234..fee33208d7d0 100644 --- a/www/chromium/files/patch-base__process__internal_linux.h +++ b/www/chromium/files/patch-base__process__internal_linux.h @@ -1,5 +1,5 @@ ---- ./base/process/internal_linux.h.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/process/internal_linux.h 2014-05-04 14:38:46.000000000 +0200 +--- ./base/process/internal_linux.h.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/internal_linux.h 2014-08-13 09:56:56.000000000 +0200 @@ -12,6 +12,8 @@ #include "base/files/file_path.h" diff --git a/www/chromium/files/patch-base__process__launch.cc b/www/chromium/files/patch-base__process__launch.cc new file mode 100644 index 000000000000..6785d64861c0 --- /dev/null +++ b/www/chromium/files/patch-base__process__launch.cc @@ -0,0 +1,15 @@ +--- ./base/process/launch.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/launch.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -23,10 +23,10 @@ + fds_to_remap(NULL), + maximize_rlimits(NULL), + new_process_group(false) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + , clone_flags(0) + , allow_new_privs(false) +-#endif // OS_LINUX ++#endif // OS_LINUX || OS_FREEBSD + #if defined(OS_CHROMEOS) + , ctrl_terminal_fd(-1) + #endif // OS_CHROMEOS diff --git a/www/chromium/files/patch-base__process__launch.h b/www/chromium/files/patch-base__process__launch.h new file mode 100644 index 000000000000..001b25e3f56d --- /dev/null +++ b/www/chromium/files/patch-base__process__launch.h @@ -0,0 +1,19 @@ +--- ./base/process/launch.h.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/launch.h 2014-08-13 09:56:56.000000000 +0200 +@@ -108,14 +108,14 @@ + // will be the same as its pid. + bool new_process_group; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + // If non-zero, start the process using clone(), using flags as provided. + int clone_flags; + + // By default, child processes will have the PR_SET_NO_NEW_PRIVS bit set. If + // true, then this bit will not be set in the new child process. + bool allow_new_privs; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_FREEBSD) + + #if defined(OS_CHROMEOS) + // If non-negative, the specified file descriptor will be set as the launched diff --git a/www/chromium/files/patch-base__process__memory_unittest.cc b/www/chromium/files/patch-base__process__memory_unittest.cc index 0525487568ee..52fe0abd33e7 100644 --- a/www/chromium/files/patch-base__process__memory_unittest.cc +++ b/www/chromium/files/patch-base__process__memory_unittest.cc @@ -1,24 +1,20 @@ ---- ./base/process/memory_unittest.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/process/memory_unittest.cc 2014-05-04 16:09:01.000000000 +0200 -@@ -151,12 +151,12 @@ +--- ./base/process/memory_unittest.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/memory_unittest.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -151,9 +151,9 @@ // Android doesn't implement set_new_handler, so we can't use the // OutOfMemoryTest cases. -// OpenBSD does not support these tests either. -+// OpenBSD and FreeBSD does not support these tests either. - // AddressSanitizer and ThreadSanitizer define the malloc()/free()/etc. - // functions so that they don't crash if the program is out of memory, so the - // OOM tests aren't supposed to work. ++// OpenBSD and FreeBSD do not support these tests either. // TODO(vandebo) make this work on Windows too. -#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && \ +#if !defined(OS_ANDROID) && !defined(OS_BSD) && \ - !defined(OS_WIN) && \ - !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) + !defined(OS_WIN) -@@ -427,5 +427,5 @@ + #if defined(USE_TCMALLOC) +@@ -425,4 +425,4 @@ EXPECT_TRUE(value_ == NULL); } - --#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && -+#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && - // !defined(OS_WIN) && !defined(ADDRESS_SANITIZER) + #endif // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) +-#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(OS_WIN) ++#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(OS_WIN) diff --git a/www/chromium/files/patch-base__process__process_iterator_freebsd.cc b/www/chromium/files/patch-base__process__process_iterator_freebsd.cc index 87475ed39d7d..93c0b7f7b3f2 100644 --- a/www/chromium/files/patch-base__process__process_iterator_freebsd.cc +++ b/www/chromium/files/patch-base__process__process_iterator_freebsd.cc @@ -1,5 +1,5 @@ ---- ./base/process/process_iterator_freebsd.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/process/process_iterator_freebsd.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/process/process_iterator_freebsd.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/process_iterator_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 @@ -8,6 +8,10 @@ #include <sys/sysctl.h> #include <unistd.h> diff --git a/www/chromium/files/patch-base__process__process_metrics.h b/www/chromium/files/patch-base__process__process_metrics.h index 3a5b90bc4e45..e993a64b45f0 100644 --- a/www/chromium/files/patch-base__process__process_metrics.h +++ b/www/chromium/files/patch-base__process__process_metrics.h @@ -1,5 +1,5 @@ ---- ./base/process/process_metrics.h.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/process/process_metrics.h 2014-05-04 14:38:46.000000000 +0200 +--- ./base/process/process_metrics.h.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/process_metrics.h 2014-08-13 09:56:56.000000000 +0200 @@ -17,6 +17,13 @@ #include "base/time/time.h" #include "base/values.h" @@ -14,3 +14,21 @@ #if defined(OS_MACOSX) #include <mach/mach.h> #endif +@@ -242,13 +249,17 @@ + // CPU-related ticks. Returns -1 on parse error. + // Exposed for testing. + BASE_EXPORT int ParseProcStatCPU(const std::string& input); ++#endif + ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) + // Get the number of threads of |process| as available in /proc/<pid>/stat. + // This should be used with care as no synchronization with running threads is + // done. This is mostly useful to guarantee being single-threaded. + // Returns 0 on failure. + BASE_EXPORT int GetNumberOfThreads(ProcessHandle process); ++#endif + ++#if defined(OS_LINUX) || defined(OS_ANDROID) + // /proc/self/exe refers to the current executable. + BASE_EXPORT extern const char kProcSelfExe[]; + diff --git a/www/chromium/files/patch-base__process__process_metrics_freebsd.cc b/www/chromium/files/patch-base__process__process_metrics_freebsd.cc index 4ca06dac4ca7..f6e0df0aca38 100644 --- a/www/chromium/files/patch-base__process__process_metrics_freebsd.cc +++ b/www/chromium/files/patch-base__process__process_metrics_freebsd.cc @@ -1,11 +1,36 @@ ---- ./base/process/process_metrics_freebsd.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/process/process_metrics_freebsd.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -10,6 +10,8 @@ +--- ./base/process/process_metrics_freebsd.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/process_metrics_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -10,6 +10,9 @@ #include "base/sys_info.h" +#include <unistd.h> /* getpagesize() */ ++#include <fcntl.h> /* O_RDONLY */ + namespace base { ProcessMetrics::ProcessMetrics(ProcessHandle process) +@@ -119,4 +122,23 @@ + return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); + } + ++int GetNumberOfThreads(ProcessHandle process) { ++ // Taken from FreeBSD top (usr.bin/top/machine.c) ++ ++ kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open"); ++ if (kd == NULL) ++ return 0; ++ ++ struct kinfo_proc* pbase; ++ int nproc; ++ pbase = kvm_getprocs(kd, KERN_PROC_PID, process, &nproc); ++ if (pbase == NULL) ++ return 0; ++ ++ if (kvm_close(kd) == -1) ++ return 0; ++ ++ return nproc; ++} ++ + } // namespace base diff --git a/www/chromium/files/patch-base__security_unittest.cc b/www/chromium/files/patch-base__security_unittest.cc index bd2ea8fdabc5..c863a480994b 100644 --- a/www/chromium/files/patch-base__security_unittest.cc +++ b/www/chromium/files/patch-base__security_unittest.cc @@ -1,6 +1,6 @@ ---- ./base/security_unittest.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/security_unittest.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -159,7 +159,7 @@ +--- ./base/security_unittest.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/security_unittest.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -160,7 +160,7 @@ // FAILS_ is too clunky. void OverflowTestsSoftExpectTrue(bool overflow_detected) { if (!overflow_detected) { diff --git a/www/chromium/files/patch-base__strings__safe_sprintf.cc b/www/chromium/files/patch-base__strings__safe_sprintf.cc index 1109027c59f5..b5104ef3cc42 100644 --- a/www/chromium/files/patch-base__strings__safe_sprintf.cc +++ b/www/chromium/files/patch-base__strings__safe_sprintf.cc @@ -1,5 +1,5 @@ ---- ./base/strings/safe_sprintf.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/strings/safe_sprintf.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/strings/safe_sprintf.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/strings/safe_sprintf.cc 2014-08-13 09:56:56.000000000 +0200 @@ -107,11 +107,11 @@ : buffer_(buffer), size_(size - 1), // Account for trailing NUL byte diff --git a/www/chromium/files/patch-base__sys_info_freebsd.cc b/www/chromium/files/patch-base__sys_info_freebsd.cc index 4ec1ae0b640e..319855663abf 100644 --- a/www/chromium/files/patch-base__sys_info_freebsd.cc +++ b/www/chromium/files/patch-base__sys_info_freebsd.cc @@ -1,5 +1,5 @@ ---- ./base/sys_info_freebsd.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/sys_info_freebsd.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/sys_info_freebsd.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/sys_info_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 @@ -4,6 +4,7 @@ #include "base/sys_info.h" diff --git a/www/chromium/files/patch-base__sys_info_posix.cc b/www/chromium/files/patch-base__sys_info_posix.cc index 1d6417a4e3ea..7d281280506d 100644 --- a/www/chromium/files/patch-base__sys_info_posix.cc +++ b/www/chromium/files/patch-base__sys_info_posix.cc @@ -1,6 +1,6 @@ ---- ./base/sys_info_posix.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/sys_info_posix.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -49,7 +49,7 @@ +--- ./base/sys_info_posix.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/sys_info_posix.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -64,7 +64,7 @@ namespace base { diff --git a/www/chromium/files/patch-base__test__expectations__expectation.cc b/www/chromium/files/patch-base__test__expectations__expectation.cc index 6481dadf5987..b2b614088efb 100644 --- a/www/chromium/files/patch-base__test__expectations__expectation.cc +++ b/www/chromium/files/patch-base__test__expectations__expectation.cc @@ -1,6 +1,6 @@ ---- ./base/test/expectations/expectation.cc.orig 2014-04-30 22:41:42.000000000 +0200 -+++ ./base/test/expectations/expectation.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -59,6 +59,7 @@ +--- ./base/test/expectations/expectation.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/test/expectations/expectation.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -60,6 +60,7 @@ variant != "64") { return false; } @@ -8,7 +8,7 @@ } else if (name == "ChromeOS") { // TODO(rsesek): Figure out what ChromeOS needs. } else if (name == "iOS") { -@@ -122,6 +123,8 @@ +@@ -125,6 +126,8 @@ platform.variant = "32"; else if (arch == "x86_64") platform.variant = "64"; diff --git a/www/chromium/files/patch-base__test__launcher__test_launcher.cc b/www/chromium/files/patch-base__test__launcher__test_launcher.cc index b6c6e17d0452..5c0569a057ef 100644 --- a/www/chromium/files/patch-base__test__launcher__test_launcher.cc +++ b/www/chromium/files/patch-base__test__launcher__test_launcher.cc @@ -1,5 +1,5 @@ ---- ./base/test/launcher/test_launcher.cc.orig 2014-04-30 22:41:42.000000000 +0200 -+++ ./base/test/launcher/test_launcher.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/test/launcher/test_launcher.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/test/launcher/test_launcher.cc 2014-08-13 09:56:56.000000000 +0200 @@ -40,6 +40,10 @@ #include "base/mac/scoped_nsautorelease_pool.h" #endif diff --git a/www/chromium/files/patch-base__threading__platform_thread_linux.cc b/www/chromium/files/patch-base__threading__platform_thread_linux.cc index d4b52f43aefb..66c52d30a68d 100644 --- a/www/chromium/files/patch-base__threading__platform_thread_linux.cc +++ b/www/chromium/files/patch-base__threading__platform_thread_linux.cc @@ -1,5 +1,5 @@ ---- ./base/threading/platform_thread_linux.cc.orig 2014-04-30 22:41:42.000000000 +0200 -+++ ./base/threading/platform_thread_linux.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/threading/platform_thread_linux.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/threading/platform_thread_linux.cc 2014-08-13 09:56:56.000000000 +0200 @@ -16,7 +16,9 @@ #include "base/tracked_objects.h" @@ -10,7 +10,7 @@ #include <sys/resource.h> #include <sys/syscall.h> #include <sys/time.h> -@@ -48,7 +50,7 @@ +@@ -50,7 +52,7 @@ ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); tracked_objects::ThreadData::InitializeThreadContext(name); diff --git a/www/chromium/files/patch-breakpad__breakpad.gyp b/www/chromium/files/patch-breakpad__breakpad.gyp new file mode 100644 index 000000000000..0c06bbe56b05 --- /dev/null +++ b/www/chromium/files/patch-breakpad__breakpad.gyp @@ -0,0 +1,11 @@ +--- ./breakpad/breakpad.gyp.orig 2014-08-12 21:02:55.000000000 +0200 ++++ ./breakpad/breakpad.gyp 2014-08-13 09:56:56.000000000 +0200 +@@ -340,7 +340,7 @@ + }, + ], + }], +- [ 'OS=="linux" or OS=="android" or OS=="freebsd"', { ++ [ 'OS=="linux" or OS=="android" or os_bsd==1', { + 'conditions': [ + ['OS=="android"', { + 'defines': [ diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi index 992009dc1b0b..94bcad570f7f 100644 --- a/www/chromium/files/patch-build__common.gypi +++ b/www/chromium/files/patch-build__common.gypi @@ -1,6 +1,15 @@ ---- ./build/common.gypi.orig 2014-04-30 22:43:21.000000000 +0200 -+++ ./build/common.gypi 2014-05-04 14:43:03.000000000 +0200 -@@ -615,7 +615,7 @@ +--- ./build/common.gypi.orig 2014-08-12 21:02:52.000000000 +0200 ++++ ./build/common.gypi 2014-08-13 09:56:56.000000000 +0200 +@@ -101,7 +101,7 @@ + # + # TODO(erg): Merge this into the previous block once compiling with + # aura safely implies including ash capabilities. +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="freebsd"', { + 'use_aura%': 1, + }], + +@@ -622,7 +622,7 @@ }], # DBus usage. @@ -9,16 +18,16 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -878,7 +878,7 @@ - # By default, use ICU data file (icudtl.dat) on all platforms +@@ -896,7 +896,7 @@ # except when building Android WebView. # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). + # Set the data reduction proxy origin for Android Webview. - ['android_webview_build==0', { + ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd"', { 'icu_use_data_file_flag%' : 1, - }, { - 'icu_use_data_file_flag%' : 0, -@@ -1076,6 +1076,9 @@ + 'spdy_proxy_auth_origin%': '', + 'data_reduction_proxy_probe_url%': '', +@@ -1106,6 +1106,9 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, @@ -28,7 +37,7 @@ # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -3894,6 +3897,13 @@ +@@ -3960,6 +3963,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], diff --git a/www/chromium/files/patch-build__filename_rules.gypi b/www/chromium/files/patch-build__filename_rules.gypi new file mode 100644 index 000000000000..d26c7e46e7e0 --- /dev/null +++ b/www/chromium/files/patch-build__filename_rules.gypi @@ -0,0 +1,11 @@ +--- ./build/filename_rules.gypi.orig 2014-08-12 21:02:52.000000000 +0200 ++++ ./build/filename_rules.gypi 2014-08-13 09:56:56.000000000 +0200 +@@ -85,7 +85,7 @@ + ['<(use_aura)==0 or OS!="win" or >(nacl_untrusted_build)==1', { + 'sources/': [ ['exclude', '_aurawin\\.(h|cc)$'] ] + }], +- ['<(use_aura)==0 or OS!="linux" or >(nacl_untrusted_build)==1', { ++ ['<(use_aura)==0 or (OS!="linux" and OS!="openbsd" and OS!="freebsd") or >(nacl_untrusted_build)==1', { + 'sources/': [ ['exclude', '_auralinux\\.(h|cc)$'] ] + }], + ['<(use_ash)==0 or >(nacl_untrusted_build)==1', { diff --git a/www/chromium/files/patch-build__linux__system.gyp b/www/chromium/files/patch-build__linux__system.gyp new file mode 100644 index 000000000000..cd9bfb4eb4ce --- /dev/null +++ b/www/chromium/files/patch-build__linux__system.gyp @@ -0,0 +1,16 @@ +--- ./build/linux/system.gyp.orig 2014-08-12 21:02:52.000000000 +0200 ++++ ./build/linux/system.gyp 2014-08-13 09:56:56.000000000 +0200 +@@ -885,6 +885,13 @@ + 'include_dirs': [ + '../..', + ], ++ 'conditions' : [ ++ ['OS=="freebsd"', { ++ 'include_dirs': [ ++ '<(prefix_dir)/include', ++ ], ++ }], ++ ], + 'hard_dependency': 1, + 'actions': [ + { diff --git a/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp b/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp new file mode 100644 index 000000000000..cb47550a24de --- /dev/null +++ b/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp @@ -0,0 +1,17 @@ +--- ./build/linux/unbundle/libwebp.gyp.orig 2014-08-12 21:02:52.000000000 +0200 ++++ ./build/linux/unbundle/libwebp.gyp 2014-08-13 09:56:56.000000000 +0200 +@@ -14,13 +14,7 @@ + }, + 'link_settings': { + 'libraries': [ +- # Check for presence of webpdemux library, use it if present. +- '<!(python <(DEPTH)/tools/compile_test/compile_test.py ' +- '--code "int main() { return 0; }" ' +- '--run-linker ' +- '--on-success "-lwebp -lwebpdemux" ' +- '--on-failure "-lwebp" ' +- '-- -lwebpdemux)', ++ '-lwebp -lwebpdemux', + ], + }, + } diff --git a/www/chromium/files/patch-cc__layers__layer.cc b/www/chromium/files/patch-cc__layers__layer.cc deleted file mode 100644 index 776a65fcf18d..000000000000 --- a/www/chromium/files/patch-cc__layers__layer.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- ./cc/layers/layer.cc.orig 2014-04-30 22:41:25.000000000 +0200 -+++ ./cc/layers/layer.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -720,13 +720,15 @@ - DCHECK(current_layer); - DCHECK(current_layer->id() == scroll_clip_layer_id_); - -- gfx::Vector2dF max_offset( -+ // (rene) prevent name collission with /usr/include/vm/vm_map.h on FreeBSD -+ // which also defines max_offset -+ gfx::Vector2dF _max_offset( - scaled_scroll_bounds.width() - current_layer->bounds().width(), - scaled_scroll_bounds.height() - current_layer->bounds().height()); - // We need the final scroll offset to be in CSS coords. -- max_offset.Scale(1.f / scale_factor); -- max_offset.SetToMax(gfx::Vector2dF()); -- return gfx::ToFlooredVector2d(max_offset); -+ _max_offset.Scale(1.f / scale_factor); -+ _max_offset.SetToMax(gfx::Vector2dF()); -+ return gfx::ToFlooredVector2d(_max_offset); - } - - void Layer::SetScrollClipLayerId(int clip_layer_id) { diff --git a/www/chromium/files/patch-cc__layers__layer_impl.cc b/www/chromium/files/patch-cc__layers__layer_impl.cc index 3879744561d3..0de4e61f6d02 100644 --- a/www/chromium/files/patch-cc__layers__layer_impl.cc +++ b/www/chromium/files/patch-cc__layers__layer_impl.cc @@ -1,8 +1,8 @@ ---- ./cc/layers/layer_impl.cc.orig 2014-04-30 22:41:25.000000000 +0200 -+++ ./cc/layers/layer_impl.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -1190,21 +1190,23 @@ - scaled_scroll_bounds.SetSize(scale_factor * scaled_scroll_bounds.width(), +--- ./cc/layers/layer_impl.cc.orig 2014-08-12 21:03:00.000000000 +0200 ++++ ./cc/layers/layer_impl.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -1215,21 +1215,23 @@ scale_factor * scaled_scroll_bounds.height()); + scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds); - gfx::Vector2dF max_offset( + // (rene) prevent name collision with /usr/include/vm/vm_map.h on FreeBSD diff --git a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc index 9d4b8f0bf48e..7fdbc736cf86 100644 --- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc +++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc @@ -1,6 +1,6 @@ ---- ./chrome/app/chrome_main_delegate.cc.orig 2014-04-30 22:42:53.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -95,7 +95,7 @@ +--- ./chrome/app/chrome_main_delegate.cc.orig 2014-08-12 21:02:25.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -96,7 +96,7 @@ #include "ui/base/x/x11_util.h" #endif @@ -9,7 +9,7 @@ #include "components/breakpad/app/breakpad_linux.h" #endif -@@ -121,7 +121,7 @@ +@@ -122,7 +122,7 @@ g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; #endif @@ -18,7 +18,7 @@ base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; #endif -@@ -243,7 +243,7 @@ +@@ -245,7 +245,7 @@ // Needed for scrollbar related images. process_type == switches::kWorkerProcess || #endif @@ -27,7 +27,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -457,7 +457,7 @@ +@@ -459,7 +459,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -36,7 +36,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -498,7 +498,7 @@ +@@ -500,7 +500,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -45,7 +45,7 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -630,7 +630,7 @@ +@@ -632,7 +632,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -54,7 +54,7 @@ breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); #endif -@@ -748,7 +748,7 @@ +@@ -757,7 +757,7 @@ #endif } @@ -63,7 +63,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -760,7 +760,7 @@ +@@ -769,7 +769,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -72,7 +72,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -845,7 +845,7 @@ +@@ -854,7 +854,7 @@ return process_type == switches::kNaClLoaderProcess || process_type == switches::kRelauncherProcess; } diff --git a/www/chromium/files/patch-chrome__app__chrome_main_delegate.h b/www/chromium/files/patch-chrome__app__chrome_main_delegate.h index 971b962bf113..9381efcc77f0 100644 --- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.h +++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.h @@ -1,5 +1,5 @@ ---- ./chrome/app/chrome_main_delegate.h.orig 2014-04-30 22:42:53.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.h 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/app/chrome_main_delegate.h.orig 2014-08-12 21:02:25.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.h 2014-08-13 09:56:56.000000000 +0200 @@ -35,7 +35,7 @@ virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; virtual bool DelaySandboxInitialization( diff --git a/www/chromium/files/patch-chrome__app__chromium_strings.grd b/www/chromium/files/patch-chrome__app__chromium_strings.grd index 6def6e0d74d5..9dceb862ba27 100644 --- a/www/chromium/files/patch-chrome__app__chromium_strings.grd +++ b/www/chromium/files/patch-chrome__app__chromium_strings.grd @@ -1,11 +1,11 @@ ---- ./chrome/app/chromium_strings.grd.orig 2014-04-30 22:42:53.000000000 +0200 -+++ ./chrome/app/chromium_strings.grd 2014-05-05 13:13:16.000000000 +0200 -@@ -1115,7 +1115,7 @@ +--- ./chrome/app/chromium_strings.grd.orig 2014-08-12 21:02:25.000000000 +0200 ++++ ./chrome/app/chromium_strings.grd 2014-08-13 09:56:56.000000000 +0200 +@@ -1099,7 +1099,7 @@ </message> <!-- ProcessSingleton --> -- <if expr="is_linux"> -+ <if expr="is_linux or is_bsd"> - <message name="IDS_PROFILE_IN_USE_LINUX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> +- <if expr="is_linux or is_macosx"> ++ <if expr="is_linux or is_macosx or is_bsd"> + <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. </message> diff --git a/www/chromium/files/patch-chrome__browser__about_flags.cc b/www/chromium/files/patch-chrome__browser__about_flags.cc index 1a8f09e5b396..6982b1545635 100644 --- a/www/chromium/files/patch-chrome__browser__about_flags.cc +++ b/www/chromium/files/patch-chrome__browser__about_flags.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/about_flags.cc.orig 2014-04-30 22:42:17.000000000 +0200 -+++ ./chrome/browser/about_flags.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -2153,7 +2153,7 @@ +--- ./chrome/browser/about_flags.cc.orig 2014-08-12 21:01:48.000000000 +0200 ++++ ./chrome/browser/about_flags.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -2183,7 +2183,7 @@ return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; diff --git a/www/chromium/files/patch-chrome__browser__browser_process_impl.cc b/www/chromium/files/patch-chrome__browser__browser_process_impl.cc index 1efe4530605a..90c50221b3dc 100644 --- a/www/chromium/files/patch-chrome__browser__browser_process_impl.cc +++ b/www/chromium/files/patch-chrome__browser__browser_process_impl.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/browser_process_impl.cc.orig 2014-04-30 22:42:17.000000000 +0200 -+++ ./chrome/browser/browser_process_impl.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -256,7 +256,7 @@ +--- ./chrome/browser/browser_process_impl.cc.orig 2014-08-12 21:01:48.000000000 +0200 ++++ ./chrome/browser/browser_process_impl.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -239,7 +239,7 @@ ExtensionRendererState::GetInstance()->Shutdown(); diff --git a/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc b/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc index b03634dcb855..45799dbc79e0 100644 --- a/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc +++ b/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/chrome_browser_main.cc.orig 2014-04-30 22:42:18.000000000 +0200 -+++ ./chrome/browser/chrome_browser_main.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -972,7 +972,7 @@ +--- ./chrome/browser/chrome_browser_main.cc.orig 2014-08-12 21:01:47.000000000 +0200 ++++ ./chrome/browser/chrome_browser_main.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -926,7 +926,7 @@ } #endif diff --git a/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc b/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc index d87be4c80f5d..11a9be705f5a 100644 --- a/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc +++ b/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/chrome_browser_main_posix.cc.orig 2014-04-30 22:42:18.000000000 +0200 -+++ ./chrome/browser/chrome_browser_main_posix.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -314,6 +314,11 @@ +--- ./chrome/browser/chrome_browser_main_posix.cc.orig 2014-08-12 21:01:48.000000000 +0200 ++++ ./chrome/browser/chrome_browser_main_posix.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -305,6 +305,11 @@ g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; g_shutdown_pipe_write_fd = pipefd[1]; @@ -12,7 +12,7 @@ #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS) const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; #else -@@ -322,6 +327,7 @@ +@@ -313,6 +318,7 @@ // size to avoid hitting the guard page. const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; #endif diff --git a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc index e048b8d3ae7e..04e415e2b7e6 100644 --- a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc +++ b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/chrome_content_browser_client.cc.orig 2014-04-30 22:42:18.000000000 +0200 -+++ ./chrome/browser/chrome_content_browser_client.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -501,7 +501,7 @@ +--- ./chrome/browser/chrome_content_browser_client.cc.orig 2014-08-12 21:01:48.000000000 +0200 ++++ ./chrome/browser/chrome_content_browser_client.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -492,7 +492,7 @@ } } @@ -9,7 +9,7 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -557,7 +557,7 @@ +@@ -548,7 +548,7 @@ return -1; } @@ -18,7 +18,7 @@ #endif // !defined(OS_ANDROID) #if !defined(OS_CHROMEOS) -@@ -1460,7 +1460,7 @@ +@@ -1459,7 +1459,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( CommandLine* command_line, int child_process_id) { @@ -27,7 +27,7 @@ if (breakpad::IsCrashReporterEnabled()) { std::string enable_crash_reporter; GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter); -@@ -2610,7 +2610,7 @@ +@@ -2563,7 +2563,7 @@ #endif } @@ -36,7 +36,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const CommandLine& command_line, int child_process_id, -@@ -2664,7 +2664,7 @@ +@@ -2617,7 +2617,7 @@ } #endif // defined(OS_ANDROID) } diff --git a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h index ffb38afb4cf2..b8b26fb245f2 100644 --- a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h +++ b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h @@ -1,6 +1,6 @@ ---- ./chrome/browser/chrome_content_browser_client.h.orig 2014-04-30 22:42:17.000000000 +0200 -+++ ./chrome/browser/chrome_content_browser_client.h 2014-05-04 14:38:46.000000000 +0200 -@@ -267,7 +267,7 @@ +--- ./chrome/browser/chrome_content_browser_client.h.orig 2014-08-12 21:01:48.000000000 +0200 ++++ ./chrome/browser/chrome_content_browser_client.h 2014-08-13 09:56:56.000000000 +0200 +@@ -260,7 +260,7 @@ const base::FilePath& storage_partition_path, ScopedVector<fileapi::FileSystemBackend>* additional_backends) OVERRIDE; diff --git a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc index 8ba8d4f9e378..ece47c907bf6 100644 --- a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc +++ b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-04-30 22:42:03.000000000 +0200 -+++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-08-12 21:01:46.000000000 +0200 ++++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-08-13 09:56:56.000000000 +0200 @@ -268,7 +268,7 @@ console_->SetColor(color); console_->Write(base::ASCIIToUTF16(result)); diff --git a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h index 140aa8c9cc89..0d0b435f90d0 100644 --- a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h +++ b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h @@ -1,5 +1,5 @@ ---- ./chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-04-30 22:42:03.000000000 +0200 -+++ ./chrome/browser/diagnostics/diagnostics_writer.h 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-08-12 21:01:46.000000000 +0200 ++++ ./chrome/browser/diagnostics/diagnostics_writer.h 2014-08-13 09:56:56.000000000 +0200 @@ -18,7 +18,7 @@ public: // The type of formatting done by this writer. diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc b/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc index d17d89a0ed46..c828b2f4640e 100644 --- a/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc +++ b/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc @@ -1,9 +1,9 @@ ---- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-04-30 22:41:59.000000000 +0200 -+++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-08-12 21:01:44.000000000 +0200 ++++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2014-08-13 09:56:56.000000000 +0200 @@ -167,10 +167,12 @@ } - bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunImpl() { + bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunAsync() { +#if !defined(OS_FREEBSD) RemovableStorageProvider::GetAllDevices( base::Bind( diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc b/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc index d3e43b329c91..1a1c3448f9b0 100644 --- a/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc +++ b/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-04-30 22:42:00.000000000 +0200 -+++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-08-12 21:01:44.000000000 +0200 ++++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-08-13 09:56:56.000000000 +0200 @@ -4,6 +4,10 @@ #include "chrome/browser/extensions/api/music_manager_private/device_id.h" diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc b/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc index 4e8b5bd362b9..87a42f0f2ce9 100644 --- a/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc +++ b/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc @@ -1,9 +1,9 @@ ---- ./chrome/browser/extensions/api/serial/serial_api.cc.orig 2014-04-30 22:42:00.000000000 +0200 -+++ ./chrome/browser/extensions/api/serial/serial_api.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/browser/extensions/api/serial/serial_api.cc.orig 2014-08-12 21:01:44.000000000 +0200 ++++ ./chrome/browser/extensions/api/serial/serial_api.cc 2014-08-13 09:56:56.000000000 +0200 @@ -84,7 +84,7 @@ void SerialGetDevicesFunction::Work() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); - +#if !defined(OS_FREEBSD) //XXX(rene) quick hack device::SerialDeviceInfoList devices; diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc b/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc index ba094c2f3af5..79f2beaa61a8 100644 --- a/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc +++ b/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2014-04-30 22:42:00.000000000 +0200 -+++ ./chrome/browser/extensions/api/serial/serial_connection_posix.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2014-08-12 21:01:44.000000000 +0200 ++++ ./chrome/browser/extensions/api/serial/serial_connection_posix.cc 2014-08-13 09:56:56.000000000 +0200 @@ -36,7 +36,7 @@ BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) diff --git a/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc b/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc index 3feed23457cc..a174756b6f4e 100644 --- a/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc +++ b/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/gpu/gl_string_manager.cc.orig 2014-04-30 22:42:17.000000000 +0200 -+++ ./chrome/browser/gpu/gl_string_manager.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/browser/gpu/gl_string_manager.cc.orig 2014-08-12 21:01:33.000000000 +0200 ++++ ./chrome/browser/gpu/gl_string_manager.cc 2014-08-13 09:56:56.000000000 +0200 @@ -25,7 +25,7 @@ void GLStringManager::Initialize() { diff --git a/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc b/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc index cbf7ac49ef9f..badb103b890a 100644 --- a/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc +++ b/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-04-30 22:42:17.000000000 +0200 -+++ ./chrome/browser/gpu/gpu_feature_checker.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-08-12 21:01:33.000000000 +0200 ++++ ./chrome/browser/gpu/gpu_feature_checker.cc 2014-08-13 09:56:56.000000000 +0200 @@ -33,7 +33,7 @@ CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); diff --git a/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc b/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc index 0cb972e02e54..0299a81a64cd 100644 --- a/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc +++ b/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/media/webrtc_log_uploader.cc.orig 2014-04-30 22:42:02.000000000 +0200 -+++ ./chrome/browser/media/webrtc_log_uploader.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/browser/media/webrtc_log_uploader.cc.orig 2014-08-12 21:01:33.000000000 +0200 ++++ ./chrome/browser/media/webrtc_log_uploader.cc 2014-08-13 09:56:56.000000000 +0200 @@ -196,6 +196,8 @@ const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc b/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc index 95f3d3d8232f..ea8128a82bad 100644 --- a/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc +++ b/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-04-30 22:42:13.000000000 +0200 -+++ ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-08-12 21:01:32.000000000 +0200 ++++ ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc 2014-08-13 09:56:56.000000000 +0200 @@ -33,9 +33,11 @@ // Note that this initializes the delegate asynchronously, but since // the delegate will only be used from the IO thread, it is guaranteed diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc b/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc index 3343eaecab49..8d0ae092256f 100644 --- a/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc +++ b/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc @@ -1,12 +1,12 @@ ---- ./chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-04-30 22:42:13.000000000 +0200 -+++ ./chrome/browser/media_galleries/media_file_system_registry.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -635,7 +635,10 @@ +--- ./chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-08-12 21:01:33.000000000 +0200 ++++ ./chrome/browser/media_galleries/media_file_system_registry.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -724,7 +724,10 @@ // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() - : file_system_context_(new MediaFileSystemContextImpl(this)) { + : file_system_context_(new MediaFileSystemContextImpl) { - StorageMonitor::GetInstance()->AddObserver(this); -+ /* This conditional is needed for shutdown. Destructors -+ try to get the media file system registry. */ ++ // This conditional is needed for shutdown. Destructors ++ // try to get the media file system registry. + if (StorageMonitor::GetInstance()) + StorageMonitor::GetInstance()->AddObserver(this); } diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc b/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc index 49a0ecd7ee77..5685f191af33 100644 --- a/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc +++ b/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-04-30 22:42:13.000000000 +0200 -+++ ./chrome/browser/media_galleries/media_folder_finder.cc 2014-05-05 11:50:29.000000000 +0200 +--- ./chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-08-12 21:01:33.000000000 +0200 ++++ ./chrome/browser/media_galleries/media_folder_finder.cc 2014-08-13 09:56:56.000000000 +0200 @@ -50,10 +50,10 @@ chrome::DIR_USER_APPLICATIONS, chrome::DIR_USER_LIBRARY, diff --git a/www/chromium/files/patch-chrome__browser__memory_details.cc b/www/chromium/files/patch-chrome__browser__memory_details.cc index 9c241af1ee8b..717588a987ca 100644 --- a/www/chromium/files/patch-chrome__browser__memory_details.cc +++ b/www/chromium/files/patch-chrome__browser__memory_details.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/memory_details.cc.orig 2014-04-30 22:42:17.000000000 +0200 -+++ ./chrome/browser/memory_details.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/browser/memory_details.cc.orig 2014-08-12 21:01:47.000000000 +0200 ++++ ./chrome/browser/memory_details.cc 2014-08-13 09:56:56.000000000 +0200 @@ -32,7 +32,7 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -9,7 +9,7 @@ #include "content/public/browser/zygote_host_linux.h" #endif -@@ -204,7 +204,7 @@ +@@ -202,7 +202,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); @@ -18,7 +18,7 @@ const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid(); const pid_t sandbox_helper_pid = content::ZygoteHost::GetInstance()->GetSandboxHelperPid(); -@@ -345,7 +345,7 @@ +@@ -336,7 +336,7 @@ } } diff --git a/www/chromium/files/patch-chrome__browser__net__connection_tester.cc b/www/chromium/files/patch-chrome__browser__net__connection_tester.cc index e7dce2924f13..52cb0fce8a71 100644 --- a/www/chromium/files/patch-chrome__browser__net__connection_tester.cc +++ b/www/chromium/files/patch-chrome__browser__net__connection_tester.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/net/connection_tester.cc.orig 2014-04-30 22:41:58.000000000 +0200 -+++ ./chrome/browser/net/connection_tester.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/browser/net/connection_tester.cc.orig 2014-08-12 21:01:39.000000000 +0200 ++++ ./chrome/browser/net/connection_tester.cc 2014-08-13 09:56:56.000000000 +0200 @@ -213,7 +213,7 @@ // Otherwise returns a network error code. int CreateSystemProxyConfigService( diff --git a/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc b/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc index ac3d44ed4433..97879d89b089 100644 --- a/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc +++ b/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/omaha_query_params/omaha_query_params.cc.orig 2014-04-30 22:42:02.000000000 +0200 -+++ ./chrome/browser/omaha_query_params/omaha_query_params.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/browser/omaha_query_params/omaha_query_params.cc.orig 2014-08-12 21:01:47.000000000 +0200 ++++ ./chrome/browser/omaha_query_params/omaha_query_params.cc 2014-08-13 09:56:56.000000000 +0200 @@ -29,6 +29,8 @@ "linux"; #elif defined(OS_OPENBSD) diff --git a/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc b/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc index 773b86a84481..1c8ec7b90037 100644 --- a/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc +++ b/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc @@ -1,5 +1,5 @@ ---- ./chrome/browser/plugins/plugins_resource_service.cc.orig 2014-04-30 22:42:06.000000000 +0200 -+++ ./chrome/browser/plugins/plugins_resource_service.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/browser/plugins/plugins_resource_service.cc.orig 2014-08-12 21:01:47.000000000 +0200 ++++ ./chrome/browser/plugins/plugins_resource_service.cc 2014-08-13 09:56:56.000000000 +0200 @@ -33,7 +33,7 @@ std::string filename; #if defined(OS_WIN) diff --git a/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc b/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc index aa64b69696e7..752a790f3801 100644 --- a/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc +++ b/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-04-30 22:41:58.000000000 +0200 -+++ ./chrome/browser/policy/policy_prefs_browsertest.cc 2014-05-05 18:09:24.000000000 +0200 -@@ -162,6 +162,8 @@ +--- ./chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-08-12 21:01:40.000000000 +0200 ++++ ./chrome/browser/policy/policy_prefs_browsertest.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -169,6 +169,8 @@ const std::string os("chromeos"); #elif defined(OS_LINUX) const std::string os("linux"); diff --git a/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h b/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h deleted file mode 100644 index 37a90202b4b6..000000000000 --- a/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./chrome/browser/ui/gtk/accelerators_gtk.h.orig 2014-04-30 22:42:07.000000000 +0200 -+++ ./chrome/browser/ui/gtk/accelerators_gtk.h 2014-05-04 14:38:46.000000000 +0200 -@@ -10,6 +10,8 @@ - #include "base/containers/hash_tables.h" - #include "ui/base/accelerators/accelerator.h" - -+#include <vector> -+ - template <typename T> struct DefaultSingletonTraits; - - class AcceleratorsGtk { diff --git a/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc b/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc deleted file mode 100644 index 2e99214b00c4..000000000000 --- a/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./chrome/browser/ui/gtk/first_run_dialog.cc.orig 2014-04-30 22:42:07.000000000 +0200 -+++ ./chrome/browser/ui/gtk/first_run_dialog.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -132,6 +132,7 @@ - if (dialog_) - gtk_widget_hide_all(dialog_); - -+#if !defined(OS_BSD) - // Check if user has opted into reporting. - if (report_crashes_ && - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(report_crashes_))) { -@@ -140,6 +141,9 @@ - } else { - GoogleUpdateSettings::SetCollectStatsConsent(false); - } -+#else -+ GoogleUpdateSettings::SetCollectStatsConsent(false); -+#endif - - // If selected set as default browser. - if (make_default_ && diff --git a/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h b/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h deleted file mode 100644 index 58d24462e42c..000000000000 --- a/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h.orig 2014-04-30 22:42:07.000000000 +0200 -+++ ./chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h 2014-05-04 20:49:17.000000000 +0200 -@@ -92,7 +92,7 @@ - const gfx::Rect& initial_pos, - bool user_gesture, - bool* was_blocked) OVERRIDE; -- virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; -+ virtual void LoadingStateChanged(content::WebContents* source) /*OVERRIDE*/; - virtual content::JavaScriptDialogManager* - GetJavaScriptDialogManager() OVERRIDE; - virtual void RequestMediaAccessPermission( diff --git a/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h b/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h deleted file mode 100644 index f2d889590d16..000000000000 --- a/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./chrome/browser/ui/gtk/web_dialog_gtk.h.orig 2014-04-30 22:42:07.000000000 +0200 -+++ ./chrome/browser/ui/gtk/web_dialog_gtk.h 2014-05-04 20:50:58.000000000 +0200 -@@ -62,7 +62,7 @@ - const gfx::Rect& initial_pos, - bool user_gesture, - bool* was_blocked) OVERRIDE; -- virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; -+ virtual void LoadingStateChanged(content::WebContents* source) /*OVERRIDE*/; - - private: - CHROMEGTK_CALLBACK_1(WebDialogGtk, void, OnResponse, int); diff --git a/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc b/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc new file mode 100644 index 000000000000..481591eee1d1 --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc @@ -0,0 +1,11 @@ +--- ./chrome/browser/ui/startup/startup_browser_creator.cc.orig 2014-08-12 21:01:35.000000000 +0200 ++++ ./chrome/browser/ui/startup/startup_browser_creator.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -81,7 +81,7 @@ + #include "chromeos/chromeos_switches.h" + #endif + +-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) ++#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_FREEBSD)) + #include "ui/events/x/touch_factory_x11.h" + #endif + diff --git a/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc b/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc new file mode 100644 index 000000000000..07e98d131cd9 --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc @@ -0,0 +1,20 @@ +--- ./chrome/browser/ui/views/first_run_dialog.cc.orig 2014-08-12 21:01:38.000000000 +0200 ++++ ./chrome/browser/ui/views/first_run_dialog.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -124,12 +124,16 @@ + bool FirstRunDialog::Accept() { + GetWidget()->Hide(); + ++#if !defined(OS_BSD) + if (report_crashes_ && report_crashes_->checked()) { + if (GoogleUpdateSettings::SetCollectStatsConsent(true)) + breakpad::InitCrashReporter(std::string()); +- } else { ++ } else ++#else ++ { + GoogleUpdateSettings::SetCollectStatsConsent(false); + } ++#endif + + if (make_default_ && make_default_->checked()) + ShellIntegration::SetAsDefaultBrowser(); diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc b/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc index 8cede7c6bdea..2b5a82a3074b 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc +++ b/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/ui/webui/about_ui.cc.orig 2014-04-30 22:42:10.000000000 +0200 -+++ ./chrome/browser/ui/webui/about_ui.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -762,7 +762,7 @@ +--- ./chrome/browser/ui/webui/about_ui.cc.orig 2014-08-12 21:01:37.000000000 +0200 ++++ ./chrome/browser/ui/webui/about_ui.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -763,7 +763,7 @@ return data; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -778,6 +778,7 @@ +@@ -779,6 +779,7 @@ return data; } @@ -17,7 +17,7 @@ void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id, bool good) { data->append("<tr><td>"); -@@ -848,6 +849,7 @@ +@@ -849,6 +850,7 @@ return data; } #endif @@ -25,7 +25,7 @@ // AboutMemoryHandler ---------------------------------------------------------- -@@ -1013,7 +1015,7 @@ +@@ -1019,7 +1021,7 @@ } else if (source_name_ == chrome::kChromeUIDNSHost) { AboutDnsHandler::Start(profile(), callback); return; diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc b/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc deleted file mode 100644 index 93b1fac29771..000000000000 --- a/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ./chrome/browser/ui/webui/certificate_viewer_webui.cc.orig 2014-04-30 22:42:10.000000000 +0200 -+++ ./chrome/browser/ui/webui/certificate_viewer_webui.cc 2014-05-04 20:57:59.000000000 +0200 -@@ -274,7 +274,7 @@ - if (cert_index < 0) - return; - -- NativeWebContentsModalDialog window = -+ _GtkWindow* window = - platform_util::GetTopLevel(dialog_->GetNativeWebContentsModalDialog()); - ShowCertExportDialog(web_ui()->GetWebContents(), - window, diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc index 335632d26e80..6562084ea7f8 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc +++ b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2014-04-30 22:42:10.000000000 +0200 -+++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -473,7 +473,7 @@ +--- ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2014-08-12 21:01:37.000000000 +0200 ++++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -488,7 +488,7 @@ url.host() == chrome::kChromeUIMemoryRedirectHost || url.host() == chrome::kChromeUIStatsHost || url.host() == chrome::kChromeUITermsHost diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc index 4e2443133edf..7a95d54cee08 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc +++ b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2014-04-30 22:42:10.000000000 +0200 -+++ ./chrome/browser/ui/webui/options/browser_options_handler.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -328,7 +328,8 @@ +--- ./chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2014-08-12 21:01:37.000000000 +0200 ++++ ./chrome/browser/ui/webui/options/browser_options_handler.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -333,7 +333,8 @@ { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, { "translateEnableTranslate", IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE }, @@ -10,7 +10,7 @@ { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, { "themesNativeButton", IDS_THEMES_GTK_BUTTON }, { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, -@@ -648,7 +649,8 @@ +@@ -640,7 +641,8 @@ "requestProfilesInfo", base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo, base::Unretained(this))); @@ -20,7 +20,7 @@ web_ui()->RegisterMessageCallback( "themesSetNative", base::Bind(&BrowserOptionsHandler::ThemesSetNative, -@@ -1298,7 +1300,8 @@ +@@ -1269,7 +1271,8 @@ ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); bool is_native_theme = false; @@ -30,7 +30,7 @@ bool profile_is_managed = profile->IsManaged(); is_native_theme = theme_service->UsingNativeTheme(); base::FundamentalValue native_theme_enabled(!is_native_theme && -@@ -1320,7 +1323,8 @@ +@@ -1291,7 +1294,8 @@ ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme(); } diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h index a10a9ab7ba38..9842296832e2 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h +++ b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h @@ -1,6 +1,6 @@ ---- ./chrome/browser/ui/webui/options/browser_options_handler.h.orig 2014-04-30 22:42:10.000000000 +0200 -+++ ./chrome/browser/ui/webui/options/browser_options_handler.h 2014-05-04 14:38:46.000000000 +0200 -@@ -183,7 +183,8 @@ +--- ./chrome/browser/ui/webui/options/browser_options_handler.h.orig 2014-08-12 21:01:37.000000000 +0200 ++++ ./chrome/browser/ui/webui/options/browser_options_handler.h 2014-08-13 09:56:57.000000000 +0200 +@@ -197,7 +197,8 @@ void ObserveThemeChanged(); void ThemesReset(const base::ListValue* args); diff --git a/www/chromium/files/patch-chrome__browser__usb__usb_context.cc b/www/chromium/files/patch-chrome__browser__usb__usb_context.cc deleted file mode 100644 index c009070f1aae..000000000000 --- a/www/chromium/files/patch-chrome__browser__usb__usb_context.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- ./chrome/browser/usb/usb_context.cc.orig 2014-04-30 22:42:13.000000000 +0200 -+++ ./chrome/browser/usb/usb_context.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -43,7 +43,9 @@ - running_ = false; - // Spreading running_ to the UsbEventHandler thread. - base::subtle::MemoryBarrier(); -+#if !defined(OS_FREEBSD) - libusb_interrupt_handle_event(context_); -+#endif - base::PlatformThread::Join(thread_handle_); - } - diff --git a/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc b/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc index 454eac7da571..f61ca44088a9 100644 --- a/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc +++ b/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc @@ -1,6 +1,6 @@ ---- ./chrome/browser/web_applications/web_app.cc.orig 2014-04-30 22:42:17.000000000 +0200 -+++ ./chrome/browser/web_applications/web_app.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -226,7 +226,7 @@ +--- ./chrome/browser/web_applications/web_app.cc.orig 2014-08-12 21:01:47.000000000 +0200 ++++ ./chrome/browser/web_applications/web_app.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -472,7 +472,7 @@ } #endif diff --git a/www/chromium/files/patch-chrome__browser__web_applications__web_app.h b/www/chromium/files/patch-chrome__browser__web_applications__web_app.h index f4794678daf3..bfbe7eb180d8 100644 --- a/www/chromium/files/patch-chrome__browser__web_applications__web_app.h +++ b/www/chromium/files/patch-chrome__browser__web_applications__web_app.h @@ -1,6 +1,6 @@ ---- ./chrome/browser/web_applications/web_app.h.orig 2014-04-30 22:42:17.000000000 +0200 -+++ ./chrome/browser/web_applications/web_app.h 2014-05-04 14:38:46.000000000 +0200 -@@ -97,7 +97,7 @@ +--- ./chrome/browser/web_applications/web_app.h.orig 2014-08-12 21:01:47.000000000 +0200 ++++ ./chrome/browser/web_applications/web_app.h 2014-08-13 09:56:57.000000000 +0200 +@@ -188,7 +188,7 @@ IconInfoList* icons); #endif diff --git a/www/chromium/files/patch-chrome__chrome_browser.gypi b/www/chromium/files/patch-chrome__chrome_browser.gypi index fa9b2c967224..226bdad96233 100644 --- a/www/chromium/files/patch-chrome__chrome_browser.gypi +++ b/www/chromium/files/patch-chrome__chrome_browser.gypi @@ -1,17 +1,6 @@ ---- ./chrome/chrome_browser.gypi.orig 2014-04-30 22:42:53.000000000 +0200 -+++ ./chrome/chrome_browser.gypi 2014-05-05 20:38:00.000000000 +0200 -@@ -1209,8 +1209,8 @@ - 'browser/media_galleries/imported_media_gallery_registry.h', - 'browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc', - 'browser/media_galleries/linux/mtp_device_delegate_impl_linux.h', -- 'browser/media_galleries/linux/mtp_device_object_enumerator.cc', -- 'browser/media_galleries/linux/mtp_device_object_enumerator.h', -+ #'browser/media_galleries/linux/mtp_device_object_enumerator.cc', -+ #'browser/media_galleries/linux/mtp_device_object_enumerator.h', - 'browser/media_galleries/linux/mtp_device_task_helper.cc', - 'browser/media_galleries/linux/mtp_device_task_helper.h', - 'browser/media_galleries/linux/mtp_device_task_helper_map_service.cc', -@@ -3025,7 +3025,7 @@ +--- ./chrome/chrome_browser.gypi.orig 2014-08-12 21:02:25.000000000 +0200 ++++ ./chrome/chrome_browser.gypi 2014-08-13 09:56:57.000000000 +0200 +@@ -2923,7 +2923,7 @@ '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', ], }], @@ -20,7 +9,7 @@ 'dependencies': [ '../build/linux/system.gyp:libspeechd', ], -@@ -3166,7 +3166,7 @@ +@@ -3046,7 +3046,7 @@ '../build/linux/system.gyp:xscrnsaver', ], }], @@ -29,7 +18,7 @@ 'sources': [ 'app/chrome_breakpad_client.cc', 'app/chrome_breakpad_client.h', -@@ -3434,6 +3434,25 @@ +@@ -3281,6 +3281,13 @@ ['exclude', '^third_party/mozilla_security_manager/'], ], }], @@ -38,20 +27,17 @@ + ['exclude', '^browser/chrome_browser_main_linux.cc'], + ['exclude', '^browser/chrome_browser_main_linux.h'], + ['exclude', '^browser/media_galleries/linux/'], -+ ['exclude', '^browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc'], -+ ['exclude', '^browser/storage_monitor/media_transfer_protocol_device_observer_linux.h'], -+ ['exclude', '^browser/storage_monitor/removable_device_notifications_linux.cc'], -+ ['exclude', '^browser/storage_monitor/removable_device_notifications_linux.h'], -+ ['exclude', '^browser/storage_monitor/storage_monitor_linux.cc'], -+ ['exclude', '^browser/storage_monitor/storage_monitor_linux.h'], -+ ['exclude', '^browser/storage_monitor/udev_util_linux.cc'], -+ ['exclude', '^browser/storage_monitor/udev_util_linux.h'], -+ ['exclude', '^browser/storage_monitor/test_media_transfer_protocol_manager_linux.cc'], -+ ['exclude', '^browser/storage_monitor/test_media_transfer_protocol_manager_linux.h'], -+ ['exclude', '^browser/storage_monitor/mtab_watcher_linux.cc'], -+ ['exclude', '^browser/storage_monitor/mtab_watcher_linux.h'], + ], + }], ['OS=="mac"', { 'dependencies': [ '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', +@@ -3390,7 +3397,7 @@ + }], + ], + }], +- ['OS=="linux"', { ++ ['OS=="linux" or os_bsd==1', { + 'conditions': [ + ['use_aura==1', { + 'dependencies': [ diff --git a/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi b/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi index f982ebae3611..8dcd4a81332d 100644 --- a/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi +++ b/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi @@ -1,6 +1,6 @@ ---- ./chrome/chrome_browser_extensions.gypi.orig 2014-04-30 22:42:53.000000000 +0200 -+++ ./chrome/chrome_browser_extensions.gypi 2014-05-04 14:38:46.000000000 +0200 -@@ -885,6 +885,11 @@ +--- ./chrome/chrome_browser_extensions.gypi.orig 2014-08-12 21:02:25.000000000 +0200 ++++ ./chrome/chrome_browser_extensions.gypi 2014-08-13 09:56:57.000000000 +0200 +@@ -921,6 +921,11 @@ 'browser/extensions/window_controller_list_observer.h', ], 'conditions': [ diff --git a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi new file mode 100644 index 000000000000..9ce3be250c12 --- /dev/null +++ b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi @@ -0,0 +1,38 @@ +--- ./chrome/chrome_browser_ui.gypi.orig 2014-08-12 21:02:25.000000000 +0200 ++++ ./chrome/chrome_browser_ui.gypi 2014-08-13 09:56:57.000000000 +0200 +@@ -2665,7 +2665,7 @@ + 'browser/ui/views/message_center/web_notification_tray.cc', + ], + }], +- ['use_aura==1 and use_ash==0 and use_ozone==0 and OS=="linux"', { ++ ['use_aura==1 and use_ash==0 and use_ozone==0 and (OS=="linux" or os_bsd==1)', { + 'dependencies': [ + # gtk2 is the only component that can interact with gtk2 in our new + # world. +@@ -2673,7 +2673,7 @@ + '../build/linux/system.gyp:gio', + ], + }], +- ['use_aura==0 or chromeos==1 or OS!="linux"', { ++ ['use_aura==0 or chromeos==1 or (OS!="linux" and os_bsd!=1)', { + 'sources!': [ + 'browser/ui/views/first_run_dialog.cc', + 'browser/ui/views/first_run_dialog.h', +@@ -3042,7 +3042,7 @@ + }], + ], + }], +- ['OS=="linux"', { ++ ['OS=="linux" or os_bsd==1', { + 'conditions': [ + ['use_aura==1', { + 'dependencies': [ +@@ -3135,7 +3135,7 @@ + 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h', + ], + }], +- ['OS!="linux" and OS!="win"', { ++ ['OS!="linux" and OS!="win" and os_bsd!=1', { + 'sources': [ + 'browser/ui/startup/session_crashed_bubble.cc' + ], diff --git a/www/chromium/files/patch-chrome__chrome_tests.gypi b/www/chromium/files/patch-chrome__chrome_tests.gypi index 67b433abebe5..5b97b3766514 100644 --- a/www/chromium/files/patch-chrome__chrome_tests.gypi +++ b/www/chromium/files/patch-chrome__chrome_tests.gypi @@ -1,6 +1,6 @@ ---- ./chrome/chrome_tests.gypi.orig 2014-04-30 22:42:53.000000000 +0200 -+++ ./chrome/chrome_tests.gypi 2014-05-05 18:29:40.000000000 +0200 -@@ -1628,7 +1628,7 @@ +--- ./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', diff --git a/www/chromium/files/patch-chrome__chrome_tests_unit.gypi b/www/chromium/files/patch-chrome__chrome_tests_unit.gypi deleted file mode 100644 index f0dfed2c4d41..000000000000 --- a/www/chromium/files/patch-chrome__chrome_tests_unit.gypi +++ /dev/null @@ -1,36 +0,0 @@ ---- ./chrome/chrome_tests_unit.gypi.orig 2014-04-30 22:42:53.000000000 +0200 -+++ ./chrome/chrome_tests_unit.gypi 2014-05-05 21:52:34.000000000 +0200 -@@ -518,7 +518,6 @@ - 'test_support_common', - 'test_support_unit', - # 3) anything tests directly depend on -- '../courgette/courgette.gyp:courgette_lib', - '../google_apis/google_apis.gyp:google_apis', - '../skia/skia.gyp:skia', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', -@@ -791,12 +790,12 @@ - 'browser/command_updater_unittest.cc', - 'browser/component_updater/test/component_installers_unittest.cc', - 'browser/component_updater/test/component_patcher_mock.h', -- 'browser/component_updater/test/component_patcher_unittest.cc', -- 'browser/component_updater/test/component_updater_ping_manager_unittest.cc', -- 'browser/component_updater/test/component_updater_service_unittest.cc', -+ #'browser/component_updater/test/component_patcher_unittest.cc', -+ #'browser/component_updater/test/component_updater_ping_manager_unittest.cc', -+ #'browser/component_updater/test/component_updater_service_unittest.cc', - 'browser/component_updater/test/crx_downloader_unittest.cc', - 'browser/component_updater/test/test_installer.cc', -- 'browser/component_updater/test/update_checker_unittest.cc', -+ #'browser/component_updater/test/update_checker_unittest.cc', - 'browser/component_updater/test/update_response_unittest.cc', - 'browser/component_updater/test/url_request_post_interceptor.cc', - 'browser/content_settings/content_settings_default_provider_unittest.cc', -@@ -1063,7 +1062,7 @@ - 'browser/media/webrtc_log_uploader_unittest.cc', - 'browser/media/webrtc_log_util_unittest.cc', - 'browser/media_galleries/fileapi/native_media_file_util_unittest.cc', -- 'browser/media_galleries/linux/mtp_device_object_enumerator_unittest.cc', -+ #'browser/media_galleries/linux/mtp_device_object_enumerator_unittest.cc', - 'browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm', - 'browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc', - 'browser/media_galleries/media_file_system_registry_unittest.cc', diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.cc b/www/chromium/files/patch-chrome__common__chrome_paths.cc index 7df0dd0ecdb6..eac5cea3b606 100644 --- a/www/chromium/files/patch-chrome__common__chrome_paths.cc +++ b/www/chromium/files/patch-chrome__common__chrome_paths.cc @@ -1,6 +1,6 @@ ---- ./chrome/common/chrome_paths.cc.orig 2014-04-30 22:42:23.000000000 +0200 -+++ ./chrome/common/chrome_paths.cc 2014-05-04 14:38:50.000000000 +0200 -@@ -440,10 +440,12 @@ +--- ./chrome/common/chrome_paths.cc.orig 2014-08-12 21:02:17.000000000 +0200 ++++ ./chrome/common/chrome_paths.cc 2014-08-13 09:57:00.000000000 +0200 +@@ -471,10 +471,12 @@ if (!base::PathExists(cur)) // We don't want to create this return false; break; @@ -14,7 +14,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -521,7 +523,7 @@ +@@ -552,7 +554,7 @@ #endif break; @@ -23,7 +23,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) #if defined(GOOGLE_CHROME_BUILD) -@@ -547,7 +549,7 @@ +@@ -578,7 +580,7 @@ return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.h b/www/chromium/files/patch-chrome__common__chrome_paths.h index e9744bcc9ec9..cff08aac2524 100644 --- a/www/chromium/files/patch-chrome__common__chrome_paths.h +++ b/www/chromium/files/patch-chrome__common__chrome_paths.h @@ -1,6 +1,6 @@ ---- ./chrome/common/chrome_paths.h.orig 2014-04-30 22:42:24.000000000 +0200 -+++ ./chrome/common/chrome_paths.h 2014-05-04 14:38:46.000000000 +0200 -@@ -111,7 +111,7 @@ +--- ./chrome/common/chrome_paths.h.orig 2014-08-12 21:02:17.000000000 +0200 ++++ ./chrome/common/chrome_paths.h 2014-08-13 09:56:57.000000000 +0200 +@@ -116,7 +116,7 @@ // files to be installed when managed user // session starts. diff --git a/www/chromium/files/patch-chrome__common__chrome_switches.cc b/www/chromium/files/patch-chrome__common__chrome_switches.cc index e538f401dc54..92ba65bd4baa 100644 --- a/www/chromium/files/patch-chrome__common__chrome_switches.cc +++ b/www/chromium/files/patch-chrome__common__chrome_switches.cc @@ -1,6 +1,6 @@ ---- ./chrome/common/chrome_switches.cc.orig 2014-04-30 22:42:24.000000000 +0200 -+++ ./chrome/common/chrome_switches.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -1448,7 +1448,7 @@ +--- ./chrome/common/chrome_switches.cc.orig 2014-08-12 21:02:17.000000000 +0200 ++++ ./chrome/common/chrome_switches.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -1375,7 +1375,7 @@ const char kPasswordStore[] = "password-store"; #endif @@ -9,7 +9,7 @@ // Triggers migration of user data directory to another directory // specified as a parameter. The migration is done under singleton lock, // and sanity checks are made to avoid corrupting the profile. -@@ -1459,7 +1459,7 @@ +@@ -1386,7 +1386,7 @@ // Linux speech service. Because it's buggy, the user must explicitly // enable it so that visiting a random webpage can't cause instability. const char kEnableSpeechDispatcher[] = "enable-speech-dispatcher"; @@ -17,4 +17,4 @@ +#endif // (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS) #if defined(OS_MACOSX) - // Disables the creation and launch of app shims for platform apps. + // Prevents Chrome from quitting when Chrome Apps are open. diff --git a/www/chromium/files/patch-chrome__common__chrome_switches.h b/www/chromium/files/patch-chrome__common__chrome_switches.h index 2d867cf8f742..5d0a5f7d068d 100644 --- a/www/chromium/files/patch-chrome__common__chrome_switches.h +++ b/www/chromium/files/patch-chrome__common__chrome_switches.h @@ -1,6 +1,6 @@ ---- ./chrome/common/chrome_switches.h.orig 2014-04-30 22:42:23.000000000 +0200 -+++ ./chrome/common/chrome_switches.h 2014-05-04 14:38:46.000000000 +0200 -@@ -406,7 +406,7 @@ +--- ./chrome/common/chrome_switches.h.orig 2014-08-12 21:02:17.000000000 +0200 ++++ ./chrome/common/chrome_switches.h 2014-08-13 09:56:57.000000000 +0200 +@@ -386,7 +386,7 @@ extern const char kPasswordStore[]; #endif diff --git a/www/chromium/files/patch-chrome__common__pref_names.cc b/www/chromium/files/patch-chrome__common__pref_names.cc index d69b9eea0b00..8c640a40ddaf 100644 --- a/www/chromium/files/patch-chrome__common__pref_names.cc +++ b/www/chromium/files/patch-chrome__common__pref_names.cc @@ -1,6 +1,6 @@ ---- ./chrome/common/pref_names.cc.orig 2014-04-30 22:42:23.000000000 +0200 -+++ ./chrome/common/pref_names.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -950,7 +950,7 @@ +--- ./chrome/common/pref_names.cc.orig 2014-08-12 21:02:17.000000000 +0200 ++++ ./chrome/common/pref_names.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -923,7 +923,7 @@ // Boolean controlling whether SafeSearch is mandatory for Google Web Searches. const char kForceSafeSearch[] = "settings.force_safesearch"; diff --git a/www/chromium/files/patch-chrome__common__pref_names.h b/www/chromium/files/patch-chrome__common__pref_names.h index cb63b30caa80..9b3fe2602946 100644 --- a/www/chromium/files/patch-chrome__common__pref_names.h +++ b/www/chromium/files/patch-chrome__common__pref_names.h @@ -1,6 +1,6 @@ ---- ./chrome/common/pref_names.h.orig 2014-04-30 22:42:23.000000000 +0200 -+++ ./chrome/common/pref_names.h 2014-05-04 14:38:46.000000000 +0200 -@@ -305,7 +305,7 @@ +--- ./chrome/common/pref_names.h.orig 2014-08-12 21:02:17.000000000 +0200 ++++ ./chrome/common/pref_names.h 2014-08-13 09:56:57.000000000 +0200 +@@ -298,7 +298,7 @@ extern const char kForceSafeSearch[]; extern const char kDeleteTimePeriod[]; extern const char kLastClearBrowsingDataTime[]; diff --git a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc b/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc index 17f6312d7d6b..e8fd4b2e75d3 100644 --- a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc +++ b/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc @@ -1,5 +1,5 @@ ---- ./chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2014-04-30 22:41:57.000000000 +0200 -+++ ./chrome/renderer/pepper/pepper_flash_font_file_host.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2014-08-12 21:02:25.000000000 +0200 ++++ ./chrome/renderer/pepper/pepper_flash_font_file_host.cc 2014-08-13 09:56:57.000000000 +0200 @@ -13,7 +13,7 @@ #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/serialized_structs.h" @@ -25,8 +25,8 @@ +#endif // defined(OS_LINUX) || defined(OS_BSD) } - PepperFlashFontFileHost::~PepperFlashFontFileHost() { -@@ -54,7 +54,7 @@ + PepperFlashFontFileHost::~PepperFlashFontFileHost() {} +@@ -53,7 +53,7 @@ uint32_t table) { std::string contents; int32_t result = PP_ERROR_FAILED; @@ -35,7 +35,7 @@ if (fd_ != -1) { size_t length = 0; if (content::GetFontTable(fd_, table, 0 /* offset */, NULL, &length)) { -@@ -69,7 +69,7 @@ +@@ -68,7 +68,7 @@ } } } diff --git a/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h b/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h index faf773dc63e4..c697e348f397 100644 --- a/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h +++ b/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h @@ -1,6 +1,6 @@ ---- ./chrome/renderer/printing/print_web_view_helper.h.orig 2014-04-30 22:41:57.000000000 +0200 -+++ ./chrome/renderer/printing/print_web_view_helper.h 2014-05-04 14:38:46.000000000 +0200 -@@ -200,7 +200,7 @@ +--- ./chrome/renderer/printing/print_web_view_helper.h.orig 2014-08-12 21:02:25.000000000 +0200 ++++ ./chrome/renderer/printing/print_web_view_helper.h 2014-08-13 09:56:57.000000000 +0200 +@@ -201,7 +201,7 @@ void FinishFramePrinting(); // Prints the page listed in |params|. diff --git a/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc b/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc index 1e6f3b0a4f99..5787c2db76a6 100644 --- a/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc +++ b/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc @@ -1,5 +1,5 @@ ---- ./chrome/test/base/in_process_browser_test.cc.orig 2014-04-30 22:42:44.000000000 +0200 -+++ ./chrome/test/base/in_process_browser_test.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/test/base/in_process_browser_test.cc.orig 2014-08-12 21:02:10.000000000 +0200 ++++ ./chrome/test/base/in_process_browser_test.cc 2014-08-13 09:56:57.000000000 +0200 @@ -72,6 +72,10 @@ namespace { diff --git a/www/chromium/files/patch-chrome__test__base__testing_browser_process.h b/www/chromium/files/patch-chrome__test__base__testing_browser_process.h index 9a638978e2c6..0c672f956b63 100644 --- a/www/chromium/files/patch-chrome__test__base__testing_browser_process.h +++ b/www/chromium/files/patch-chrome__test__base__testing_browser_process.h @@ -1,6 +1,6 @@ ---- ./chrome/test/base/testing_browser_process.h.orig 2014-04-30 22:42:44.000000000 +0200 -+++ ./chrome/test/base/testing_browser_process.h 2014-05-05 18:01:58.000000000 +0200 -@@ -101,8 +101,8 @@ +--- ./chrome/test/base/testing_browser_process.h.orig 2014-08-12 21:02:10.000000000 +0200 ++++ ./chrome/test/base/testing_browser_process.h 2014-08-13 09:56:57.000000000 +0200 +@@ -100,8 +100,8 @@ virtual DownloadStatusUpdater* download_status_updater() OVERRIDE; virtual DownloadRequestLimiter* download_request_limiter() OVERRIDE; diff --git a/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc b/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc index 217dbe9cc0d6..c8cc5e8e8c6d 100644 --- a/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc +++ b/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc @@ -1,5 +1,5 @@ ---- ./chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2014-04-30 22:42:44.000000000 +0200 -+++ ./chrome/test/chromedriver/chrome/chrome_finder.cc 2014-05-05 14:47:06.000000000 +0200 +--- ./chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2014-08-12 21:02:10.000000000 +0200 ++++ ./chrome/test/chromedriver/chrome/chrome_finder.cc 2014-08-13 09:56:57.000000000 +0200 @@ -42,7 +42,7 @@ installation_locations[i].Append(L"Chromium\\Application")); } diff --git a/www/chromium/files/patch-chrome__test__perf__perf_test.cc b/www/chromium/files/patch-chrome__test__perf__perf_test.cc index cf1412e34f9f..1b992a7841d8 100644 --- a/www/chromium/files/patch-chrome__test__perf__perf_test.cc +++ b/www/chromium/files/patch-chrome__test__perf__perf_test.cc @@ -1,5 +1,5 @@ ---- ./chrome/test/perf/perf_test.cc.orig 2014-04-30 22:42:44.000000000 +0200 -+++ ./chrome/test/perf/perf_test.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/test/perf/perf_test.cc.orig 2014-08-12 21:02:10.000000000 +0200 ++++ ./chrome/test/perf/perf_test.cc 2014-08-13 09:56:57.000000000 +0200 @@ -352,7 +352,7 @@ AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name, total_working_set_size, "bytes", diff --git a/www/chromium/files/patch-chrome__test__ui__ui_test.cc b/www/chromium/files/patch-chrome__test__ui__ui_test.cc deleted file mode 100644 index 559b81e70563..000000000000 --- a/www/chromium/files/patch-chrome__test__ui__ui_test.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ./chrome/test/ui/ui_test.cc.orig 2014-04-30 22:42:44.000000000 +0200 -+++ ./chrome/test/ui/ui_test.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -68,7 +68,7 @@ - L"NOTE: This test is expected to fail if crash_service.exe is not " - L"running. Start it manually before running this test (see the build " - L"output directory)."; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_FREEBSD) - L"NOTE: This test is expected to fail if breakpad is not built in " - L"or if chromium is not running headless (try CHROME_HEADLESS=1)."; - #else diff --git a/www/chromium/files/patch-chrome__tools__build__linux__sed.sh b/www/chromium/files/patch-chrome__tools__build__linux__sed.sh index 12ac6d5c6378..4743076512c7 100644 --- a/www/chromium/files/patch-chrome__tools__build__linux__sed.sh +++ b/www/chromium/files/patch-chrome__tools__build__linux__sed.sh @@ -1,5 +1,5 @@ ---- ./chrome/tools/build/linux/sed.sh.orig 2014-04-30 22:42:24.000000000 +0200 -+++ ./chrome/tools/build/linux/sed.sh 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/tools/build/linux/sed.sh.orig 2014-08-12 21:02:25.000000000 +0200 ++++ ./chrome/tools/build/linux/sed.sh 2014-08-13 09:56:57.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash diff --git a/www/chromium/files/patch-components__policy__resources__policy_templates.json b/www/chromium/files/patch-components__policy__resources__policy_templates.json index f82605554471..24e567054f76 100644 --- a/www/chromium/files/patch-components__policy__resources__policy_templates.json +++ b/www/chromium/files/patch-components__policy__resources__policy_templates.json @@ -1,6 +1,6 @@ ---- ./components/policy/resources/policy_templates.json.orig 2014-04-30 22:43:03.000000000 +0200 -+++ ./components/policy/resources/policy_templates.json 2014-05-04 14:38:46.000000000 +0200 -@@ -1456,7 +1456,7 @@ +--- ./components/policy/resources/policy_templates.json.orig 2014-08-12 21:02:36.000000000 +0200 ++++ ./components/policy/resources/policy_templates.json 2014-08-13 09:56:57.000000000 +0200 +@@ -1513,7 +1513,7 @@ 'name': 'GSSAPILibraryName', 'type': 'string', 'schema': { 'type': 'string' }, @@ -9,7 +9,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -3583,7 +3583,7 @@ +@@ -3643,7 +3643,7 @@ 'name': 'RequireOnlineRevocationChecksForLocalAnchors', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -4242,7 +4242,7 @@ +@@ -4305,7 +4305,7 @@ 'name': 'BackgroundModeEnabled', 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/files/patch-components__policy__tools__generate_policy_source.py b/www/chromium/files/patch-components__policy__tools__generate_policy_source.py index b86466a76b8b..103c99130c86 100644 --- a/www/chromium/files/patch-components__policy__tools__generate_policy_source.py +++ b/www/chromium/files/patch-components__policy__tools__generate_policy_source.py @@ -1,6 +1,6 @@ ---- ./components/policy/tools/generate_policy_source.py.orig 2014-04-30 22:43:03.000000000 +0200 -+++ ./components/policy/tools/generate_policy_source.py 2014-05-04 14:38:46.000000000 +0200 -@@ -64,7 +64,7 @@ +--- ./components/policy/tools/generate_policy_source.py.orig 2014-08-12 21:02:35.000000000 +0200 ++++ ./components/policy/tools/generate_policy_source.py 2014-08-13 09:56:57.000000000 +0200 +@@ -66,7 +66,7 @@ if platform.startswith('chrome.'): platform_sub = platform[7:] if platform_sub == '*': diff --git a/www/chromium/files/patch-components__storage_monitor.gypi b/www/chromium/files/patch-components__storage_monitor.gypi index acd736811b98..d94350e19591 100644 --- a/www/chromium/files/patch-components__storage_monitor.gypi +++ b/www/chromium/files/patch-components__storage_monitor.gypi @@ -1,51 +1,27 @@ ---- ./components/storage_monitor.gypi.orig 2014-04-30 22:43:04.000000000 +0200 -+++ ./components/storage_monitor.gypi 2014-05-05 17:54:12.000000000 +0200 -@@ -20,10 +20,10 @@ - 'storage_monitor/image_capture_device_manager.mm', - 'storage_monitor/media_storage_util.cc', - 'storage_monitor/media_storage_util.h', -- 'storage_monitor/media_transfer_protocol_device_observer_linux.cc', -- 'storage_monitor/media_transfer_protocol_device_observer_linux.h', -- 'storage_monitor/mtab_watcher_linux.cc', -- 'storage_monitor/mtab_watcher_linux.h', -+ #'storage_monitor/media_transfer_protocol_device_observer_linux.cc', -+ #'storage_monitor/media_transfer_protocol_device_observer_linux.h', -+ #'storage_monitor/mtab_watcher_linux.cc', -+ #'storage_monitor/mtab_watcher_linux.h', - 'storage_monitor/portable_device_watcher_win.cc', - 'storage_monitor/portable_device_watcher_win.h', - 'storage_monitor/removable_device_constants.cc', -@@ -35,16 +35,18 @@ - 'storage_monitor/storage_monitor.h', - 'storage_monitor/storage_monitor_chromeos.cc', - 'storage_monitor/storage_monitor_chromeos.h', -- 'storage_monitor/storage_monitor_linux.cc', -- 'storage_monitor/storage_monitor_linux.h', -+ #'storage_monitor/storage_monitor_linux.cc', -+ #'storage_monitor/storage_monitor_linux.h', -+ 'storage_monitor/storage_monitor_freebsd.cc', -+ 'storage_monitor/storage_monitor_freebsd.h', - 'storage_monitor/storage_monitor_mac.h', - 'storage_monitor/storage_monitor_mac.mm', - 'storage_monitor/storage_monitor_win.cc', - 'storage_monitor/storage_monitor_win.h', - 'storage_monitor/transient_device_ids.cc', - 'storage_monitor/transient_device_ids.h', -- 'storage_monitor/udev_util_linux.cc', -- 'storage_monitor/udev_util_linux.h', -+ #'storage_monitor/udev_util_linux.cc', -+ #'storage_monitor/udev_util_linux.h', - 'storage_monitor/volume_mount_watcher_win.cc', +--- ./components/storage_monitor.gypi.orig 2014-08-12 21:02:37.000000000 +0200 ++++ ./components/storage_monitor.gypi 2014-08-13 09:56:57.000000000 +0200 +@@ -49,6 +49,24 @@ 'storage_monitor/volume_mount_watcher_win.h', ], -@@ -89,8 +91,8 @@ - 'sources': [ - 'storage_monitor/mock_removable_storage_observer.cc', - 'storage_monitor/mock_removable_storage_observer.h', -- 'storage_monitor/test_media_transfer_protocol_manager_linux.cc', -- 'storage_monitor/test_media_transfer_protocol_manager_linux.h', -+ #'storage_monitor/test_media_transfer_protocol_manager_linux.cc', -+ #'storage_monitor/test_media_transfer_protocol_manager_linux.h', - 'storage_monitor/test_portable_device_watcher_win.cc', - 'storage_monitor/test_portable_device_watcher_win.h', - 'storage_monitor/test_storage_monitor.cc', + 'conditions': [ ++ ['os_bsd == 1', { ++ 'sources!': [ ++ 'storage_monitor/media_transfer_protocol_device_observer_linux.cc', ++ 'storage_monitor/media_transfer_protocol_device_observer_linux.h', ++ 'storage_monitor/mtab_watcher_linux.cc', ++ 'storage_monitor/mtab_watcher_linux.h', ++ 'storage_monitor/storage_monitor_linux.cc', ++ 'storage_monitor/storage_monitor_linux.h', ++ 'storage_monitor/udev_util_linux.cc', ++ 'storage_monitor/udev_util_linux.h', ++ ], ++ }], ++ ['OS == "freebsd"', { ++ 'sources': [ ++ 'storage_monitor/storage_monitor_freebsd.cc', ++ 'storage_monitor/storage_monitor_freebsd.h', ++ ], ++ }], + ['OS == "mac"', { + 'link_settings': { + 'libraries': [ diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc b/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc index 9aef40a887d3..88606c6de649 100644 --- a/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc +++ b/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc @@ -1,5 +1,5 @@ ---- ./components/storage_monitor/storage_monitor.cc.orig 2014-04-30 22:43:01.000000000 +0200 -+++ ./components/storage_monitor/storage_monitor.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./components/storage_monitor/storage_monitor.cc.orig 2014-08-12 21:02:37.000000000 +0200 ++++ ./components/storage_monitor/storage_monitor.cc 2014-08-13 09:56:57.000000000 +0200 @@ -85,6 +85,7 @@ void StorageMonitor::EnsureInitialized(base::Closure callback) { diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc index e5ab1c63b297..c915b3e3d083 100644 --- a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc +++ b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc @@ -1,5 +1,5 @@ ---- ./components/storage_monitor/storage_monitor_freebsd.cc.orig 2014-05-04 14:38:46.000000000 +0200 -+++ ./components/storage_monitor/storage_monitor_freebsd.cc 2014-05-04 15:17:12.000000000 +0200 +--- ./components/storage_monitor/storage_monitor_freebsd.cc.orig 2014-08-13 09:56:57.000000000 +0200 ++++ ./components/storage_monitor/storage_monitor_freebsd.cc 2014-08-13 09:56:57.000000000 +0200 @@ -0,0 +1,102 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h index 3d6f057c7628..3cdc22276461 100644 --- a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h +++ b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h @@ -1,5 +1,5 @@ ---- ./components/storage_monitor/storage_monitor_freebsd.h.orig 2014-05-04 14:38:47.000000000 +0200 -+++ ./components/storage_monitor/storage_monitor_freebsd.h 2014-05-04 15:15:00.000000000 +0200 +--- ./components/storage_monitor/storage_monitor_freebsd.h.orig 2014-08-13 09:56:57.000000000 +0200 ++++ ./components/storage_monitor/storage_monitor_freebsd.h 2014-08-13 09:56:57.000000000 +0200 @@ -0,0 +1,47 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be diff --git a/www/chromium/files/patch-components__usb_service.gypi b/www/chromium/files/patch-components__usb_service.gypi new file mode 100644 index 000000000000..5977c1168f86 --- /dev/null +++ b/www/chromium/files/patch-components__usb_service.gypi @@ -0,0 +1,14 @@ +--- ./components/usb_service.gypi.orig 2014-08-12 21:02:37.000000000 +0200 ++++ ./components/usb_service.gypi 2014-08-13 09:56:57.000000000 +0200 +@@ -37,6 +37,11 @@ + 'dependencies': [ + '../build/linux/system.gyp:udev', + ], ++ }], ++ ['OS == "freebsd"', { ++ 'dependencies!': [ ++ '../third_party/libusb/libusb.gyp:libusb', ++ ], + }] + ] + }], diff --git a/www/chromium/files/patch-components__usb_service__usb_context.cc b/www/chromium/files/patch-components__usb_service__usb_context.cc new file mode 100644 index 000000000000..3ba5e9430483 --- /dev/null +++ b/www/chromium/files/patch-components__usb_service__usb_context.cc @@ -0,0 +1,26 @@ +--- ./components/usb_service/usb_context.cc.orig 2014-08-12 21:02:37.000000000 +0200 ++++ ./components/usb_service/usb_context.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -7,8 +7,13 @@ + #include "base/logging.h" + #include "base/synchronization/waitable_event.h" + #include "base/threading/platform_thread.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#define LIBUSB_CALL ++#else + #include "third_party/libusb/src/libusb/interrupt.h" + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + namespace usb_service { + +@@ -45,7 +50,9 @@ + running_ = false; + // Spreading running_ to the UsbEventHandler thread. + base::subtle::MemoryBarrier(); ++#if !defined(OS_FREEBSD) // XXX(rene) only available in bundled version + libusb_interrupt_handle_event(context_); ++#endif + base::PlatformThread::Join(thread_handle_); + } + diff --git a/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc b/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc new file mode 100644 index 000000000000..46a5c6fd9e4d --- /dev/null +++ b/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc @@ -0,0 +1,14 @@ +--- ./components/usb_service/usb_context_unittest.cc.orig 2014-08-12 21:02:37.000000000 +0200 ++++ ./components/usb_service/usb_context_unittest.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -6,7 +6,11 @@ + #include "build/build_config.h" + #include "components/usb_service/usb_context.h" + #include "testing/gtest/include/gtest/gtest.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + using usb_service::UsbContext; + using usb_service::PlatformUsbContext; diff --git a/www/chromium/files/patch-components__usb_service__usb_device_handle.cc b/www/chromium/files/patch-components__usb_service__usb_device_handle.cc new file mode 100644 index 000000000000..f890873ad106 --- /dev/null +++ b/www/chromium/files/patch-components__usb_service__usb_device_handle.cc @@ -0,0 +1,15 @@ +--- ./components/usb_service/usb_device_handle.cc.orig 2014-08-12 21:02:37.000000000 +0200 ++++ ./components/usb_service/usb_device_handle.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -16,7 +16,12 @@ + #include "components/usb_service/usb_interface.h" + #include "components/usb_service/usb_service.h" + #include "content/public/browser/browser_thread.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#define LIBUSB_CALL ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + using content::BrowserThread; + diff --git a/www/chromium/files/patch-components__usb_service__usb_device_impl.cc b/www/chromium/files/patch-components__usb_service__usb_device_impl.cc new file mode 100644 index 000000000000..fe362308602f --- /dev/null +++ b/www/chromium/files/patch-components__usb_service__usb_device_impl.cc @@ -0,0 +1,14 @@ +--- ./components/usb_service/usb_device_impl.cc.orig 2014-08-12 21:02:37.000000000 +0200 ++++ ./components/usb_service/usb_device_impl.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -10,7 +10,11 @@ + #include "components/usb_service/usb_context.h" + #include "components/usb_service/usb_device_handle.h" + #include "content/public/browser/browser_thread.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + #if defined(OS_CHROMEOS) + #include "base/sys_info.h" diff --git a/www/chromium/files/patch-components__usb_service__usb_interface.cc b/www/chromium/files/patch-components__usb_service__usb_interface.cc new file mode 100644 index 000000000000..b77c5c70f8ec --- /dev/null +++ b/www/chromium/files/patch-components__usb_service__usb_interface.cc @@ -0,0 +1,14 @@ +--- ./components/usb_service/usb_interface.cc.orig 2014-08-12 21:02:37.000000000 +0200 ++++ ./components/usb_service/usb_interface.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -5,7 +5,11 @@ + #include "components/usb_service/usb_interface.h" + + #include "base/logging.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + namespace usb_service { + diff --git a/www/chromium/files/patch-components__usb_service__usb_service_impl.cc b/www/chromium/files/patch-components__usb_service__usb_service_impl.cc new file mode 100644 index 000000000000..38386ffe3737 --- /dev/null +++ b/www/chromium/files/patch-components__usb_service__usb_service_impl.cc @@ -0,0 +1,14 @@ +--- ./components/usb_service/usb_service_impl.cc.orig 2014-08-12 21:02:37.000000000 +0200 ++++ ./components/usb_service/usb_service_impl.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -13,7 +13,11 @@ + #include "components/usb_service/usb_context.h" + #include "components/usb_service/usb_device_impl.h" + #include "content/public/browser/browser_thread.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + namespace usb_service { + diff --git a/www/chromium/files/patch-content__app__content_main_runner.cc b/www/chromium/files/patch-content__app__content_main_runner.cc index 503f5f71295a..c791b624f6db 100644 --- a/www/chromium/files/patch-content__app__content_main_runner.cc +++ b/www/chromium/files/patch-content__app__content_main_runner.cc @@ -1,6 +1,6 @@ ---- ./content/app/content_main_runner.cc.orig 2014-04-30 22:41:44.000000000 +0200 -+++ ./content/app/content_main_runner.cc 2014-05-04 14:38:47.000000000 +0200 -@@ -86,10 +86,10 @@ +--- ./content/app/content_main_runner.cc.orig 2014-08-12 21:01:22.000000000 +0200 ++++ ./content/app/content_main_runner.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -88,10 +88,10 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -13,7 +13,7 @@ #include "content/zygote/zygote_main.h" #endif -@@ -343,7 +343,8 @@ +@@ -282,7 +282,8 @@ int (*function)(const MainFunctionParams&); }; @@ -23,7 +23,7 @@ // On platforms that use the zygote, we have a special subset of // subprocesses that are launched via the zygote. This function // fills in some process-launching bits around ZygoteMain(). -@@ -471,7 +472,8 @@ +@@ -412,7 +413,8 @@ } } diff --git a/www/chromium/files/patch-content__browser__browser_main_loop.cc b/www/chromium/files/patch-content__browser__browser_main_loop.cc index 7aff2b0742a8..ce0ddb6ec0d0 100644 --- a/www/chromium/files/patch-content__browser__browser_main_loop.cc +++ b/www/chromium/files/patch-content__browser__browser_main_loop.cc @@ -1,15 +1,6 @@ ---- ./content/browser/browser_main_loop.cc.orig 2014-04-30 22:41:47.000000000 +0200 -+++ ./content/browser/browser_main_loop.cc 2014-05-04 14:38:47.000000000 +0200 -@@ -102,7 +102,7 @@ - #include "ui/gfx/gtk_util.h" - #endif - --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - #include <sys/stat.h> - - #include "content/browser/renderer_host/render_sandbox_host_linux.h" -@@ -129,7 +129,7 @@ +--- ./content/browser/browser_main_loop.cc.orig 2014-08-12 21:01:25.000000000 +0200 ++++ ./content/browser/browser_main_loop.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -135,7 +135,7 @@ namespace content { namespace { @@ -17,8 +8,8 @@ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) void SetupSandbox(const CommandLine& parsed_command_line) { TRACE_EVENT0("startup", "SetupSandbox"); - // TODO(evanm): move this into SandboxWrapper; I'm just trying to move this -@@ -353,7 +353,7 @@ + base::FilePath sandbox_binary; +@@ -336,7 +336,7 @@ void BrowserMainLoop::EarlyInitialization() { TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); @@ -27,12 +18,15 @@ // No thread should be created before this call, as SetupSandbox() // will end-up using fork(). SetupSandbox(parsed_command_line_); -@@ -780,7 +780,7 @@ +@@ -762,9 +762,9 @@ } #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) ZygoteHostImpl::GetInstance()->TearDownAfterLastChild(); - #endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + // The device monitors are using |system_monitor_| as dependency, so delete + // them before |system_monitor_| goes away. diff --git a/www/chromium/files/patch-content__browser__child_process_launcher.cc b/www/chromium/files/patch-content__browser__child_process_launcher.cc index 91a9a2f356de..d206ddce079c 100644 --- a/www/chromium/files/patch-content__browser__child_process_launcher.cc +++ b/www/chromium/files/patch-content__browser__child_process_launcher.cc @@ -1,15 +1,15 @@ ---- ./content/browser/child_process_launcher.cc.orig 2014-04-30 22:41:47.000000000 +0200 -+++ ./content/browser/child_process_launcher.cc 2014-05-04 14:38:47.000000000 +0200 -@@ -59,7 +59,7 @@ - termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION), - exit_code_(RESULT_CODE_NORMAL_EXIT), - starting_(true) +--- ./content/browser/child_process_launcher.cc.orig 2014-08-12 21:01:25.000000000 +0200 ++++ ./content/browser/child_process_launcher.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -66,7 +66,7 @@ + #else + terminate_child_on_shutdown_(true) + #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) , zygote_(false) #endif { -@@ -231,7 +231,7 @@ +@@ -232,7 +232,7 @@ // child termination. base::ScopedFD ipcfd_closer(ipcfd); @@ -18,7 +18,16 @@ GetContentClient()->browser()-> GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id, &files_to_register); -@@ -252,7 +252,7 @@ +@@ -242,7 +242,7 @@ + process_type); + } else + // Fall through to the normal posix case below when we're not zygoting. +-#endif // !defined(OS_MACOSX) ++#endif // !defined(OS_MACOSX) && !defined(OS_BSD) + { + // Convert FD mapping to FileHandleMappingVector + base::FileHandleMappingVector fds_to_map; +@@ -253,7 +253,7 @@ base::GlobalDescriptors::kBaseDescriptor)); } @@ -27,7 +36,16 @@ if (process_type == switches::kRendererProcess) { const int sandbox_fd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket(); -@@ -306,7 +306,7 @@ +@@ -261,7 +261,7 @@ + sandbox_fd, + GetSandboxFD())); + } +-#endif // defined(OS_MACOSX) ++#endif // defined(OS_MACOSX) && !defined(OS_BSD) + + // Actually launch the app. + base::LaunchOptions options; +@@ -307,7 +307,7 @@ base::Bind( &Context::Notify, this_object.get(), @@ -36,7 +54,7 @@ use_zygote, #endif handle)); -@@ -314,7 +314,7 @@ +@@ -315,7 +315,7 @@ } void Notify( @@ -45,7 +63,7 @@ bool zygote, #endif base::ProcessHandle handle) { -@@ -327,7 +327,7 @@ +@@ -328,7 +328,7 @@ if (!handle) LOG(ERROR) << "Failed to launch child process"; @@ -54,7 +72,7 @@ zygote_ = zygote; #endif if (client_) { -@@ -354,7 +354,7 @@ +@@ -355,7 +355,7 @@ BrowserThread::PROCESS_LAUNCHER, FROM_HERE, base::Bind( &Context::TerminateInternal, @@ -63,7 +81,7 @@ zygote_, #endif process_.handle())); -@@ -368,7 +368,7 @@ +@@ -372,7 +372,7 @@ } static void TerminateInternal( @@ -72,7 +90,7 @@ bool zygote, #endif base::ProcessHandle handle) { -@@ -382,7 +382,7 @@ +@@ -386,13 +386,13 @@ process.Terminate(RESULT_CODE_NORMAL_EXIT); // On POSIX, we must additionally reap the child. #if defined(OS_POSIX) @@ -81,7 +99,14 @@ if (zygote) { // If the renderer was created via a zygote, we have to proxy the reaping // through the zygote process. -@@ -409,7 +409,7 @@ + ZygoteHostImpl::GetInstance()->EnsureProcessTerminated(handle); + } else +-#endif // !OS_MACOSX ++#endif // !OS_MACOSX && !OS_BSD + { + base::EnsureProcessTerminated(handle); + } +@@ -413,7 +413,7 @@ #if defined(OS_ANDROID) // The fd to close after creating the process. int ipcfd_; @@ -90,7 +115,7 @@ bool zygote_; #endif }; -@@ -451,7 +451,7 @@ +@@ -455,7 +455,7 @@ *exit_code = context_->exit_code_; return context_->termination_status_; } diff --git a/www/chromium/files/patch-content__browser__download__base_file.cc b/www/chromium/files/patch-content__browser__download__base_file.cc index 0344391b9876..9e0879e1ad24 100644 --- a/www/chromium/files/patch-content__browser__download__base_file.cc +++ b/www/chromium/files/patch-content__browser__download__base_file.cc @@ -1,6 +1,6 @@ ---- ./content/browser/download/base_file.cc.orig 2014-04-30 22:41:46.000000000 +0200 -+++ ./content/browser/download/base_file.cc 2014-05-04 14:38:47.000000000 +0200 -@@ -216,7 +216,8 @@ +--- ./content/browser/download/base_file.cc.orig 2014-08-12 21:01:23.000000000 +0200 ++++ ./content/browser/download/base_file.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -204,7 +204,8 @@ } // OS_WIN, OS_MACOSX and OS_LINUX have specialized implementations. diff --git a/www/chromium/files/patch-content__browser__download__base_file_linux.cc b/www/chromium/files/patch-content__browser__download__base_file_linux.cc index e2e717556787..fa1b140d5a45 100644 --- a/www/chromium/files/patch-content__browser__download__base_file_linux.cc +++ b/www/chromium/files/patch-content__browser__download__base_file_linux.cc @@ -1,5 +1,5 @@ ---- ./content/browser/download/base_file_linux.cc.orig 2014-04-30 22:41:46.000000000 +0200 -+++ ./content/browser/download/base_file_linux.cc 2014-05-04 14:38:47.000000000 +0200 +--- ./content/browser/download/base_file_linux.cc.orig 2014-08-12 21:01:23.000000000 +0200 ++++ ./content/browser/download/base_file_linux.cc 2014-08-13 09:56:57.000000000 +0200 @@ -13,7 +13,9 @@ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DCHECK(!detached_); diff --git a/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc b/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc index 2384efa56bf2..407b23275f75 100644 --- a/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc +++ b/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc @@ -1,5 +1,5 @@ ---- ./content/browser/geolocation/location_arbitrator_impl.cc.orig 2014-04-30 22:41:44.000000000 +0200 -+++ ./content/browser/geolocation/location_arbitrator_impl.cc 2014-05-04 14:38:47.000000000 +0200 +--- ./content/browser/geolocation/location_arbitrator_impl.cc.orig 2014-08-12 21:01:23.000000000 +0200 ++++ ./content/browser/geolocation/location_arbitrator_impl.cc 2014-08-13 09:56:57.000000000 +0200 @@ -160,7 +160,7 @@ } diff --git a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc index d93baafbcf36..baa537cb2a8d 100644 --- a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc +++ b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc @@ -1,5 +1,5 @@ ---- ./content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2014-05-04 14:38:47.000000000 +0200 -+++ ./content/browser/geolocation/wifi_data_provider_freebsd.cc 2014-05-04 14:38:47.000000000 +0200 +--- ./content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2014-08-13 09:56:57.000000000 +0200 ++++ ./content/browser/geolocation/wifi_data_provider_freebsd.cc 2014-08-13 09:56:57.000000000 +0200 @@ -0,0 +1,200 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be diff --git a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h index d77ad573b955..f9ff50794e61 100644 --- a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h +++ b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h @@ -1,5 +1,5 @@ ---- ./content/browser/geolocation/wifi_data_provider_freebsd.h.orig 2014-05-04 14:38:47.000000000 +0200 -+++ ./content/browser/geolocation/wifi_data_provider_freebsd.h 2014-05-04 14:38:47.000000000 +0200 +--- ./content/browser/geolocation/wifi_data_provider_freebsd.h.orig 2014-08-13 09:56:57.000000000 +0200 ++++ ./content/browser/geolocation/wifi_data_provider_freebsd.h 2014-08-13 09:56:57.000000000 +0200 @@ -0,0 +1,31 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be diff --git a/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc b/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc new file mode 100644 index 000000000000..f28a4aba0b1f --- /dev/null +++ b/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc @@ -0,0 +1,11 @@ +--- ./content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2014-08-12 21:01:24.000000000 +0200 ++++ ./content/browser/renderer_host/render_widget_host_view_aura.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -626,7 +626,7 @@ + if (host) + return reinterpret_cast<gfx::NativeViewId>(host->GetAcceleratedWidget()); + #endif +- return static_cast<gfx::NativeViewId>(NULL); ++ return static_cast<gfx::NativeViewId>(0); + } + + gfx::NativeViewAccessible RenderWidgetHostViewAura::GetNativeViewAccessible() { diff --git a/www/chromium/files/patch-content__common__set_process_title_linux.cc b/www/chromium/files/patch-content__common__set_process_title_linux.cc index 617dccf7e385..c9771442c3bd 100644 --- a/www/chromium/files/patch-content__common__set_process_title_linux.cc +++ b/www/chromium/files/patch-content__common__set_process_title_linux.cc @@ -1,5 +1,5 @@ ---- ./content/common/set_process_title_linux.cc.orig 2014-04-30 22:41:44.000000000 +0200 -+++ ./content/common/set_process_title_linux.cc 2014-05-04 14:38:47.000000000 +0200 +--- ./content/common/set_process_title_linux.cc.orig 2014-08-12 21:01:26.000000000 +0200 ++++ ./content/common/set_process_title_linux.cc 2014-08-13 09:56:57.000000000 +0200 @@ -48,6 +48,8 @@ extern char** environ; diff --git a/www/chromium/files/patch-content__common__set_process_title_linux.h b/www/chromium/files/patch-content__common__set_process_title_linux.h index 4d0aa17f947c..2f8318ce1eb5 100644 --- a/www/chromium/files/patch-content__common__set_process_title_linux.h +++ b/www/chromium/files/patch-content__common__set_process_title_linux.h @@ -1,5 +1,5 @@ ---- ./content/common/set_process_title_linux.h.orig 2014-04-30 22:41:44.000000000 +0200 -+++ ./content/common/set_process_title_linux.h 2014-05-04 14:38:47.000000000 +0200 +--- ./content/common/set_process_title_linux.h.orig 2014-08-12 21:01:26.000000000 +0200 ++++ ./content/common/set_process_title_linux.h 2014-08-13 09:56:57.000000000 +0200 @@ -5,6 +5,9 @@ #ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_ #define CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_ diff --git a/www/chromium/files/patch-content__content_browser.gypi b/www/chromium/files/patch-content__content_browser.gypi index 68f70fbcc150..5ae931f418a0 100644 --- a/www/chromium/files/patch-content__content_browser.gypi +++ b/www/chromium/files/patch-content__content_browser.gypi @@ -1,6 +1,6 @@ ---- ./content/content_browser.gypi.orig 2014-04-30 22:41:54.000000000 +0200 -+++ ./content/content_browser.gypi 2014-05-04 14:38:47.000000000 +0200 -@@ -618,6 +618,8 @@ +--- ./content/content_browser.gypi.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./content/content_browser.gypi 2014-08-13 09:56:57.000000000 +0200 +@@ -631,6 +631,8 @@ 'browser/geolocation/wifi_data_provider_common_win.cc', 'browser/geolocation/wifi_data_provider_common_win.h', 'browser/geolocation/wifi_data_provider_corewlan_mac.mm', @@ -9,7 +9,7 @@ 'browser/geolocation/wifi_data_provider_linux.cc', 'browser/geolocation/wifi_data_provider_linux.h', 'browser/geolocation/wifi_data_provider_mac.cc', -@@ -1654,8 +1656,18 @@ +@@ -1652,8 +1654,18 @@ ], }], ['os_bsd==1', { @@ -29,13 +29,13 @@ + 'browser/udev_linux.cc', ], }], - ['use_aura!=1 and OS!="android"', { -@@ -1737,7 +1749,7 @@ + ['use_aura==1', { +@@ -1717,7 +1729,7 @@ 'browser/geolocation/empty_wifi_data_provider.cc', ], }], - ['OS == "linux" and use_dbus==1', { -+ ['(OS == "linux" or OS=="freebsd") and use_dbus==1', { ++ ['(OS == "linux" or os_bsd==1) and use_dbus==1', { 'sources!': [ 'browser/geolocation/empty_wifi_data_provider.cc', ], diff --git a/www/chromium/files/patch-content__content_common.gypi b/www/chromium/files/patch-content__content_common.gypi index 992b62cd22c7..1116c8386b95 100644 --- a/www/chromium/files/patch-content__content_common.gypi +++ b/www/chromium/files/patch-content__content_common.gypi @@ -1,6 +1,6 @@ ---- ./content/content_common.gypi.orig 2014-04-30 22:41:54.000000000 +0200 -+++ ./content/content_common.gypi 2014-05-04 14:38:47.000000000 +0200 -@@ -544,6 +544,21 @@ +--- ./content/content_common.gypi.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./content/content_common.gypi 2014-08-13 09:56:57.000000000 +0200 +@@ -559,6 +559,21 @@ 'content.gyp:common_aidl', ], }], @@ -19,6 +19,6 @@ + 'common/sandbox_linux/sandbox_seccomp_bpf_linux.cc', + ], + }], - ['toolkit_uses_gtk == 1', { + ['use_pango == 1', { 'dependencies': [ - '../build/linux/system.gyp:gtk', + '../build/linux/system.gyp:pangocairo', diff --git a/www/chromium/files/patch-content__content_tests.gypi b/www/chromium/files/patch-content__content_tests.gypi index 62f3deac2e22..259270337004 100644 --- a/www/chromium/files/patch-content__content_tests.gypi +++ b/www/chromium/files/patch-content__content_tests.gypi @@ -1,6 +1,6 @@ ---- ./content/content_tests.gypi.orig 2014-04-30 22:41:54.000000000 +0200 -+++ ./content/content_tests.gypi 2014-05-04 14:38:47.000000000 +0200 -@@ -828,6 +828,15 @@ +--- ./content/content_tests.gypi.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./content/content_tests.gypi 2014-08-13 09:56:57.000000000 +0200 +@@ -872,6 +872,15 @@ 'browser/geolocation/wifi_data_provider_linux_unittest.cc', ], }], diff --git a/www/chromium/files/patch-content__plugin__plugin_main_linux.cc b/www/chromium/files/patch-content__plugin__plugin_main_linux.cc deleted file mode 100644 index 9cfae296dc11..000000000000 --- a/www/chromium/files/patch-content__plugin__plugin_main_linux.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- ./content/plugin/plugin_main_linux.cc.orig 2014-04-30 22:41:47.000000000 +0200 -+++ ./content/plugin/plugin_main_linux.cc 2014-05-04 14:38:47.000000000 +0200 -@@ -5,13 +5,13 @@ - #include <signal.h> - #include <string.h> - #include <sys/types.h> --#include <syscall.h> -+#include <sys/syscall.h> - #include <unistd.h> - - #include "build/build_config.h" - - // This whole file is only useful on 64-bit architectures. --#if defined(ARCH_CPU_64_BITS) -+#if defined(ARCH_CPU_64_BITS) && !defined(OS_BSD) - - namespace content { - diff --git a/www/chromium/files/patch-content__public__test__browser_test_base.cc b/www/chromium/files/patch-content__public__test__browser_test_base.cc index 270f0ad57f9f..4a7001c3466e 100644 --- a/www/chromium/files/patch-content__public__test__browser_test_base.cc +++ b/www/chromium/files/patch-content__public__test__browser_test_base.cc @@ -1,5 +1,5 @@ ---- ./content/public/test/browser_test_base.cc.orig 2014-04-30 22:41:51.000000000 +0200 -+++ ./content/public/test/browser_test_base.cc 2014-05-04 14:38:47.000000000 +0200 +--- ./content/public/test/browser_test_base.cc.orig 2014-08-12 21:01:19.000000000 +0200 ++++ ./content/public/test/browser_test_base.cc 2014-08-13 09:56:57.000000000 +0200 @@ -4,6 +4,10 @@ #include "content/public/test/browser_test_base.h" diff --git a/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc b/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc new file mode 100644 index 000000000000..2333ff649fe5 --- /dev/null +++ b/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc @@ -0,0 +1,24 @@ +--- ./content/renderer/accessibility/blink_ax_tree_source.cc.orig 2014-08-12 21:01:18.000000000 +0200 ++++ ./content/renderer/accessibility/blink_ax_tree_source.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -431,13 +431,15 @@ + dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X, scroll_offset.width()); + dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y, scroll_offset.height()); + +- const gfx::Size& min_offset = document.frame()->minimumScrollOffset(); +- dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MIN, min_offset.width()); +- dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MIN, min_offset.height()); ++ // Prefix {min|max}_offset with '_' to avoid collision with ++ // FreeBSD namespace ++ const gfx::Size& _min_offset = document.frame()->minimumScrollOffset(); ++ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MIN, _min_offset.width()); ++ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MIN, _min_offset.height()); + +- const gfx::Size& max_offset = document.frame()->maximumScrollOffset(); +- dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, max_offset.width()); +- dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MAX, max_offset.height()); ++ const gfx::Size& _max_offset = document.frame()->maximumScrollOffset(); ++ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, _max_offset.width()); ++ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MAX, _max_offset.height()); + } + + if (dst->role == ui::AX_ROLE_TABLE) { diff --git a/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc b/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc index d9829b33aff3..896a67619025 100644 --- a/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc +++ b/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc @@ -1,24 +1,24 @@ ---- ./content/renderer/media/webrtc_audio_capturer.cc.orig 2014-04-30 22:41:47.000000000 +0200 -+++ ./content/renderer/media/webrtc_audio_capturer.cc 2014-05-04 14:38:47.000000000 +0200 -@@ -29,10 +29,10 @@ - // The listed rates below adds restrictions and WebRtcAudioDeviceImpl::Init() +--- ./content/renderer/media/webrtc_audio_capturer.cc.orig 2014-08-12 21:01:18.000000000 +0200 ++++ ./content/renderer/media/webrtc_audio_capturer.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -31,9 +31,7 @@ // will fail if the user selects any rate outside these ranges. - const int kValidInputRates[] = {96000, 48000, 44100, 32000, 16000, 8000}; + const int kValidInputRates[] = + {192000, 96000, 48000, 44100, 32000, 16000, 8000}; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) -const int kValidInputRates[] = {48000, 44100}; - #elif defined(OS_ANDROID) - const int kValidInputRates[] = {48000, 44100}; +-#elif defined(OS_ANDROID) +#elif defined(OS_POSIX) -+const int kValidInputRates[] = {48000, 44100}; + const int kValidInputRates[] = {48000, 44100}; #else const int kValidInputRates[] = {44100}; - #endif -@@ -430,7 +430,7 @@ +@@ -452,8 +450,8 @@ // CaptureCallback. #if defined(OS_WIN) || defined(OS_MACOSX) DCHECK_LE(volume, 1.0); -#elif defined(OS_LINUX) || defined(OS_OPENBSD) +- // We have a special situation on Linux where the microphone volume can be +#elif defined(OS_POSIX) && !defined(OS_ANDROID) - // We have a special situation on Linux where the microphone volume can be ++ // We have a special situation on POSIX where the microphone volume can be // "higher than maximum". The input volume slider in the sound preference // allows the user to set a scaling that is higher than 100%. It means that + // even if the reported maximum levels is N, the actual microphone level can diff --git a/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc b/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc index 0b8655e15e14..741ca5afaac7 100644 --- a/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc +++ b/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc @@ -1,5 +1,5 @@ ---- ./content/renderer/media/webrtc_audio_renderer.cc.orig 2014-04-30 22:41:47.000000000 +0200 -+++ ./content/renderer/media/webrtc_audio_renderer.cc 2014-05-04 14:38:47.000000000 +0200 +--- ./content/renderer/media/webrtc_audio_renderer.cc.orig 2014-08-12 21:01:18.000000000 +0200 ++++ ./content/renderer/media/webrtc_audio_renderer.cc 2014-08-13 09:56:57.000000000 +0200 @@ -34,7 +34,7 @@ // rates below adds restrictions and Initialize() will fail if the user selects // any rate outside these ranges. diff --git a/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc b/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc index 59df7039deab..b29105878ab8 100644 --- a/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc +++ b/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc @@ -1,5 +1,5 @@ ---- ./content/renderer/pepper/usb_key_code_conversion.cc.orig 2014-04-30 22:41:48.000000000 +0200 -+++ ./content/renderer/pepper/usb_key_code_conversion.cc 2014-05-04 14:38:47.000000000 +0200 +--- ./content/renderer/pepper/usb_key_code_conversion.cc.orig 2014-08-12 21:01:19.000000000 +0200 ++++ ./content/renderer/pepper/usb_key_code_conversion.cc 2014-08-13 09:56:57.000000000 +0200 @@ -10,7 +10,7 @@ namespace content { diff --git a/www/chromium/files/patch-content__renderer__render_process_impl.cc b/www/chromium/files/patch-content__renderer__render_process_impl.cc deleted file mode 100644 index 42425a7ab8b8..000000000000 --- a/www/chromium/files/patch-content__renderer__render_process_impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ./content/renderer/render_process_impl.cc.orig 2014-04-30 22:41:48.000000000 +0200 -+++ ./content/renderer/render_process_impl.cc 2014-05-04 14:38:48.000000000 +0200 -@@ -155,7 +155,7 @@ - int width = rect.width(); - int height = rect.height(); - const size_t stride = skia::PlatformCanvasStrideForWidth(rect.width()); --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_BSD) - const size_t max_size = base::SysInfo::MaxSharedMemorySize(); - #else - const size_t max_size = 0; diff --git a/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc b/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc index de7431eb3b14..ae06e82afee8 100644 --- a/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc +++ b/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc @@ -1,5 +1,5 @@ ---- ./content/renderer/renderer_main_platform_delegate_linux.cc.orig 2014-04-30 22:41:48.000000000 +0200 -+++ ./content/renderer/renderer_main_platform_delegate_linux.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./content/renderer/renderer_main_platform_delegate_linux.cc.orig 2014-08-12 21:01:19.000000000 +0200 ++++ ./content/renderer/renderer_main_platform_delegate_linux.cc 2014-08-13 09:56:57.000000000 +0200 @@ -50,11 +50,14 @@ // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox // diff --git a/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc b/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc index fe2c2cb42b15..a4538877e0db 100644 --- a/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc +++ b/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc @@ -1,6 +1,6 @@ ---- ./content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2014-04-30 22:41:48.000000000 +0200 -+++ ./content/renderer/renderer_webkitplatformsupport_impl.cc 2014-05-04 14:38:48.000000000 +0200 -@@ -90,7 +90,7 @@ +--- ./content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2014-08-12 21:01:19.000000000 +0200 ++++ ./content/renderer/renderer_webkitplatformsupport_impl.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -91,7 +91,7 @@ #if defined(OS_POSIX) #include "base/file_descriptor_posix.h" @@ -9,7 +9,7 @@ #include <map> #include <string> -@@ -178,7 +178,7 @@ +@@ -179,7 +179,7 @@ scoped_refptr<ThreadSafeSender> thread_safe_sender_; }; @@ -18,7 +18,7 @@ // WebKit doesn't use WebSandboxSupport on android so we don't need to // implement anything here. class RendererWebKitPlatformSupportImpl::SandboxSupport { -@@ -271,7 +271,7 @@ +@@ -272,7 +272,7 @@ } blink::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() { @@ -27,7 +27,7 @@ // WebKit doesn't use WebSandboxSupport on android. return NULL; #else -@@ -588,7 +588,7 @@ +@@ -590,7 +590,7 @@ return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out); } diff --git a/www/chromium/files/patch-crypto__nss_util.cc b/www/chromium/files/patch-crypto__nss_util.cc index 300db0383eec..2cd6f50db3c5 100644 --- a/www/chromium/files/patch-crypto__nss_util.cc +++ b/www/chromium/files/patch-crypto__nss_util.cc @@ -1,5 +1,5 @@ ---- ./crypto/nss_util.cc.orig 2014-04-30 22:41:24.000000000 +0200 -+++ ./crypto/nss_util.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./crypto/nss_util.cc.orig 2014-08-12 21:03:00.000000000 +0200 ++++ ./crypto/nss_util.cc 2014-08-13 09:56:57.000000000 +0200 @@ -13,7 +13,7 @@ #include <prtime.h> #include <secmod.h> diff --git a/www/chromium/files/patch-device__hid__hid.gyp b/www/chromium/files/patch-device__hid__hid.gyp index 6b5bf5a9366e..d810374b8906 100644 --- a/www/chromium/files/patch-device__hid__hid.gyp +++ b/www/chromium/files/patch-device__hid__hid.gyp @@ -1,24 +1,21 @@ ---- ./device/hid/hid.gyp.orig 2014-04-30 22:43:21.000000000 +0200 -+++ ./device/hid/hid.gyp 2014-05-04 14:38:48.000000000 +0200 -@@ -23,8 +23,8 @@ +--- ./device/hid/hid.gyp.orig 2014-08-12 21:02:53.000000000 +0200 ++++ ./device/hid/hid.gyp 2014-08-13 09:56:57.000000000 +0200 +@@ -19,6 +19,18 @@ + '../../build/linux/system.gyp:udev', + ], + }], ++ ['os_bsd==1', { ++ 'sources!': [ ++ 'device_monitor_linux.cc', ++ 'device_monitor_linux.h', ++ 'hid_connection_linux.cc', ++ 'hid_connection_linux.h', ++ 'hid_service_linux.cc', ++ 'hid_service_linux.h', ++ 'input_service_linux.cc', ++ 'input_service_linux.h', ++ ], ++ }], + ], 'sources': [ - 'hid_connection.cc', - 'hid_connection.h', -- 'hid_connection_linux.cc', -- 'hid_connection_linux.h', -+ #'hid_connection_linux.cc', -+ #'hid_connection_linux.h', - 'hid_connection_mac.cc', - 'hid_connection_mac.h', - 'hid_connection_win.cc', -@@ -33,8 +33,8 @@ - 'hid_device_info.h', - 'hid_service.cc', - 'hid_service.h', -- 'hid_service_linux.cc', -- 'hid_service_linux.h', -+ #'hid_service_linux.cc', -+ #'hid_service_linux.h', - 'hid_service_mac.cc', - 'hid_service_mac.h', - 'hid_service_win.cc', + 'device_monitor_linux.cc', diff --git a/www/chromium/files/patch-device__serial__serial.gyp b/www/chromium/files/patch-device__serial__serial.gyp index 233581bcc8a5..a066d30d74df 100644 --- a/www/chromium/files/patch-device__serial__serial.gyp +++ b/www/chromium/files/patch-device__serial__serial.gyp @@ -1,13 +1,15 @@ ---- ./device/serial/serial.gyp.orig 2014-04-30 22:43:21.000000000 +0200 -+++ ./device/serial/serial.gyp 2014-05-04 14:38:48.000000000 +0200 -@@ -23,8 +23,8 @@ +--- ./device/serial/serial.gyp.orig 2014-08-12 21:02:53.000000000 +0200 ++++ ./device/serial/serial.gyp 2014-08-13 09:56:57.000000000 +0200 +@@ -19,6 +19,12 @@ + '../../build/linux/system.gyp:udev', + ], + }], ++ ['os_bsd==1', { ++ 'sources!': [ ++ 'serial_device_enumerator_linux.cc', ++ 'serial_device_enumerator_linux.h', ++ ], ++ }], + ], 'sources': [ 'serial_device_enumerator.cc', - 'serial_device_enumerator.h', -- 'serial_device_enumerator_linux.cc', -- 'serial_device_enumerator_linux.h', -+ #'serial_device_enumerator_linux.cc', -+ #'serial_device_enumerator_linux.h', - 'serial_device_enumerator_mac.cc', - 'serial_device_enumerator_mac.h', - 'serial_device_enumerator_win.cc', diff --git a/www/chromium/files/patch-gpu__config__gpu_control_list.cc b/www/chromium/files/patch-gpu__config__gpu_control_list.cc index 94aa0fd2f960..6b781484968d 100644 --- a/www/chromium/files/patch-gpu__config__gpu_control_list.cc +++ b/www/chromium/files/patch-gpu__config__gpu_control_list.cc @@ -1,6 +1,6 @@ ---- ./gpu/config/gpu_control_list.cc.orig 2014-04-30 22:41:33.000000000 +0200 -+++ ./gpu/config/gpu_control_list.cc 2014-05-04 14:38:48.000000000 +0200 -@@ -1400,10 +1400,10 @@ +--- ./gpu/config/gpu_control_list.cc.orig 2014-08-12 21:01:10.000000000 +0200 ++++ ./gpu/config/gpu_control_list.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -1512,10 +1512,10 @@ return kOsWin; #elif defined(OS_ANDROID) return kOsAndroid; diff --git a/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc b/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc index ea344173a976..e5af94d2bb18 100644 --- a/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc +++ b/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc @@ -1,6 +1,6 @@ ---- ./gpu/config/gpu_control_list_unittest.cc.orig 2014-04-30 22:41:33.000000000 +0200 -+++ ./gpu/config/gpu_control_list_unittest.cc 2014-05-04 14:38:48.000000000 +0200 -@@ -175,8 +175,7 @@ +--- ./gpu/config/gpu_control_list_unittest.cc.orig 2014-08-12 21:01:09.000000000 +0200 ++++ ./gpu/config/gpu_control_list_unittest.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -176,8 +176,7 @@ features = control_list->MakeDecision( GpuControlList::kOsLinux, kOsVersion, gpu_info()); EXPECT_SINGLE_FEATURE(features, TEST_FEATURE_0); diff --git a/www/chromium/files/patch-gpu__config__gpu_test_config.cc b/www/chromium/files/patch-gpu__config__gpu_test_config.cc index a09bfaf65191..ed7604f212a1 100644 --- a/www/chromium/files/patch-gpu__config__gpu_test_config.cc +++ b/www/chromium/files/patch-gpu__config__gpu_test_config.cc @@ -1,5 +1,5 @@ ---- ./gpu/config/gpu_test_config.cc.orig 2014-04-30 22:41:33.000000000 +0200 -+++ ./gpu/config/gpu_test_config.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./gpu/config/gpu_test_config.cc.orig 2014-08-12 21:01:09.000000000 +0200 ++++ ./gpu/config/gpu_test_config.cc 2014-08-13 09:56:57.000000000 +0200 @@ -23,8 +23,6 @@ GPUTestConfig::OS GetCurrentOS() { #if defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-gpu__gpu_config.gypi b/www/chromium/files/patch-gpu__gpu_config.gypi index 5b2318ae9dcf..e64ba0a31136 100644 --- a/www/chromium/files/patch-gpu__gpu_config.gypi +++ b/www/chromium/files/patch-gpu__gpu_config.gypi @@ -1,5 +1,5 @@ ---- ./gpu/gpu_config.gypi.orig 2014-04-30 22:41:34.000000000 +0200 -+++ ./gpu/gpu_config.gypi 2014-05-04 14:38:48.000000000 +0200 +--- ./gpu/gpu_config.gypi.orig 2014-08-12 21:01:10.000000000 +0200 ++++ ./gpu/gpu_config.gypi 2014-08-13 09:56:57.000000000 +0200 @@ -63,7 +63,7 @@ '../third_party/amd/amd_videocard_info_win.cc', ], @@ -7,5 +7,5 @@ - ['OS=="linux" and use_x11==1', { + ['(OS=="linux" or os_bsd==1) and use_x11==1', { 'dependencies': [ - '../build/linux/system.gyp:libpci', - '../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl', + '../build/linux/system.gyp:x11', + '../build/linux/system.gyp:xext', diff --git a/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc b/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc index 18a23296334e..4dbe8ebcbc7e 100644 --- a/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc +++ b/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc @@ -1,5 +1,5 @@ ---- ./media/audio/audio_input_volume_unittest.cc.orig 2014-04-30 22:41:23.000000000 +0200 -+++ ./media/audio/audio_input_volume_unittest.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./media/audio/audio_input_volume_unittest.cc.orig 2014-08-12 21:02:56.000000000 +0200 ++++ ./media/audio/audio_input_volume_unittest.cc 2014-08-13 09:56:57.000000000 +0200 @@ -74,7 +74,7 @@ params, device_id); EXPECT_TRUE(NULL != ais); diff --git a/www/chromium/files/patch-media__base__audio_splicer.cc b/www/chromium/files/patch-media__base__audio_splicer.cc index 471cb95f8859..987ece05fd93 100644 --- a/www/chromium/files/patch-media__base__audio_splicer.cc +++ b/www/chromium/files/patch-media__base__audio_splicer.cc @@ -1,6 +1,6 @@ ---- ./media/base/audio_splicer.cc.orig 2014-04-30 22:41:24.000000000 +0200 -+++ ./media/base/audio_splicer.cc 2014-05-04 14:38:48.000000000 +0200 -@@ -160,7 +160,7 @@ +--- ./media/base/audio_splicer.cc.orig 2014-08-12 21:02:57.000000000 +0200 ++++ ./media/base/audio_splicer.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -143,7 +143,7 @@ output_timestamp_helper_.GetTimestamp(); const base::TimeDelta delta = timestamp - expected_timestamp; @@ -9,7 +9,7 @@ DVLOG(1) << "Timestamp delta too large: " << delta.InMicroseconds() << "us"; return false; } -@@ -169,7 +169,7 @@ +@@ -152,7 +152,7 @@ if (delta != base::TimeDelta()) frames_to_fill = output_timestamp_helper_.GetFramesToTarget(timestamp); diff --git a/www/chromium/files/patch-media__cast__rtcp__rtcp.cc b/www/chromium/files/patch-media__cast__rtcp__rtcp.cc index 97c90a453b9d..d8e9881a9548 100644 --- a/www/chromium/files/patch-media__cast__rtcp__rtcp.cc +++ b/www/chromium/files/patch-media__cast__rtcp__rtcp.cc @@ -1,6 +1,6 @@ ---- media/cast/rtcp/rtcp.cc.orig 2014-05-14 21:23:34.000000000 +0200 -+++ media/cast/rtcp/rtcp.cc 2014-05-22 09:51:16.000000000 +0200 -@@ -362,7 +362,7 @@ +--- ./media/cast/rtcp/rtcp.cc.orig 2014-08-12 21:02:56.000000000 +0200 ++++ ./media/cast/rtcp/rtcp.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -361,7 +361,7 @@ int64 rtp_time_diff_ms = rtp_timestamp_diff / frequency_khz; // Sanity check. diff --git a/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc b/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc index 57eea7861841..d1482a2ea99c 100644 --- a/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc +++ b/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc @@ -1,5 +1,5 @@ ---- ./media/filters/decrypting_audio_decoder.cc.orig 2014-04-30 22:41:23.000000000 +0200 -+++ ./media/filters/decrypting_audio_decoder.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./media/filters/decrypting_audio_decoder.cc.orig 2014-08-12 21:02:56.000000000 +0200 ++++ ./media/filters/decrypting_audio_decoder.cc 2014-08-13 09:56:57.000000000 +0200 @@ -30,7 +30,7 @@ // Out of sync of 100ms would be pretty noticeable and we should keep any // drift below that. diff --git a/www/chromium/files/patch-media__media.gyp b/www/chromium/files/patch-media__media.gyp index 3031900836fb..5a759be94a09 100644 --- a/www/chromium/files/patch-media__media.gyp +++ b/www/chromium/files/patch-media__media.gyp @@ -1,20 +1,20 @@ ---- ./media/media.gyp.orig 2014-04-30 22:41:24.000000000 +0200 -+++ ./media/media.gyp 2014-05-04 14:38:48.000000000 +0200 -@@ -641,7 +641,7 @@ +--- ./media/media.gyp.orig 2014-08-12 21:03:00.000000000 +0200 ++++ ./media/media.gyp 2014-08-13 09:56:57.000000000 +0200 +@@ -658,7 +658,7 @@ 'audio/openbsd/audio_manager_openbsd.h', ], }], - ['OS=="linux"', { -+ ['OS=="linux" or OS=="freebsd"', { ++ ['OS=="linux" or os_bsd==1', { 'conditions': [ ['use_x11==1', { 'dependencies': [ -@@ -892,7 +892,7 @@ +@@ -917,7 +917,7 @@ 'base/simd/convert_yuv_to_rgb_x86.cc', ], }], - ['OS!="linux" and OS!="win"', { -+ ['OS!="linux" and OS!="win" and OS!="freebsd"', { ++ ['OS!="linux" and OS!="win" and os_bsd!=1', { 'sources!': [ 'base/keyboard_event_counter.cc', 'base/keyboard_event_counter.h', diff --git a/www/chromium/files/patch-native_client__build__common.gypi b/www/chromium/files/patch-native_client__build__common.gypi index f27b2760bf2f..4b048ce9863a 100644 --- a/www/chromium/files/patch-native_client__build__common.gypi +++ b/www/chromium/files/patch-native_client__build__common.gypi @@ -1,5 +1,5 @@ ---- ./native_client/build/common.gypi.orig 2014-04-30 22:43:44.000000000 +0200 -+++ ./native_client/build/common.gypi 2014-05-04 14:38:48.000000000 +0200 +--- ./native_client/build/common.gypi.orig 2014-08-12 21:03:33.000000000 +0200 ++++ ./native_client/build/common.gypi 2014-08-13 09:56:57.000000000 +0200 @@ -269,7 +269,7 @@ ], }, diff --git a/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp b/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp index 8592f616ed43..98507023f782 100644 --- a/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp +++ b/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp @@ -1,5 +1,5 @@ ---- ./native_client/src/shared/platform/platform.gyp.orig 2014-04-30 22:43:43.000000000 +0200 -+++ ./native_client/src/shared/platform/platform.gyp 2014-05-04 14:38:48.000000000 +0200 +--- ./native_client/src/shared/platform/platform.gyp.orig 2014-08-12 21:03:09.000000000 +0200 ++++ ./native_client/src/shared/platform/platform.gyp 2014-08-13 09:56:57.000000000 +0200 @@ -36,7 +36,7 @@ 'refcount_base.cc', ], diff --git a/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp b/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp index 8dda650b7e53..0c13f108b645 100644 --- a/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp +++ b/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp @@ -1,5 +1,5 @@ ---- ./native_client/src/trusted/debug_stub/debug_stub.gyp.orig 2014-04-30 22:43:33.000000000 +0200 -+++ ./native_client/src/trusted/debug_stub/debug_stub.gyp 2014-05-04 14:38:48.000000000 +0200 +--- ./native_client/src/trusted/debug_stub/debug_stub.gyp.orig 2014-08-12 21:03:10.000000000 +0200 ++++ ./native_client/src/trusted/debug_stub/debug_stub.gyp 2014-08-13 09:56:57.000000000 +0200 @@ -27,7 +27,7 @@ 'test.cc', ], diff --git a/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp b/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp index a652b38645ec..ffa618b4f19b 100644 --- a/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp +++ b/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp @@ -1,5 +1,5 @@ ---- ./native_client/src/trusted/service_runtime/service_runtime.gyp.orig 2014-04-30 22:43:32.000000000 +0200 -+++ ./native_client/src/trusted/service_runtime/service_runtime.gyp 2014-05-04 14:38:48.000000000 +0200 +--- ./native_client/src/trusted/service_runtime/service_runtime.gyp.orig 2014-08-12 21:03:22.000000000 +0200 ++++ ./native_client/src/trusted/service_runtime/service_runtime.gyp 2014-08-13 09:56:57.000000000 +0200 @@ -6,7 +6,7 @@ { 'variables': { diff --git a/www/chromium/files/patch-net__base__address_tracker_linux.h b/www/chromium/files/patch-net__base__address_tracker_linux.h new file mode 100644 index 000000000000..4ae62843fb9c --- /dev/null +++ b/www/chromium/files/patch-net__base__address_tracker_linux.h @@ -0,0 +1,15 @@ +--- ./net/base/address_tracker_linux.h.orig 2014-08-12 21:02:39.000000000 +0200 ++++ ./net/base/address_tracker_linux.h 2014-08-13 09:56:57.000000000 +0200 +@@ -6,10 +6,12 @@ + #define NET_BASE_ADDRESS_TRACKER_LINUX_H_ + + #include <sys/socket.h> // Needed to include netlink. ++#if !defined(__FreeBSD__) + // Mask superfluous definition of |struct net|. This is fixed in Linux 2.6.38. + #define net net_kernel + #include <linux/rtnetlink.h> + #undef net ++#endif + + #include <map> + diff --git a/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc b/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc new file mode 100644 index 000000000000..25eb840a58cf --- /dev/null +++ b/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc @@ -0,0 +1,14 @@ +--- ./net/base/address_tracker_linux_unittest.cc.orig 2014-08-12 21:02:39.000000000 +0200 ++++ ./net/base/address_tracker_linux_unittest.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -4,7 +4,11 @@ + + #include "net/base/address_tracker_linux.h" + ++#if defined(__linux__) + #include <linux/if.h> ++#else ++#include <net/if.h> ++#endif + + #include <vector> + diff --git a/www/chromium/files/patch-net__base__dns_reloader.cc b/www/chromium/files/patch-net__base__dns_reloader.cc index cab0db14a57d..26507afd26f5 100644 --- a/www/chromium/files/patch-net__base__dns_reloader.cc +++ b/www/chromium/files/patch-net__base__dns_reloader.cc @@ -1,5 +1,5 @@ ---- ./net/base/dns_reloader.cc.orig 2014-04-30 22:43:05.000000000 +0200 -+++ ./net/base/dns_reloader.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./net/base/dns_reloader.cc.orig 2014-08-12 21:02:39.000000000 +0200 ++++ ./net/base/dns_reloader.cc 2014-08-13 09:56:57.000000000 +0200 @@ -7,6 +7,9 @@ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-net__base__mime_util_unittest.cc b/www/chromium/files/patch-net__base__mime_util_unittest.cc index 2087c2fcc12e..6ed09939c84c 100644 --- a/www/chromium/files/patch-net__base__mime_util_unittest.cc +++ b/www/chromium/files/patch-net__base__mime_util_unittest.cc @@ -1,6 +1,6 @@ ---- ./net/base/mime_util_unittest.cc.orig 2014-04-30 22:43:05.000000000 +0200 -+++ ./net/base/mime_util_unittest.cc 2014-05-04 14:38:48.000000000 +0200 -@@ -260,7 +260,7 @@ +--- ./net/base/mime_util_unittest.cc.orig 2014-08-12 21:02:39.000000000 +0200 ++++ ./net/base/mime_util_unittest.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -291,7 +291,7 @@ { "MeSsAge/*", 1, "eml" }, { "image/bmp", 1, "bmp" }, { "video/*", 6, "mp4" }, diff --git a/www/chromium/files/patch-net__base__net_util.h b/www/chromium/files/patch-net__base__net_util.h index 17ab034041b0..add2d33d0431 100644 --- a/www/chromium/files/patch-net__base__net_util.h +++ b/www/chromium/files/patch-net__base__net_util.h @@ -1,5 +1,5 @@ ---- ./net/base/net_util.h.orig 2014-04-30 22:43:05.000000000 +0200 -+++ ./net/base/net_util.h 2014-05-04 14:38:48.000000000 +0200 +--- ./net/base/net_util.h.orig 2014-08-12 21:02:39.000000000 +0200 ++++ ./net/base/net_util.h 2014-08-13 09:56:57.000000000 +0200 @@ -13,6 +13,9 @@ #elif defined(OS_POSIX) #include <sys/types.h> diff --git a/www/chromium/files/patch-net__base__network_change_notifier.cc b/www/chromium/files/patch-net__base__network_change_notifier.cc index be66e25ecfd1..7894169039ef 100644 --- a/www/chromium/files/patch-net__base__network_change_notifier.cc +++ b/www/chromium/files/patch-net__base__network_change_notifier.cc @@ -1,6 +1,6 @@ ---- ./net/base/network_change_notifier.cc.orig 2014-04-30 22:43:05.000000000 +0200 -+++ ./net/base/network_change_notifier.cc 2014-05-04 14:38:48.000000000 +0200 -@@ -470,7 +470,6 @@ +--- ./net/base/network_change_notifier.cc.orig 2014-08-12 21:02:39.000000000 +0200 ++++ ./net/base/network_change_notifier.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -508,7 +508,6 @@ #elif defined(OS_MACOSX) return new NetworkChangeNotifierMac(); #else diff --git a/www/chromium/files/patch-net__dns__address_sorter_posix.cc b/www/chromium/files/patch-net__dns__address_sorter_posix.cc index 8520e0018cfd..bda561fedf0c 100644 --- a/www/chromium/files/patch-net__dns__address_sorter_posix.cc +++ b/www/chromium/files/patch-net__dns__address_sorter_posix.cc @@ -1,5 +1,5 @@ ---- ./net/dns/address_sorter_posix.cc.orig 2014-04-30 22:43:08.000000000 +0200 -+++ ./net/dns/address_sorter_posix.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./net/dns/address_sorter_posix.cc.orig 2014-08-12 21:02:40.000000000 +0200 ++++ ./net/dns/address_sorter_posix.cc 2014-08-13 09:56:57.000000000 +0200 @@ -10,6 +10,7 @@ #include <sys/socket.h> // Must be included before ifaddrs.h. #include <ifaddrs.h> diff --git a/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc b/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc index 8e4325cea0ad..12f774f1bc1b 100644 --- a/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc +++ b/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc @@ -1,5 +1,5 @@ ---- ./net/dns/dns_config_service_posix_unittest.cc.orig 2014-04-30 22:43:08.000000000 +0200 -+++ ./net/dns/dns_config_service_posix_unittest.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./net/dns/dns_config_service_posix_unittest.cc.orig 2014-08-12 21:02:40.000000000 +0200 ++++ ./net/dns/dns_config_service_posix_unittest.cc 2014-08-13 09:56:57.000000000 +0200 @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/www/chromium/files/patch-net__dns__dns_session.cc b/www/chromium/files/patch-net__dns__dns_session.cc index 4c23329ac82d..2bca4438fd50 100644 --- a/www/chromium/files/patch-net__dns__dns_session.cc +++ b/www/chromium/files/patch-net__dns__dns_session.cc @@ -1,5 +1,5 @@ ---- ./net/dns/dns_session.cc.orig 2014-04-30 22:43:08.000000000 +0200 -+++ ./net/dns/dns_session.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./net/dns/dns_session.cc.orig 2014-08-12 21:02:40.000000000 +0200 ++++ ./net/dns/dns_session.cc 2014-08-13 09:56:57.000000000 +0200 @@ -178,7 +178,7 @@ base::TimeDelta current_error = rtt - estimate; estimate += current_error / 8; // * alpha diff --git a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc b/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc index 7cf32b2fc102..3d1b78a6ddc9 100644 --- a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc +++ b/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc @@ -1,5 +1,5 @@ ---- ./net/http/http_auth_gssapi_posix.cc.orig 2014-04-30 22:43:05.000000000 +0200 -+++ ./net/http/http_auth_gssapi_posix.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./net/http/http_auth_gssapi_posix.cc.orig 2014-08-12 21:02:39.000000000 +0200 ++++ ./net/http/http_auth_gssapi_posix.cc 2014-08-13 09:56:57.000000000 +0200 @@ -431,8 +431,8 @@ static const char* const kDefaultLibraryNames[] = { #if defined(OS_MACOSX) diff --git a/www/chromium/files/patch-net__net.gyp b/www/chromium/files/patch-net__net.gyp index aef4d9115b2f..4b46e9d34fdc 100644 --- a/www/chromium/files/patch-net__net.gyp +++ b/www/chromium/files/patch-net__net.gyp @@ -1,6 +1,6 @@ ---- ./net/net.gyp.orig 2014-04-30 22:43:09.000000000 +0200 -+++ ./net/net.gyp 2014-05-04 14:38:48.000000000 +0200 -@@ -1472,9 +1472,10 @@ +--- ./net/net.gyp.orig 2014-08-12 21:02:41.000000000 +0200 ++++ ./net/net.gyp 2014-08-13 09:56:57.000000000 +0200 +@@ -277,9 +277,10 @@ }], ['os_bsd==1', { 'sources!': [ @@ -12,8 +12,8 @@ ], },{ 'dependencies': [ -@@ -2130,7 +2131,7 @@ - 'websockets/websocket_throttle_test.cc', +@@ -509,7 +510,7 @@ + '<@(net_test_sources)', ], 'conditions': [ - ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { @@ -21,9 +21,9 @@ 'dependencies': [ 'balsa', 'epoll_server', -@@ -2413,6 +2414,11 @@ - '../testing/android/native_test.gyp:native_test_native_code', - ] +@@ -973,6 +974,11 @@ + 'dns/mock_mdns_socket_factory.h' + ] }], + [ 'os_bsd == 1', { + 'sources!': [ @@ -31,5 +31,5 @@ + ], + }], ], - 'target_conditions': [ - # These source files are excluded by default platform rules, but they + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + 'msvs_disabled_warnings': [4267, ], diff --git a/www/chromium/files/patch-net__net.gypi b/www/chromium/files/patch-net__net.gypi new file mode 100644 index 000000000000..4aa949558139 --- /dev/null +++ b/www/chromium/files/patch-net__net.gypi @@ -0,0 +1,22 @@ +--- ./net/net.gypi.orig 2014-08-12 21:02:41.000000000 +0200 ++++ ./net/net.gypi 2014-08-13 09:56:58.000000000 +0200 +@@ -167,8 +167,8 @@ + 'android/network_change_notifier_factory_android.h', + 'android/network_library.cc', + 'android/network_library.h', +- 'base/address_tracker_linux.cc', +- 'base/address_tracker_linux.h', ++ #'base/address_tracker_linux.cc', ++ #'base/address_tracker_linux.h', + 'base/backoff_entry.cc', + 'base/backoff_entry.h', + 'base/bandwidth_metrics.cc', +@@ -1229,7 +1229,7 @@ + 'android/keystore_unittest.cc', + 'android/network_change_notifier_android_unittest.cc', + 'base/address_list_unittest.cc', +- 'base/address_tracker_linux_unittest.cc', ++ #'base/address_tracker_linux_unittest.cc', + 'base/backoff_entry_unittest.cc', + 'base/data_url_unittest.cc', + 'base/directory_lister_unittest.cc', diff --git a/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc b/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc index b582092a0889..d75286357e34 100644 --- a/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc +++ b/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc @@ -1,6 +1,6 @@ ---- ./net/proxy/proxy_config_service_linux.cc.orig 2014-04-30 22:43:07.000000000 +0200 -+++ ./net/proxy/proxy_config_service_linux.cc 2014-05-04 14:38:48.000000000 +0200 -@@ -12,7 +12,13 @@ +--- ./net/proxy/proxy_config_service_linux.cc.orig 2014-08-12 21:02:40.000000000 +0200 ++++ ./net/proxy/proxy_config_service_linux.cc 2014-08-13 09:56:58.000000000 +0200 +@@ -21,7 +21,13 @@ #include <limits.h> #include <stdio.h> #include <stdlib.h> @@ -14,7 +14,7 @@ #include <unistd.h> #include <map> -@@ -846,9 +852,10 @@ +@@ -855,9 +861,10 @@ public base::MessagePumpLibevent::Watcher { public: explicit SettingGetterImplKDE(base::Environment* env_var_getter) @@ -28,7 +28,7 @@ // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; -@@ -912,9 +919,10 @@ +@@ -921,9 +928,10 @@ // and pending tasks may then be deleted without being run. // Here in the KDE version, we can safely close the file descriptor // anyway. (Not that it really matters; the process is exiting.) @@ -40,7 +40,7 @@ } virtual bool Init(base::SingleThreadTaskRunner* glib_thread_task_runner, -@@ -922,11 +930,21 @@ +@@ -931,11 +939,21 @@ // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; DCHECK(inotify_fd_ < 0); @@ -62,7 +62,7 @@ int flags = fcntl(inotify_fd_, F_GETFL); if (fcntl(inotify_fd_, F_SETFL, flags | O_NONBLOCK) < 0) { PLOG(ERROR) << "fcntl failed"; -@@ -934,6 +952,7 @@ +@@ -943,6 +961,7 @@ inotify_fd_ = -1; return false; } @@ -70,7 +70,7 @@ file_loop_ = file_loop; // The initial read is done on the current thread, not |file_loop_|, // since we will need to have it for SetUpAndFetchInitialConfig(). -@@ -948,20 +967,38 @@ +@@ -957,20 +976,38 @@ close(inotify_fd_); inotify_fd_ = -1; } @@ -109,7 +109,7 @@ notify_delegate_ = delegate; if (!file_loop_->WatchFileDescriptor(inotify_fd_, true, -@@ -982,7 +1019,19 @@ +@@ -991,7 +1028,19 @@ virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE { DCHECK_EQ(fd, inotify_fd_); DCHECK(base::MessageLoop::current() == file_loop_); @@ -129,7 +129,7 @@ } virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE { NOTREACHED(); -@@ -1261,8 +1310,11 @@ +@@ -1270,8 +1319,11 @@ void OnChangeNotification() { DCHECK_GE(inotify_fd_, 0); DCHECK(base::MessageLoop::current() == file_loop_); @@ -142,7 +142,7 @@ ssize_t r; while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) { // inotify returns variable-length structures, which is why we have -@@ -1299,6 +1351,7 @@ +@@ -1308,6 +1360,7 @@ inotify_fd_ = -1; } } @@ -150,7 +150,7 @@ if (kioslaverc_touched) { // We don't use Reset() because the timer may not yet be running. // (In that case Stop() is a no-op.) -@@ -1314,6 +1367,7 @@ +@@ -1323,6 +1376,7 @@ std::vector<std::string> > strings_map_type; int inotify_fd_; diff --git a/www/chromium/files/patch-net__proxy__proxy_service.cc b/www/chromium/files/patch-net__proxy__proxy_service.cc index 1d293449c591..1d4e5f263a93 100644 --- a/www/chromium/files/patch-net__proxy__proxy_service.cc +++ b/www/chromium/files/patch-net__proxy__proxy_service.cc @@ -1,5 +1,5 @@ ---- ./net/proxy/proxy_service.cc.orig 2014-04-30 22:43:07.000000000 +0200 -+++ ./net/proxy/proxy_service.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./net/proxy/proxy_service.cc.orig 2014-08-12 21:02:40.000000000 +0200 ++++ ./net/proxy/proxy_service.cc 2014-08-13 09:56:58.000000000 +0200 @@ -39,7 +39,7 @@ #elif defined(OS_MACOSX) #include "net/proxy/proxy_config_service_mac.h" @@ -9,7 +9,7 @@ #include "net/proxy/proxy_config_service_linux.h" #elif defined(OS_ANDROID) #include "net/proxy/proxy_config_service_android.h" -@@ -1376,7 +1376,7 @@ +@@ -1382,7 +1382,7 @@ << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return new UnsetProxyConfigService; diff --git a/www/chromium/files/patch-net__quic__congestion_control__inter_arrival_overuse_detector.cc b/www/chromium/files/patch-net__quic__congestion_control__inter_arrival_overuse_detector.cc deleted file mode 100644 index 6f70d9bbe7ba..000000000000 --- a/www/chromium/files/patch-net__quic__congestion_control__inter_arrival_overuse_detector.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- net/quic/congestion_control/inter_arrival_overuse_detector.cc.orig 2014-04-24 22:35:53.000000000 +0200 -+++ net/quic/congestion_control/inter_arrival_overuse_detector.cc 2014-05-09 10:29:30.000000000 +0200 -@@ -165,7 +165,7 @@ - if ((sigma_delta * kDetectTimeDiffStandardDeviation > - estimated_congestion_delay_.ToMicroseconds()) && - (sigma_delta * kDetectDriftStandardDeviation > -- std::abs(accumulated_deltas_.ToMicroseconds()))) { -+ std::labs(accumulated_deltas_.ToMicroseconds()))) { - if (delta_estimate_ != kBandwidthSteady) { - DVLOG(1) << "Bandwidth estimate drift: Steady" - << " mean:" << delta_mean_ diff --git a/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc b/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc index d890ba29f9d7..2702a5218d6b 100644 --- a/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc +++ b/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc @@ -1,6 +1,6 @@ ---- net/quic/congestion_control/rtt_stats.cc.orig 2014-05-14 21:22:13.000000000 +0200 -+++ net/quic/congestion_control/rtt_stats.cc 2014-05-21 23:32:04.000000000 +0200 -@@ -63,7 +63,7 @@ +--- ./net/quic/congestion_control/rtt_stats.cc.orig 2014-08-12 21:02:38.000000000 +0200 ++++ ./net/quic/congestion_control/rtt_stats.cc 2014-08-13 09:56:58.000000000 +0200 +@@ -73,7 +73,7 @@ } else { mean_deviation_ = QuicTime::Delta::FromMicroseconds( kOneMinusBeta * mean_deviation_.ToMicroseconds() + diff --git a/www/chromium/files/patch-net__socket__socks5_client_socket.cc b/www/chromium/files/patch-net__socket__socks5_client_socket.cc index 1bd34406dbb6..f0cae1462b2c 100644 --- a/www/chromium/files/patch-net__socket__socks5_client_socket.cc +++ b/www/chromium/files/patch-net__socket__socks5_client_socket.cc @@ -1,5 +1,5 @@ ---- ./net/socket/socks5_client_socket.cc.orig 2014-04-30 22:43:08.000000000 +0200 -+++ ./net/socket/socks5_client_socket.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./net/socket/socks5_client_socket.cc.orig 2014-08-12 21:02:38.000000000 +0200 ++++ ./net/socket/socks5_client_socket.cc 2014-08-13 09:56:58.000000000 +0200 @@ -4,6 +4,10 @@ #include "net/socket/socks5_client_socket.h" diff --git a/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h b/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h index b71e109dbb50..40eda478127d 100644 --- a/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h +++ b/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h @@ -1,5 +1,5 @@ ---- ./net/socket/tcp_listen_socket_unittest.h.orig 2014-04-30 22:43:08.000000000 +0200 -+++ ./net/socket/tcp_listen_socket_unittest.h 2014-05-04 14:38:48.000000000 +0200 +--- ./net/socket/tcp_listen_socket_unittest.h.orig 2014-08-12 21:02:38.000000000 +0200 ++++ ./net/socket/tcp_listen_socket_unittest.h 2014-08-13 09:56:58.000000000 +0200 @@ -13,6 +13,9 @@ #include <arpa/inet.h> #include <errno.h> diff --git a/www/chromium/files/patch-net__udp__udp_socket_unittest.cc b/www/chromium/files/patch-net__udp__udp_socket_unittest.cc index f0358c6243bf..7676abd3ce0d 100644 --- a/www/chromium/files/patch-net__udp__udp_socket_unittest.cc +++ b/www/chromium/files/patch-net__udp__udp_socket_unittest.cc @@ -1,5 +1,5 @@ ---- ./net/udp/udp_socket_unittest.cc.orig 2014-04-30 22:43:08.000000000 +0200 -+++ ./net/udp/udp_socket_unittest.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./net/udp/udp_socket_unittest.cc.orig 2014-08-12 21:02:40.000000000 +0200 ++++ ./net/udp/udp_socket_unittest.cc 2014-08-13 09:56:58.000000000 +0200 @@ -202,7 +202,7 @@ client_entries, 5, NetLog::TYPE_SOCKET_ALIVE)); } diff --git a/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc b/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc index 9a2c175ec642..54c342951c34 100644 --- a/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc +++ b/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc @@ -1,5 +1,5 @@ ---- ./ppapi/proxy/file_io_resource.cc.orig 2014-04-30 22:41:40.000000000 +0200 -+++ ./ppapi/proxy/file_io_resource.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./ppapi/proxy/file_io_resource.cc.orig 2014-08-12 21:01:17.000000000 +0200 ++++ ./ppapi/proxy/file_io_resource.cc 2014-08-13 09:56:58.000000000 +0200 @@ -294,15 +294,17 @@ if (check_quota_) { diff --git a/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc b/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc index 9742cbe43882..21d669fd198e 100644 --- a/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc +++ b/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc @@ -1,5 +1,5 @@ ---- ./ppapi/shared_impl/private/net_address_private_impl.cc.orig 2014-04-30 22:41:41.000000000 +0200 -+++ ./ppapi/shared_impl/private/net_address_private_impl.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./ppapi/shared_impl/private/net_address_private_impl.cc.orig 2014-08-12 21:01:16.000000000 +0200 ++++ ./ppapi/shared_impl/private/net_address_private_impl.cc 2014-08-13 09:56:58.000000000 +0200 @@ -14,6 +14,10 @@ #include <sys/types.h> #endif diff --git a/www/chromium/files/patch-printing__printing.gyp b/www/chromium/files/patch-printing__printing.gyp index b96d3f3abdb1..39c42fe111ef 100644 --- a/www/chromium/files/patch-printing__printing.gyp +++ b/www/chromium/files/patch-printing__printing.gyp @@ -1,11 +1,11 @@ ---- ./printing/printing.gyp.orig 2014-04-30 22:43:20.000000000 +0200 -+++ ./printing/printing.gyp 2014-05-04 14:38:48.000000000 +0200 -@@ -215,7 +215,7 @@ +--- ./printing/printing.gyp.orig 2014-08-12 21:02:51.000000000 +0200 ++++ ./printing/printing.gyp 2014-08-13 09:56:58.000000000 +0200 +@@ -193,7 +193,7 @@ 'backend/print_backend_chromeos.cc', ], }], - ['OS=="linux" and chromeos==0', { -+ ['(OS=="linux" and chromeos==0) or OS=="freebsd"', { #XXX (rene) temp! ++ ['(OS=="linux" or os_bsd == 1) and chromeos==0', { 'sources': [ 'printing_context_linux.cc', 'printing_context_linux.h', diff --git a/www/chromium/files/patch-remoting__remoting_host.gypi b/www/chromium/files/patch-remoting__remoting_host.gypi new file mode 100644 index 000000000000..4b9caaffc603 --- /dev/null +++ b/www/chromium/files/patch-remoting__remoting_host.gypi @@ -0,0 +1,20 @@ +--- ./remoting/remoting_host.gypi.orig 2014-08-12 21:02:33.000000000 +0200 ++++ ./remoting/remoting_host.gypi 2014-08-13 09:56:58.000000000 +0200 +@@ -12,7 +12,7 @@ + 'variables': { + 'conditions': [ + # Remoting host is supported only on Windows, OSX and Linux (with X11). +- ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', { ++ ['OS=="win" or OS=="mac" or os_bsd==1 or (OS=="linux" and chromeos==0 and use_x11==1)', { + 'enable_remoting_host': 1, + }, { + 'enable_remoting_host': 0, +@@ -266,7 +266,7 @@ + 'host/win/wts_terminal_observer.h', + ], + 'conditions': [ +- ['OS=="linux"', { ++ ['OS=="linux" or os_bsd==1', { + 'dependencies': [ + # Always use GTK on Linux, even for Aura builds. + '../build/linux/system.gyp:gtk', diff --git a/www/chromium/files/patch-skia__skia_chrome.gypi b/www/chromium/files/patch-skia__skia_chrome.gypi new file mode 100644 index 000000000000..ec2872ec33f3 --- /dev/null +++ b/www/chromium/files/patch-skia__skia_chrome.gypi @@ -0,0 +1,14 @@ +--- ./skia/skia_chrome.gypi.orig 2014-08-12 21:03:06.000000000 +0200 ++++ ./skia/skia_chrome.gypi 2014-08-13 09:56:58.000000000 +0200 +@@ -78,6 +78,11 @@ + 'ext/vector_platform_device_skia.h', + ], + 'conditions': [ ++ [ 'use_cairo == 1', { ++ 'dependencies': [ ++ '../build/linux/system.gyp:pangocairo', ++ ], ++ }], + [ 'OS == "android" and enable_printing == 0', { + 'sources!': [ + 'ext/skia_utils_base.cc', diff --git a/www/chromium/files/patch-skia__skia_common.gypi b/www/chromium/files/patch-skia__skia_common.gypi index 4e0e3fd3dcf5..a932813ee08b 100644 --- a/www/chromium/files/patch-skia__skia_common.gypi +++ b/www/chromium/files/patch-skia__skia_common.gypi @@ -1,5 +1,5 @@ ---- ./skia/skia_common.gypi.orig 2014-04-30 22:41:33.000000000 +0200 -+++ ./skia/skia_common.gypi 2014-05-04 14:38:48.000000000 +0200 +--- ./skia/skia_common.gypi.orig 2014-08-12 21:03:06.000000000 +0200 ++++ ./skia/skia_common.gypi 2014-08-13 09:56:58.000000000 +0200 @@ -66,7 +66,7 @@ }], diff --git a/www/chromium/files/patch-sync__util__get_session_name.cc b/www/chromium/files/patch-sync__util__get_session_name.cc index 9f99ff9ca799..9fcb996748c0 100644 --- a/www/chromium/files/patch-sync__util__get_session_name.cc +++ b/www/chromium/files/patch-sync__util__get_session_name.cc @@ -1,5 +1,5 @@ ---- ./sync/util/get_session_name.cc.orig 2014-04-30 22:41:19.000000000 +0200 -+++ ./sync/util/get_session_name.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./sync/util/get_session_name.cc.orig 2014-08-12 21:02:55.000000000 +0200 ++++ ./sync/util/get_session_name.cc 2014-08-13 09:56:58.000000000 +0200 @@ -11,7 +11,7 @@ #include "base/sys_info.h" #include "base/task_runner.h" diff --git a/www/chromium/files/patch-sync__util__get_session_name_linux.cc b/www/chromium/files/patch-sync__util__get_session_name_linux.cc index 5a0f1e3f8cae..89133eeeeb20 100644 --- a/www/chromium/files/patch-sync__util__get_session_name_linux.cc +++ b/www/chromium/files/patch-sync__util__get_session_name_linux.cc @@ -1,5 +1,5 @@ ---- ./sync/util/get_session_name_linux.cc.orig 2014-04-30 22:41:19.000000000 +0200 -+++ ./sync/util/get_session_name_linux.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./sync/util/get_session_name_linux.cc.orig 2014-08-12 21:02:55.000000000 +0200 ++++ ./sync/util/get_session_name_linux.cc 2014-08-13 09:56:58.000000000 +0200 @@ -13,8 +13,9 @@ namespace internal { diff --git a/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h b/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h index 52a732830cd7..dc0486033bbd 100644 --- a/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h +++ b/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h @@ -1,5 +1,5 @@ ---- ./testing/gtest/include/gtest/internal/gtest-port.h.orig 2014-04-30 22:43:26.000000000 +0200 -+++ ./testing/gtest/include/gtest/internal/gtest-port.h 2014-05-04 14:38:48.000000000 +0200 +--- ./testing/gtest/include/gtest/internal/gtest-port.h.orig 2014-08-12 21:03:10.000000000 +0200 ++++ ./testing/gtest/include/gtest/internal/gtest-port.h 2014-08-13 09:56:58.000000000 +0200 @@ -265,6 +265,8 @@ # define GTEST_OS_NACL 1 #elif defined __OpenBSD__ diff --git a/www/chromium/files/patch-testing__gtest__src__gtest.cc b/www/chromium/files/patch-testing__gtest__src__gtest.cc index 89da02d6b859..14d62d46c08b 100644 --- a/www/chromium/files/patch-testing__gtest__src__gtest.cc +++ b/www/chromium/files/patch-testing__gtest__src__gtest.cc @@ -1,5 +1,5 @@ ---- ./testing/gtest/src/gtest.cc.orig 2014-04-30 22:43:26.000000000 +0200 -+++ ./testing/gtest/src/gtest.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./testing/gtest/src/gtest.cc.orig 2014-08-12 21:03:10.000000000 +0200 ++++ ./testing/gtest/src/gtest.cc 2014-08-13 09:56:58.000000000 +0200 @@ -117,6 +117,10 @@ #endif // GTEST_OS_LINUX diff --git a/www/chromium/files/patch-third_party__WebKit__Source__config.h b/www/chromium/files/patch-third_party__WebKit__Source__config.h index db67ec491d40..94a7cdf17cfd 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__config.h +++ b/www/chromium/files/patch-third_party__WebKit__Source__config.h @@ -1,5 +1,5 @@ ---- ./third_party/WebKit/Source/config.h.orig 2014-04-30 22:47:23.000000000 +0200 -+++ ./third_party/WebKit/Source/config.h 2014-05-04 14:38:48.000000000 +0200 +--- ./third_party/WebKit/Source/config.h.orig 2014-08-12 21:07:17.000000000 +0200 ++++ ./third_party/WebKit/Source/config.h 2014-08-13 09:56:58.000000000 +0200 @@ -156,6 +156,6 @@ #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1 #endif diff --git a/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp b/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp index e5924c0da4a2..b72e3b3289f2 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp +++ b/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp @@ -1,6 +1,6 @@ ---- ./third_party/WebKit/Source/core/core.gyp.orig 2014-04-30 22:47:22.000000000 +0200 -+++ ./third_party/WebKit/Source/core/core.gyp 2014-05-04 14:38:48.000000000 +0200 -@@ -641,7 +641,7 @@ +--- ./third_party/WebKit/Source/core/core.gyp.orig 2014-08-12 21:07:11.000000000 +0200 ++++ ./third_party/WebKit/Source/core/core.gyp 2014-08-13 09:56:58.000000000 +0200 +@@ -636,7 +636,7 @@ # Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable. 'cflags': ['-Wno-uninitialized'], }], @@ -9,7 +9,7 @@ 'sources/': [ ['exclude', 'Linux\\.cpp$'], ], -@@ -685,7 +685,7 @@ +@@ -675,7 +675,7 @@ ['OS=="win" and buildtype=="Official"', { 'msvs_shard': 19, }], diff --git a/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp b/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp index e64e9db31cec..614cea2a810f 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp +++ b/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp @@ -1,20 +1,48 @@ ---- ./third_party/WebKit/Source/platform/blink_platform.gyp.orig 2014-04-30 22:47:17.000000000 +0200 -+++ ./third_party/WebKit/Source/platform/blink_platform.gyp 2014-05-04 14:38:48.000000000 +0200 -@@ -193,7 +193,7 @@ +--- ./third_party/WebKit/Source/platform/blink_platform.gyp.orig 2014-08-12 21:07:17.000000000 +0200 ++++ ./third_party/WebKit/Source/platform/blink_platform.gyp 2014-08-13 09:56:58.000000000 +0200 +@@ -38,6 +38,9 @@ + 'targets': [{ + 'target_name': 'blink_common', + 'type': '<(component)', ++ 'include_dirs': [ ++ '<(prefix_dir)/include', ++ ], + 'variables': { 'enable_wexit_time_destructors': 1 }, + 'dependencies': [ + '../config.gyp:config', +@@ -246,7 +249,7 @@ # compiler optimizations, see crbug.com/237063 'msvs_disabled_warnings': [ 4267, 4334, 4724 ], 'conditions': [ - ['OS=="linux" or OS=="android" or OS=="win"', { -+ ['OS=="linux" or OS=="android" or OS=="freebsd" or OS=="win"', { ++ ['OS=="linux" or OS=="android" or OS=="win" or os_bsd==1', { 'sources/': [ # Cherry-pick files excluded by the broader regular expressions above. ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'], -@@ -303,7 +303,7 @@ +@@ -266,7 +269,7 @@ + ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'], + ], + }], +- ['OS=="linux" or OS=="android"', { ++ ['OS=="linux" or OS=="android" or os_bsd==1', { + 'sources/': [ + ['include', 'fonts/linux/FontPlatformDataLinuxHarfBuzz\\.cpp$'], + ] +@@ -363,7 +366,7 @@ ['exclude', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'], ], }], - ['OS != "linux" and OS != "mac" and OS != "win"', { -+ ['OS != "linux" and OS != "freebsd" and OS != "mac" and OS != "win"', { ++ ['OS != "linux" and OS != "mac" and OS != "win" and os_bsd != 1', { 'sources/': [ ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], ], +@@ -409,7 +412,7 @@ + ['exclude', 'Android\\.cpp$'], + ], + }], +- ['OS=="linux"', { ++ ['OS=="linux" or os_bsd==1', { + 'dependencies': [ + '<(DEPTH)/build/linux/system.gyp:fontconfig', + ], diff --git a/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp b/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp index ee4217ea7cce..afa8e1862695 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp +++ b/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp @@ -1,6 +1,6 @@ ---- ./third_party/WebKit/Source/heap/ThreadState.cpp.orig 2014-04-30 22:47:13.000000000 +0200 -+++ ./third_party/WebKit/Source/heap/ThreadState.cpp 2014-05-04 14:38:48.000000000 +0200 -@@ -43,13 +43,22 @@ +--- ./third_party/WebKit/Source/platform/heap/ThreadState.cpp.orig 2014-08-12 21:07:16.000000000 +0200 ++++ ./third_party/WebKit/Source/platform/heap/ThreadState.cpp 2014-08-13 09:56:58.000000000 +0200 +@@ -45,13 +45,22 @@ extern "C" void* __libc_stack_end; // NOLINT #endif @@ -24,7 +24,7 @@ void* base; size_t size; int error = pthread_attr_getstack(&attr, &base, &size); -@@ -57,6 +66,9 @@ +@@ -59,6 +68,9 @@ pthread_attr_destroy(&attr); return reinterpret_cast<Address>(base) + size; } diff --git a/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp b/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp deleted file mode 100644 index 3166a7622171..000000000000 --- a/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp +++ /dev/null @@ -1,22 +0,0 @@ ---- ./third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp.orig 2014-04-30 22:47:14.000000000 +0200 -+++ ./third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp 2014-05-04 14:38:48.000000000 +0200 -@@ -41,6 +41,8 @@ - #include <gtk/gtk.h> - #include <stdlib.h> - -+#include <cstdlib> -+ - #include "wtf/Assertions.h" - - namespace { -@@ -66,8 +68,8 @@ - "gtk-double-click-time", &doubleClickTime, - "gtk-double-click-distance", &doubleClickDistance, NULL); - return (time - gLastClickTime) > doubleClickTime -- || abs(x - gLastClickX) > doubleClickDistance -- || abs(y - gLastClickY) > doubleClickDistance; -+ || std::abs(x - gLastClickX) > doubleClickDistance -+ || std::abs(y - gLastClickY) > doubleClickDistance; - } - - void resetClickCountState() diff --git a/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp b/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp index d3e46d62dd4a..57a3718ae32c 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp +++ b/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp @@ -1,5 +1,5 @@ ---- ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp.orig 2014-04-30 22:47:13.000000000 +0200 -+++ ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp 2014-05-04 14:38:48.000000000 +0200 +--- ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp.orig 2014-08-12 21:07:15.000000000 +0200 ++++ ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp 2014-08-13 09:56:58.000000000 +0200 @@ -34,7 +34,7 @@ #include "platform/fonts/FontDescription.h" #include "platform/fonts/FontPlatformData.h" diff --git a/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp b/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp index 70c44796b5de..a58fa9b50332 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp +++ b/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp @@ -1,6 +1,6 @@ ---- ./third_party/WebKit/Source/web/web.gyp.orig 2014-04-30 22:47:14.000000000 +0200 -+++ ./third_party/WebKit/Source/web/web.gyp 2014-05-04 14:38:48.000000000 +0200 -@@ -149,7 +149,7 @@ +--- ./third_party/WebKit/Source/web/web.gyp.orig 2014-08-12 21:07:15.000000000 +0200 ++++ ./third_party/WebKit/Source/web/web.gyp 2014-08-13 09:56:58.000000000 +0200 +@@ -142,7 +142,7 @@ }, }, }], diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp b/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp index 26a775a8af48..2ae09af423d0 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp +++ b/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp @@ -1,5 +1,5 @@ ---- ./third_party/WebKit/Source/wtf/Assertions.cpp.orig 2014-04-30 22:47:16.000000000 +0200 -+++ ./third_party/WebKit/Source/wtf/Assertions.cpp 2014-05-04 14:38:48.000000000 +0200 +--- ./third_party/WebKit/Source/wtf/Assertions.cpp.orig 2014-08-12 21:07:13.000000000 +0200 ++++ ./third_party/WebKit/Source/wtf/Assertions.cpp 2014-08-13 09:56:58.000000000 +0200 @@ -38,6 +38,7 @@ #include "OwnPtr.h" #include "PassOwnPtr.h" diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h b/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h index 694b838a0c48..06c797400d14 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h +++ b/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h @@ -1,5 +1,5 @@ ---- ./third_party/WebKit/Source/wtf/ByteSwap.h.orig 2014-04-30 22:47:16.000000000 +0200 -+++ ./third_party/WebKit/Source/wtf/ByteSwap.h 2014-05-04 14:38:48.000000000 +0200 +--- ./third_party/WebKit/Source/wtf/ByteSwap.h.orig 2014-08-12 21:07:13.000000000 +0200 ++++ ./third_party/WebKit/Source/wtf/ByteSwap.h 2014-08-13 09:56:58.000000000 +0200 @@ -52,14 +52,20 @@ #else diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp b/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp index 48f212fe4561..5c6c06bebb2c 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp +++ b/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp @@ -1,5 +1,5 @@ ---- ./third_party/WebKit/Source/wtf/DateMath.cpp.orig 2014-04-30 22:47:16.000000000 +0200 -+++ ./third_party/WebKit/Source/wtf/DateMath.cpp 2014-05-04 14:38:48.000000000 +0200 +--- ./third_party/WebKit/Source/wtf/DateMath.cpp.orig 2014-08-12 21:07:13.000000000 +0200 ++++ ./third_party/WebKit/Source/wtf/DateMath.cpp 2014-08-13 09:56:58.000000000 +0200 @@ -80,6 +80,7 @@ #include "StringExtras.h" diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp b/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp new file mode 100644 index 000000000000..4ebf6fc7224e --- /dev/null +++ b/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp @@ -0,0 +1,11 @@ +--- ./third_party/WebKit/Source/wtf/wtf.gyp.orig 2014-08-12 21:07:13.000000000 +0200 ++++ ./third_party/WebKit/Source/wtf/wtf.gyp 2014-08-13 09:56:58.000000000 +0200 +@@ -70,7 +70,7 @@ + 'target_name': 'wtf', + 'type': '<(component)', + 'include_dirs': [ +- '..', ++ '..', '<(prefix_dir)/include', + ], + 'dependencies': [ + 'wtf_config', diff --git a/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h b/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h index aa1c6639801c..bb4a711859fa 100644 --- a/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h +++ b/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h @@ -1,5 +1,5 @@ ---- third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.orig 2014-05-13 23:46:25.000000000 +0200 -+++ third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h 2014-05-16 22:18:50.000000000 +0200 +--- ./third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.orig 2014-08-12 21:03:19.000000000 +0200 ++++ ./third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h 2014-08-13 09:56:58.000000000 +0200 @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H diff --git a/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c b/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c index a5dd24ee16aa..c8011dbd1441 100644 --- a/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c +++ b/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c @@ -1,5 +1,5 @@ ---- ./third_party/ffmpeg/libavutil/mem.c.orig 2014-04-30 22:43:45.000000000 +0200 -+++ ./third_party/ffmpeg/libavutil/mem.c 2014-05-04 14:38:48.000000000 +0200 +--- ./third_party/ffmpeg/libavutil/mem.c.orig 2014-08-12 21:03:23.000000000 +0200 ++++ ./third_party/ffmpeg/libavutil/mem.c 2014-08-13 09:56:58.000000000 +0200 @@ -32,7 +32,7 @@ #include <stdint.h> #include <stdlib.h> diff --git a/www/chromium/files/patch-third_party__khronos__khronos.gyp b/www/chromium/files/patch-third_party__khronos__khronos.gyp new file mode 100644 index 000000000000..791d6bb917a9 --- /dev/null +++ b/www/chromium/files/patch-third_party__khronos__khronos.gyp @@ -0,0 +1,10 @@ +--- ./third_party/khronos/khronos.gyp.orig 2014-08-12 21:02:46.000000000 +0200 ++++ ./third_party/khronos/khronos.gyp 2014-08-13 09:56:58.000000000 +0200 +@@ -11,6 +11,7 @@ + 'include_dirs': [ + '.', + '../../gpu', # Contains GLES2/gl2chromium.h ++ '<(prefix_dir)/include', + ], + }, + }, diff --git a/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp b/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp index 5ce448734b89..d14bd115dfa6 100644 --- a/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp +++ b/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp @@ -1,5 +1,5 @@ ---- ./third_party/libXNVCtrl/libXNVCtrl.gyp.orig 2014-04-30 22:43:11.000000000 +0200 -+++ ./third_party/libXNVCtrl/libXNVCtrl.gyp 2014-05-04 14:38:48.000000000 +0200 +--- ./third_party/libXNVCtrl/libXNVCtrl.gyp.orig 2014-08-12 21:02:42.000000000 +0200 ++++ ./third_party/libXNVCtrl/libXNVCtrl.gyp 2014-08-13 09:56:58.000000000 +0200 @@ -13,6 +13,9 @@ 'NVCtrlLib.h', 'nv_control.h', diff --git a/www/chromium/files/patch-third_party__libexif__libexif.gyp b/www/chromium/files/patch-third_party__libexif__libexif.gyp new file mode 100644 index 000000000000..7276998e3d65 --- /dev/null +++ b/www/chromium/files/patch-third_party__libexif__libexif.gyp @@ -0,0 +1,14 @@ +--- ./third_party/libexif/libexif.gyp.orig 2014-07-15 21:03:04.000000000 +0200 ++++ ./third_party/libexif/libexif.gyp 2014-08-11 15:06:34.000000000 +0200 +@@ -5,9 +5,9 @@ + { + 'variables': { + 'conditions': [ +- ['OS == "linux" and chromeos==0', { ++ ['(OS == "linux" or OS == "freebsd") and chromeos==0', { + 'use_system_libexif%': 1, +- }, { # OS != "linux" and chromeos==0 ++ }, { # (OS != "linux" and OS != "freebsd") or chromeos==0 + 'use_system_libexif%': 0, + }], + ], diff --git a/www/chromium/files/patch-third_party__libjingle__libjingle.gyp b/www/chromium/files/patch-third_party__libjingle__libjingle.gyp index b1616aa76289..8a583f8ff5e0 100644 --- a/www/chromium/files/patch-third_party__libjingle__libjingle.gyp +++ b/www/chromium/files/patch-third_party__libjingle__libjingle.gyp @@ -1,6 +1,6 @@ ---- ./third_party/libjingle/libjingle.gyp.orig 2014-04-30 22:43:11.000000000 +0200 -+++ ./third_party/libjingle/libjingle.gyp 2014-05-04 14:38:48.000000000 +0200 -@@ -472,7 +472,7 @@ +--- ./third_party/libjingle/libjingle.gyp.orig 2014-08-12 21:02:51.000000000 +0200 ++++ ./third_party/libjingle/libjingle.gyp 2014-08-13 09:56:58.000000000 +0200 +@@ -473,7 +473,7 @@ ], }], # TODO(mallinath) - Enable SCTP for iOS. diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc b/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc index 76f7bf3ec3a3..4a7f3d332d04 100644 --- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc +++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc @@ -1,5 +1,5 @@ ---- ./third_party/libjingle/source/talk/base/cpumonitor.cc.orig 2014-04-30 22:44:03.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/cpumonitor.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./third_party/libjingle/source/talk/base/cpumonitor.cc.orig 2014-08-12 21:03:39.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/cpumonitor.cc 2014-08-13 09:56:58.000000000 +0200 @@ -52,13 +52,13 @@ #include <mach/task.h> #endif // defined(IOS) || defined(OSX) diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h b/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h index e61921660e33..827f7585335b 100644 --- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h +++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h @@ -1,5 +1,5 @@ ---- ./third_party/libjingle/source/talk/base/ipaddress.h.orig 2014-04-30 22:44:03.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/ipaddress.h 2014-05-04 14:38:48.000000000 +0200 +--- ./third_party/libjingle/source/talk/base/ipaddress.h.orig 2014-08-12 21:03:39.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/ipaddress.h 2014-08-13 09:56:58.000000000 +0200 @@ -34,6 +34,9 @@ #include <arpa/inet.h> #include <netdb.h> diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc b/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc index 5407b03f8a06..bed02519389c 100644 --- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc +++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc @@ -1,5 +1,5 @@ ---- ./third_party/libjingle/source/talk/base/linux.cc.orig 2014-04-30 22:44:03.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/linux.cc 2014-05-04 14:38:48.000000000 +0200 +--- ./third_party/libjingle/source/talk/base/linux.cc.orig 2014-08-12 21:03:39.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/linux.cc 2014-08-13 09:56:58.000000000 +0200 @@ -25,7 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h b/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h index 5f54f2b294c0..6154553b011f 100644 --- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h +++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h @@ -1,5 +1,5 @@ ---- ./third_party/libjingle/source/talk/base/linux.h.orig 2014-04-30 22:44:03.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/linux.h 2014-05-04 14:38:48.000000000 +0200 +--- ./third_party/libjingle/source/talk/base/linux.h.orig 2014-08-12 21:03:34.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/linux.h 2014-08-13 09:56:58.000000000 +0200 @@ -28,7 +28,7 @@ #ifndef TALK_BASE_LINUX_H_ #define TALK_BASE_LINUX_H_ diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h b/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h index d1c3b2df0e90..fb4f69f74e95 100644 --- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h +++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h @@ -1,5 +1,5 @@ ---- ./third_party/libjingle/source/talk/base/network.h.orig 2014-04-30 22:44:03.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/network.h 2014-05-04 14:38:48.000000000 +0200 +--- ./third_party/libjingle/source/talk/base/network.h.orig 2014-08-12 21:03:39.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/network.h 2014-08-13 09:56:58.000000000 +0200 @@ -38,6 +38,10 @@ #include "talk/base/messagehandler.h" #include "talk/base/sigslot.h" diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc b/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc index 7e32282e8be0..bb1a7c467ba2 100644 --- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc +++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc @@ -1,5 +1,5 @@ ---- ./third_party/libjingle/source/talk/base/systeminfo.cc.orig 2014-04-30 22:44:03.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/systeminfo.cc 2014-05-04 20:37:54.000000000 +0200 +--- ./third_party/libjingle/source/talk/base/systeminfo.cc.orig 2014-08-12 21:03:39.000000000 +0200 ++++ ./third_party/libjingle/source/talk/base/systeminfo.cc 2014-08-13 09:56:58.000000000 +0200 @@ -36,8 +36,12 @@ #elif defined(OSX) #include <ApplicationServices/ApplicationServices.h> diff --git a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp new file mode 100644 index 000000000000..d6525b6ee5ff --- /dev/null +++ b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp @@ -0,0 +1,11 @@ +--- third_party/libjpeg_turbo/libjpeg.gyp.orig 2014-07-15 21:03:36.000000000 +0200 ++++ third_party/libjpeg_turbo/libjpeg.gyp 2014-08-12 22:43:14.000000000 +0200 +@@ -245,7 +245,7 @@ + ], + }, + }], +- [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and target_arch!="arm")', { ++ [ 'OS=="linux" or os_bsd==1 or (OS=="android" and target_arch!="arm")', { + 'conditions': [ + [ 'use_system_yasm==0', { + 'dependencies': [ diff --git a/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp b/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp new file mode 100644 index 000000000000..8fbe5ffb0cc1 --- /dev/null +++ b/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp @@ -0,0 +1,10 @@ +--- ./third_party/libphonenumber/libphonenumber.gyp.orig 2014-08-12 21:02:49.000000000 +0200 ++++ ./third_party/libphonenumber/libphonenumber.gyp 2014-08-13 09:56:58.000000000 +0200 +@@ -11,6 +11,7 @@ + # generated protocol headers to be available with "phonenumbers" include + # path, e.g. #include "phonenumbers/foo.pb.h". + '<(SHARED_INTERMEDIATE_DIR)/protoc_out/third_party/libphonenumber', ++ '<(prefix_dir)/include', + ], + 'defines': [ + 'I18N_PHONENUMBERS_USE_ICU_REGEXP=1', diff --git a/www/chromium/files/patch-third_party__libusb__libusb.gyp b/www/chromium/files/patch-third_party__libusb__libusb.gyp deleted file mode 100644 index 1f2dec9b49d4..000000000000 --- a/www/chromium/files/patch-third_party__libusb__libusb.gyp +++ /dev/null @@ -1,22 +0,0 @@ ---- ./third_party/libusb/libusb.gyp.orig 2014-04-30 22:43:13.000000000 +0200 -+++ ./third_party/libusb/libusb.gyp 2014-05-04 14:38:48.000000000 +0200 -@@ -93,6 +93,19 @@ - ], - 'msvs_disabled_warnings': [ 4267 ], - }], -+ ['OS == "freebsd"', { -+ 'type': 'none', -+ 'sources/': [ -+ ['exclude', '^src/libusb/'], -+ ], -+ 'direct_dependent_settings': { -+ 'link_settings': { -+ 'libraries': [ -+ '-lusb', -+ ], -+ }, -+ }, -+ }], - ], - }, - ], diff --git a/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh b/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh index 080c54491218..bff7f4e20d65 100644 --- a/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh +++ b/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh @@ -1,12 +1,12 @@ ---- ./third_party/libvpx/unpack_lib_posix.sh.orig 2014-04-30 22:43:59.000000000 +0200 -+++ ./third_party/libvpx/unpack_lib_posix.sh 2014-05-04 14:38:49.000000000 +0200 +--- ./third_party/libvpx/unpack_lib_posix.sh.orig 2014-08-12 21:03:39.000000000 +0200 ++++ ./third_party/libvpx/unpack_lib_posix.sh 2014-08-13 09:56:58.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/usr/bin/env bash # # Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be -@@ -52,16 +52,12 @@ +@@ -54,16 +54,12 @@ fi fi diff --git a/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h b/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h index a6b2081ab8d8..9ac2433f8fc7 100644 --- a/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h +++ b/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h @@ -1,5 +1,5 @@ ---- ./third_party/ots/include/opentype-sanitiser.h.orig 2014-04-30 22:43:54.000000000 +0200 -+++ ./third_party/ots/include/opentype-sanitiser.h 2014-05-04 14:38:49.000000000 +0200 +--- ./third_party/ots/include/opentype-sanitiser.h.orig 2014-08-12 21:03:34.000000000 +0200 ++++ ./third_party/ots/include/opentype-sanitiser.h 2014-08-13 09:56:58.000000000 +0200 @@ -22,6 +22,7 @@ #else #include <arpa/inet.h> diff --git a/www/chromium/files/patch-third_party__sfntly__sfntly.gyp b/www/chromium/files/patch-third_party__sfntly__sfntly.gyp new file mode 100644 index 000000000000..cc5a6729cad9 --- /dev/null +++ b/www/chromium/files/patch-third_party__sfntly__sfntly.gyp @@ -0,0 +1,11 @@ +--- ./third_party/sfntly/sfntly.gyp.orig 2014-08-12 21:02:45.000000000 +0200 ++++ ./third_party/sfntly/sfntly.gyp 2014-08-13 09:56:59.000000000 +0200 +@@ -126,7 +126,7 @@ + 'cpp/src/sample/chromium/subsetter_impl.h', + ], + 'include_dirs': [ +- 'cpp/src', '../..', ++ 'cpp/src', '../..', '<(prefix_dir)/include', + ], + # This macro must be define to suppress the use of exception + 'defines': [ diff --git a/www/chromium/files/patch-third_party__sqlite__sqlite.gyp b/www/chromium/files/patch-third_party__sqlite__sqlite.gyp new file mode 100644 index 000000000000..9b44c36320cf --- /dev/null +++ b/www/chromium/files/patch-third_party__sqlite__sqlite.gyp @@ -0,0 +1,11 @@ +--- ./third_party/sqlite/sqlite.gyp.orig 2014-08-12 21:02:44.000000000 +0200 ++++ ./third_party/sqlite/sqlite.gyp 2014-08-13 09:56:59.000000000 +0200 +@@ -105,6 +105,8 @@ + 'amalgamation', + # Needed for fts2 to build. + 'src/src', ++ # FreeBSD ... ++ '<(prefix_dir)/include', + ], + 'dependencies': [ + '../icu/icu.gyp:icui18n', diff --git a/www/chromium/files/patch-third_party__webrtc__build__common.gypi b/www/chromium/files/patch-third_party__webrtc__build__common.gypi index 4e3abfc4af13..3772a5d2cb48 100644 --- a/www/chromium/files/patch-third_party__webrtc__build__common.gypi +++ b/www/chromium/files/patch-third_party__webrtc__build__common.gypi @@ -1,6 +1,6 @@ ---- ./third_party/webrtc/build/common.gypi.orig 2014-04-30 22:44:26.000000000 +0200 -+++ ./third_party/webrtc/build/common.gypi 2014-05-04 14:38:49.000000000 +0200 -@@ -287,6 +287,13 @@ +--- ./third_party/webrtc/build/common.gypi.orig 2014-08-12 21:04:14.000000000 +0200 ++++ ./third_party/webrtc/build/common.gypi 2014-08-13 09:56:59.000000000 +0200 +@@ -286,6 +286,13 @@ 'WEBRTC_LINUX', ], }], diff --git a/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi b/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi index 7ff46767eb6b..9edd59bf3f30 100644 --- a/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi +++ b/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi @@ -1,5 +1,5 @@ ---- ./third_party/webrtc/modules/audio_device/audio_device.gypi.orig 2014-04-30 22:44:08.000000000 +0200 -+++ ./third_party/webrtc/modules/audio_device/audio_device.gypi 2014-05-04 14:38:49.000000000 +0200 +--- ./third_party/webrtc/modules/audio_device/audio_device.gypi.orig 2014-08-12 21:03:58.000000000 +0200 ++++ ./third_party/webrtc/modules/audio_device/audio_device.gypi 2014-08-13 09:56:59.000000000 +0200 @@ -47,7 +47,7 @@ 'dummy/audio_device_utility_dummy.h', ], diff --git a/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi b/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi index 3dc82226c0ec..8087edfaed5b 100644 --- a/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi +++ b/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi @@ -1,6 +1,6 @@ ---- ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig 2014-04-30 22:44:20.000000000 +0200 -+++ ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi 2014-05-04 14:38:49.000000000 +0200 -@@ -101,6 +101,11 @@ +--- ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig 2014-08-12 21:04:10.000000000 +0200 ++++ ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi 2014-08-13 09:57:00.000000000 +0200 +@@ -107,6 +107,11 @@ ], }, }], diff --git a/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc b/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc index 3bac881ddf78..965514b0e932 100644 --- a/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc +++ b/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc @@ -1,5 +1,5 @@ ---- ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2014-04-30 22:44:21.000000000 +0200 -+++ ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc 2014-05-04 14:38:49.000000000 +0200 +--- ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2014-08-12 21:04:11.000000000 +0200 ++++ ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc 2014-08-13 09:57:00.000000000 +0200 @@ -15,6 +15,7 @@ #include <string.h> diff --git a/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc b/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc index 33c61da18b65..b57a60708258 100644 --- a/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc +++ b/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc @@ -1,17 +1,13 @@ ---- third_party/webrtc/modules/video_coding/main/source/receiver.cc.orig 2014-05-14 21:24:36.000000000 +0200 -+++ third_party/webrtc/modules/video_coding/main/source/receiver.cc 2014-05-21 23:46:49.000000000 +0200 -@@ -158,12 +158,12 @@ +--- ./third_party/webrtc/modules/video_coding/main/source/receiver.cc.orig 2014-08-12 21:04:10.000000000 +0200 ++++ ./third_party/webrtc/modules/video_coding/main/source/receiver.cc 2014-08-13 09:57:00.000000000 +0200 +@@ -134,8 +134,8 @@ // Assume that render timing errors are due to changes in the video stream. if (next_render_time_ms < 0) { timing_error = true; - } else if (std::abs(next_render_time_ms - now_ms) > max_video_delay_ms_) { +- int frame_delay = static_cast<int>(std::abs(next_render_time_ms - now_ms)); + } else if (std::labs(next_render_time_ms - now_ms) > max_video_delay_ms_) { - WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideoCoding, - VCMId(vcm_id_, receiver_id_), - "This frame is out of our delay bounds, resetting jitter " - "buffer: %d > %d", -- static_cast<int>(std::abs(next_render_time_ms - now_ms)), -+ static_cast<int>(std::labs(next_render_time_ms - now_ms)), - max_video_delay_ms_); - timing_error = true; - } else if (static_cast<int>(timing_->TargetVideoDelay()) > ++ int frame_delay = static_cast<int>(std::labs(next_render_time_ms - now_ms)); + LOG(LS_WARNING) << "A frame about to be decoded is out of the configured " + << "delay bounds (" << frame_delay << " > " + << max_video_delay_ms_ diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc index 1e8d71f4eac1..af5095ac26df 100644 --- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc +++ b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc @@ -1,5 +1,5 @@ ---- ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig 2014-04-30 22:44:26.000000000 +0200 -+++ ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc 2014-05-04 14:38:49.000000000 +0200 +--- ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig 2014-08-12 21:04:15.000000000 +0200 ++++ ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc 2014-08-13 09:57:00.000000000 +0200 @@ -12,7 +12,11 @@ #include <assert.h> diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc index b1c672b2b28c..a8b927db0e05 100644 --- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc +++ b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc @@ -1,5 +1,5 @@ ---- ./third_party/webrtc/system_wrappers/source/cpu_info.cc.orig 2014-04-30 22:44:26.000000000 +0200 -+++ ./third_party/webrtc/system_wrappers/source/cpu_info.cc 2014-05-04 14:38:49.000000000 +0200 +--- ./third_party/webrtc/system_wrappers/source/cpu_info.cc.orig 2014-08-12 21:04:15.000000000 +0200 ++++ ./third_party/webrtc/system_wrappers/source/cpu_info.cc 2014-08-13 09:57:00.000000000 +0200 @@ -12,7 +12,10 @@ #if defined(_WIN32) diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc index e28b49200887..89a773aa7995 100644 --- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc +++ b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc @@ -1,5 +1,5 @@ ---- ./third_party/webrtc/system_wrappers/source/thread_posix.cc.orig 2014-04-30 22:44:26.000000000 +0200 -+++ ./third_party/webrtc/system_wrappers/source/thread_posix.cc 2014-05-04 14:38:49.000000000 +0200 +--- ./third_party/webrtc/system_wrappers/source/thread_posix.cc.orig 2014-08-12 21:04:15.000000000 +0200 ++++ ./third_party/webrtc/system_wrappers/source/thread_posix.cc 2014-08-13 09:57:00.000000000 +0200 @@ -51,9 +51,11 @@ #include <string.h> // strncpy #include <unistd.h> diff --git a/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h b/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h index f781774af944..53065c58f01e 100644 --- a/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h +++ b/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h @@ -1,6 +1,6 @@ ---- ./third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2014-04-30 22:44:26.000000000 +0200 -+++ ./third_party/webrtc/voice_engine/voice_engine_defines.h 2014-05-04 14:38:49.000000000 +0200 -@@ -233,7 +233,7 @@ +--- ./third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2014-08-12 21:04:14.000000000 +0200 ++++ ./third_party/webrtc/voice_engine/voice_engine_defines.h 2014-08-13 09:57:00.000000000 +0200 +@@ -237,7 +237,7 @@ #include <pthread.h> #include <sys/socket.h> #include <sys/types.h> diff --git a/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py b/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py index eae2ca7b8fe5..182d76eaa2f6 100644 --- a/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py +++ b/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py @@ -1,5 +1,5 @@ ---- ./tools/gyp/pylib/gyp/generator/make.py.orig 2014-04-30 22:44:16.000000000 +0200 -+++ ./tools/gyp/pylib/gyp/generator/make.py 2014-05-04 14:38:49.000000000 +0200 +--- ./tools/gyp/pylib/gyp/generator/make.py.orig 2014-08-12 21:03:54.000000000 +0200 ++++ ./tools/gyp/pylib/gyp/generator/make.py 2014-08-13 09:57:00.000000000 +0200 @@ -87,7 +87,7 @@ else: operating_system = flavor diff --git a/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp b/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp index 758f1cd22df6..0b12237b180d 100644 --- a/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp +++ b/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp @@ -1,5 +1,5 @@ ---- ./tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2014-04-30 22:44:27.000000000 +0200 -+++ ./tools/gyp/test/additional-targets/src/dir1/actions.gyp 2014-05-04 14:38:49.000000000 +0200 +--- ./tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2014-08-12 21:04:03.000000000 +0200 ++++ ./tools/gyp/test/additional-targets/src/dir1/actions.gyp 2014-08-13 09:57:00.000000000 +0200 @@ -47,7 +47,7 @@ }, ], diff --git a/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp b/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp index 046fb37604b1..a4d68943ca95 100644 --- a/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp +++ b/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp @@ -1,5 +1,5 @@ ---- ./tools/gyp/test/library/src/library.gyp.orig 2014-04-30 22:44:27.000000000 +0200 -+++ ./tools/gyp/test/library/src/library.gyp 2014-05-04 14:38:49.000000000 +0200 +--- ./tools/gyp/test/library/src/library.gyp.orig 2014-08-12 21:04:03.000000000 +0200 ++++ ./tools/gyp/test/library/src/library.gyp 2014-08-13 09:57:00.000000000 +0200 @@ -48,7 +48,7 @@ }, ], diff --git a/www/chromium/files/patch-ui__app_list__app_list_constants.cc b/www/chromium/files/patch-ui__app_list__app_list_constants.cc new file mode 100644 index 000000000000..171a3648f7ee --- /dev/null +++ b/www/chromium/files/patch-ui__app_list__app_list_constants.cc @@ -0,0 +1,11 @@ +--- ./ui/app_list/app_list_constants.cc.orig 2014-08-12 21:02:31.000000000 +0200 ++++ ./ui/app_list/app_list_constants.cc 2014-08-13 09:57:00.000000000 +0200 +@@ -81,7 +81,7 @@ + const ui::ResourceBundle::FontStyle kItemTextFontStyle = + ui::ResourceBundle::SmallBoldFont; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + #if defined(GOOGLE_CHROME_BUILD) + const char kAppListWMClass[] = "chrome_app_list"; + #else // CHROMIUM_BUILD diff --git a/www/chromium/files/patch-ui__app_list__app_list_constants.h b/www/chromium/files/patch-ui__app_list__app_list_constants.h new file mode 100644 index 000000000000..e65f5cee00fd --- /dev/null +++ b/www/chromium/files/patch-ui__app_list__app_list_constants.h @@ -0,0 +1,13 @@ +--- ./ui/app_list/app_list_constants.h.orig 2014-08-12 21:02:31.000000000 +0200 ++++ ./ui/app_list/app_list_constants.h 2014-08-13 09:57:00.000000000 +0200 +@@ -57,8 +57,8 @@ + + APP_LIST_EXPORT extern const ui::ResourceBundle::FontStyle kItemTextFontStyle; + +-#if defined(OS_LINUX) +-// The WM_CLASS name for the app launcher window on Linux. ++#if defined(OS_LINUX) || defined(OS_FREEBSD) ++// The WM_CLASS name for the app launcher window on Linux/FreeBSD. + APP_LIST_EXPORT extern const char kAppListWMClass[]; + #endif + diff --git a/www/chromium/files/patch-ui__base__ui_base.gyp b/www/chromium/files/patch-ui__base__ui_base.gyp new file mode 100644 index 000000000000..301d02481f8c --- /dev/null +++ b/www/chromium/files/patch-ui__base__ui_base.gyp @@ -0,0 +1,11 @@ +--- ./ui/base/ui_base.gyp.orig 2014-08-12 21:02:27.000000000 +0200 ++++ ./ui/base/ui_base.gyp 2014-08-13 09:57:00.000000000 +0200 +@@ -366,7 +366,7 @@ + 'x/selection_utils.h', + ] + }], +- ['use_aura==0 or OS!="linux"', { ++ ['use_aura==0 or (OS!="linux" and os_bsd!=1)', { + 'sources!': [ + 'resource/resource_bundle_auralinux.cc', + ], diff --git a/www/chromium/files/patch-ui__events__event_switches.cc b/www/chromium/files/patch-ui__events__event_switches.cc index 4b802135ae42..1276f53a21c9 100644 --- a/www/chromium/files/patch-ui__events__event_switches.cc +++ b/www/chromium/files/patch-ui__events__event_switches.cc @@ -1,8 +1,8 @@ ---- ./ui/events/event_switches.cc.orig 2014-04-30 22:42:57.000000000 +0200 -+++ ./ui/events/event_switches.cc 2014-05-04 14:38:49.000000000 +0200 -@@ -20,7 +20,7 @@ - // disabled: touch events are disabled. - const char kTouchEventsDisabled[] = "disabled"; +--- ./ui/events/event_switches.cc.orig 2014-08-12 21:02:29.000000000 +0200 ++++ ./ui/events/event_switches.cc 2014-08-13 09:57:00.000000000 +0200 +@@ -22,7 +22,7 @@ + // Use the unified gesture detector, instead of the aura gesture detector. + const char kUseUnifiedGestureDetector[] = "use-unified-gesture-detector"; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) diff --git a/www/chromium/files/patch-ui__events__event_switches.h b/www/chromium/files/patch-ui__events__event_switches.h index c64dbd03aea0..c42467768871 100644 --- a/www/chromium/files/patch-ui__events__event_switches.h +++ b/www/chromium/files/patch-ui__events__event_switches.h @@ -1,8 +1,8 @@ ---- ./ui/events/event_switches.h.orig 2014-04-30 22:42:57.000000000 +0200 -+++ ./ui/events/event_switches.h 2014-05-04 14:38:49.000000000 +0200 -@@ -16,7 +16,7 @@ - EVENTS_BASE_EXPORT extern const char kTouchEventsEnabled[]; +--- ./ui/events/event_switches.h.orig 2014-08-12 21:02:29.000000000 +0200 ++++ ./ui/events/event_switches.h 2014-08-13 09:57:00.000000000 +0200 +@@ -17,7 +17,7 @@ EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[]; + EVENTS_BASE_EXPORT extern const char kUseUnifiedGestureDetector[]; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) diff --git a/www/chromium/files/patch-ui__gl__gl.gyp b/www/chromium/files/patch-ui__gl__gl.gyp index c971af923cb0..168d7f969449 100644 --- a/www/chromium/files/patch-ui__gl__gl.gyp +++ b/www/chromium/files/patch-ui__gl__gl.gyp @@ -1,6 +1,6 @@ ---- ./ui/gl/gl.gyp.orig 2014-04-30 22:42:53.000000000 +0200 -+++ ./ui/gl/gl.gyp 2014-05-04 17:23:38.000000000 +0200 -@@ -171,7 +171,7 @@ +--- ./ui/gl/gl.gyp.orig 2014-08-12 21:02:27.000000000 +0200 ++++ ./ui/gl/gl.gyp 2014-08-13 09:57:00.000000000 +0200 +@@ -173,7 +173,7 @@ }, ], 'conditions': [ @@ -9,12 +9,12 @@ 'sources': [ 'egl_util.cc', 'egl_util.h', -@@ -190,7 +190,7 @@ +@@ -192,7 +192,7 @@ '<(DEPTH)/third_party/khronos', ], }], - ['OS in ("android", "linux")', { -+ ['OS in ("android", "linux", "freebsd")', { ++ ['OS in ("android", "linux", "freebsd", "openbsd")', { 'sources': [ 'gl_implementation_osmesa.cc', 'gl_implementation_osmesa.h', diff --git a/www/chromium/files/patch-ui__views__views.gyp b/www/chromium/files/patch-ui__views__views.gyp new file mode 100644 index 000000000000..315487821a53 --- /dev/null +++ b/www/chromium/files/patch-ui__views__views.gyp @@ -0,0 +1,11 @@ +--- ./ui/views/views.gyp.orig 2014-08-12 21:02:26.000000000 +0200 ++++ ./ui/views/views.gyp 2014-08-13 09:57:00.000000000 +0200 +@@ -461,7 +461,7 @@ + '../display/display.gyp:display_util', + ], + }], +- ['OS=="linux" and chromeos==0', { ++ ['(OS=="linux" or os_bsd==1) and chromeos==0', { + 'dependencies': [ + '../shell_dialogs/shell_dialogs.gyp:shell_dialogs', + ], diff --git a/www/chromium/files/patch-ui__views__views_delegate.cc b/www/chromium/files/patch-ui__views__views_delegate.cc new file mode 100644 index 000000000000..587202e80e68 --- /dev/null +++ b/www/chromium/files/patch-ui__views__views_delegate.cc @@ -0,0 +1,11 @@ +--- ./ui/views/views_delegate.cc.orig 2014-08-12 21:02:26.000000000 +0200 ++++ ./ui/views/views_delegate.cc 2014-08-13 09:57:00.000000000 +0200 +@@ -50,7 +50,7 @@ + bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { + return false; + } +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) + gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const { + return NULL; + } diff --git a/www/chromium/files/patch-ui__views__views_delegate.h b/www/chromium/files/patch-ui__views__views_delegate.h new file mode 100644 index 000000000000..13091850cd9e --- /dev/null +++ b/www/chromium/files/patch-ui__views__views_delegate.h @@ -0,0 +1,11 @@ +--- ./ui/views/views_delegate.h.orig 2014-08-12 21:02:26.000000000 +0200 ++++ ./ui/views/views_delegate.h 2014-08-13 09:57:00.000000000 +0200 +@@ -94,7 +94,7 @@ + // Returns true if the window passed in is in the Windows 8 metro + // environment. + virtual bool IsWindowInMetro(gfx::NativeWindow window) const; +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) + virtual gfx::ImageSkia* GetDefaultWindowIcon() const; + #endif + diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 6bb693397ad5..b8eaa77e768a 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -5,6 +5,7 @@ share/applications/chromium-browser.desktop %%DATADIR%%/chrome-wrapper %%DATADIR%%/chrome_100_percent.pak %%DATADIR%%/content_resources.pak +%%DATADIR%%/keyboard_resources.pak %%DATADIR%%/libffmpegsumo.so %%DATADIR%%/locales/am.pak %%DATADIR%%/locales/ar.pak @@ -59,35 +60,9 @@ share/applications/chromium-browser.desktop %%DATADIR%%/locales/vi.pak %%DATADIR%%/locales/zh-CN.pak %%DATADIR%%/locales/zh-TW.pak -%%DATADIR%%/product_logo_48.png -%%DATADIR%%/protoc +%%DATADIR%%/mksnapshot %%DATADIR%%/resources.pak %%DATADIR%%/resources/extension/demo/library.js -%%DATADIR%%/resources/inspector/accelerometer.css -%%DATADIR%%/resources/inspector/breakpointsList.css -%%DATADIR%%/resources/inspector/buildSystemOnly.js -%%DATADIR%%/resources/inspector/flameChart.css -%%DATADIR%%/resources/inspector/sidebarPane.css -%%DATADIR%%/resources/inspector/auditsPanel.css -%%DATADIR%%/resources/inspector/AuditsPanel.js -%%DATADIR%%/resources/inspector/breadcrumbList.css -%%DATADIR%%/resources/inspector/canvasProfiler.css -%%DATADIR%%/resources/inspector/cmdevtools.css -%%DATADIR%%/resources/inspector/codemirror.css -%%DATADIR%%/resources/inspector/CodeMirrorTextEditor.js -%%DATADIR%%/resources/inspector/ConsolePanel.js -%%DATADIR%%/resources/inspector/dataGrid.css -%%DATADIR%%/resources/inspector/devtools.html -%%DATADIR%%/resources/inspector/devtools_extension_api.js -%%DATADIR%%/resources/inspector/elementsPanel.css -%%DATADIR%%/resources/inspector/ElementsPanel.js -%%DATADIR%%/resources/inspector/ExtensionServer.js -%%DATADIR%%/resources/inspector/filter.css -%%DATADIR%%/resources/inspector/filteredItemSelectionDialog.css -%%DATADIR%%/resources/inspector/heapProfiler.css -%%DATADIR%%/resources/inspector/HeapSnapshotWorker.js -%%DATADIR%%/resources/inspector/helpScreen.css -%%DATADIR%%/resources/inspector/inspector.css %%DATADIR%%/resources/inspector/Images/addIcon.png %%DATADIR%%/resources/inspector/Images/applicationCache.png %%DATADIR%%/resources/inspector/Images/back.png @@ -148,39 +123,88 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/toolbarItemSelected.png %%DATADIR%%/resources/inspector/Images/trackHoriz.png %%DATADIR%%/resources/inspector/Images/trackVert.png +%%DATADIR%%/resources/inspector/Main.js +%%DATADIR%%/resources/inspector/accelerometer.css +%%DATADIR%%/resources/inspector/audits/AuditsPanel.js +%%DATADIR%%/resources/inspector/auditsPanel.css +%%DATADIR%%/resources/inspector/breadcrumbList.css +%%DATADIR%%/resources/inspector/breakpointsList.css +%%DATADIR%%/resources/inspector/buildSystemOnly.js +%%DATADIR%%/resources/inspector/canvasProfiler.css +%%DATADIR%%/resources/inspector/cmdevtools.css +%%DATADIR%%/resources/inspector/codemirror.css +%%DATADIR%%/resources/inspector/console/ConsolePanel.js +%%DATADIR%%/resources/inspector/dataGrid.css +%%DATADIR%%/resources/inspector/devices/DevicesView.js +%%DATADIR%%/resources/inspector/devicesView.css +%%DATADIR%%/resources/inspector/devtools.html +%%DATADIR%%/resources/inspector/devtools_extension_api.js +%%DATADIR%%/resources/inspector/elements/ElementsPanel.js +%%DATADIR%%/resources/inspector/elementsPanel.css +%%DATADIR%%/resources/inspector/extensions/ExtensionServer.js +%%DATADIR%%/resources/inspector/filter.css +%%DATADIR%%/resources/inspector/filteredItemSelectionDialog.css +%%DATADIR%%/resources/inspector/flameChart.css +%%DATADIR%%/resources/inspector/heapProfiler.css +%%DATADIR%%/resources/inspector/helpScreen.css %%DATADIR%%/resources/inspector/indexedDBViews.css +%%DATADIR%%/resources/inspector/inspector.css %%DATADIR%%/resources/inspector/inspectorCommon.css -%%DATADIR%%/resources/inspector/LayersPanel.js +%%DATADIR%%/resources/inspector/layers/LayersPanel.js %%DATADIR%%/resources/inspector/layersPanel.css -%%DATADIR%%/resources/inspector/Main.js %%DATADIR%%/resources/inspector/navigatorView.css +%%DATADIR%%/resources/inspector/network/NetworkPanel.js %%DATADIR%%/resources/inspector/networkLogView.css %%DATADIR%%/resources/inspector/networkPanel.css -%%DATADIR%%/resources/inspector/NetworkPanel.js %%DATADIR%%/resources/inspector/overrides.css %%DATADIR%%/resources/inspector/panelEnablerView.css +%%DATADIR%%/resources/inspector/profiler/ProfilesPanel.js +%%DATADIR%%/resources/inspector/profiler/heap_snapshot_worker/HeapSnapshotWorker.js %%DATADIR%%/resources/inspector/profilesPanel.css -%%DATADIR%%/resources/inspector/ProfilesPanel.js -%%DATADIR%%/resources/inspector/resourcesPanel.css -%%DATADIR%%/resources/inspector/ResourcesPanel.js %%DATADIR%%/resources/inspector/resourceView.css +%%DATADIR%%/resources/inspector/resources/ResourcesPanel.js +%%DATADIR%%/resources/inspector/resourcesPanel.css %%DATADIR%%/resources/inspector/revisionHistory.css -%%DATADIR%%/resources/inspector/ScriptFormatterWorker.js %%DATADIR%%/resources/inspector/screencastView.css +%%DATADIR%%/resources/inspector/script_formatter_worker/ScriptFormatterWorker.js +%%DATADIR%%/resources/inspector/search/AdvancedSearchView.js +%%DATADIR%%/resources/inspector/sidebarPane.css +%%DATADIR%%/resources/inspector/source_frame/SourceFrame.js +%%DATADIR%%/resources/inspector/sources/SourcesPanel.js %%DATADIR%%/resources/inspector/sourcesPanel.css -%%DATADIR%%/resources/inspector/SourcesPanel.js %%DATADIR%%/resources/inspector/sourcesView.css %%DATADIR%%/resources/inspector/spectrum.css %%DATADIR%%/resources/inspector/splitView.css -%%DATADIR%%/resources/inspector/TempStorageSharedWorker.js -%%DATADIR%%/resources/inspector/textPrompt.css +%%DATADIR%%/resources/inspector/suggestBox.css +%%DATADIR%%/resources/inspector/temp_storage_shared_worker/TempStorageSharedWorker.js +%%DATADIR%%/resources/inspector/timeline/TimelinePanel.js %%DATADIR%%/resources/inspector/timelinePanel.css -%%DATADIR%%/resources/inspector/TimelinePanel.js -%%DATADIR%%/xdg-settings -@dirrm %%DATADIR%%/locales -@dirrm %%DATADIR%%/resources/inspector/Images -@dirrm %%DATADIR%%/resources/inspector -@dirrm %%DATADIR%%/resources/extension/demo -@dirrm %%DATADIR%%/resources/extension -@dirrm %%DATADIR%%/resources -@dirrm %%DATADIR%% +share/icons/hicolor/128x128/apps/chrome.png +share/icons/hicolor/22x22/apps/chrome.png +share/icons/hicolor/24x24/apps/chrome.png +share/icons/hicolor/256x256/apps/chrome.png +share/icons/hicolor/48x48/apps/chrome.png +share/icons/hicolor/64x64/apps/chrome.png +@dirrmtry %%DATADIR%%/locales +@dirrmtry %%DATADIR%%/resources/extension/demo +@dirrmtry %%DATADIR%%/resources/extension +@dirrmtry %%DATADIR%%/resources/inspector/Images +@dirrmtry %%DATADIR%%/resources/inspector/audits +@dirrmtry %%DATADIR%%/resources/inspector/console +@dirrmtry %%DATADIR%%/resources/inspector/devices +@dirrmtry %%DATADIR%%/resources/inspector/elements +@dirrmtry %%DATADIR%%/resources/inspector/extensions +@dirrmtry %%DATADIR%%/resources/inspector/layers +@dirrmtry %%DATADIR%%/resources/inspector/network +@dirrmtry %%DATADIR%%/resources/inspector/profiler/heap_snapshot_worker +@dirrmtry %%DATADIR%%/resources/inspector/profiler +@dirrmtry %%DATADIR%%/resources/inspector/resources +@dirrmtry %%DATADIR%%/resources/inspector/script_formatter_worker +@dirrmtry %%DATADIR%%/resources/inspector/search +@dirrmtry %%DATADIR%%/resources/inspector/source_frame +@dirrmtry %%DATADIR%%/resources/inspector/sources +@dirrmtry %%DATADIR%%/resources/inspector/temp_storage_shared_worker +@dirrmtry %%DATADIR%%/resources/inspector/timeline +@dirrmtry %%DATADIR%%/resources/inspector +@dirrmtry %%DATADIR%%/resources +@dirrmtry %%DATADIR%% |