Index: head/www/chromium/Makefile =================================================================== --- head/www/chromium/Makefile (revision 396535) +++ head/www/chromium/Makefile (revision 396536) @@ -1,388 +1,389 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 44.0.2403.155 +PORTVERSION= 45.0.2454.85 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 execinfo jpeg \ ninja perl5 pkgconfig python:2,build shebangfix tar:xz CPE_VENDOR= google CPE_PRODUCT= chrome USE_PERL5= build USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst USE_GNOME= atk glib20 gtk20 dconf libxslt MAKE_ARGS= -C out/${BUILDTYPE} 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 DRIVER CODECS_DESC= Compile and enable patented codecs like H.264 DRIVER_DESC= Install chromedriver OPTIONS_DEFAULT= CODECS GCONF KERBEROS OPTIONS_SUB= yes GCONF_USE= GNOME=gconf2 PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio DRIVER_MAKE_ARGS=chromedriver TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} .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" .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_new' \ + 'third_party/hunspell' \ 'third_party/iccjpeg' \ 'third_party/icu/icu.isolate' \ 'third_party/jinja2' \ 'third_party/jstemplate' \ 'third_party/khronos' \ 'third_party/leveldatabase' \ 'third_party/libaddressinput' \ 'third_party/libjingle' \ 'third_party/libphonenumber' \ 'third_party/libsrtp' \ 'third_party/libvpx' \ 'third_party/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/trace-viewer/tracing' \ + 'third_party/trace-viewer/tracing/third_party' \ + 'third_party/trace-viewer/tracing/third_party/tvcm/third_party' \ + 'third_party/trace-viewer/tracing/third_party/tvcm/tvcm' \ '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} 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} .if ${PORT_OPTIONS:MDRIVER} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ ${STAGEDIR}${PREFIX}/bin .endif .include Index: head/www/chromium/distinfo =================================================================== --- head/www/chromium/distinfo (revision 396535) +++ head/www/chromium/distinfo (revision 396536) @@ -1,4 +1,4 @@ -SHA256 (chromium-44.0.2403.155.tar.xz) = eba271c210a020dd61b72c940abeecdafc562a1d15fb45615dda72bcb6219f3c -SIZE (chromium-44.0.2403.155.tar.xz) = 293362744 -SHA256 (chromium-44.0.2403.155-testdata.tar.xz) = 1fbcfc5bb94db75970f04055163a82560814f3961dece961db4ed5c11014f3d4 -SIZE (chromium-44.0.2403.155-testdata.tar.xz) = 128600128 +SHA256 (chromium-45.0.2454.85.tar.xz) = 3e8c03a5a6ea4cc35017404a58687ca18207eed70781bad7f2d7d70610934c91 +SIZE (chromium-45.0.2454.85.tar.xz) = 321222028 +SHA256 (chromium-45.0.2454.85-testdata.tar.xz) = 94577c27e9de9dd1c85d2e3ea4db5021ea7a6661f5615c2c91180104516b51b7 +SIZE (chromium-45.0.2454.85-testdata.tar.xz) = 115779592 Index: head/www/chromium/files/patch-third_party__webrtc__base__thread_checker_impl.cc =================================================================== --- head/www/chromium/files/patch-third_party__webrtc__base__thread_checker_impl.cc (revision 396535) +++ head/www/chromium/files/patch-third_party__webrtc__base__thread_checker_impl.cc (nonexistent) @@ -1,28 +0,0 @@ ---- third_party/webrtc/base/thread_checker_impl.cc.orig 2015-04-19 18:30:59.000000000 +0200 -+++ third_party/webrtc/base/thread_checker_impl.cc 2015-04-19 18:51:43.000000000 +0200 -@@ -14,10 +14,15 @@ - - #include "webrtc/base/checks.h" - --#if defined(WEBRTC_LINUX) -+#if defined(WEBRTC_LINUX) && !defined(__FreeBSD__) - #include - #endif - -+#if defined(WEBRTC_BSD) -+#include -+#include -+#endif -+ - namespace rtc { - - PlatformThreadId CurrentThreadId() { -@@ -27,6 +32,8 @@ - #elif defined(WEBRTC_POSIX) - #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS) - ret = pthread_mach_thread_np(pthread_self()); -+#elif defined(WEBRTC_BSD) -+ ret = static_cast(pthread_getthreadid_np()); - #elif defined(WEBRTC_LINUX) - ret = syscall(__NR_gettid); - #elif defined(WEBRTC_ANDROID) Property changes on: head/www/chromium/files/patch-third_party__webrtc__base__thread_checker_impl.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: head/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc =================================================================== --- head/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc (revision 396535) +++ head/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc (nonexistent) @@ -1,24 +0,0 @@ ---- content/renderer/accessibility/blink_ax_tree_source.cc.orig 2014-10-10 09:15:31 UTC -+++ content/renderer/accessibility/blink_ax_tree_source.cc -@@ -470,13 +470,15 @@ - dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X, scroll_offset.width()); - dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y, scroll_offset.height()); - -- const gfx::Size& min_offset = document.minimumScrollOffset(); -- dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MIN, min_offset.width()); -- dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MIN, min_offset.height()); -+ // Prefix {min|max}_offset with '_' to avoid collision with -+ // FreeBSD namespace -+ const gfx::Size& _min_offset = document.minimumScrollOffset(); -+ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MIN, _min_offset.width()); -+ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MIN, _min_offset.height()); - -- const gfx::Size& max_offset = document.maximumScrollOffset(); -- dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, max_offset.width()); -- dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MAX, max_offset.height()); -+ const gfx::Size& _max_offset = document.maximumScrollOffset(); -+ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, _max_offset.width()); -+ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MAX, _max_offset.height()); - - if (node_to_frame_routing_id_map_ && !src.equals(GetRoot())) { - WebLocalFrame* frame = document.frame(); Property changes on: head/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc ___________________________________________________________________ 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: head/www/chromium/files/patch-net__base__net_util_posix.cc =================================================================== --- head/www/chromium/files/patch-net__base__net_util_posix.cc (revision 396535) +++ head/www/chromium/files/patch-net__base__net_util_posix.cc (nonexistent) @@ -1,18 +0,0 @@ ---- net/base/net_util_posix.cc.orig 2015-04-19 16:44:32.000000000 +0200 -+++ net/base/net_util_posix.cc 2015-04-19 16:45:29.000000000 +0200 -@@ -20,6 +20,7 @@ - #if !defined(OS_NACL) - namespace internal { - -+#if !defined(OS_BSD) - // The application layer can pass |policy| defined in net_util.h to - // request filtering out certain type of interfaces. - bool ShouldIgnoreInterface(const std::string& name, int policy) { -@@ -56,6 +57,7 @@ - } - return false; - } -+#endif - - } // namespace internal - #else // OS_NACL Property changes on: head/www/chromium/files/patch-net__base__net_util_posix.cc ___________________________________________________________________ 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: head/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h =================================================================== --- head/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h (revision 396535) +++ head/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h (nonexistent) @@ -1,12 +0,0 @@ ---- net/socket/tcp_listen_socket_unittest.h.orig 2014-10-10 09:15:31 UTC -+++ net/socket/tcp_listen_socket_unittest.h -@@ -13,6 +13,9 @@ - #include - #include - #include -+#if defined(OS_BSD) -+#include -+#endif - #endif - - #include "base/basictypes.h" Property changes on: head/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.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: head/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_egl.cc =================================================================== --- head/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_egl.cc (revision 396535) +++ head/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_egl.cc (nonexistent) @@ -1,28 +0,0 @@ ---- gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc.orig 2015-05-13 18:35:46.000000000 -0400 -+++ gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc 2015-05-20 15:58:33.229171000 -0400 -@@ -89,7 +89,7 @@ - public: - TransferThread() : base::Thread(kAsyncTransferThreadName) { - Start(); --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) - SetPriority(base::ThreadPriority::BACKGROUND); - #endif - } -@@ -465,14 +465,14 @@ - - void AsyncPixelTransferDelegateEGL::WaitForTransferCompletion() { - if (state_->TransferIsInProgress()) { --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) - g_transfer_thread.Pointer()->SetPriority(base::ThreadPriority::DISPLAY); - #endif - - state_->WaitForTransferCompletion(); - DCHECK(!state_->TransferIsInProgress()); - --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) - g_transfer_thread.Pointer()->SetPriority(base::ThreadPriority::BACKGROUND); - #endif - } Property changes on: head/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_egl.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: head/www/chromium/files/patch-net__base__net_util_linux.cc =================================================================== --- head/www/chromium/files/patch-net__base__net_util_linux.cc (revision 396535) +++ head/www/chromium/files/patch-net__base__net_util_linux.cc (nonexistent) @@ -1,105 +0,0 @@ ---- net/base/net_util_linux.cc.orig 2015-04-19 19:54:25.000000000 +0200 -+++ net/base/net_util_linux.cc 2015-04-20 20:26:41.000000000 +0200 -@@ -4,12 +4,14 @@ - - #include "net/base/net_util_linux.h" - -+#if !defined(OS_FREEBSD) - #if !defined(OS_ANDROID) - #include - #endif // !defined(OS_ANDROID) - #include - #include - #include -+#endif // !defined(OS_FREEBSD) - #include - #include - #include -@@ -44,6 +46,7 @@ - // are still progressing through duplicated address detection (DAD) - // and shouldn't be used by the application layer until DAD process - // is completed. -+#if !defined(OS_FREEBSD) - if (native_attributes & ( - #if !defined(OS_ANDROID) - IFA_F_OPTIMISTIC | IFA_F_DADFAILED | -@@ -61,6 +64,10 @@ - } - - return true; -+#else -+ // the flags tested above are not present on FreeBSD -+ return false; -+#endif // !OS_FREEBSD - } - - } // namespace -@@ -83,13 +90,15 @@ - if (!s.is_valid()) - return NetworkChangeNotifier::CONNECTION_UNKNOWN; - -+#if !defined(OS_FREEBSD) - // Test wireless extensions for CONNECTION_WIFI - struct iwreq pwrq = {}; - strncpy(pwrq.ifr_name, ifname.c_str(), IFNAMSIZ - 1); - if (ioctl(s.get(), SIOCGIWNAME, &pwrq) != -1) - return NetworkChangeNotifier::CONNECTION_WIFI; -+#endif // !defined(OS_FREEBSD) - --#if !defined(OS_ANDROID) -+#if !defined(OS_ANDROID) && !defined(OS_FREEBSD) - // Test ethtool for CONNECTION_ETHERNET - struct ethtool_cmd ecmd = {}; - ecmd.cmd = ETHTOOL_GSET; -@@ -98,12 +107,13 @@ - strncpy(ifr.ifr_name, ifname.c_str(), IFNAMSIZ - 1); - if (ioctl(s.get(), SIOCETHTOOL, &ifr) != -1) - return NetworkChangeNotifier::CONNECTION_ETHERNET; --#endif // !defined(OS_ANDROID) -+#endif // !defined(OS_ANDROID) && !defined(OS_FREEBSD) - - return NetworkChangeNotifier::CONNECTION_UNKNOWN; - } - - std::string GetInterfaceSSID(const std::string& ifname) { -+#if !defined(OS_FREEBSD) - base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0)); - if (!ioctl_socket.is_valid()) - return ""; -@@ -115,9 +125,11 @@ - wreq.u.essid.length = IW_ESSID_MAX_SIZE; - if (ioctl(ioctl_socket.get(), SIOCGIWESSID, &wreq) != -1) - return ssid; -+#endif // !defined(OS_FREEBSD) - return ""; - } - -+#if !defined(OS_FREEBSD) - bool GetNetworkListImpl( - NetworkInterfaceList* networks, - int policy, -@@ -186,6 +198,7 @@ - - return true; - } -+#endif // !defined(OS_FREEBSD) - - std::string GetWifiSSIDFromInterfaceListInternal( - const NetworkInterfaceList& interfaces, -@@ -210,12 +223,16 @@ - if (networks == NULL) - return false; - -+#if !defined(OS_FREEBSD) - internal::AddressTrackerLinux tracker; - tracker.Init(); - - return internal::GetNetworkListImpl( - networks, policy, tracker.GetOnlineLinks(), tracker.GetAddressMap(), - &internal::AddressTrackerLinux::GetInterfaceName); -+#else -+ return false; -+#endif - } - - std::string GetWifiSSID() { Property changes on: head/www/chromium/files/patch-net__base__net_util_linux.cc ___________________________________________________________________ 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: head/www/chromium/files/patch-chrome__browser__extensions__api__tabs__tabs_api.cc =================================================================== --- head/www/chromium/files/patch-chrome__browser__extensions__api__tabs__tabs_api.cc (revision 396535) +++ head/www/chromium/files/patch-chrome__browser__extensions__api__tabs__tabs_api.cc (nonexistent) @@ -1,20 +0,0 @@ ---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2015-08-02 00:29:44.653703000 -0400 -+++ chrome/browser/extensions/api/tabs/tabs_api.cc 2015-08-02 00:32:45.945039000 -0400 -@@ -659,7 +659,7 @@ - - WindowController* controller = new_window->extension_window_controller(); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // On Desktop Linux, window managers may ignore hints until the X11 window is - // mapped, which happens in the blocking call to Show() above. - // DesktopWindowTreeHostX11 currently only checks for an attempt to maximize -@@ -669,7 +669,7 @@ - if (create_params.initial_show_state == ui::SHOW_STATE_MINIMIZED) - new_window->window()->Minimize(); - #endif --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) -+#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) || defined(OS_WIN) - // On Desktop Linux and Windows, managers don't handle fullscreen state to - // create window for now. - if (create_params.initial_show_state == ui::SHOW_STATE_FULLSCREEN) Property changes on: head/www/chromium/files/patch-chrome__browser__extensions__api__tabs__tabs_api.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: head/www/chromium/files/chrome.in =================================================================== --- head/www/chromium/files/chrome.in (revision 396535) +++ head/www/chromium/files/chrome.in (revision 396536) @@ -1,18 +1,19 @@ #!/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 +ulimit -c 0 exec %%PREFIX%%/share/chromium/chrome $* Index: head/www/chromium/files/extra-patch-clang =================================================================== --- head/www/chromium/files/extra-patch-clang (revision 396535) +++ head/www/chromium/files/extra-patch-clang (revision 396536) @@ -1,246 +1,255 @@ ---- 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 +--- 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 +--- 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 +--- 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 @@ +--- base/tracked_objects.cc 2015-04-15 00:31:20.000000000 +0200 ++++ base/tracked_objects.cc 2015-04-18 21:57:33.000000000 +0200 +@@ -425,7 +425,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 +--- base/tracked_objects_unittest.cc.orig 2015-08-22 15:01:51.000000000 -0400 ++++ base/tracked_objects_unittest.cc 2015-09-03 09:20:53.370191000 -0400 @@ -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 @@ - } +@@ -240,7 +240,7 @@ + ThreadData::InitializeAndSetTrackingStatus(ThreadData::PROFILING_ACTIVE); 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_max(), 0); EXPECT_EQ(data->run_duration_sample(), 0); - EXPECT_EQ(data->queue_duration_sum(), 0); +@@ -279,7 +279,7 @@ + ThreadData::InitializeAndSetTrackingStatus(ThreadData::PROFILING_ACTIVE); + + scoped_ptr data(new DeathData()); +- ASSERT_NE(data, reinterpret_cast(NULL)); ++ ASSERT_NE(data, static_cast(NULL)); + + int32 run_ms = 42; + int32 queue_ms = 8; --- 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 @@ +@@ -262,7 +262,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 @@ +@@ -315,11 +315,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 @@ +@@ -422,7 +422,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_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 +--- third_party/hunspell/src/hunspell/affentry.hxx.orig 2015-07-21 18:46:37.322427000 -0400 ++++ third_party/hunspell/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.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 @@ +--- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc.orig 2015-09-03 09:31:11.815462000 -0400 ++++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-09-03 09:31:50.974163000 -0400 +@@ -1028,7 +1028,7 @@ const AudioEncoder* AudioCodingImpl::GetSenderInfo() const { FATAL() << "Not implemented yet."; - return reinterpret_cast(NULL); + return static_cast(NULL); } const CodecInst* AudioCodingImpl::GetSenderCodecInst() { -@@ -1009,7 +1009,7 @@ +@@ -1048,7 +1048,7 @@ const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const { FATAL() << "Not implemented yet."; - return reinterpret_cast(NULL); + return static_cast(NULL); } - bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) { + 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: head/www/chromium/files/patch-base__process__process_posix.cc =================================================================== --- head/www/chromium/files/patch-base__process__process_posix.cc (revision 396535) +++ head/www/chromium/files/patch-base__process__process_posix.cc (revision 396536) @@ -1,34 +1,88 @@ ---- base/process/process_posix.cc.orig 2015-05-20 21:26:57.068650000 -0400 -+++ base/process/process_posix.cc 2015-05-20 21:25:28.077153000 -0400 -@@ -17,6 +17,13 @@ +--- base/process/process_posix.cc.orig 2015-08-22 15:01:51.000000000 -0400 ++++ base/process/process_posix.cc 2015-09-05 09:44:45.526291000 -0400 +@@ -17,8 +17,18 @@ #include #endif +#if defined(OS_BSD) +#include +#include +#include +#include +#endif + namespace { ++const int kBackgroundPriority = 5; ++const int kForegroundPriority = 0; ++ #if !defined(OS_NACL_NONSFI) -@@ -83,7 +90,7 @@ + + bool WaitpidWithTimeout(base::ProcessHandle handle, +@@ -83,7 +93,7 @@ return ret_pid > 0; } -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) // Using kqueue on Mac so that we can wait on non-child processes. // We can't use kqueues on child processes because we need to reap // our own children using wait. -@@ -180,7 +187,7 @@ +@@ -180,7 +190,7 @@ base::ProcessHandle parent_pid = base::GetParentProcessId(handle); base::ProcessHandle our_pid = base::GetCurrentProcessHandle(); if (parent_pid != our_pid) { -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) // On Mac we can wait on non child processes. return WaitForSingleNonChildProcess(handle, timeout); #else +@@ -255,13 +265,6 @@ + return Process(handle); + } + +-#if !defined(OS_LINUX) && !defined(OS_MACOSX) +-// static +-bool Process::CanBackgroundProcesses() { +- return false; +-} +-#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) +- + bool Process::IsValid() const { + return process_ != kNullProcessHandle; + } +@@ -357,18 +360,27 @@ + } + + #if !defined(OS_LINUX) && !defined(OS_MACOSX) ++// static ++bool Process::CanBackgroundProcesses() { ++ return true; ++} ++ + bool Process::IsProcessBackgrounded() const { +- // See SetProcessBackgrounded(). + DCHECK(IsValid()); +- return false; ++ return GetPriority() == kBackgroundPriority; + } + + bool Process::SetProcessBackgrounded(bool value) { +- // Not implemented for POSIX systems other than Mac and Linux. With POSIX, if +- // we were to lower the process priority we wouldn't be able to raise it back +- // to its initial priority. +- NOTIMPLEMENTED(); +- return false; ++ DCHECK(IsValid()); ++ ++ if (!CanBackgroundProcesses()) ++ return false; ++ ++ int priority = value ? kBackgroundPriority : kForegroundPriority; ++ int result = setpriority(PRIO_PROCESS, process_, priority); ++ ++ DPCHECK(result == 0); ++ return result == 0; + } + #endif // !defined(OS_LINUX) && !defined(OS_MACOSX) + Index: head/www/chromium/files/patch-build__common.gypi =================================================================== --- head/www/chromium/files/patch-build__common.gypi (revision 396535) +++ head/www/chromium/files/patch-build__common.gypi (revision 396536) @@ -1,76 +1,67 @@ ---- 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 @@ +--- build/common.gypi.orig 2015-09-01 16:10:41.000000000 -0400 ++++ build/common.gypi 2015-09-03 09:38:09.528529000 -0400 +@@ -105,7 +105,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"', { + # Windows and Linux (including Chrome OS) use Aura and Ash. +- ['OS=="win" or OS=="linux"', { ++ ['OS=="win" or OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'use_ash%': 1, 'use_aura%': 1, }], -@@ -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 @@ +@@ -729,6 +729,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 @@ +@@ -767,7 +773,7 @@ }], # DBus usage. - ['OS=="linux" and embedded==0', { + ['(OS=="linux" or OS=="freebsd") and embedded==0', { 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -986,7 +992,7 @@ +@@ -997,7 +1003,7 @@ }, { 'use_openmax_dl_fft%': 0, }], - ['OS=="win" or OS=="linux"', { + ['OS=="win" or OS=="linux" or OS=="freebsd"', { 'enable_mdns%' : 1, }], -@@ -1248,6 +1254,10 @@ +@@ -1263,6 +1269,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. -@@ -4631,6 +4641,13 @@ +@@ -4698,6 +4708,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], + 'ldflags!': [ + '-ldl', + '-pie' + ], + 'libraries!': [ + '-ldl', + ], }, }], # Android-specific options; note that most are set above with Linux. Index: head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc =================================================================== --- head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc (revision 396535) +++ head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc (revision 396536) @@ -1,47 +1,38 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2015-04-18 22:54:06.000000000 +0200 -+++ chrome/browser/chrome_content_browser_client.cc 2015-04-18 22:58:13.000000000 +0200 -@@ -446,7 +446,7 @@ +--- chrome/browser/chrome_content_browser_client.cc.orig 2015-09-01 16:10:41.000000000 -0400 ++++ chrome/browser/chrome_content_browser_client.cc 2015-09-03 09:43:02.602298000 -0400 +@@ -444,7 +444,7 @@ return false; } -#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -503,7 +503,7 @@ +@@ -501,7 +501,7 @@ return -1; } -#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) - #if !defined(OS_CHROMEOS) - GURL GetEffectiveURLForSignin(const GURL& url) { -@@ -1295,7 +1295,7 @@ + void SetApplicationLocaleOnIOThread(const std::string& locale) { + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); +@@ -1246,7 +1246,7 @@ command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } -#elif defined(OS_POSIX) +#elif defined(OS_POSIX) && !defined(OS_BSD) if (breakpad::IsCrashReporterEnabled()) { scoped_ptr client_info = GoogleUpdateSettings::LoadMetricsClientInfo(); -@@ -2409,7 +2409,7 @@ - } +@@ -2332,7 +2332,7 @@ + PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path); + DCHECK(!app_data_path.empty()); } - --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#elif defined(OS_POSIX) && !defined(OS_MACOSX) ++#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -2494,7 +2494,7 @@ - } - #endif // defined(OS_ANDROID) - } --#endif // defined(OS_POSIX) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - - #if defined(OS_WIN) - const wchar_t* ChromeContentBrowserClient::GetResourceDllName() { Index: head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h =================================================================== --- head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h (revision 396535) +++ head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h (revision 396536) @@ -1,11 +1,11 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2015-01-21 20:28:15 UTC -+++ chrome/browser/chrome_content_browser_client.h -@@ -262,7 +262,7 @@ - net::CookieStore* OverrideCookieStoreForRenderProcess( - int render_process_id) override; - --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +--- chrome/browser/chrome_content_browser_client.h.orig 2015-09-03 09:44:27.080480000 -0400 ++++ chrome/browser/chrome_content_browser_client.h 2015-09-03 09:44:46.151235000 -0400 +@@ -253,7 +253,7 @@ + int child_process_id, + content::FileDescriptorInfo* mappings, + std::map* regions) override; +-#elif defined(OS_POSIX) && !defined(OS_MACOSX) ++#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) void GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, Index: head/www/chromium/files/patch-chrome__browser__memory__system_memory_stats_recorder_linux.cc =================================================================== --- head/www/chromium/files/patch-chrome__browser__memory__system_memory_stats_recorder_linux.cc (nonexistent) +++ head/www/chromium/files/patch-chrome__browser__memory__system_memory_stats_recorder_linux.cc (revision 396536) @@ -0,0 +1,18 @@ +--- chrome/browser/memory/system_memory_stats_recorder_linux.cc.orig 2015-09-03 20:30:21.188785000 -0400 ++++ chrome/browser/memory/system_memory_stats_recorder_linux.cc 2015-09-03 20:25:00.522580000 -0400 +@@ -29,6 +29,7 @@ + UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50) + + void RecordMemoryStats(RecordMemoryStatsType type) { ++#if !defined(OS_FREEBSD) + base::SystemMemoryInfoKB memory; + if (!base::GetSystemMemoryInfo(&memory)) + return; +@@ -92,6 +93,7 @@ + break; + } + } ++#endif // !defined(OS_FREEBSD) + } + + } // namespace memory Property changes on: head/www/chromium/files/patch-chrome__browser__memory__system_memory_stats_recorder_linux.cc ___________________________________________________________________ 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: head/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc =================================================================== --- head/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc (revision 396535) +++ head/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc (revision 396536) @@ -1,46 +1,46 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2015-04-19 00:16:05.000000000 +0200 -+++ chrome/renderer/pepper/pepper_flash_font_file_host.cc 2015-04-19 00:17:03.000000000 +0200 +--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2015-08-22 15:01:53.000000000 -0400 ++++ chrome/renderer/pepper/pepper_flash_font_file_host.cc 2015-09-03 10:01:52.619879000 -0400 @@ -13,7 +13,7 @@ #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/serialized_structs.h" -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) #include "content/public/common/child_process_sandbox_support_linux.h" #endif @@ -24,14 +24,14 @@ const ppapi::proxy::SerializedFontDescription& description, PP_PrivateFontCharset charset) : ResourceHost(host->GetPpapiHost(), instance, resource) { -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) fd_.reset(content::MatchFontWithFallback( - description.face.c_str(), + description.face, description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD, description.italic, charset, PP_BROWSERFONT_TRUSTED_FAMILY_DEFAULT)); -#endif // defined(OS_LINUX) || defined(OS_OPENBSD) +#endif // defined(OS_LINUX) || defined(OS_BSD) } PepperFlashFontFileHost::~PepperFlashFontFileHost() {} @@ -51,7 +51,7 @@ uint32_t table) { std::string contents; int32_t result = PP_ERROR_FAILED; -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) int fd = fd_.get(); if (fd != -1) { size_t length = 0; @@ -67,7 +67,7 @@ } } } -#endif // defined(OS_LINUX) || defined(OS_OPENBSD) +#endif // defined(OS_LINUX) || defined(OS_BSD) context->reply_msg = PpapiPluginMsg_FlashFontFile_GetFontTableReply(contents); return result; Index: head/www/chromium/files/patch-content__browser__child_process_launcher.cc =================================================================== --- head/www/chromium/files/patch-content__browser__child_process_launcher.cc (revision 396535) +++ head/www/chromium/files/patch-content__browser__child_process_launcher.cc (revision 396536) @@ -1,92 +1,109 @@ ---- 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 -@@ -111,7 +111,11 @@ +--- content/browser/child_process_launcher.cc.orig 2015-09-01 16:10:42.000000000 -0400 ++++ content/browser/child_process_launcher.cc 2015-09-03 10:33:53.388547000 -0400 +@@ -114,7 +114,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 @@ +@@ -143,7 +147,7 @@ + #endif + #endif + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + std::map regions; + GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess( + *cmd_line, child_process_id, files_to_register.get() +@@ -176,7 +180,7 @@ + } + } + #endif // defined(V8_USE_EXTERNAL_STARTUP_DATA) +-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + + #if defined(OS_ANDROID) + files_to_register->Share( +@@ -196,21 +200,21 @@ // 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 +170,14 @@ + base::ProcessHandle handle = ZygoteHostImpl::GetInstance()->ForkRequest( + cmd_line->argv(), files_to_register.Pass(), process_type); 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 +185,7 @@ +@@ -218,7 +222,7 @@ sandbox_fd, GetSandboxFD())); } -#endif // defined(OS_MACOSX) +#endif // defined(OS_MACOSX) && !defined(OS_BSD) // Actually launch the app. base::LaunchOptions options; -@@ -254,13 +258,13 @@ +@@ -294,13 +298,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 +355,7 @@ +@@ -399,7 +403,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 +363,7 @@ +@@ -407,7 +411,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 +437,7 @@ +@@ -481,7 +485,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: head/www/chromium/files/patch-content__renderer__render_thread_impl.cc =================================================================== --- head/www/chromium/files/patch-content__renderer__render_thread_impl.cc (revision 396535) +++ head/www/chromium/files/patch-content__renderer__render_thread_impl.cc (revision 396536) @@ -1,11 +1,11 @@ ---- content/renderer/render_thread_impl.cc.orig 2015-05-13 18:35:46.000000000 -0400 -+++ content/renderer/render_thread_impl.cc 2015-05-20 15:46:14.175833000 -0400 -@@ -673,7 +673,7 @@ - static_cast(compositor_raster_threads_.size() + 1)) - .c_str())); - raster_thread->Start(); +--- content/renderer/render_thread_impl.cc.orig 2015-09-01 16:10:42.000000000 -0400 ++++ content/renderer/render_thread_impl.cc 2015-09-03 10:37:57.364787000 -0400 +@@ -768,7 +768,7 @@ + is_gather_pixel_refs_enabled_ = num_raster_threads > 1; + + base::SimpleThread::Options thread_options; -#if defined(OS_ANDROID) || defined(OS_LINUX) +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) - if (!command_line.HasSwitch( - switches::kUseNormalPriorityForTileTaskWorkerThreads)) { - raster_thread->SetThreadPriority(base::ThreadPriority::BACKGROUND); + if (!command_line.HasSwitch( + switches::kUseNormalPriorityForTileTaskWorkerThreads)) { + thread_options.set_priority(base::ThreadPriority::BACKGROUND); Index: head/www/chromium/files/patch-device__usb__usb_service_impl.cc =================================================================== --- head/www/chromium/files/patch-device__usb__usb_service_impl.cc (revision 396535) +++ head/www/chromium/files/patch-device__usb__usb_service_impl.cc (revision 396536) @@ -1,56 +1,56 @@ ---- 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" +--- device/usb/usb_service_impl.cc.orig 2015-09-01 16:10:43.000000000 -0400 ++++ device/usb/usb_service_impl.cc 2015-09-03 10:41:26.551811000 -0400 +@@ -19,7 +19,11 @@ #include "components/device_event_log/device_event_log.h" + #include "device/usb/usb_device_handle.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 @@ +@@ -373,6 +377,7 @@ weak_factory_(this) { base::MessageLoop::current()->AddDestructionObserver(this); +#if !defined(OS_FREEBSD) int rv = libusb_hotplug_register_callback( context_->context(), static_cast(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -321,14 +326,16 @@ - } - #endif // OS_WIN +@@ -391,14 +396,17 @@ + device_observer_.Add(device_monitor); } -+#endif // !OS_FREEBSD + #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 ++#endif // OS_FREEBSD for (const auto& map_entry : devices_) { map_entry.second->OnDisconnect(); } -@@ -566,6 +573,7 @@ +@@ -630,6 +638,7 @@ device->OnDisconnect(); } +#if !defined(OS_FREEBSD) // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, PlatformUsbDevice device, -@@ -603,6 +611,7 @@ +@@ -667,6 +676,7 @@ return 0; } +#endif // !OS_FREEBSD void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) { DCHECK(CalledOnValidThread()); Index: head/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc =================================================================== --- head/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc (revision 396535) +++ head/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc (revision 396536) @@ -1,11 +1,11 @@ ---- gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc.orig 2015-05-13 18:35:46.000000000 -0400 -+++ gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc 2015-05-20 16:00:07.466335000 -0400 -@@ -46,7 +46,7 @@ +--- gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc.orig 2015-09-01 16:10:43.000000000 -0400 ++++ gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc 2015-09-03 10:44:42.860094000 -0400 +@@ -48,7 +48,7 @@ : base::Thread(kAsyncTransferThreadName), initialized_(false) { - Start(); + base::Thread::Options options; -#if defined(OS_ANDROID) || defined(OS_LINUX) +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) - SetPriority(base::ThreadPriority::BACKGROUND); + options.priority = base::ThreadPriority::BACKGROUND; #endif - } + StartWithOptions(options); Index: head/www/chromium/files/patch-net__base__address_tracker_linux.cc =================================================================== --- head/www/chromium/files/patch-net__base__address_tracker_linux.cc (revision 396535) +++ head/www/chromium/files/patch-net__base__address_tracker_linux.cc (revision 396536) @@ -1,94 +1,94 @@ ---- net/base/address_tracker_linux.cc.orig 2015-04-19 20:31:08.000000000 +0200 -+++ net/base/address_tracker_linux.cc 2015-04-19 20:36:27.000000000 +0200 +--- net/base/address_tracker_linux.cc.orig 2015-08-22 15:01:56.000000000 -0400 ++++ net/base/address_tracker_linux.cc 2015-09-03 10:45:50.411703000 -0400 @@ -5,7 +5,9 @@ #include "net/base/address_tracker_linux.h" #include +#if !defined(OS_FREEBSD) #include +#endif #include #include "base/files/scoped_file.h" -@@ -24,6 +26,7 @@ +@@ -39,6 +41,7 @@ bool GetAddress(const struct nlmsghdr* header, IPAddressNumber* out, bool* really_deprecated) { +#if !defined(OS_FREEBSD) if (really_deprecated) *really_deprecated = false; const struct ifaddrmsg* msg = -@@ -76,6 +79,9 @@ +@@ -91,6 +94,9 @@ return false; out->assign(address, address + address_length); return true; +#else + return false; +#endif } } // namespace -@@ -128,6 +134,7 @@ +@@ -146,6 +152,7 @@ } void AddressTrackerLinux::Init() { +#if !defined(OS_FREEBSD) netlink_fd_ = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); if (netlink_fd_ < 0) { PLOG(ERROR) << "Could not create NETLINK socket"; -@@ -215,6 +222,10 @@ +@@ -233,6 +240,10 @@ return; } } +#else + AbortAndForceOnline(); + return; +#endif } void AddressTrackerLinux::AbortAndForceOnline() { -@@ -250,6 +261,7 @@ +@@ -277,6 +288,7 @@ void AddressTrackerLinux::ReadMessages(bool* address_changed, bool* link_changed, bool* tunnel_changed) { +#if !defined(OS_FREEBSD) *address_changed = false; *link_changed = false; *tunnel_changed = false; -@@ -276,6 +288,7 @@ +@@ -303,6 +315,7 @@ } if (*link_changed || *address_changed) UpdateCurrentConnectionType(); +#endif } void AddressTrackerLinux::HandleMessage(char* buffer, -@@ -283,6 +296,7 @@ +@@ -310,6 +323,7 @@ bool* address_changed, bool* link_changed, bool* tunnel_changed) { +#if !defined(OS_FREEBSD) DCHECK(buffer); for (struct nlmsghdr* header = reinterpret_cast(buffer); NLMSG_OK(header, length); -@@ -365,6 +379,7 @@ +@@ -406,6 +420,7 @@ break; } } +#endif } void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) { -@@ -391,8 +406,12 @@ +@@ -432,8 +447,12 @@ bool AddressTrackerLinux::IsTunnelInterface(int interface_index) const { // Linux kernel drivers/net/tun.c uses "tun" name prefix. +#if !defined(OS_FREEBSD) char buf[IFNAMSIZ] = {0}; return strncmp(get_interface_name_(interface_index, buf), "tun", 3) == 0; +#else + return false; +#endif } void AddressTrackerLinux::UpdateCurrentConnectionType() { Index: head/www/chromium/files/patch-net__base__network_interfaces_linux.cc =================================================================== --- head/www/chromium/files/patch-net__base__network_interfaces_linux.cc (nonexistent) +++ head/www/chromium/files/patch-net__base__network_interfaces_linux.cc (revision 396536) @@ -0,0 +1,105 @@ +--- net/base/network_interfaces_linux.cc.orig 2015-09-03 11:01:37.625073000 -0400 ++++ net/base/network_interfaces_linux.cc 2015-09-03 11:00:13.970733000 -0400 +@@ -4,12 +4,14 @@ + + #include "net/base/network_interfaces_linux.h" + ++#if !defined(OS_FREEBSD) + #if !defined(OS_ANDROID) + #include + #endif // !defined(OS_ANDROID) + #include + #include + #include ++#endif // !defined(OS_FREEBSD) + #include + #include + #include +@@ -45,6 +47,7 @@ + // are still progressing through duplicated address detection (DAD) + // and shouldn't be used by the application layer until DAD process + // is completed. ++#if !defined(OS_FREEBSD) + if (native_attributes & ( + #if !defined(OS_ANDROID) + IFA_F_OPTIMISTIC | IFA_F_DADFAILED | +@@ -62,6 +65,10 @@ + } + + return true; ++#else ++ // the flags tested above are not present on FreeBSD ++ return false; ++#endif // !OS_FREEBSD + } + + } // namespace +@@ -80,13 +87,15 @@ + if (!s.is_valid()) + return NetworkChangeNotifier::CONNECTION_UNKNOWN; + ++#if !defined(OS_FREEBSD) + // Test wireless extensions for CONNECTION_WIFI + struct iwreq pwrq = {}; + strncpy(pwrq.ifr_name, ifname.c_str(), IFNAMSIZ - 1); + if (ioctl(s.get(), SIOCGIWNAME, &pwrq) != -1) + return NetworkChangeNotifier::CONNECTION_WIFI; ++#endif // !defined(OS_FREEBSD) + +-#if !defined(OS_ANDROID) ++#if !defined(OS_ANDROID) && !defined(OS_FREEBSD) + // Test ethtool for CONNECTION_ETHERNET + struct ethtool_cmd ecmd = {}; + ecmd.cmd = ETHTOOL_GSET; +@@ -95,12 +104,13 @@ + strncpy(ifr.ifr_name, ifname.c_str(), IFNAMSIZ - 1); + if (ioctl(s.get(), SIOCETHTOOL, &ifr) != -1) + return NetworkChangeNotifier::CONNECTION_ETHERNET; +-#endif // !defined(OS_ANDROID) ++#endif // !defined(OS_ANDROID) && !defined(OS_FREEBSD) + + return NetworkChangeNotifier::CONNECTION_UNKNOWN; + } + + std::string GetInterfaceSSID(const std::string& ifname) { ++#if !defined(OS_FREEBSD) + base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0)); + if (!ioctl_socket.is_valid()) + return ""; +@@ -112,9 +122,11 @@ + wreq.u.essid.length = IW_ESSID_MAX_SIZE; + if (ioctl(ioctl_socket.get(), SIOCGIWESSID, &wreq) != -1) + return ssid; ++#endif // !defined(OS_FREEBSD) + return ""; + } + ++#if !defined(OS_FREEBSD) + bool GetNetworkListImpl( + NetworkInterfaceList* networks, + int policy, +@@ -183,6 +195,7 @@ + + return true; + } ++#endif // !defined(OS_FREEBSD) + + std::string GetWifiSSIDFromInterfaceListInternal( + const NetworkInterfaceList& interfaces, +@@ -207,12 +220,16 @@ + if (networks == NULL) + return false; + ++#if !defined(OS_FREEBSD) + internal::AddressTrackerLinux tracker; + tracker.Init(); + + return internal::GetNetworkListImpl( + networks, policy, tracker.GetOnlineLinks(), tracker.GetAddressMap(), + &internal::AddressTrackerLinux::GetInterfaceName); ++#else ++ return false; ++#endif + } + + std::string GetWifiSSID() { Property changes on: head/www/chromium/files/patch-net__base__network_interfaces_linux.cc ___________________________________________________________________ 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: head/www/chromium/files/patch-net__base__network_interfaces_posix.cc =================================================================== --- head/www/chromium/files/patch-net__base__network_interfaces_posix.cc (nonexistent) +++ head/www/chromium/files/patch-net__base__network_interfaces_posix.cc (revision 396536) @@ -0,0 +1,18 @@ +--- net/base/network_interfaces_posix.cc.orig 2015-09-03 11:04:58.534429000 -0400 ++++ net/base/network_interfaces_posix.cc 2015-09-03 11:07:05.587031000 -0400 +@@ -20,6 +20,7 @@ + #if !defined(OS_NACL) + namespace internal { + ++#if !defined(OS_BSD) + // The application layer can pass |policy| defined in net_util.h to + // request filtering out certain type of interfaces. + bool ShouldIgnoreInterface(const std::string& name, int policy) { +@@ -33,6 +34,7 @@ + + return false; + } ++#endif + + // Check if the address is unspecified (i.e. made of zeroes) or loopback. + bool IsLoopbackOrUnspecifiedAddress(const sockaddr* addr) { Property changes on: head/www/chromium/files/patch-net__base__network_interfaces_posix.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: head/www/chromium/files/patch-skia__ext__SkMemory_new_handler.cpp =================================================================== --- head/www/chromium/files/patch-skia__ext__SkMemory_new_handler.cpp (revision 396535) +++ head/www/chromium/files/patch-skia__ext__SkMemory_new_handler.cpp (revision 396536) @@ -1,20 +1,20 @@ ---- skia/ext/SkMemory_new_handler.cpp.orig 2015-04-20 19:38:21.000000000 +0200 -+++ skia/ext/SkMemory_new_handler.cpp 2015-04-20 19:38:39.000000000 +0200 -@@ -53,7 +53,7 @@ - static void* sk_malloc_nothrow(size_t size) { +--- skia/ext/SkMemory_new_handler.cpp.orig 2015-08-22 15:01:57.000000000 -0400 ++++ skia/ext/SkMemory_new_handler.cpp 2015-09-03 11:11:25.462063000 -0400 +@@ -62,7 +62,7 @@ // TODO(b.kelemen): we should always use UncheckedMalloc but currently it // doesn't work as intended everywhere. + void* result; -#if defined(OS_IOS) +#if defined(OS_IOS) || defined(OS_FREEBSD) - return malloc(size); + result = malloc(size); #else - void* result; -@@ -77,7 +77,7 @@ - void* sk_calloc(size_t size) { + // It's the responsibility of the caller to check the return value. +@@ -89,7 +89,7 @@ // TODO(b.kelemen): we should always use UncheckedCalloc but currently it // doesn't work as intended everywhere. + void* result; -#if defined(OS_IOS) +#if defined(OS_IOS) || defined(OS_FREEBSD) - return calloc(1, size); + result = calloc(1, size); #else - void* result; + // It's the responsibility of the caller to check the return value. Index: head/www/chromium/files/patch-sync__util__get_session_name.cc =================================================================== --- head/www/chromium/files/patch-sync__util__get_session_name.cc (revision 396535) +++ head/www/chromium/files/patch-sync__util__get_session_name.cc (revision 396536) @@ -1,20 +1,20 @@ ---- sync/util/get_session_name.cc.orig 2014-10-10 08:54:17 UTC -+++ sync/util/get_session_name.cc -@@ -12,7 +12,7 @@ - #include "base/sys_info.h" - #include "base/task_runner.h" +--- sync/util/get_session_name.cc.orig 2015-08-22 15:01:57.000000000 -0400 ++++ sync/util/get_session_name.cc 2015-09-03 11:15:14.369871000 -0400 +@@ -14,7 +14,7 @@ --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) + #if defined(OS_CHROMEOS) + #include "chromeos/system/devicetype.h" +-#elif defined(OS_LINUX) ++#elif (defined(OS_LINUX) || defined(OS_BSD)) #include "sync/util/get_session_name_linux.h" #elif defined(OS_IOS) #include "sync/util/get_session_name_ios.h" -@@ -37,7 +37,7 @@ - // like "stumpy-signed-mp-v2keys" etc. The information can be checked on - // "CHROMEOS_RELEASE_BOARD" line in chrome://system. - session_name = board.substr(0, 6) == "stumpy" ? "Chromebox" : "Chromebook"; +@@ -50,7 +50,7 @@ + session_name = "Chromebook"; + break; + } -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) session_name = internal::GetHostname(); #elif defined(OS_IOS) session_name = internal::GetComputerName(); Index: head/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp =================================================================== --- head/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp (revision 396535) +++ head/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp (revision 396536) @@ -1,48 +1,48 @@ ---- third_party/WebKit/Source/platform/blink_platform.gyp.orig 2015-01-21 20:48:07 UTC -+++ third_party/WebKit/Source/platform/blink_platform.gyp +--- third_party/WebKit/Source/platform/blink_platform.gyp.orig 2015-09-01 16:10:53.000000000 -0400 ++++ third_party/WebKit/Source/platform/blink_platform.gyp 2015-09-03 11:17:44.822976000 -0400 @@ -38,6 +38,9 @@ 'targets': [{ 'target_name': 'blink_common', 'type': '<(component)', + 'include_dirs': [ + '<(prefix_dir)/include', + ], 'variables': { 'enable_wexit_time_destructors': 1 }, 'dependencies': [ '../config.gyp:config', -@@ -248,7 +251,7 @@ - # compiler optimizations, see crbug.com/237063 - 'msvs_disabled_warnings': [ 4267, 4334, 4724 ], - 'conditions': [ +@@ -251,7 +254,7 @@ + ['include', 'graphics/cpu/x86/WebGLImageConversionSSE\\.h$'], + ], + }], - ['OS=="linux" or OS=="android" or OS=="win"', { + ['OS=="linux" or OS=="android" or OS=="win" or os_bsd==1', { 'sources/': [ # Cherry-pick files excluded by the broader regular expressions above. ['include', 'fonts/opentype/OpenTypeTypes\\.h$'], -@@ -259,7 +262,7 @@ +@@ -262,7 +265,7 @@ ], }, ], - ['OS=="linux" or OS=="android"', { + ['OS=="linux" or OS=="android" or os_bsd==1', { 'sources/': [ ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'], ] -@@ -350,7 +353,7 @@ +@@ -345,7 +348,7 @@ ['exclude', 'scroll/ScrollbarThemeMac'], ], }], - ['OS != "linux" and OS != "mac" and OS != "win"', { + ['OS != "linux" and OS != "mac" and OS != "win" and os_bsd != 1', { 'sources/': [ ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], ], -@@ -395,7 +398,7 @@ +@@ -388,7 +391,7 @@ ['exclude', 'Android\\.cpp$'], ], }], - ['OS=="linux"', { + ['OS=="linux" or os_bsd==1', { 'dependencies': [ '<(DEPTH)/build/linux/system.gyp:fontconfig', ], Index: head/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h =================================================================== --- head/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h (revision 396535) +++ head/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h (revision 396536) @@ -1,23 +1,18 @@ ---- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2014-10-10 09:34:38 UTC -+++ third_party/WebKit/Source/wtf/ByteSwap.h -@@ -52,14 +52,20 @@ +--- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2015-08-22 15:03:03.000000000 -0400 ++++ third_party/WebKit/Source/wtf/ByteSwap.h 2015-09-03 11:19:52.852584000 -0400 +@@ -52,9 +52,15 @@ #else +#ifndef bswap64 ALWAYS_INLINE uint64_t bswap64(uint64_t x) { return __builtin_bswap64(x); } +#endif +#ifndef bswap32 ALWAYS_INLINE uint32_t bswap32(uint32_t x) { return __builtin_bswap32(x); } +#endif - // GCC 4.6 lacks __builtin_bswap16. Newer versions have it but we support 4.6. +#ifndef bswap16 - #if COMPILER(CLANG) ALWAYS_INLINE uint16_t bswap16(uint16_t x) { return __builtin_bswap16(x); } - #else - inline uint16_t bswap16(uint16_t x) { return ((x & 0xff00) >> 8) | ((x & 0x00ff) << 8); } - #endif +#endif #endif Index: head/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi =================================================================== --- head/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi (nonexistent) +++ head/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi (revision 396536) @@ -0,0 +1,38 @@ +--- third_party/ffmpeg/ffmpeg_generated.gypi.orig 2015-09-04 18:08:57.318433000 -0400 ++++ third_party/ffmpeg/ffmpeg_generated.gypi 2015-09-08 12:00:45.690486000 -0400 +@@ -138,7 +138,7 @@ + 'libavcodec/x86/flacdsp.asm', + ], + }], # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") +- ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")', { ++ ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome") or (os_bsd==1 and ffmpeg_branding == "Chrome")', { + 'c_sources': [ + 'libavcodec/x86/dct_init.c', + 'libavcodec/x86/h264_qpel.c', +@@ -301,7 +301,7 @@ + 'libavutil/arm/autorename_libavutil_arm_float_dsp_neon.S', + ], + }], # (OS == "android" and target_arch == "arm") or (OS == "linux" and target_arch == "arm" and arm_neon == 1) +- ['(OS == "linux" and target_arch == "ia32") or (OS == "linux" and target_arch == "x64") or (OS == "mac") or (OS == "win")', { ++ ['(OS == "linux" and target_arch == "ia32") or (OS == "linux" and target_arch == "x64") or (OS == "mac") or (OS == "win") or (os_bsd==1)', { + 'c_sources': [ + 'libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c', + 'libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c', +@@ -376,7 +376,7 @@ + 'libavutil/arm/float_dsp_vfp.S', + ], + }], # (OS == "android" and target_arch == "arm") or (OS == "linux" and target_arch == "arm" and arm_neon == 1) or (OS == "linux" and target_arch == "arm") +- ['(OS == "linux" and ffmpeg_branding == "Chrome") or (OS == "linux" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")', { ++ ['((OS == "linux" or os_bsd==1) and ffmpeg_branding == "Chrome") or (OS == "linux" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")', { + 'c_sources': [ + 'libavcodec/cabac.c', + 'libavcodec/h264.c', +@@ -437,7 +437,7 @@ + 'libavformat/rawdec.c', + ], + }], # (OS == "linux" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and ffmpeg_branding == "ChromiumOS") or (ffmpeg_branding == "Chrome") +- ['(OS == "linux") or (OS == "mac") or (OS == "win")', { ++ ['(OS == "linux") or (OS == "mac") or (OS == "win") or (os_bsd==1)', { + 'c_sources': [ + 'libavcodec/h264pred.c', + 'libavcodec/hpeldsp.c', Property changes on: head/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi ___________________________________________________________________ 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: head/www/chromium/files/patch-third_party__webrtc__base__platform_thread.cc =================================================================== --- head/www/chromium/files/patch-third_party__webrtc__base__platform_thread.cc (nonexistent) +++ head/www/chromium/files/patch-third_party__webrtc__base__platform_thread.cc (revision 396536) @@ -0,0 +1,42 @@ +--- third_party/webrtc/base/platform_thread.cc.orig 2015-09-03 11:23:10.962030000 -0400 ++++ third_party/webrtc/base/platform_thread.cc 2015-09-03 11:36:53.569521000 -0400 +@@ -14,11 +14,18 @@ + + #include "webrtc/base/checks.h" + +-#if defined(WEBRTC_LINUX) ++#if defined(WEBRTC_LINUX) && !defined(__FreeBSD__) + #include + #include + #endif + ++#if defined(WEBRTC_BSD) ++#include ++#include ++#include ++#include ++#endif ++ + namespace rtc { + + PlatformThreadId CurrentThreadId() { +@@ -28,6 +35,8 @@ + #elif defined(WEBRTC_POSIX) + #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS) + ret = pthread_mach_thread_np(pthread_self()); ++#elif defined(WEBRTC_BSD) ++ ret = static_cast(pthread_getthreadid_np()); + #elif defined(WEBRTC_LINUX) + ret = syscall(__NR_gettid); + #elif defined(WEBRTC_ANDROID) +@@ -72,7 +81,9 @@ + reinterpret_cast(&threadname_info)); + } __except (EXCEPTION_EXECUTE_HANDLER) { + } +-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) ++#elif defined(WEBRTC_BSD) ++ pthread_set_name_np(pthread_self(), name); ++#elif (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)) && !defined(WEBRTC_BSD) + prctl(PR_SET_NAME, reinterpret_cast(name)); + #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) + pthread_setname_np(name); Property changes on: head/www/chromium/files/patch-third_party__webrtc__base__platform_thread.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: head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc =================================================================== --- head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc (revision 396535) +++ head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc (revision 396536) @@ -1,24 +1,12 @@ ---- third_party/webrtc/system_wrappers/source/thread_posix.cc.orig 2015-04-19 17:26:21.000000000 +0200 -+++ third_party/webrtc/system_wrappers/source/thread_posix.cc 2015-04-19 19:08:15.000000000 +0200 -@@ -15,9 +15,11 @@ +--- third_party/webrtc/system_wrappers/source/thread_posix.cc.orig 2015-08-22 15:03:58.000000000 -0400 ++++ third_party/webrtc/system_wrappers/source/thread_posix.cc 2015-09-03 11:27:39.172029000 -0400 +@@ -15,7 +15,9 @@ #include #include #ifdef WEBRTC_LINUX +#if !defined(WEBRTC_BSD) #include --#include - #include +#endif -+#include - #include + #include #include #endif -@@ -138,7 +140,7 @@ - if (!name_.empty()) { - // Setting the thread name may fail (harmlessly) if running inside a - // sandbox. Ignore failures if they happen. --#if defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) -+#if (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)) && !defined(WEBRTC_BSD) - prctl(PR_SET_NAME, reinterpret_cast(name_.c_str())); - #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) - pthread_setname_np(name_.substr(0, 63).c_str()); Index: head/www/chromium/files/patch-ui__base__ime__input_method_factory.cc =================================================================== --- head/www/chromium/files/patch-ui__base__ime__input_method_factory.cc (revision 396535) +++ head/www/chromium/files/patch-ui__base__ime__input_method_factory.cc (revision 396536) @@ -1,20 +1,20 @@ ---- ui/base/ime/input_method_factory.cc.orig 2015-04-19 17:31:55.000000000 +0200 -+++ ui/base/ime/input_method_factory.cc 2015-04-19 17:33:24.000000000 +0200 -@@ -14,7 +14,7 @@ - #include "ui/base/ime/remote_input_method_win.h" +--- ui/base/ime/input_method_factory.cc.orig 2015-08-22 15:01:59.000000000 -0400 ++++ ui/base/ime/input_method_factory.cc 2015-09-03 11:38:57.103095000 -0400 +@@ -15,7 +15,7 @@ #elif defined(OS_MACOSX) #include "ui/base/ime/input_method_mac.h" --#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \ +- !defined(OS_CHROMEOS) ++ !defined(OS_CHROMEOS) || defined(OS_BSD) #include "ui/base/ime/input_method_auralinux.h" #else #include "ui/base/ime/input_method_minimal.h" -@@ -47,7 +47,7 @@ - return make_scoped_ptr(new InputMethodWin(delegate, widget)); +@@ -57,7 +57,7 @@ #elif defined(OS_MACOSX) return make_scoped_ptr(new InputMethodMac(delegate)); --#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \ +- !defined(OS_CHROMEOS) ++ !defined(OS_CHROMEOS) || defined(OS_BSD) return make_scoped_ptr(new InputMethodAuraLinux(delegate)); #else return make_scoped_ptr(new InputMethodMinimal(delegate)); Index: head/www/chromium/files/patch-ui__views__views_delegate.cc =================================================================== --- head/www/chromium/files/patch-ui__views__views_delegate.cc (revision 396535) +++ head/www/chromium/files/patch-ui__views__views_delegate.cc (revision 396536) @@ -1,20 +1,11 @@ ---- 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 @@ +--- ui/views/views_delegate.cc.orig 2015-08-22 15:02:00.000000000 -0400 ++++ ui/views/views_delegate.cc 2015-09-03 11:41:11.900854000 -0400 +@@ -62,7 +62,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: head/www/chromium/files/patch-ui__views__views_delegate.h =================================================================== --- head/www/chromium/files/patch-ui__views__views_delegate.h (revision 396535) +++ head/www/chromium/files/patch-ui__views__views_delegate.h (revision 396536) @@ -1,20 +1,11 @@ ---- 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 @@ +--- ui/views/views_delegate.h.orig 2015-08-22 15:02:00.000000000 -0400 ++++ ui/views/views_delegate.h 2015-09-03 11:42:15.403898000 -0400 +@@ -110,7 +110,7 @@ // Returns true if the window passed in is in the Windows 8 metro // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) +#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_FREEBSD) virtual gfx::ImageSkia* GetDefaultWindowIcon() const; #endif -@@ -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: head/www/chromium/files/patch-ui__webui__resources__js__cr.js =================================================================== --- head/www/chromium/files/patch-ui__webui__resources__js__cr.js (nonexistent) +++ head/www/chromium/files/patch-ui__webui__resources__js__cr.js (revision 396536) @@ -0,0 +1,13 @@ +--- ui/webui/resources/js/cr.js.orig 2015-09-05 09:28:39.153643000 -0400 ++++ ui/webui/resources/js/cr.js 2015-09-05 09:29:44.511113000 -0400 +@@ -431,5 +431,10 @@ + get isLinux() { + return /Linux/.test(navigator.userAgent); + }, ++ ++ /** Whether this is on *BSD. */ ++ get isBSD() { ++ return /BSD/.test(navigator.userAgent); ++ }, + }; + }(); Property changes on: head/www/chromium/files/patch-ui__webui__resources__js__cr.js ___________________________________________________________________ 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/javascript \ No newline at end of property Index: head/www/chromium/files/patch-ui__webui__resources__js__util.js =================================================================== --- head/www/chromium/files/patch-ui__webui__resources__js__util.js (nonexistent) +++ head/www/chromium/files/patch-ui__webui__resources__js__util.js (revision 396536) @@ -0,0 +1,11 @@ +--- ui/webui/resources/js/util.js.orig 2015-09-05 09:31:35.172857000 -0400 ++++ ui/webui/resources/js/util.js 2015-09-05 09:31:57.588607000 -0400 +@@ -58,7 +58,7 @@ + */ + function getSupportedScaleFactors() { + var supportedScaleFactors = []; +- if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux) { ++ if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux || cr.isBSD) { + // All desktop platforms support zooming which also updates the + // renderer's device scale factors (a.k.a devicePixelRatio), and + // these platforms has high DPI assets for 2.0x. Use 1x and 2x in Property changes on: head/www/chromium/files/patch-ui__webui__resources__js__util.js ___________________________________________________________________ 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/javascript \ No newline at end of property Index: head/www/chromium/pkg-plist =================================================================== --- head/www/chromium/pkg-plist (revision 396535) +++ head/www/chromium/pkg-plist (revision 396536) @@ -1,196 +1,205 @@ bin/chrome man/man1/chrome.1.gz %%DRIVER%%bin/chromedriver share/applications/chromium-browser.desktop %%DATADIR%%/chrome %%DATADIR%%/chrome-wrapper %%DATADIR%%/chrome_100_percent.pak %%DATADIR%%/content_resources.pak %%DATADIR%%/keyboard_resources.pak %%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/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/securityStateHttp.png +%%DATADIR%%/resources/inspector/Images/securityStateHttp_2x.png +%%DATADIR%%/resources/inspector/Images/securityStateInsecure.png +%%DATADIR%%/resources/inspector/Images/securityStateInsecure_2x.png +%%DATADIR%%/resources/inspector/Images/securityStateSecure.png +%%DATADIR%%/resources/inspector/Images/securityStateSecure_2x.png +%%DATADIR%%/resources/inspector/Images/securityStateWarning.png +%%DATADIR%%/resources/inspector/Images/securityStateWarning_2x.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/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/animation_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/emulated_devices_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/security_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