Index: branches/2015Q3/www/chromium/Makefile =================================================================== --- branches/2015Q3/www/chromium/Makefile (revision 393090) +++ branches/2015Q3/www/chromium/Makefile (revision 393091) @@ -1,386 +1,384 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 43.0.2357.134 +PORTVERSION= 44.0.2403.107 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on MAINTAINER= chromium@FreeBSD.org COMMENT= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi CFLAGS+= -isystem${LOCALBASE}/include -I${PREFIX}/include/atk-1.0 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}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}ply>0:${PORTSDIR}/devel/py-ply LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libdbus-1.so:${PORTSDIR}/devel/dbus \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ 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 \ libicuuc.so:${PORTSDIR}/devel/icu \ libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \ 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 \ droid-fonts-ttf>0:${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 jpeg pkgconfig \ perl5 shebangfix ninja tar:xz python:2,build execinfo CPE_VENDOR= google CPE_PRODUCT= chrome USE_PERL5= build USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst USE_GNOME= atk glib20 gtk20 dconf libxslt SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome INSTALLS_ICONS= yes #TODO bz@ : if you do undestand the gyp stuff, third_party/widevine/cdm/widevine_cdm.gyp talks about it (plz install libwidevinecdm.so) # See build/common.gypi for all the available variables. GYP_DEFINES+= \ clang_use_chrome_plugins=0 \ linux_breakpad=0 \ linux_use_heapchecker=0 \ linux_strip_binary=1 \ use_aura=1 \ test_isolation_mode=noop \ disable_nacl=1 \ enable_extensions=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} \ 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_nspr=1 \ use_system_protobuf=0 \ use_system_re2=1 \ use_system_snappy=1 \ use_system_speex=1 \ use_system_xdg_utils=1 \ use_system_yasm=1 \ v8_use_external_startup_data=0 # 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 . # Note: these are for FreeBSD use ONLY. For your own distribution, # please get your own set of keys. GYP_DEFINES+= google_api_key=AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8 \ google_default_client_id=996322985003.apps.googleusercontent.com \ google_default_client_secret=IR1za9-1VK0zZ0f_O8MVFicn SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO TEST KERBEROS DEBUG CODECS_DESC= Compile and enable patented codecs like H.264 OPTIONS_DEFAULT= CODECS GCONF KERBEROS GCONF_USE= GNOME=gconf2 PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} BROKEN_FreeBSD_8= Does not compile, missing locale .include .if ${PORT_OPTIONS:MCODECS} GYP_DEFINES+= ffmpeg_branding=Chrome GYP_DEFINES+= proprietary_codecs=1 .else GYP_DEFINES+= ffmpeg_branding=Chromium GYP_DEFINES+= proprietary_codecs=0 .endif .if ${PORT_OPTIONS:MGCONF} GYP_DEFINES+= use_gconf=1 .else GYP_DEFINES+= use_gconf=0 .endif .if ${PORT_OPTIONS:MPULSEAUDIO} GYP_DEFINES+= use_pulseaudio=1 .else GYP_DEFINES+= use_pulseaudio=0 .endif .if ! ${MACHINE_CPU:Msse2} GYP_DEFINES+= disable_sse2=1 .endif .if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libusb-pc .endif # pointed out by "Tomek" on freebsd-chromium@ .if !exists(/usr/lib/libexecinfo.so) CFLAGS+= -fno-omit-frame-pointer EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-ffmpeg .endif .if ${PORT_OPTIONS:MTEST} .include "Makefile.tests" ALL_TARGET+= ${TEST_TARGETS} .endif DEBUG_MAKE_ENV= V=1 .if ${PORT_OPTIONS:MDEBUG} BUILDTYPE= Debug .else BUILDTYPE= Release .endif CONFIGURE_ENV+= CC="${CC}" \ CXX="${CXX}" \ GYP_GENERATORS=ninja \ GYP_DEFINES="${GYP_DEFINES}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF="${LOCALBASE}/bin/gperf" MAKE_ARGS= -C out/${BUILDTYPE} .include .if ${CHOSEN_COMPILER_TYPE} == gcc GYP_DEFINES+= gcc_version=${CXX:S/g++//} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc CFLAGS+= -fno-stack-protector # gcc 4.8 cannot find __stack_chk_fail_local .else GYP_DEFINES+= clang=1 CFLAGS+= -Wno-unknown-warning-option EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang CONFIGURE_ENV+= AR=/usr/bin/ar .endif .if ! ${PORT_OPTIONS:MKERBEROS} GYP_DEFINES+= use_kerberos=0 .endif # according to portlint the below is passed via bsd.port.mk, # but 'make -V CONFIGURE_ENV' does not show it: CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="${LDFLAGS}" pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Chromium, you should have around 2 GB of memory" .if ${PORT_OPTIONS:MDEBUG} @${ECHO_MSG} "and lots of free diskspace (~ 8.5GB)." .else @${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}|" \ ${WRKSRC}/crypto/crypto.gyp \ ${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}/base/base.gyp 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/mock4js' \ '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/analytics' \ 'third_party/angle' \ 'third_party/angle/src/third_party' \ 'third_party/blanketjs' \ 'third_party/brotli' \ 'third_party/boringssl' \ 'third_party/cacheinvalidation' \ 'third_party/cld' \ 'third_party/cros_system_api' \ 'third_party/dom_distiller_js' \ 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \ 'third_party/ffmpeg' \ 'third_party/gardiner_mod' \ 'third_party/fips181' \ 'third_party/flot' \ 'third_party/google_input_tools' \ 'third_party/google_input_tools/third_party/closure_library' \ 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ - 'third_party/hunspell' \ + 'third_party/hunspell_new' \ '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/libvpx/source/libvpx/third_party/x86inc' \ '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/mojo' \ 'third_party/modp_b64' \ 'third_party/mt19937ar' \ 'third_party/npapi' \ 'third_party/openmax_dl' \ 'third_party/opus' \ 'third_party/ots' \ 'third_party/pdfium' \ 'third_party/pdfium/third_party' \ 'third_party/ply' \ 'third_party/polymer' \ 'third_party/protobuf' \ 'third_party/pywebsocket' \ 'third_party/qcms' \ 'third_party/qunit' \ 'third_party/readability' \ 'third_party/sfntly' \ 'third_party/sinonjs' \ 'third_party/skia' \ 'third_party/smhasher' \ 'third_party/sqlite' \ 'third_party/tcmalloc' \ 'third_party/tlslite' \ 'third_party/trace-viewer' \ 'third_party/trace-viewer/third_party' \ 'third_party/trace-viewer/third_party/tvcm/third_party' \ 'third_party/undoview' \ 'third_party/usrsctp' \ 'third_party/web-animations-js' \ 'third_party/webdriver' \ 'third_party/webrtc' \ 'third_party/widevine' \ 'third_party/x86inc' \ 'third_party/yasm' \ 'third_party/zlib' \ 'url/third_party/mozilla' \ 'v8/src/third_party/valgrind' \ 'v8/src/third_party/fdlibm' \ --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} \ ./build/gyp_chromium chrome/chrome.gyp --depth . test regression-test: build .for t in ${TEST_TARGETS} cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \ ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE} .endfor do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${STAGEDIR}${MANPREFIX}/man/man1 .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 ${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} ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \ ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \ ${STAGEDIR}${DATADIR}/mksnapshot .include Index: branches/2015Q3/www/chromium/distinfo =================================================================== --- branches/2015Q3/www/chromium/distinfo (revision 393090) +++ branches/2015Q3/www/chromium/distinfo (revision 393091) @@ -1,4 +1,4 @@ -SHA256 (chromium-43.0.2357.134.tar.xz) = d3a1bbe3e1445dfcf5ef4aff4b11a8f3770436c8b8954b7cc5fee5416f117659 -SIZE (chromium-43.0.2357.134.tar.xz) = 290976408 -SHA256 (chromium-43.0.2357.134-testdata.tar.xz) = f69b79d44e670ffc73f476e1d8e08d04a540c011ff1c7b6afbc76cdde88dfdeb -SIZE (chromium-43.0.2357.134-testdata.tar.xz) = 127570540 +SHA256 (chromium-44.0.2403.107.tar.xz) = d0634ffbe4f158010852fde3ee32aaf7bdf200932573fdf57328dd9ba5983d71 +SIZE (chromium-44.0.2403.107.tar.xz) = 292924752 +SHA256 (chromium-44.0.2403.107-testdata.tar.xz) = 43ba2f8df021fd1787cf4a96bb5068190905c21e0130db29a6d9e976176074c3 +SIZE (chromium-44.0.2403.107-testdata.tar.xz) = 128646184 Index: branches/2015Q3/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc (nonexistent) @@ -1,11 +0,0 @@ ---- content/renderer/pepper/usb_key_code_conversion.cc.orig 2014-10-10 08:54:14 UTC -+++ content/renderer/pepper/usb_key_code_conversion.cc -@@ -10,7 +10,7 @@ - - namespace content { - --#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_WIN) -+#if !((defined(OS_POSIX) && !defined(OS_ANDROID)) || defined(OS_WIN)) - - uint32_t UsbKeyCodeForKeyboardEvent(const WebKeyboardEvent& key_event) { - return 0; Property changes on: branches/2015Q3/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q3/www/chromium/files/patch-ui__events__keycodes__dom4__keycode_converter.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-ui__events__keycodes__dom4__keycode_converter.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-ui__events__keycodes__dom4__keycode_converter.cc (nonexistent) @@ -1,11 +0,0 @@ ---- ui/events/keycodes/dom4/keycode_converter.cc.orig 2015-04-14 18:19:00.000000000 -0400 -+++ ui/events/keycodes/dom4/keycode_converter.cc 2015-04-28 08:47:25.161132000 -0400 -@@ -15,7 +15,7 @@ - // and DOM Level 3 |code| strings. - #if defined(OS_WIN) - #define USB_KEYMAP(usb, xkb, win, mac, code, id) {usb, win, code} --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #define USB_KEYMAP(usb, xkb, win, mac, code, id) {usb, xkb, code} - #elif defined(OS_MACOSX) - #define USB_KEYMAP(usb, xkb, win, mac, code, id) {usb, mac, code} Property changes on: branches/2015Q3/www/chromium/files/patch-ui__events__keycodes__dom4__keycode_converter.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q3/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h =================================================================== --- branches/2015Q3/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h (nonexistent) @@ -1,29 +0,0 @@ ---- testing/gtest/include/gtest/internal/gtest-port.h.orig 2014-10-10 09:15:35 UTC -+++ testing/gtest/include/gtest/internal/gtest-port.h -@@ -343,6 +343,8 @@ - # define GTEST_OS_NACL 1 - #elif defined __OpenBSD__ - # define GTEST_OS_OPENBSD 1 -+#elif defined __FreeBSD__ -+# define GTEST_OS_FREEBSD 1 - #elif defined __QNX__ - # define GTEST_OS_QNX 1 - #endif // __CYGWIN__ -@@ -611,7 +613,7 @@ - // To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0 - // to your compiler flags. - # define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX \ -- || GTEST_OS_QNX) -+ || GTEST_OS_QNX || GTEST_OS_FREEBSD) - #endif // GTEST_HAS_PTHREAD - - #if GTEST_HAS_PTHREAD -@@ -791,7 +793,7 @@ - (GTEST_OS_MAC && !GTEST_OS_IOS) || GTEST_OS_IOS_SIMULATOR || \ - (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ - GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \ -- GTEST_OS_OPENBSD || GTEST_OS_QNX) -+ GTEST_OS_OPENBSD || GTEST_OS_FREEBSD || GTEST_OS_QNX) - # define GTEST_HAS_DEATH_TEST 1 - # include // NOLINT - #endif Property changes on: branches/2015Q3/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q3/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__Visitor.cpp =================================================================== --- branches/2015Q3/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__Visitor.cpp (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__Visitor.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/WebKit/Source/platform/heap/Visitor.cpp.orig 2015-04-19 21:39:50.000000000 +0200 -+++ third_party/WebKit/Source/platform/heap/Visitor.cpp 2015-04-19 21:40:31.000000000 +0200 -@@ -34,6 +34,8 @@ - #include "platform/heap/Handle.h" - #include "platform/heap/Heap.h" - -+#include -+ - namespace blink { - - // GCInfo indices start from 1 for heap objects, with 0 being treated Property changes on: branches/2015Q3/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__Visitor.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -LF \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q3/www/chromium/files/patch-chrome__browser__net__connection_tester.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-chrome__browser__net__connection_tester.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-chrome__browser__net__connection_tester.cc (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/browser/net/connection_tester.cc.orig 2014-10-10 09:15:30 UTC -+++ chrome/browser/net/connection_tester.cc -@@ -219,7 +219,7 @@ - // Otherwise returns a network error code. - int CreateSystemProxyConfigService( - scoped_ptr* config_service) { --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_BSD) - // TODO(eroman): This is not supported on Linux yet, because of how - // construction needs ot happen on the UI thread. - return net::ERR_NOT_IMPLEMENTED; Property changes on: branches/2015Q3/www/chromium/files/patch-chrome__browser__net__connection_tester.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q3/www/chromium/files/chrome.in =================================================================== --- branches/2015Q3/www/chromium/files/chrome.in (revision 393090) +++ branches/2015Q3/www/chromium/files/chrome.in (revision 393091) @@ -1,18 +1,18 @@ #!/bin/sh SYSCTL=kern.ipc.shm_allow_removed if [ "`/sbin/sysctl -n $SYSCTL`" = 0 ] ; then cat << EOMSG For correct operation, shared memory support has to be enabled in Chromium by performing the following command as root : sysctl $SYSCTL=1 To preserve this setting across reboots, append the following to /etc/sysctl.conf : $SYSCTL=1 EOMSG exit 1 fi -%%PREFIX%%/share/chromium/chrome "$@" +%%PREFIX%%/share/chromium/chrome $* Index: branches/2015Q3/www/chromium/files/extra-patch-clang =================================================================== --- branches/2015Q3/www/chromium/files/extra-patch-clang (revision 393090) +++ branches/2015Q3/www/chromium/files/extra-patch-clang (revision 393091) @@ -1,246 +1,246 @@ --- base/allocator/allocator_extension.cc 2015-04-15 00:18:47.000000000 +0200 +++ base/allocator/allocator_extension.cc 2015-04-18 21:44:25.000000000 +0200 @@ -35,20 +35,20 @@ void SetGetAllocatorWasteSizeFunction( thunks::GetAllocatorWasteSizeFunction get_allocator_waste_size_function) { DCHECK_EQ(thunks::GetGetAllocatorWasteSizeFunction(), - reinterpret_cast(NULL)); + static_cast(NULL)); thunks::SetGetAllocatorWasteSizeFunction(get_allocator_waste_size_function); } void SetGetStatsFunction(thunks::GetStatsFunction get_stats_function) { DCHECK_EQ(thunks::GetGetStatsFunction(), - reinterpret_cast(NULL)); + static_cast(NULL)); thunks::SetGetStatsFunction(get_stats_function); } void SetReleaseFreeMemoryFunction( thunks::ReleaseFreeMemoryFunction release_free_memory_function) { DCHECK_EQ(thunks::GetReleaseFreeMemoryFunction(), - reinterpret_cast(NULL)); + static_cast(NULL)); thunks::SetReleaseFreeMemoryFunction(release_free_memory_function); } --- base/strings/safe_sprintf_unittest.cc 2015-04-15 00:18:48.000000000 +0200 +++ base/strings/safe_sprintf_unittest.cc 2015-04-18 22:08:45.000000000 +0200 @@ -729,12 +729,14 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wconversion-null" #endif +/* Avoid compiler error: http://pastebin.com/1edWUE84 EXPECT_EQ(1, SafeSPrintf(buf, "%d", NULL)); EXPECT_EQ("0", std::string(buf)); EXPECT_EQ(3, SafeSPrintf(buf, "%p", NULL)); EXPECT_EQ("0x0", std::string(buf)); EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL)); EXPECT_EQ("", std::string(buf)); +*/ #if defined(__GCC__) #pragma GCC diagnostic pop #endif --- base/threading/thread_local_storage_unittest.cc 2015-04-15 00:18:48.000000000 +0200 +++ base/threading/thread_local_storage_unittest.cc 2015-04-18 21:45:40.000000000 +0200 @@ -60,7 +60,7 @@ void ThreadLocalStorageCleanup(void *value) { int *ptr = reinterpret_cast(value); // Destructors should never be called with a NULL. - ASSERT_NE(reinterpret_cast(NULL), ptr); + ASSERT_NE(static_cast(NULL), ptr); if (*ptr == kFinalTlsValue) return; // We've been called enough times. ASSERT_LT(kFinalTlsValue, *ptr); --- base/tracked_objects.cc 2015-04-15 00:31:20.000000000 +0200 +++ base/tracked_objects.cc 2015-04-18 21:57:33.000000000 +0200 @@ -393,7 +393,7 @@ } // We must NOT do any allocations during this callback. // Using the simple linked lists avoids all allocations. - DCHECK_EQ(this->next_retired_worker_, reinterpret_cast(NULL)); + DCHECK_EQ(this->next_retired_worker_, static_cast(NULL)); this->next_retired_worker_ = first_retired_worker_; first_retired_worker_ = this; } --- base/tracked_objects_unittest.cc 2015-04-15 00:31:20.000000000 +0200 +++ base/tracked_objects_unittest.cc 2015-04-18 22:01:28.000000000 +0200 @@ -58,9 +58,9 @@ Births* birth = ThreadData::TallyABirthIfActive(location); if (ThreadData::status() == ThreadData::DEACTIVATED) - EXPECT_EQ(reinterpret_cast(NULL), birth); + EXPECT_EQ(static_cast(NULL), birth); else - EXPECT_NE(reinterpret_cast(NULL), birth); + EXPECT_NE(static_cast(NULL), birth); } // Helper function to verify the most common test expectations. @@ -271,7 +271,7 @@ } scoped_ptr data(new DeathData()); - ASSERT_NE(data, reinterpret_cast(NULL)); + ASSERT_NE(data, static_cast(NULL)); EXPECT_EQ(data->run_duration_sum(), 0); EXPECT_EQ(data->run_duration_sample(), 0); EXPECT_EQ(data->queue_duration_sum(), 0); --- chrome/browser/sync/glue/synced_session_tracker.cc 2015-04-15 00:18:50.000000000 +0200 +++ chrome/browser/sync/glue/synced_session_tracker.cc 2015-04-18 22:02:15.000000000 +0200 @@ -260,7 +260,7 @@ } DCHECK(window_ptr); DCHECK_EQ(window_ptr->window_id.id(), window_id); - DCHECK_EQ(reinterpret_cast(NULL), + DCHECK_EQ(static_cast(NULL), GetSession(session_tag)->windows[window_id]); GetSession(session_tag)->windows[window_id] = window_ptr; } --- content/browser/frame_host/render_widget_host_view_guest.cc 2015-04-15 00:31:22.000000000 +0200 +++ content/browser/frame_host/render_widget_host_view_guest.cc 2015-04-18 22:10:28.000000000 +0200 @@ -241,11 +241,11 @@ gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const { if (!guest_) - return static_cast(NULL); + return reinterpret_cast(NULL); RenderWidgetHostView* rwhv = guest_->GetOwnerRenderWidgetHostView(); if (!rwhv) - return static_cast(NULL); + return reinterpret_cast(NULL); return rwhv->GetNativeViewId(); } --- media/audio/audio_output_proxy_unittest.cc 2015-04-15 00:18:55.000000000 +0200 +++ media/audio/audio_output_proxy_unittest.cc 2015-04-18 22:02:38.000000000 +0200 @@ -387,7 +387,7 @@ // |stream| is closed at this point. Start() should reopen it again. EXPECT_CALL(manager(), MakeAudioOutputStream(_, _)) .Times(2) - .WillRepeatedly(Return(reinterpret_cast(NULL))); + .WillRepeatedly(Return(static_cast(NULL))); EXPECT_CALL(callback_, OnError(_)) .Times(2); --- media/filters/decrypting_video_decoder_unittest.cc 2015-04-15 00:31:22.000000000 +0200 +++ media/filters/decrypting_video_decoder_unittest.cc 2015-04-18 22:03:40.000000000 +0200 @@ -420,7 +420,7 @@ // NULL callback to cancel the |decryptor_ready_cb|. EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback())).WillOnce( ResetAndRunCallback(&decryptor_ready_cb, - reinterpret_cast(NULL), + static_cast(NULL), base::Bind(&DecryptingVideoDecoderTest::DecryptorSet, base::Unretained(this)))); EXPECT_CALL(*this, DecryptorSet(_)).Times(0); ---- third_party/hunspell/src/hunspell/affentry.hxx 2015-04-15 00:31:35.000000000 +0200 -+++ third_party/hunspell/src/hunspell/affentry.hxx 2015-04-18 22:04:39.000000000 +0200 +--- third_party/hunspell_new/src/hunspell/affentry.hxx.orig 2015-07-21 18:46:37.322427000 -0400 ++++ third_party/hunspell_new/src/hunspell/affentry.hxx 2015-07-21 18:48:02.034251000 -0400 @@ -27,7 +27,7 @@ struct hentry * checkword(const char * word, int len, char in_compound, const FLAG needflag = FLAG_NULL); - struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL); + struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = 0); char * check_morph(const char * word, int len, char in_compound, const FLAG needflag = FLAG_NULL); @@ -90,7 +90,7 @@ // const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT); const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0); - struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL); + struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = 0); char * check_twosfx_morph(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); --- third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200 +++ third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200 @@ -439,7 +439,7 @@ } CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat0, cmap_id) { } @@ -563,7 +563,7 @@ : CMapTable::CMap::Builder(data ? down_cast( data->Slice(offset, data->ReadUShort( offset + Offset::kFormat0Length))) - : reinterpret_cast(NULL), + : static_cast(NULL), CMapFormat::kFormat2, cmap_id) { // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. } @@ -574,7 +574,7 @@ : CMapTable::CMap::Builder(data ? down_cast( data->Slice(offset, data->ReadUShort( offset + Offset::kFormat0Length))) - : reinterpret_cast(NULL), + : static_cast(NULL), CMapFormat::kFormat2, cmap_id) { // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. } @@ -958,7 +958,7 @@ CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments, IntegerList* glyph_id_array, const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat4, cmap_id), segments_(segments->begin(), segments->end()), glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) { @@ -966,7 +966,7 @@ } CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat4, cmap_id) { } --- third_party/webrtc/base/taskrunner.cc 2015-04-15 00:32:17.000000000 +0200 +++ third_party/webrtc/base/taskrunner.cc 2015-04-18 22:10:53.000000000 +0200 @@ -102,7 +102,7 @@ std::vector::iterator it; it = std::remove(tasks_.begin(), tasks_.end(), - reinterpret_cast(NULL)); + static_cast(NULL)); tasks_.erase(it, tasks_.end()); ---- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-04-15 00:32:17.000000000 +0200 -+++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-04-18 22:13:27.000000000 +0200 -@@ -961,7 +961,7 @@ +--- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc.orig 2015-07-21 18:53:32.511953000 -0400 ++++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-07-21 18:54:56.010341000 -0400 +@@ -989,7 +989,7 @@ const AudioEncoder* AudioCodingImpl::GetSenderInfo() const { FATAL() << "Not implemented yet."; - return reinterpret_cast(NULL); + return static_cast(NULL); } const CodecInst* AudioCodingImpl::GetSenderCodecInst() { -@@ -980,7 +980,7 @@ +@@ -1009,7 +1009,7 @@ const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const { FATAL() << "Not implemented yet."; - return reinterpret_cast(NULL); + return static_cast(NULL); } bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) { --- v8/src/runtime/runtime-i18n.cc 2015-04-15 00:32:37.000000000 +0200 +++ v8/src/runtime/runtime-i18n.cc 2015-04-18 22:06:17.000000000 +0200 @@ -627,7 +627,7 @@ local_object->SetInternalField(0, reinterpret_cast(break_iterator)); // Make sure that the pointer to adopted text is NULL. - local_object->SetInternalField(1, reinterpret_cast(NULL)); + local_object->SetInternalField(1, static_cast(NULL)); Factory* factory = isolate->factory(); Handle key = factory->NewStringFromStaticChars("breakIterator"); Index: branches/2015Q3/www/chromium/files/extra-patch-gcc =================================================================== --- branches/2015Q3/www/chromium/files/extra-patch-gcc (revision 393090) +++ branches/2015Q3/www/chromium/files/extra-patch-gcc (revision 393091) @@ -1,126 +1,137 @@ --- media/filters/file_data_source.h.orig 2011-09-14 10:01:06.000000000 +0200 +++ media/filters/file_data_source.h 2011-09-26 19:08:17.000000000 +0200 @@ -5,6 +5,7 @@ #ifndef MEDIA_FILTERS_FILE_DATA_SOURCE_H_ #define MEDIA_FILTERS_FILE_DATA_SOURCE_H_ +#include #include #include "base/files/file.h" --- content/public/common/child_process_sandbox_support_linux.h.orig 2013-10-11 19:30:28.000000000 +0200 +++ content/public/common/child_process_sandbox_support_linux.h 2013-10-16 15:29:00.000000000 +0200 @@ -7,6 +7,7 @@ #include #include +#include #include "content/common/content_export.h" --- third_party/ffmpeg/libavutil/cpu.c.orig 2013-11-16 01:26:14.000000000 +0100 +++ third_party/ffmpeg/libavutil/cpu.c 2013-11-19 00:24:53.000000000 +0100 @@ -24,6 +24,9 @@ #include "opt.h" #include "common.h" +/* TODO(rene) work around a compile error with GCC 4.6.4 on FreeBSD */ +#define __BSD_VISIBLE 1 + #if HAVE_SCHED_GETAFFINITY #ifndef _GNU_SOURCE # define _GNU_SOURCE --- content/browser/browser_shutdown_profile_dumper.cc.orig 2014-02-20 15:28:24.000000000 -0500 +++ content/browser/browser_shutdown_profile_dumper.cc 2014-03-03 15:36:33.000000000 -0500 @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include + #include "content/browser/browser_shutdown_profile_dumper.h" #include "base/base_switches.h" --- testing/perf/perf_test.cc 2014-03-03 12:59:30.000000000 -0500 +++ testing/perf/perf_test.cc.orig 2014-02-20 15:28:27.000000000 -0500 @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include + #include "testing/perf/perf_test.h" -#include - #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" --- ui/gfx/codec/jpeg_codec.cc.orig 2014-10-02 19:19:03.000000000 +0200 +++ ui/gfx/codec/jpeg_codec.cc 2014-10-05 22:38:28.000000000 +0200 @@ -13,6 +13,7 @@ extern "C" { #if defined(USE_SYSTEM_LIBJPEG) +#include #include #elif defined(USE_LIBJPEG_TURBO) #include "third_party/libjpeg_turbo/jpeglib.h" --- third_party/webrtc/common_audio/wav_file.h.orig 2014-10-17 02:57:34.000000000 +0200 +++ third_party/webrtc/common_audio/wav_file.h 2014-10-18 12:04:03.000000000 +0200 @@ -14,6 +14,7 @@ #ifdef __cplusplus #include +#include #include #include --- v8/src/base/platform/platform.h.orig 2015-01-27 03:22:59.000000000 +0100 +++ v8/src/base/platform/platform.h 2015-01-28 18:37:43.268781292 +0100 @@ -22,6 +22,7 @@ #define V8_BASE_PLATFORM_PLATFORM_H_ #include +#include #include #include --- v8/src/compiler/graph-visualizer.cc.orig 2015-04-28 22:29:10.000000000 +0200 +++ v8/src/compiler/graph-visualizer.cc 2015-05-02 21:01:32.086593000 +0200 @@ -5,6 +5,7 @@ #include "src/compiler/graph-visualizer.h" #include +#include #include #include "src/code-stubs.h" @@ -25,7 +26,7 @@ namespace compiler { -FILE* OpenVisualizerLogFile(CompilationInfo* info, const char* phase, +std::FILE* OpenVisualizerLogFile(CompilationInfo* info, const char* phase, const char* suffix, const char* mode) { EmbeddedVector filename; SmartArrayPointer function_name; ---- v8/src/compiler/graph-visualizer.h.orig 2015-04-28 22:29:10.000000000 +0200 -+++ v8/src/compiler/graph-visualizer.h 2015-05-02 21:34:40.659733000 +0200 -@@ -5,6 +5,7 @@ +--- third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c.orig 2015-07-24 22:27:11.000000000 +0200 ++++ third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c 2015-07-26 17:38:40.937606000 +0200 +@@ -37,6 +37,7 @@ + #if HAVE_SYS_PARAM_H + #include + #endif ++#define __BSD_VISIBLE 1 + #include + #include + #endif +--- v8/src/compiler/graph-visualizer.h.orig 2015-07-24 22:28:03.000000000 +0200 ++++ v8/src/compiler/graph-visualizer.h 2015-07-26 18:37:45.488253000 +0200 +@@ -5,7 +5,7 @@ #ifndef V8_COMPILER_GRAPH_VISUALIZER_H_ #define V8_COMPILER_GRAPH_VISUALIZER_H_ +-#include +#include #include namespace v8 { -@@ -20,7 +21,7 @@ +@@ -21,7 +21,7 @@ class Schedule; class SourcePositionTable; -FILE* OpenVisualizerLogFile(CompilationInfo* info, const char* phase, +std::FILE* OpenVisualizerLogFile(CompilationInfo* info, const char* phase, const char* suffix, const char* mode); struct AsDOT { Index: branches/2015Q3/www/chromium/files/patch-base__process__memory_unittest.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-base__process__memory_unittest.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-base__process__memory_unittest.cc (revision 393091) @@ -1,20 +1,23 @@ ---- base/process/memory_unittest.cc.orig 2014-10-10 09:15:29 UTC -+++ base/process/memory_unittest.cc -@@ -160,9 +160,9 @@ +--- base/process/memory_unittest.cc.orig 2015-07-15 16:29:55.000000000 -0400 ++++ base/process/memory_unittest.cc 2015-07-21 19:03:40.407090000 -0400 +@@ -127,11 +127,11 @@ + #endif // defined(OS_MACOSX) // 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 do not support these tests either. +-// OutOfMemoryTest cases. OpenBSD does not support these tests either. ++// OutOfMemoryTest cases. OpenBSD and FreeBSD do not support these tests either. + // Don't test these on ASan/TSan/MSan configurations: only test the real + // allocator. // 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) +-#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(OS_WIN) && \ ++#if !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(OS_WIN) && \ + !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) #if defined(USE_TCMALLOC) -@@ -448,4 +448,4 @@ +@@ -415,5 +415,5 @@ EXPECT_TRUE(value_ == NULL); } #endif // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) --#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(OS_WIN) +-#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(OS_WIN) && +#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(OS_WIN) + // !defined(ADDRESS_SANITIZER) Index: branches/2015Q3/www/chromium/files/patch-base__sys_info_freebsd.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-base__sys_info_freebsd.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-base__sys_info_freebsd.cc (revision 393091) @@ -1,56 +1,56 @@ ---- base/sys_info_freebsd.cc.orig 2014-10-10 08:54:09 UTC -+++ base/sys_info_freebsd.cc +--- base/sys_info_freebsd.cc.orig 2015-07-15 16:29:55.000000000 -0400 ++++ base/sys_info_freebsd.cc 2015-07-21 20:50:15.595303000 -0400 @@ -4,6 +4,7 @@ #include "base/sys_info.h" +#include #include #include "base/logging.h" @@ -23,6 +24,19 @@ } // static +int64 SysInfo::AmountOfAvailablePhysicalMemory() { + int available_pages, page_size; + size_t size = sizeof(available_pages); + sysctlbyname("vm.stats.vm.v_free_count", &available_pages, &size, NULL, 0); + sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); + if (available_pages == -1 || page_size == -1) { + NOTREACHED(); + return 0; + } + return static_cast(available_pages) * page_size; +} + +// static - size_t SysInfo::MaxSharedMemorySize() { + uint64 SysInfo::MaxSharedMemorySize() { size_t limit; size_t size = sizeof(limit); @@ -33,4 +47,25 @@ - return limit; + return static_cast(limit); } +// static +std::string SysInfo::CPUModelName() { + int mib[] = { CTL_HW, HW_MODEL }; + char name[256]; + size_t size = arraysize(name); + if (sysctl(mib, arraysize(mib), &name, &size, NULL, 0) == 0) + return name; + return std::string(); +} + +int SysInfo::NumberOfProcessors() { + int mib[] = { CTL_HW, HW_NCPU }; + int ncpu; + size_t size = sizeof(ncpu); + if (sysctl(mib, arraysize(mib), &ncpu, &size, NULL, 0) == -1) { + NOTREACHED(); + return 1; + } + return ncpu; +} + } // namespace base Index: branches/2015Q3/www/chromium/files/patch-build__common.gypi =================================================================== --- branches/2015Q3/www/chromium/files/patch-build__common.gypi (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-build__common.gypi (revision 393091) @@ -1,63 +1,76 @@ ---- build/common.gypi.orig 2015-04-18 22:35:23.000000000 +0200 -+++ build/common.gypi 2015-04-18 22:42:51.000000000 +0200 -@@ -94,7 +94,7 @@ +--- build/common.gypi.orig 2015-07-15 16:29:56.000000000 -0400 ++++ build/common.gypi 2015-07-22 18:47:32.413623000 -0400 +@@ -97,7 +97,7 @@ 'conditions': [ # ChromeOS and Windows use Aura and Ash. - ['chromeos==1 or OS=="win" or OS=="linux"', { + ['chromeos==1 or OS=="win" or OS=="linux" or OS=="freebsd"', { 'use_ash%': 1, 'use_aura%': 1, }], -@@ -694,7 +694,7 @@ +@@ -676,7 +676,7 @@ + # Whether the entire browser uses toolkit-views on Mac instead of Cocoa. + 'mac_views_browser%': 0, + +- # By default, use ICU data file (icudtl.dat). ++ # By default, use ICU data file (icudtl.dat) + 'icu_use_data_file_flag%': 1, + + # Turn on JNI generation optimizations by default. +@@ -697,6 +697,12 @@ + 'os_bsd%': 0, }], ++ ['OS=="freebsd" or OS=="openbsd"', { ++ 'icu_use_data_file_flag%': 0, ++ }, { ++ 'icu_use_data_file_flag%': 1, ++ }], ++ + # NSS usage. + ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris")', { + 'use_nss_certs%': 1, +@@ -735,7 +741,7 @@ + }], + # DBus usage. - ['OS=="linux" and embedded==0', { + ['(OS=="linux" or OS=="freebsd") and embedded==0', { 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -944,7 +944,7 @@ +@@ -986,7 +992,7 @@ }, { 'use_openmax_dl_fft%': 0, }], - ['OS=="win" or OS=="linux"', { + ['OS=="win" or OS=="linux" or OS=="freebsd"', { 'enable_mdns%' : 1, }], -@@ -968,7 +968,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, -@@ -1216,6 +1216,10 @@ +@@ -1248,6 +1254,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, + # XXX(rene) More options, keep them? + 'os_ver%': 0, + 'use_system_libjpeg%': 0, + # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -4479,6 +4483,13 @@ +@@ -4631,6 +4641,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], + 'ldflags!': [ + '-ldl', + '-pie' + ], + 'libraries!': [ + '-ldl', + ], }, }], # Android-specific options; note that most are set above with Linux. Index: branches/2015Q3/www/chromium/files/patch-chrome__browser__download__download_prefs.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-chrome__browser__download__download_prefs.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-chrome__browser__download__download_prefs.cc (revision 393091) @@ -1,65 +1,65 @@ ---- chrome/browser/download/download_prefs.cc.orig 2015-01-24 21:51:37 UTC -+++ chrome/browser/download/download_prefs.cc +--- chrome/browser/download/download_prefs.cc.orig 2015-07-15 16:29:57.000000000 -0400 ++++ chrome/browser/download/download_prefs.cc 2015-07-21 21:27:54.085299000 -0400 @@ -51,7 +51,7 @@ // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; @@ -131,7 +131,7 @@ GetDefaultDownloadDirectoryForProfile())); #endif // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ (defined(OS_MACOSX) && !defined(OS_IOS)) should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); -@@ -205,7 +205,7 @@ - prefs::kSaveFileDefaultDirectory, - default_download_path, - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); +@@ -208,7 +208,7 @@ + default_download_path); + registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, + default_download_path); -#if defined(OS_WIN) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ (defined(OS_MACOSX) && !defined(OS_IOS)) - registry->RegisterBooleanPref( - prefs::kOpenPdfDownloadInSystemReader, + registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); + #endif @@ -286,7 +286,7 @@ } bool DownloadPrefs::IsAutoOpenUsed() const { -#if defined(OS_WIN) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ (defined(OS_MACOSX) && !defined(OS_IOS)) if (ShouldOpenPdfInSystemReader()) return true; @@ -301,7 +301,7 @@ return false; DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); -#if defined(OS_WIN) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ (defined(OS_MACOSX) && !defined(OS_IOS)) if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader()) return true; -@@ -333,7 +333,7 @@ +@@ -335,7 +335,7 @@ SaveAutoOpenState(); } -#if defined(OS_WIN) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ (defined(OS_MACOSX) && !defined(OS_IOS)) void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) -@@ -355,7 +355,7 @@ +@@ -357,7 +357,7 @@ #endif void DownloadPrefs::ResetAutoOpen() { -#if defined(OS_WIN) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ (defined(OS_MACOSX) && !defined(OS_IOS)) SetShouldOpenPdfInSystemReader(false); #endif Index: branches/2015Q3/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc (revision 393091) @@ -1,11 +1,11 @@ ---- chrome/browser/net/cookie_store_util.cc.orig 2015-04-14 18:31:21.000000000 -0400 -+++ chrome/browser/net/cookie_store_util.cc 2015-04-28 10:11:34.004175000 -0400 -@@ -120,7 +120,7 @@ +--- chrome/browser/net/cookie_store_util.cc.orig 2015-07-21 21:42:54.358730000 -0400 ++++ chrome/browser/net/cookie_store_util.cc 2015-07-21 21:43:07.938330000 -0400 +@@ -85,7 +85,7 @@ new ChromeCookieMonsterDelegate(profile)); } -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) namespace { // Use the operating system's mechanisms to encrypt cookies before writing Index: branches/2015Q3/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc (revision 393091) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig 2015-04-14 18:31:21.000000000 -0400 -+++ chrome/browser/ui/toolbar/wrench_menu_model.cc 2015-04-28 09:58:56.258305000 -0400 -@@ -762,7 +762,7 @@ - #endif +--- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig 2015-07-15 16:29:58.000000000 -0400 ++++ chrome/browser/ui/toolbar/wrench_menu_model.cc 2015-07-21 21:50:51.697458000 -0400 +@@ -796,7 +796,7 @@ case IDC_UPGRADE_DIALOG: - return UpgradeDetector::GetInstance()->notify_upgrade(); + return browser_defaults::kShowUpgradeMenuItem && + UpgradeDetector::GetInstance()->notify_upgrade(); -#if !defined(OS_LINUX) || defined(USE_AURA) +#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA) case IDC_BOOKMARK_PAGE: return !chrome::ShouldRemoveBookmarkThisPageUI(browser_->profile()); case IDC_BOOKMARK_ALL_TABS: Index: branches/2015Q3/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h =================================================================== --- branches/2015Q3/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h (revision 393091) @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2015-01-21 20:28:16 UTC -+++ chrome/browser/ui/views/chrome_views_delegate.h -@@ -35,7 +35,7 @@ - #if defined(OS_WIN) - virtual HICON GetDefaultWindowIcon() const override; - virtual bool IsWindowInMetro(gfx::NativeWindow window) const override; +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2015-07-15 16:29:58.000000000 -0400 ++++ chrome/browser/ui/views/chrome_views_delegate.h 2015-07-21 21:54:27.828544000 -0400 +@@ -31,7 +31,7 @@ + HICON GetDefaultWindowIcon() const override; + HICON GetSmallWindowIcon() const override; + bool IsWindowInMetro(gfx::NativeWindow window) const override; -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) +#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) gfx::ImageSkia* GetDefaultWindowIcon() const override; #endif -@@ -48,7 +48,7 @@ +@@ -44,7 +44,7 @@ void OnBeforeWidgetInit( views::Widget::InitParams* params, views::internal::NativeWidgetDelegate* delegate) override; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) bool WindowManagerProvidesTitleBar(bool maximized) override; #endif - #if defined(USE_AURA) + ui::ContextFactory* GetContextFactory() override; Index: branches/2015Q3/www/chromium/files/patch-chrome__chrome_browser.gypi =================================================================== --- branches/2015Q3/www/chromium/files/patch-chrome__chrome_browser.gypi (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-chrome__chrome_browser.gypi (revision 393091) @@ -1,43 +1,43 @@ ---- chrome/chrome_browser.gypi.orig 2014-10-10 09:15:30 UTC -+++ chrome/chrome_browser.gypi -@@ -3123,7 +3123,7 @@ +--- chrome/chrome_browser.gypi.orig 2015-07-21 22:00:15.902799000 -0400 ++++ chrome/chrome_browser.gypi 2015-07-21 22:08:53.180707000 -0400 +@@ -3277,6 +3277,13 @@ + 'browser/download/download_dir_policy_handler.h', + ], + }], ++ ['os_bsd==1', { ++ 'sources/': [ ++ ['exclude', '^browser/chrome_browser_main_linux.cc'], ++ ['exclude', '^browser/chrome_browser_main_linux.h'], ++ ['exclude', '^browser/media_galleries/linux/'], ++ ], ++ }], + ['OS=="mac"', { + 'dependencies': [ + 'app_shim', +@@ -3416,7 +3423,7 @@ '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', ], }], - ['OS=="linux" and chromeos==0', { + ['(OS=="linux" and chromeos==0) or os_bsd==1', { 'dependencies': [ '../build/linux/system.gyp:libspeechd', ], -@@ -3180,7 +3180,7 @@ - }], - ], +@@ -3472,7 +3479,7 @@ + ['use_x11==1', { + 'sources': [ '<@(chrome_browser_x11_sources)' ], }], - ['os_posix == 1 and OS != "mac" and OS != "ios"', { + ['os_posix == 1 and OS != "mac" and OS != "ios" and os_bsd != 1', { 'sources': [ 'app/chrome_crash_reporter_client.cc', 'app/chrome_crash_reporter_client.h', -@@ -3267,6 +3267,13 @@ - }, { # Non-Android. - 'sources': [ '<@(chrome_browser_non_android_sources)' ], - }], -+ ['os_bsd==1', { -+ 'sources/': [ -+ ['exclude', '^browser/chrome_browser_main_linux.cc'], -+ ['exclude', '^browser/chrome_browser_main_linux.h'], -+ ['exclude', '^browser/media_galleries/linux/'], -+ ], -+ }], - ['OS=="mac"', { - 'dependencies': [ - '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', -@@ -3343,7 +3350,7 @@ +@@ -3667,7 +3674,7 @@ }], ], }], - ['OS=="linux"', { + ['OS=="linux" or os_bsd==1', { 'sources': [ '<@(chrome_browser_linux_sources)' ], 'conditions': [ ['use_aura==1', { Index: branches/2015Q3/www/chromium/files/patch-chrome__chrome_browser_ui.gypi =================================================================== --- branches/2015Q3/www/chromium/files/patch-chrome__chrome_browser_ui.gypi (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-chrome__chrome_browser_ui.gypi (revision 393091) @@ -1,42 +1,33 @@ ---- chrome/chrome_browser_ui.gypi.orig 2014-10-10 09:15:30 UTC -+++ chrome/chrome_browser_ui.gypi -@@ -2875,7 +2875,7 @@ +--- chrome/chrome_browser_ui.gypi.orig 2015-07-15 16:29:59.000000000 -0400 ++++ chrome/chrome_browser_ui.gypi 2015-07-21 22:40:24.997217000 -0400 +@@ -2922,7 +2922,7 @@ }], ], }], - ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', { + ['use_aura==1 and chromeos==0 and use_ozone==0 and (OS=="linux" or os_bsd==1)', { 'dependencies': [ # gtk2 is the only component that can interact with gtk2 in our new # world. -@@ -2883,7 +2883,7 @@ +@@ -2930,7 +2930,7 @@ '../build/linux/system.gyp:gio', ], }], - ['OS=="win" or OS=="mac" or desktop_linux==1', { + ['OS=="win" or OS=="mac" or desktop_linux==1 or os_bsd==1', { 'sources': [ '<@(chrome_browser_ui_desktop_sources)' ], }], ['use_aura==1', { -@@ -2918,7 +2918,7 @@ - ['enable_print_preview==1', { - 'sources': [ '<@(chrome_browser_ui_print_preview_sources)' ], - }], -- ['OS=="linux" or OS=="android"', { -+ ['OS=="linux" or OS=="android" or OS=="freebsd"', { - 'sources': [ '<@(chrome_browser_ui_android_linux_sources)' ], - }], - ['OS=="android"', { -@@ -3030,10 +3030,10 @@ +@@ -3083,10 +3083,10 @@ }], ], }], - ['desktop_linux==1', { + ['desktop_linux==1 or os_bsd==1', { 'sources': [ '<@(chrome_browser_ui_desktop_linux_sources)' ], }], - ['OS=="linux"', { # Both desktop Linux and ChromeOS. + ['OS=="linux" or OS=="freebsd"', { # Both desktop Linux and ChromeOS. 'sources': [ '<@(chrome_browser_ui_linux_sources)' ], 'conditions': [ ['use_aura==1', { Index: branches/2015Q3/www/chromium/files/patch-chrome__common__chrome_paths.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-chrome__common__chrome_paths.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-chrome__common__chrome_paths.cc (revision 393091) @@ -1,44 +1,53 @@ --- chrome/common/chrome_paths.cc.orig 2014-10-10 08:54:11 UTC +++ chrome/common/chrome_paths.cc -@@ -461,10 +461,12 @@ +@@ -198,7 +198,7 @@ + return false; + break; + case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + if (!GetUserDownloadsDirectorySafe(&cur)) + return false; + break; +@@ -488,10 +488,12 @@ if (!base::PathExists(cur)) // We don't want to create this return false; break; -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) +#if defined(OS_POSIX) && !defined(OS_MACOSX) case chrome::DIR_POLICY_FILES: { #if defined(GOOGLE_CHROME_BUILD) cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); +#elif defined(OS_BSD) + cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies")); #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -542,7 +544,7 @@ +@@ -557,7 +559,7 @@ #endif break; -#if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) +#if defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_MACOSX) && !defined(OS_IOS)) case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) #if defined(GOOGLE_CHROME_BUILD) -@@ -556,6 +558,9 @@ +@@ -571,6 +573,9 @@ #if defined(GOOGLE_CHROME_BUILD) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); +#elif defined(OS_BSD) + cur = base::FilePath(FILE_PATH_LITERAL( + "/usr/local/etc/chrome/native-messaging-hosts")); #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -568,7 +573,7 @@ +@@ -583,7 +588,7 @@ return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; -#endif // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) +#endif // defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_MACOSX) && !defined(OS_IOS)) #if !defined(OS_ANDROID) case chrome::DIR_GLOBAL_GCM_STORE: if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) Index: branches/2015Q3/www/chromium/files/patch-chrome__common__chrome_paths_internal.h =================================================================== --- branches/2015Q3/www/chromium/files/patch-chrome__common__chrome_paths_internal.h (nonexistent) +++ branches/2015Q3/www/chromium/files/patch-chrome__common__chrome_paths_internal.h (revision 393091) @@ -0,0 +1,11 @@ +--- chrome/common/chrome_paths_internal.h.orig 2015-07-18 16:46:40.033337000 -0400 ++++ chrome/common/chrome_paths_internal.h 2015-07-18 16:51:35.226378000 -0400 +@@ -39,7 +39,7 @@ + // Get the path to the user's documents directory. + bool GetUserDocumentsDirectory(base::FilePath* result); + +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + // Gets the path to a safe default download directory for a user. + bool GetUserDownloadsDirectorySafe(base::FilePath* result); + #endif Property changes on: branches/2015Q3/www/chromium/files/patch-chrome__common__chrome_paths_internal.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2015Q3/www/chromium/files/patch-content__browser__child_process_launcher.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-content__browser__child_process_launcher.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-content__browser__child_process_launcher.cc (revision 393091) @@ -1,80 +1,92 @@ --- content/browser/child_process_launcher.cc.orig 2015-05-13 18:23:06.000000000 -0400 +++ content/browser/child_process_launcher.cc 2015-05-20 11:55:38.781168000 -0400 -@@ -157,7 +157,7 @@ +@@ -111,7 +111,11 @@ + base::EnvironmentMap env = delegate->GetEnvironment(); + base::ScopedFD ipcfd = delegate->TakeIpcFd(); + #elif defined(OS_POSIX) && !defined(OS_ANDROID) ++#if !defined(OS_BSD) + bool use_zygote = delegate->ShouldUseZygote(); ++#else ++ bool use_zygote = false; ++#endif + base::EnvironmentMap env = delegate->GetEnvironment(); + base::ScopedFD ipcfd = delegate->TakeIpcFd(); + #endif +@@ -157,7 +161,7 @@ // We need to close the client end of the IPC channel to reliably detect // child termination. -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess( *cmd_line, child_process_id, files_to_register.get()); if (use_zygote) { -@@ -166,14 +166,14 @@ +@@ -166,14 +170,14 @@ process = base::Process(handle); } 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 = files_to_register->GetMappingWithIDAdjustment( base::GlobalDescriptors::kBaseDescriptor); -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) if (process_type == switches::kRendererProcess) { const int sandbox_fd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket(); -@@ -181,7 +181,7 @@ +@@ -181,7 +185,7 @@ sandbox_fd, GetSandboxFD())); } -#endif // defined(OS_MACOSX) +#endif // defined(OS_MACOSX) && !defined(OS_BSD) // Actually launch the app. base::LaunchOptions options; -@@ -254,13 +254,13 @@ +@@ -254,13 +258,13 @@ process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. #if defined(OS_POSIX) -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) if (zygote) { // If the renderer was created via a zygote, we have to proxy the reaping // through the zygote process. ZygoteHostImpl::GetInstance()->EnsureProcessTerminated(process.Handle()); } else -#endif // !OS_MACOSX +#endif // !OS_MACOSX && !OS_BSD base::EnsureProcessTerminated(process.Pass()); #endif // OS_POSIX #endif // defined(OS_ANDROID) -@@ -351,7 +351,7 @@ +@@ -351,7 +355,7 @@ void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) { DCHECK(CalledOnValidThread()); -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) if (zygote_) { termination_status_ = ZygoteHostImpl::GetInstance()-> GetTerminationStatus(process_.Handle(), known_dead, &exit_code_); -@@ -359,7 +359,7 @@ +@@ -359,7 +363,7 @@ termination_status_ = base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_); } else { -#elif defined(OS_MACOSX) +#elif defined(OS_MACOSX) || defined(OS_BSD) if (known_dead) { termination_status_ = base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_); -@@ -433,7 +433,7 @@ +@@ -433,7 +437,7 @@ starting_ = false; process_ = process.Pass(); -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) zygote_ = zygote; #endif if (process_.IsValid()) { Index: branches/2015Q3/www/chromium/files/patch-content__gpu__gpu_main.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-content__gpu__gpu_main.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-content__gpu__gpu_main.cc (revision 393091) @@ -1,45 +1,45 @@ ---- content/gpu/gpu_main.cc.orig 2015-04-19 00:48:39.000000000 +0200 -+++ content/gpu/gpu_main.cc 2015-04-19 00:51:41.000000000 +0200 -@@ -73,7 +73,7 @@ +--- content/gpu/gpu_main.cc.orig 2015-07-15 16:30:03.000000000 -0400 ++++ content/gpu/gpu_main.cc 2015-07-22 06:59:18.148443000 -0400 +@@ -81,7 +81,7 @@ const base::CommandLine& command_line); bool WarmUpSandbox(const base::CommandLine& command_line); -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) //XXX(rene) added !FreeBSD bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info); #endif -@@ -162,13 +162,13 @@ - message_loop_type = base::MessageLoop::TYPE_UI; - } - base::MessageLoop main_message_loop(message_loop_type); +@@ -163,13 +163,13 @@ + // Use a UI message loop because ANGLE and the desktop GL platform can + // create child windows to render to. + base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); -#elif defined(OS_LINUX) && defined(USE_X11) -+#elif (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) ++#elif (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11) // We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX // and https://crbug.com/326995. base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); scoped_ptr event_source = ui::PlatformEventSource::CreateDefault(); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT); #elif defined(OS_MACOSX) // This is necessary for CoreAnimation layers hosted in the GPU process to be -@@ -269,7 +269,7 @@ +@@ -274,7 +274,7 @@ // and we already registered them through SetGpuInfo() above. base::TimeTicks before_collect_context_graphics_info = base::TimeTicks::Now(); -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) //XXX(rene) added !FreeBSD if (!CollectGraphicsInfo(gpu_info)) dead_on_arrival = true; -@@ -402,7 +402,7 @@ +@@ -408,7 +408,7 @@ return true; } -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_FREEBSD)//XXX(rene) added !FreeBSD bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) { bool res = true; gpu::CollectInfoResult result = gpu::CollectContextGraphicsInfo(&gpu_info); Index: branches/2015Q3/www/chromium/files/patch-crypto__nss_util.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-crypto__nss_util.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-crypto__nss_util.cc (revision 393091) @@ -1,33 +1,33 @@ ---- crypto/nss_util.cc.orig 2014-10-10 08:54:15 UTC -+++ crypto/nss_util.cc +--- crypto/nss_util.cc.orig 2015-07-15 16:30:04.000000000 -0400 ++++ crypto/nss_util.cc 2015-07-22 07:15:16.577810000 -0400 @@ -13,7 +13,7 @@ #include #include -#if defined(OS_OPENBSD) +#if defined(OS_BSD) #include #include #endif -@@ -143,7 +143,7 @@ +@@ -146,7 +146,7 @@ // detection when database_dir is on NFS. See http://crbug.com/48585. // - // TODO(wtc): port this function to other USE_NSS platforms. It is defined --// only for OS_LINUX and OS_OPENBSD simply because the statfs structure -+// only for OS_LINUX and OS_BSD simply because the statfs structure + // TODO(wtc): port this function to other USE_NSS_CERTS platforms. It is +-// defined only for OS_LINUX and OS_OPENBSD simply because the statfs structure ++// defined only for OS_LINUX and OS_BSD simply because the statfs structure // is OS-specific. // // Because this function sets an environment variable it must be run before we -@@ -154,10 +154,10 @@ +@@ -157,10 +157,10 @@ base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN; if (base::GetFileSystemType(database_dir, &fs_type)) db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS); -#elif defined(OS_OPENBSD) +#elif defined(OS_BSD) struct statfs buf; if (statfs(database_dir.value().c_str(), &buf) == 0) - db_on_nfs = (strcmp(buf.f_fstypename, MOUNT_NFS) == 0); + db_on_nfs = (strcmp(buf.f_fstypename, "nfs") == 0); #else NOTIMPLEMENTED(); #endif Index: branches/2015Q3/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc (revision 393091) @@ -1,20 +1,29 @@ ---- device/serial/serial_io_handler_posix.cc.orig 2014-10-10 08:54:15 UTC -+++ device/serial/serial_io_handler_posix.cc -@@ -39,7 +39,7 @@ +--- device/serial/serial_io_handler_posix.cc.orig 2015-07-15 16:30:04.000000000 -0400 ++++ device/serial/serial_io_handler_posix.cc 2015-07-22 07:27:41.841184000 -0400 +@@ -61,7 +61,7 @@ BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) BITRATE_TO_SPEED_CASE(38400) --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) BITRATE_TO_SPEED_CASE(57600) BITRATE_TO_SPEED_CASE(115200) BITRATE_TO_SPEED_CASE(230400) -@@ -77,7 +77,7 @@ +@@ -99,7 +99,7 @@ SPEED_TO_BITRATE_CASE(9600) SPEED_TO_BITRATE_CASE(19200) SPEED_TO_BITRATE_CASE(38400) --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) SPEED_TO_BITRATE_CASE(57600) SPEED_TO_BITRATE_CASE(115200) SPEED_TO_BITRATE_CASE(230400) +@@ -131,7 +131,7 @@ + return false; + } + return true; +-#elif defined(OS_MACOSX) ++#elif defined(OS_MACOSX) || defined(OS_BSD) + speed_t speed = static_cast(bitrate); + cfsetispeed(config, speed); + cfsetospeed(config, speed); Index: branches/2015Q3/www/chromium/files/patch-device__usb__usb_context.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-device__usb__usb_context.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-device__usb__usb_context.cc (revision 393091) @@ -1,26 +1,26 @@ ---- device/usb/usb_context.cc.orig 2014-10-10 09:15:31 UTC -+++ device/usb/usb_context.cc -@@ -9,8 +9,13 @@ - #include "base/synchronization/waitable_event.h" +--- device/usb/usb_context.cc.orig 2015-07-15 16:30:04.000000000 -0400 ++++ device/usb/usb_context.cc 2015-07-22 07:32:40.938868000 -0400 +@@ -8,8 +8,13 @@ + #include "base/logging.h" #include "base/threading/platform_thread.h" #include "device/usb/usb_error.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 device { -@@ -43,7 +48,9 @@ +@@ -62,7 +67,9 @@ - UsbContext::UsbEventHandler::~UsbEventHandler() { + void UsbContext::UsbEventHandler::Stop() { base::subtle::Release_Store(&running_, 0); +#if !defined(OS_FREEBSD) // XXX(rene) not available in base version libusb_interrupt_handle_event(context_); +#endif - base::PlatformThread::Join(thread_handle_); } + UsbContext::UsbContext(PlatformUsbContext context) : context_(context) { Index: branches/2015Q3/www/chromium/files/patch-device__usb__usb_device_handle_impl.h =================================================================== --- branches/2015Q3/www/chromium/files/patch-device__usb__usb_device_handle_impl.h (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-device__usb__usb_device_handle_impl.h (revision 393091) @@ -1,15 +1,15 @@ ---- device/usb/usb_device_handle_impl.h.orig 2014-10-10 09:15:31 UTC -+++ device/usb/usb_device_handle_impl.h -@@ -14,7 +14,12 @@ +--- device/usb/usb_device_handle_impl.h.orig 2015-07-15 16:30:04.000000000 -0400 ++++ device/usb/usb_device_handle_impl.h 2015-07-22 07:35:03.384188000 -0400 +@@ -13,7 +13,12 @@ + #include "base/memory/ref_counted.h" #include "base/threading/thread_checker.h" #include "device/usb/usb_device_handle.h" - #include "net/base/io_buffer.h" +#if defined(OS_FREEBSD) +#include "libusb.h" +#define LIBUSB_CALL +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif namespace base { - class SingleThreadTaskRunner; + class SequencedTaskRunner; Index: branches/2015Q3/www/chromium/files/patch-device__usb__usb_service_impl.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-device__usb__usb_service_impl.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-device__usb__usb_service_impl.cc (revision 393091) @@ -1,42 +1,56 @@ ---- device/usb/usb_service_impl.cc.orig 2015-04-19 21:12:40.000000000 +0200 -+++ device/usb/usb_service_impl.cc 2015-04-19 21:16:15.000000000 +0200 -@@ -113,6 +113,7 @@ - hotplug_enabled_(false), +--- device/usb/usb_service_impl.cc.orig 2015-07-15 16:30:04.000000000 -0400 ++++ device/usb/usb_service_impl.cc 2015-07-22 20:14:21.946835000 -0400 +@@ -17,7 +17,11 @@ + #include "base/thread_task_runner_handle.h" + #include "components/device_event_log/device_event_log.h" + #include "device/usb/usb_error.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + #if defined(OS_WIN) + #include +@@ -294,6 +298,7 @@ weak_factory_(this) { - task_runner_ = base::ThreadTaskRunnerHandle::Get(); + base::MessageLoop::current()->AddDestructionObserver(this); + +#if !defined(OS_FREEBSD) int rv = libusb_hotplug_register_callback( context_->context(), static_cast(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -130,12 +131,15 @@ - base::Unretained(ui_thread_helper_))); +@@ -321,14 +326,16 @@ + } #endif // OS_WIN } +#endif // !OS_FREEBSD } UsbServiceImpl::~UsbServiceImpl() { + base::MessageLoop::current()->RemoveDestructionObserver(this); +- +#if !defined(OS_FREEBSD) if (hotplug_enabled_) { libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_); } +#endif // !OS_FREEBSD - #if defined(OS_WIN) - if (ui_thread_helper_) { - ui_task_runner_->DeleteSoon(FROM_HERE, ui_thread_helper_); -@@ -219,6 +223,7 @@ + for (const auto& map_entry : devices_) { + map_entry.second->OnDisconnect(); } +@@ -566,6 +573,7 @@ + device->OnDisconnect(); } +#if !defined(OS_FREEBSD) // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, PlatformUsbDevice device, -@@ -256,6 +261,7 @@ +@@ -603,6 +611,7 @@ return 0; } +#endif // !OS_FREEBSD - void UsbServiceImpl::OnDeviceAdded(PlatformUsbDevice platform_device) { + void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) { DCHECK(CalledOnValidThread()); Index: branches/2015Q3/www/chromium/files/patch-device__usb__usb_service_impl.h =================================================================== --- branches/2015Q3/www/chromium/files/patch-device__usb__usb_service_impl.h (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-device__usb__usb_service_impl.h (revision 393091) @@ -1,40 +1,40 @@ ---- device/usb/usb_service_impl.h.orig 2015-04-19 16:22:47.000000000 +0200 -+++ device/usb/usb_service_impl.h 2015-04-19 21:10:55.000000000 +0200 -@@ -10,7 +10,13 @@ - #include "base/single_thread_task_runner.h" +--- device/usb/usb_service_impl.h.orig 2015-07-15 16:30:04.000000000 -0400 ++++ device/usb/usb_service_impl.h 2015-07-22 07:42:23.863097000 -0400 +@@ -11,7 +11,13 @@ + #include "base/message_loop/message_loop.h" #include "device/usb/usb_context.h" #include "device/usb/usb_device_impl.h" +#if defined(OS_FREEBSD) +#include "libusb.h" +#define LIBUSB_CALL +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif + - namespace device { + #if defined(OS_WIN) + #include "base/scoped_observer.h" +@@ -92,11 +98,13 @@ -@@ -38,11 +44,13 @@ - // Adds a new UsbDevice to the devices_ map based on the given libusb device. - scoped_refptr AddDevice(PlatformUsbDevice platform_device); + void RemoveDevice(scoped_refptr device); +#if !defined(OS_FREEBSD) // Handle hotplug events from libusb. static int LIBUSB_CALL HotplugCallback(libusb_context* context, PlatformUsbDevice device, libusb_hotplug_event event, void* user_data); +#endif // These functions release a reference to the provided platform device. - void OnDeviceAdded(PlatformUsbDevice platform_device); - void OnDeviceRemoved(PlatformUsbDevice platform_device); -@@ -63,7 +71,9 @@ + void OnPlatformDeviceAdded(PlatformUsbDevice platform_device); + void OnPlatformDeviceRemoved(PlatformUsbDevice platform_device); +@@ -112,7 +120,9 @@ // connected instead of only when a full enumeration is requested. // TODO(reillyg): Support this on all platforms. crbug.com/411715 - bool hotplug_enabled_; + bool hotplug_enabled_ = false; +#if !defined(OS_FREEBSD) libusb_hotplug_callback_handle hotplug_handle_; +#endif - // The map from unique IDs to UsbDevices. - typedef std::map> DeviceMap; + // Enumeration callbacks are queued until an enumeration completes. + bool enumeration_ready_ = false; Index: branches/2015Q3/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc (revision 393091) @@ -1,11 +1,11 @@ ---- net/dns/dns_config_service_posix_unittest.cc.orig 2014-10-10 08:54:16 UTC -+++ net/dns/dns_config_service_posix_unittest.cc +--- net/dns/dns_config_service_posix_unittest.cc.orig 2015-07-15 16:30:05.000000000 -0400 ++++ net/dns/dns_config_service_posix_unittest.cc 2015-07-22 07:45:57.034816000 -0400 @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include - + #include "base/cancelable_callback.h" + #include "base/files/file_util.h" #include "base/sys_byteorder.h" - #include "net/dns/dns_config_service_posix.h" - Index: branches/2015Q3/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc (revision 393091) @@ -1,13 +1,13 @@ ---- net/http/http_auth_gssapi_posix.cc.orig 2014-10-10 08:54:16 UTC -+++ net/http/http_auth_gssapi_posix.cc -@@ -431,8 +431,8 @@ - static const char* const kDefaultLibraryNames[] = { +--- net/http/http_auth_gssapi_posix.cc.orig 2015-07-15 16:30:05.000000000 -0400 ++++ net/http/http_auth_gssapi_posix.cc 2015-07-22 07:50:14.149575000 -0400 +@@ -432,8 +432,8 @@ #if defined(OS_MACOSX) - "libgssapi_krb5.dylib" // MIT Kerberos + // This library is provided by Kerberos.framework. + "libgssapi_krb5.dylib" -#elif defined(OS_OPENBSD) - "libgssapi.so" // Heimdal - OpenBSD +#elif defined(OS_BSD) + "libgssapi.so" // Heimdal - OpenBSD / FreeBSD #else "libgssapi_krb5.so.2", // MIT Kerberos - FC, Suse10, Debian "libgssapi.so.4", // Heimdal - Suse10, MDK Index: branches/2015Q3/www/chromium/files/patch-net__net.gypi =================================================================== --- branches/2015Q3/www/chromium/files/patch-net__net.gypi (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-net__net.gypi (revision 393091) @@ -1,22 +1,22 @@ ---- net/net.gypi.orig 2014-10-10 09:15:31 UTC -+++ net/net.gypi -@@ -182,8 +182,8 @@ +--- net/net.gypi.orig 2015-07-15 16:30:05.000000000 -0400 ++++ net/net.gypi 2015-07-22 07:53:36.298350000 -0400 +@@ -196,8 +196,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', -@@ -1252,7 +1252,7 @@ + 'base/backoff_entry_serializer.cc', +@@ -1278,7 +1278,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_serializer_unittest.cc', 'base/backoff_entry_unittest.cc', - 'base/data_url_unittest.cc', - 'base/directory_lister_unittest.cc', + 'base/chunked_upload_data_stream_unittest.cc', Index: branches/2015Q3/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__GCInfo.cpp =================================================================== --- branches/2015Q3/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__GCInfo.cpp (nonexistent) +++ branches/2015Q3/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__GCInfo.cpp (revision 393091) @@ -0,0 +1,11 @@ +--- third_party/WebKit/Source/platform/heap/GCInfo.cpp.orig 2015-07-22 08:00:24.013307000 -0400 ++++ third_party/WebKit/Source/platform/heap/GCInfo.cpp 2015-07-22 08:00:35.112590000 -0400 +@@ -8,6 +8,8 @@ + #include "platform/heap/Handle.h" + #include "platform/heap/Heap.h" + ++#include ++ + namespace blink { + + // GCInfo indices start from 1 for heap objects, with 0 being treated Property changes on: branches/2015Q3/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__GCInfo.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2015Q3/www/chromium/files/patch-third_party__boringssl__src__crypto__bn__generic.c =================================================================== --- branches/2015Q3/www/chromium/files/patch-third_party__boringssl__src__crypto__bn__generic.c (nonexistent) +++ branches/2015Q3/www/chromium/files/patch-third_party__boringssl__src__crypto__bn__generic.c (revision 393091) @@ -0,0 +1,11 @@ +--- third_party/boringssl/src/crypto/bn/generic.c.orig 2015-07-22 18:56:54.552496000 -0400 ++++ third_party/boringssl/src/crypto/bn/generic.c 2015-07-22 18:59:06.813075000 -0400 +@@ -71,6 +71,8 @@ + + #if defined(OPENSSL_WINDOWS) + #define alloca _alloca ++#elif defined(__FreeBSD__) ++#include + #else + #include + #endif Property changes on: branches/2015Q3/www/chromium/files/patch-third_party__boringssl__src__crypto__bn__generic.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2015Q3/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp =================================================================== --- branches/2015Q3/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp (revision 393091) @@ -1,21 +1,28 @@ ---- third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp.orig 2014-10-10 09:15:55 UTC -+++ third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp -@@ -753,12 +753,17 @@ +--- third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp.orig 2015-07-15 16:31:51.000000000 -0400 ++++ third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp 2015-07-22 18:15:27.210562000 -0400 +@@ -747,11 +747,12 @@ double _getLocalTZA() { -+ struct tm *lt; ++ struct tm *lt; if(!FSDK_IsSandBoxPolicyEnabled(FPDF_POLICY_MACHINETIME_ACCESS)) return 0; time_t t = 0; time(&t); - localtime(&t); + lt = localtime(&t); + #if _MSC_VER >= 1900 + // In gcc and in Visual Studio prior to VS 2015 'timezone' is a global + // variable declared in time.h. That variable was deprecated and in VS 2015 +@@ -759,7 +760,11 @@ + long timezone = 0; + _get_timezone(&timezone); + #endif +#ifdef __FreeBSD__ -+ return (double)(-(lt->tm_gmtoff * 1000)); ++ return (double)(-(lt->tm_gmtoff * 1000)); +#else return (double)(-(timezone * 1000)); +#endif } int _getDaylightSavingTA(double d) Index: branches/2015Q3/www/chromium/files/patch-third_party__skia__src__ports__SkTime_Unix.cpp =================================================================== --- branches/2015Q3/www/chromium/files/patch-third_party__skia__src__ports__SkTime_Unix.cpp (nonexistent) +++ branches/2015Q3/www/chromium/files/patch-third_party__skia__src__ports__SkTime_Unix.cpp (revision 393091) @@ -0,0 +1,14 @@ +--- third_party/skia/src/ports/SkTime_Unix.cpp.orig 2015-07-22 19:35:29.020385000 -0400 ++++ third_party/skia/src/ports/SkTime_Unix.cpp 2015-07-22 19:49:28.094432000 -0400 +@@ -24,7 +24,11 @@ + int offset = tstruct->tm_isdst == 1 ? 60 : 0; + + // http://pubs.opengroup.org/onlinepubs/009695399/basedefs/time.h.html ++#if defined(__FreeBSD__) ++ dt->fTimeZoneMinutes = SkToS16(offset - tstruct->tm_gmtoff / 60); ++#else + dt->fTimeZoneMinutes = SkToS16(offset - timezone / 60); ++#endif + dt->fYear = tstruct->tm_year + 1900; + dt->fMonth = SkToU8(tstruct->tm_mon + 1); + dt->fDayOfWeek = SkToU8(tstruct->tm_wday); Property changes on: branches/2015Q3/www/chromium/files/patch-third_party__skia__src__ports__SkTime_Unix.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2015Q3/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h =================================================================== --- branches/2015Q3/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h (revision 393091) @@ -1,11 +1,11 @@ ---- third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2014-10-10 09:16:13 UTC -+++ third_party/webrtc/voice_engine/voice_engine_defines.h -@@ -237,7 +237,7 @@ +--- third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2015-07-15 16:32:13.000000000 -0400 ++++ third_party/webrtc/voice_engine/voice_engine_defines.h 2015-07-22 18:28:32.539800000 -0400 +@@ -213,7 +213,7 @@ #include #include #include -#ifndef QNX +#if !defined(QNX) && !defined(WEBRTC_BSD) - #include + #include #ifndef ANDROID - #include + #include Index: branches/2015Q3/www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc (nonexistent) +++ branches/2015Q3/www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc (revision 393091) @@ -0,0 +1,11 @@ +--- ui/events/keycodes/dom/keycode_converter.cc.orig 2015-07-22 18:31:47.703757000 -0400 ++++ ui/events/keycodes/dom/keycode_converter.cc 2015-07-22 18:32:17.605463000 -0400 +@@ -16,7 +16,7 @@ + // and DOM Level 3 |code| strings. + #if defined(OS_WIN) + #define USB_KEYMAP(usb, xkb, win, mac, code, id) {usb, win, code} +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #define USB_KEYMAP(usb, xkb, win, mac, code, id) {usb, xkb, code} + #elif defined(OS_MACOSX) + #define USB_KEYMAP(usb, xkb, win, mac, code, id) {usb, mac, code} Property changes on: branches/2015Q3/www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2015Q3/www/chromium/files/patch-ui__views__views_delegate.cc =================================================================== --- branches/2015Q3/www/chromium/files/patch-ui__views__views_delegate.cc (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-ui__views__views_delegate.cc (revision 393091) @@ -1,11 +1,20 @@ ---- ui/views/views_delegate.cc.orig 2014-10-10 08:54:19 UTC -+++ ui/views/views_delegate.cc -@@ -50,7 +50,7 @@ +--- ui/views/views_delegate.cc.orig 2015-07-15 16:30:11.000000000 -0400 ++++ ui/views/views_delegate.cc 2015-07-22 22:04:39.799216000 -0400 +@@ -51,7 +51,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; } +@@ -91,7 +91,7 @@ + return program.BaseName().AsUTF8Unsafe(); + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + scoped_refptr + ViewsDelegate::GetTaskRunnerForAuraLinuxAccessibilityInit() { + return nullptr; Index: branches/2015Q3/www/chromium/files/patch-ui__views__views_delegate.h =================================================================== --- branches/2015Q3/www/chromium/files/patch-ui__views__views_delegate.h (revision 393090) +++ branches/2015Q3/www/chromium/files/patch-ui__views__views_delegate.h (revision 393091) @@ -1,11 +1,20 @@ ---- ui/views/views_delegate.h.orig 2014-10-10 08:54:19 UTC -+++ ui/views/views_delegate.h -@@ -98,7 +98,7 @@ +--- ui/views/views_delegate.h.orig 2015-07-15 16:30:11.000000000 -0400 ++++ ui/views/views_delegate.h 2015-07-24 06:37:19.269166000 -0400 +@@ -101,7 +101,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) ++#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_FREEBSD) virtual gfx::ImageSkia* GetDefaultWindowIcon() const; #endif +@@ -139,7 +139,7 @@ + // Returns the user-visible name of the application. + virtual std::string GetApplicationName(); + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + // Get a task runner suitable for posting initialization tasks for + // Aura Linux accessibility. + virtual scoped_refptr Index: branches/2015Q3/www/chromium/pkg-plist =================================================================== --- branches/2015Q3/www/chromium/pkg-plist (revision 393090) +++ branches/2015Q3/www/chromium/pkg-plist (revision 393091) @@ -1,195 +1,195 @@ bin/chrome man/man1/chrome.1.gz share/applications/chromium-browser.desktop %%DATADIR%%/chrome %%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 %%DATADIR%%/locales/bg.pak %%DATADIR%%/locales/bn.pak %%DATADIR%%/locales/ca.pak %%DATADIR%%/locales/cs.pak %%DATADIR%%/locales/da.pak %%DATADIR%%/locales/de.pak %%DATADIR%%/locales/el.pak %%DATADIR%%/locales/en-GB.pak %%DATADIR%%/locales/en-US.pak %%DATADIR%%/locales/es-419.pak %%DATADIR%%/locales/es.pak %%DATADIR%%/locales/et.pak %%DATADIR%%/locales/fa.pak %%DATADIR%%/locales/fi.pak %%DATADIR%%/locales/fil.pak %%DATADIR%%/locales/fr.pak %%DATADIR%%/locales/gu.pak %%DATADIR%%/locales/he.pak %%DATADIR%%/locales/hi.pak %%DATADIR%%/locales/hr.pak %%DATADIR%%/locales/hu.pak %%DATADIR%%/locales/id.pak %%DATADIR%%/locales/it.pak %%DATADIR%%/locales/ja.pak %%DATADIR%%/locales/kn.pak %%DATADIR%%/locales/ko.pak %%DATADIR%%/locales/lt.pak %%DATADIR%%/locales/lv.pak %%DATADIR%%/locales/ml.pak %%DATADIR%%/locales/mr.pak %%DATADIR%%/locales/ms.pak %%DATADIR%%/locales/nb.pak %%DATADIR%%/locales/nl.pak %%DATADIR%%/locales/pl.pak %%DATADIR%%/locales/pt-BR.pak %%DATADIR%%/locales/pt-PT.pak %%DATADIR%%/locales/ro.pak %%DATADIR%%/locales/ru.pak %%DATADIR%%/locales/sk.pak %%DATADIR%%/locales/sl.pak %%DATADIR%%/locales/sr.pak %%DATADIR%%/locales/sv.pak %%DATADIR%%/locales/sw.pak %%DATADIR%%/locales/ta.pak %%DATADIR%%/locales/te.pak %%DATADIR%%/locales/th.pak %%DATADIR%%/locales/tr.pak %%DATADIR%%/locales/uk.pak %%DATADIR%%/locales/vi.pak %%DATADIR%%/locales/zh-CN.pak %%DATADIR%%/locales/zh-TW.pak %%DATADIR%%/mksnapshot %%DATADIR%%/resources.pak %%DATADIR%%/resources/extension/demo/library.js %%DATADIR%%/resources/inspector/Images/applicationCache.png %%DATADIR%%/resources/inspector/Images/breakpoint.png %%DATADIR%%/resources/inspector/Images/breakpointConditional.png %%DATADIR%%/resources/inspector/Images/breakpointConditional_2x.png %%DATADIR%%/resources/inspector/Images/breakpoint_2x.png %%DATADIR%%/resources/inspector/Images/checker.png %%DATADIR%%/resources/inspector/Images/chromeDisabledSelect.png %%DATADIR%%/resources/inspector/Images/chromeDisabledSelect_2x.png %%DATADIR%%/resources/inspector/Images/chromeLeft.png %%DATADIR%%/resources/inspector/Images/chromeMiddle.png %%DATADIR%%/resources/inspector/Images/chromeRight.png %%DATADIR%%/resources/inspector/Images/chromeSelect.png %%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png %%DATADIR%%/resources/inspector/Images/cookie.png %%DATADIR%%/resources/inspector/Images/database.png %%DATADIR%%/resources/inspector/Images/databaseTable.png %%DATADIR%%/resources/inspector/Images/deleteIcon.png %%DATADIR%%/resources/inspector/Images/domain.png %%DATADIR%%/resources/inspector/Images/errorWave.png %%DATADIR%%/resources/inspector/Images/errorWave_2x.png %%DATADIR%%/resources/inspector/Images/fileSystem.png %%DATADIR%%/resources/inspector/Images/forward.png %%DATADIR%%/resources/inspector/Images/frame.png %%DATADIR%%/resources/inspector/Images/graphLabelCalloutLeft.png %%DATADIR%%/resources/inspector/Images/graphLabelCalloutRight.png %%DATADIR%%/resources/inspector/Images/indexedDB.png %%DATADIR%%/resources/inspector/Images/indexedDBIndex.png %%DATADIR%%/resources/inspector/Images/indexedDBObjectStore.png %%DATADIR%%/resources/inspector/Images/localStorage.png %%DATADIR%%/resources/inspector/Images/navigationControls.png %%DATADIR%%/resources/inspector/Images/navigationControls_2x.png +%%DATADIR%%/resources/inspector/Images/notifications.svg %%DATADIR%%/resources/inspector/Images/paneAddButtons.png -%%DATADIR%%/resources/inspector/Images/paneAnimationsButtons.png -%%DATADIR%%/resources/inspector/Images/paneElementStateButtons.png %%DATADIR%%/resources/inspector/Images/paneFilterButtons.png %%DATADIR%%/resources/inspector/Images/paneRefreshButtons.png %%DATADIR%%/resources/inspector/Images/popoverArrows.png %%DATADIR%%/resources/inspector/Images/profileGroupIcon.png %%DATADIR%%/resources/inspector/Images/profileIcon.png %%DATADIR%%/resources/inspector/Images/profileSmallIcon.png %%DATADIR%%/resources/inspector/Images/radioDot.png %%DATADIR%%/resources/inspector/Images/resourceCSSIcon.png %%DATADIR%%/resources/inspector/Images/resourceDocumentIcon.png %%DATADIR%%/resources/inspector/Images/resourceDocumentIconSmall.png %%DATADIR%%/resources/inspector/Images/resourceJSIcon.png %%DATADIR%%/resources/inspector/Images/resourcePlainIcon.png %%DATADIR%%/resources/inspector/Images/resourcePlainIconSmall.png %%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.png %%DATADIR%%/resources/inspector/Images/responsiveDesign.png %%DATADIR%%/resources/inspector/Images/responsiveDesign_2x.png %%DATADIR%%/resources/inspector/Images/searchNext.png %%DATADIR%%/resources/inspector/Images/searchPrev.png %%DATADIR%%/resources/inspector/Images/serviceWorker.svg %%DATADIR%%/resources/inspector/Images/sessionStorage.png %%DATADIR%%/resources/inspector/Images/settingsListRemove.png %%DATADIR%%/resources/inspector/Images/settingsListRemove_2x.png %%DATADIR%%/resources/inspector/Images/speech.png %%DATADIR%%/resources/inspector/Images/spinner.svg -%%DATADIR%%/resources/inspector/Images/statusbarButtonGlyphs.png -%%DATADIR%%/resources/inspector/Images/statusbarButtonGlyphs_2x.png -%%DATADIR%%/resources/inspector/Images/statusbarResizerHorizontal.png -%%DATADIR%%/resources/inspector/Images/statusbarResizerVertical.png %%DATADIR%%/resources/inspector/Images/thumbActiveHoriz.png %%DATADIR%%/resources/inspector/Images/thumbActiveVert.png %%DATADIR%%/resources/inspector/Images/thumbHoriz.png %%DATADIR%%/resources/inspector/Images/thumbHoverHoriz.png %%DATADIR%%/resources/inspector/Images/thumbHoverVert.png %%DATADIR%%/resources/inspector/Images/thumbVert.png +%%DATADIR%%/resources/inspector/Images/toolbarButtonGlyphs.png +%%DATADIR%%/resources/inspector/Images/toolbarButtonGlyphs_2x.png %%DATADIR%%/resources/inspector/Images/toolbarItemSelected.png +%%DATADIR%%/resources/inspector/Images/toolbarResizerHorizontal.png +%%DATADIR%%/resources/inspector/Images/toolbarResizerVertical.png %%DATADIR%%/resources/inspector/Images/touchCursor.png %%DATADIR%%/resources/inspector/Images/touchCursor_2x.png +%%DATADIR%%/resources/inspector/Images/updateServiceWorker.svg %%DATADIR%%/resources/inspector/InspectorBackendCommands.js %%DATADIR%%/resources/inspector/SupportedCSSProperties.js %%DATADIR%%/resources/inspector/accessibility_module.js %%DATADIR%%/resources/inspector/audits_module.js +%%DATADIR%%/resources/inspector/cm_modes_module.js %%DATADIR%%/resources/inspector/components_lazy_module.js %%DATADIR%%/resources/inspector/console_module.js %%DATADIR%%/resources/inspector/devtools.css %%DATADIR%%/resources/inspector/devtools.html %%DATADIR%%/resources/inspector/devtools.js %%DATADIR%%/resources/inspector/devtools_extension_api.js %%DATADIR%%/resources/inspector/elements_module.js %%DATADIR%%/resources/inspector/heap_snapshot_worker_module.js %%DATADIR%%/resources/inspector/inspector.css %%DATADIR%%/resources/inspector/inspector.html %%DATADIR%%/resources/inspector/inspector.js %%DATADIR%%/resources/inspector/layers_module.js %%DATADIR%%/resources/inspector/network_module.js %%DATADIR%%/resources/inspector/profiler_module.js %%DATADIR%%/resources/inspector/promises_module.js %%DATADIR%%/resources/inspector/resources_module.js %%DATADIR%%/resources/inspector/screencast_module.js %%DATADIR%%/resources/inspector/script_formatter_worker_module.js %%DATADIR%%/resources/inspector/settings_module.js %%DATADIR%%/resources/inspector/snippets_module.js %%DATADIR%%/resources/inspector/source_frame_module.js %%DATADIR%%/resources/inspector/sources_module.js %%DATADIR%%/resources/inspector/temp_storage_shared_worker_module.js %%DATADIR%%/resources/inspector/timeline_module.js %%DATADIR%%/resources/inspector/toolbox.css %%DATADIR%%/resources/inspector/toolbox.html %%DATADIR%%/resources/inspector/toolbox.js %%DATADIR%%/resources/inspector/ui_lazy_module.js 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 @dir %%DATADIR%%/locales @dir %%DATADIR%%/resources/extension/demo @dir %%DATADIR%%/resources/extension @dir %%DATADIR%%/resources/inspector/Images @dir %%DATADIR%%/resources/inspector @dir %%DATADIR%%/resources @dir %%DATADIR%% @dir share/icons/hicolor/128x128/apps @dir share/icons/hicolor/128x128 @dir share/icons/hicolor/22x22/apps @dir share/icons/hicolor/22x22 @dir share/icons/hicolor/24x24/apps @dir share/icons/hicolor/24x24 @dir share/icons/hicolor/256x256/apps @dir share/icons/hicolor/256x256 @dir share/icons/hicolor/48x48/apps @dir share/icons/hicolor/48x48 @dir share/icons/hicolor/64x64/apps @dir share/icons/hicolor/64x64 @dir share/icons/hicolor @dir share/icons Index: branches/2015Q3 =================================================================== --- branches/2015Q3 (revision 393090) +++ branches/2015Q3 (revision 393091) Property changes on: branches/2015Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r393089