Index: head/www/chromium/Makefile =================================================================== --- head/www/chromium/Makefile (revision 475100) +++ head/www/chromium/Makefile (revision 475101) @@ -1,314 +1,312 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 65.0.3325.181 -PORTREVISION= 6 +PORTVERSION= 67.0.3396.87 CATEGORIES?= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= chromium@FreeBSD.org COMMENT?= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ .if !defined(GN_ONLY) -BUILD_DEPENDS+= gperf:devel/gperf \ +BUILD_DEPENDS+= git:devel/git \ + gperf:devel/gperf \ yasm:devel/yasm \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ flock:sysutils/flock \ node:www/node \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} .endif .if !defined(GN_ONLY) LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libspeechd.so:accessibility/speech-dispatcher \ libsnappy.so:archivers/snappy \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ libspeex.so:audio/speex \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libicuuc.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ libpci.so:devel/libpci \ libnspr4.so:devel/nspr \ libre2.so:devel/re2 \ libcairo.so:graphics/cairo \ libdrm.so:graphics/libdrm \ libexif.so:graphics/libexif \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libavcodec.so:multimedia/ffmpeg \ - libvpx.so:multimedia/libvpx \ libopenh264.so:multimedia/openh264 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libgcrypt.so:security/libgcrypt \ libsecret-1.so:security/libsecret \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-lite>0:x11-fonts/noto-lite BROKEN_FreeBSD_11_aarch64= components/safe_browsing_db/v4_rice.cc:120:18: use of overloaded operator '&' is ambiguous ONLY_FOR_ARCHS= aarch64 amd64 i386 .endif .if defined(GN_ONLY) USES= compiler:c++14-lang ninja pkgconfig python:2.7,build shebangfix tar:xz .else USES= bison cpe desktop-file-utils jpeg ninja perl5 pkgconfig \ python:2.7,build shebangfix tar:xz .endif MAKE_ARGS= -C out/${BUILDTYPE} BINARY_ALIAS= python=${PYTHON_CMD} .if !defined(GN_ONLY) CPE_VENDOR= google CPE_PRODUCT= chrome USE_GL= gl USE_LDCONFIG= ${DATADIR} USE_PERL5= build USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xproto xrandr xrender xscrnsaver xtst USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome INSTALLS_ICONS= yes .endif EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) # # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables. # Some parts don't have use_system_* flag, and can be turned on/off by using # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. GN_ARGS+= clang_use_chrome_plugins=false \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ enable_webrtc=true \ fieldtrial_testing_like_official_build=true \ is_clang=true \ toolkit_views=true \ treat_warnings_as_errors=false \ use_allocator="none" \ use_allocator_shim=false \ use_aura=true \ use_bundled_fontconfig=false \ use_custom_libcxx=false \ use_gnome_keyring=false \ use_gtk3=true \ use_lld=true \ use_sysroot=false \ use_system_freetype=true \ use_system_harfbuzz=true \ use_system_libjpeg=true \ - use_system_sqlite=false \ extra_cxxflags="-I${LOCALBASE}/include" \ extra_ldflags="-L${LOCALBASE}/lib" # TODO: investigate building with these options: # use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild # 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. GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \ google_default_client_id="996322985003.apps.googleusercontent.com" \ google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn" .if !defined(GN_ONLY) SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS TEST CODECS_DESC= Compile and enable patented codecs like H.264 DRIVER_DESC= Install chromedriver OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_DEFAULT= ALSA CODECS CUPS DRIVER KERBEROS OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ alsa-lib>=1.1.1_1:audio/alsa-lib ALSA_VARS= GN_ARGS+=use_alsa=true ALSA_VARS_OFF= GN_ARGS+=use_alsa=false CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \ GN_ARGS+=proprietary_codecs=true \ GN_ARGS+=enable_hevc_demuxing=true CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \ GN_ARGS+=proprietary_codecs=false \ GN_ARGS+=enable_hevc_demuxing=false CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_VARS= GN_ARGS+=use_cups=true CUPS_VARS_OFF= GN_ARGS+=use_cups=false DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_debug=true \ GN_ARGS+=is_component_build=false \ GN_BOOTSTRAP_FLAGS+=--debug \ WANTSPACE="lots of free disk space (~ 12GB)" DEBUG_VARS_OFF= BUILDTYPE=Release \ GN_ARGS+=is_debug=false \ GN_ARGS+=is_official_build=true \ GN_ARGS+=symbol_level=0 \ GN_ARGS+=remove_webcore_debug_symbols=true \ WANTSPACE="a fair amount of free disk space (~ 5.8GB)" DRIVER_MAKE_ARGS= chromedriver KERBEROS_VARS= GN_ARGS+=use_kerberos=true KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false # With SNDIO=on we exclude audio_manager_linux from the build (see # media/audio/BUILD.gn) and use audio_manager_openbsd which does not # support falling back to ALSA or PulseAudio. SNDIO_PREVENTS= ALSA PULSEAUDIO SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false .endif .include "Makefile.tests" TEST_ALL_TARGET= ${TEST_TARGETS} TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1101513 BUILD_DEPENDS+= clang60:devel/llvm60 CC= clang60 CXX= clang++60 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-llvm-port .else BUILD_DEPENDS+= ${LOCALBASE}/bin/ar:devel/binutils EXTRA_PATCHES+= ${FILESDIR}/extra-patch-llvm-base .endif # TODO: -isystem, would be just as ugly as this approach, but more reliably # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set. MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include .if !defined(GN_ONLY) pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Chromium, you should have around 2GB of memory" @${ECHO_MSG} "and ${WANTSPACE}." @${ECHO_MSG} post-patch: @${REINPLACE_CMD} -e 's|@@PACKAGE@@|chromium|' \ -e 's|@@MENUNAME@@|Chromium Web Browser|' \ ${WRKSRC}/chrome/app/resources/manpage.1.in post-patch-SNDIO-on: @${MKDIR} ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd @${CP} ${FILESDIR}/sndio_output.* ${WRKSRC}/media/audio/sndio @${CP} ${FILESDIR}/sndio_input.* ${WRKSRC}/media/audio/sndio @${CP} ${FILESDIR}/audio_manager_openbsd.* ${WRKSRC}/media/audio/openbsd pre-configure: # We used to remove bundled libraries to be sure that chromium uses # system libraries and not shipped ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - ffmpeg flac freetype harfbuzz-ng libdrm libvpx libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} + ffmpeg flac freetype harfbuzz-ng libdrm libusb libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} .endif do-configure: # GN generator bootstrapping and generating ninja files cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \ READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} .if !defined(GN_ONLY) cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \ gen --args='${GN_ARGS}' out/${BUILDTYPE} # Setup nodejs dependency @${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node .endif do-test-TEST-on: .for t in ${TEST_TARGETS} cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \ ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE} .endfor .if !defined(GN_ONLY) do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \ ${STAGEDIR}${MANPREFIX}/man/man1/chrome.1 ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.service ${STAGEDIR}${DATADIR} .for s in 22 24 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png .endfor ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR} .for d in protoc icudtl.dat mksnapshot natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${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_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${STAGEDIR}${DATADIR} .for f in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader .for g in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \ ${STAGEDIR}${DATADIR}/swiftshader .endfor post-install-DEBUG-on: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \ ${STAGEDIR}${DATADIR} post-install-DRIVER-on: ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ ${STAGEDIR}${PREFIX}/bin .endif .include Index: head/www/chromium/distinfo =================================================================== --- head/www/chromium/distinfo (revision 475100) +++ head/www/chromium/distinfo (revision 475101) @@ -1,5 +1,5 @@ -TIMESTAMP = 1521889794 -SHA256 (chromium-65.0.3325.181.tar.xz) = 93666448c6b96ec83e6a35a64cff40db4eb92a154fe1db4e7dab4761d0e38687 -SIZE (chromium-65.0.3325.181.tar.xz) = 570386836 -SHA256 (chromium-65.0.3325.181-testdata.tar.xz) = 03018143ffe8c96ca2710e0c48bb19f1e122cf07394f15b73a814c2f6b2a3cdb -SIZE (chromium-65.0.3325.181-testdata.tar.xz) = 252462976 +TIMESTAMP = 1531563535 +SHA256 (chromium-67.0.3396.87.tar.xz) = 5d27a72f0cb8247343034f63fdd9747ff388c05b9fceb541668dd04fb372db1d +SIZE (chromium-67.0.3396.87.tar.xz) = 591491608 +SHA256 (chromium-67.0.3396.87-testdata.tar.xz) = 091923fca8baca0e949d1d8e490cabdec0a536c3af3d67d398c6465b67c5fb3c +SIZE (chromium-67.0.3396.87-testdata.tar.xz) = 261857908 Index: head/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/WebKit/Source/platform/heap/GCInfo.cpp.orig 2017-04-19 19:06:50 UTC -+++ third_party/WebKit/Source/platform/heap/GCInfo.cpp -@@ -7,6 +7,8 @@ - #include "platform/heap/Handle.h" - #include "platform/heap/Heap.h" - -+#include -+ - namespace blink { - - // GCInfo indices start from 1 for heap objects, with 0 being treated Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp ___________________________________________________________________ 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_media_webrtc_processed__local__audio__source.cc =================================================================== --- head/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc (revision 475100) +++ head/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc (nonexistent) @@ -1,13 +0,0 @@ ---- content/renderer/media/webrtc/processed_local_audio_source.cc.orig 2017-06-05 19:03:07 UTC -+++ content/renderer/media/webrtc/processed_local_audio_source.cc -@@ -269,8 +269,8 @@ void ProcessedLocalAudioSource::Capture(const media::A - bool key_pressed) { - #if defined(OS_WIN) || defined(OS_MACOSX) - DCHECK_LE(volume, 1.0); --#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD) -- // We have a special situation on Linux where the microphone volume can be -+#elif defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -+ // We have a special situation on POSIX where the microphone volume can be - // "higher than maximum". The input volume slider in the sound preference - // allows the user to set a scaling that is higher than 100%. It means that - // even if the reported maximum levels is N, the actual microphone level can Property changes on: head/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.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-third__party_WebKit_Source_platform_fonts_FontPlatformData.h =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h (nonexistent) @@ -1,32 +0,0 @@ ---- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2017-09-05 21:05:41.000000000 +0200 -+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h 2017-09-06 21:44:50.459129000 +0200 -@@ -48,9 +48,9 @@ - #include "platform/wtf/text/StringImpl.h" - #include "third_party/skia/include/core/SkRefCnt.h" - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #include "platform/fonts/linux/FontRenderStyle.h" --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - - #if defined(OS_MACOSX) - OBJC_CLASS NSFont; -@@ -152,7 +152,7 @@ - PassRefPtr VerticalData() const; - Vector OpenTypeTable(SkFontTableTag) const; - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - // The returned styles are all actual styles without - // FontRenderStyle::NoPreference. - const FontRenderStyle& GetFontRenderStyle() const { return style_; } -@@ -182,7 +182,7 @@ - FontOrientation orientation_; - - private: --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - FontRenderStyle style_; - #endif - Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.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-third__party_WebKit_Source_platform_wtf_Atomics.h =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Atomics.h (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Atomics.h (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/WebKit/Source/platform/wtf/Atomics.h.orig 2017-09-05 21:05:41.000000000 +0200 -+++ third_party/WebKit/Source/platform/wtf/Atomics.h 2017-09-06 22:14:43.075913000 +0200 -@@ -176,7 +176,7 @@ - #if defined(THREAD_SANITIZER) - // The definitions below assume an LP64 data model. This is fine because - // TSan is only supported on x86_64 Linux. --#if defined(ARCH_CPU_64_BITS) && defined(OS_LINUX) -+#if defined(ARCH_CPU_64_BITS) && (defined(OS_LINUX) || defined(OS_BSD)) - ALWAYS_INLINE void ReleaseStore(volatile int* ptr, int value) { - __tsan_atomic32_store(ptr, value, __tsan_memory_order_release); - } Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Atomics.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-net_tools_get__server__time_get__server__time.cc =================================================================== --- head/www/chromium/files/patch-net_tools_get__server__time_get__server__time.cc (revision 475100) +++ head/www/chromium/files/patch-net_tools_get__server__time_get__server__time.cc (nonexistent) @@ -1,20 +0,0 @@ ---- net/tools/get_server_time/get_server_time.cc.orig 2017-06-05 19:03:10 UTC -+++ net/tools/get_server_time/get_server_time.cc -@@ -46,7 +46,7 @@ - - #if defined(OS_MACOSX) - #include "base/mac/scoped_nsautorelease_pool.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #include "net/proxy/proxy_config.h" - #include "net/proxy/proxy_config_service_fixed.h" - #endif -@@ -142,7 +142,7 @@ class PrintingLogObserver : public net::NetLog::Thread - std::unique_ptr BuildURLRequestContext( - net::NetLog* net_log) { - net::URLRequestContextBuilder builder; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // On Linux, use a fixed ProxyConfigService, since the default one - // depends on glib. - // Property changes on: head/www/chromium/files/patch-net_tools_get__server__time_get__server__time.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-third__party_WebKit_Source_platform_wtf_StackUtil.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_StackUtil.cpp (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_StackUtil.cpp (nonexistent) @@ -1,14 +0,0 @@ ---- third_party/WebKit/Source/platform/wtf/StackUtil.cpp.orig 2017-09-05 21:05:41.000000000 +0200 -+++ third_party/WebKit/Source/platform/wtf/StackUtil.cpp 2017-09-06 22:25:12.873520000 +0200 -@@ -16,6 +16,11 @@ - extern "C" void* __libc_stack_end; // NOLINT - #endif - -+#if defined(OS_FREEBSD) -+#include -+#include -+#endif -+ - namespace WTF { - - size_t GetUnderestimatedStackSize() { Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_StackUtil.cpp ___________________________________________________________________ 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-third__party_WebKit_Source_platform_wtf_ThreadingPthreads.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ThreadingPthreads.cpp (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ThreadingPthreads.cpp (nonexistent) @@ -1,33 +0,0 @@ ---- third_party/WebKit/Source/platform/wtf/ThreadingPthreads.cpp.orig 2017-09-05 21:05:41.000000000 +0200 -+++ third_party/WebKit/Source/platform/wtf/ThreadingPthreads.cpp 2017-09-06 22:33:24.096670000 +0200 -@@ -51,14 +51,19 @@ - #include - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include - #endif - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #include - #endif - -+#if defined(OS_BSD) -+#include -+#include -+#endif -+ - namespace WTF { - - namespace internal { -@@ -70,6 +75,8 @@ - return syscall(__NR_gettid); - #elif defined(OS_ANDROID) - return gettid(); -+#elif defined(OS_BSD) -+ return pthread_getthreadid_np(); - #else - return reinterpret_cast(pthread_self()); - #endif Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ThreadingPthreads.cpp ___________________________________________________________________ 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-third__party_WebKit_Source_platform_wtf_Assertions.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Assertions.cpp (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Assertions.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/WebKit/Source/platform/wtf/Assertions.cpp.orig 2017-09-05 21:05:41.000000000 +0200 -+++ third_party/WebKit/Source/platform/wtf/Assertions.cpp 2017-09-06 22:08:33.610705000 +0200 -@@ -56,7 +56,7 @@ - #include - #endif - --#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(__UCLIBC__)) -+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(__UCLIBC__)) - #include - #include - #include Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Assertions.cpp ___________________________________________________________________ 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-device_usb_usb__device__handle__impl.cc =================================================================== --- head/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc (revision 475100) +++ head/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc (nonexistent) @@ -1,14 +0,0 @@ ---- device/usb/usb_device_handle_impl.cc.orig 2018-03-20 23:05:25.000000000 +0100 -+++ device/usb/usb_device_handle_impl.cc 2018-03-24 17:28:45.532305000 +0100 -@@ -25,7 +25,11 @@ - #include "device/usb/usb_device_impl.h" - #include "device/usb/usb_error.h" - #include "device/usb/usb_service.h" -+#if defined(OS_FREEBSD) -+#include "libusb.h" -+#else - #include "third_party/libusb/src/libusb/libusb.h" -+#endif - - namespace device { - Property changes on: head/www/chromium/files/patch-device_usb_usb__device__handle__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-third__party_WebKit_Source_platform_fonts_FontCache.h =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h (nonexistent) @@ -1,20 +0,0 @@ ---- third_party/WebKit/Source/platform/fonts/FontCache.h.orig 2017-09-05 21:05:41.000000000 +0200 -+++ third_party/WebKit/Source/platform/fonts/FontCache.h 2017-09-06 21:34:33.301287000 +0200 -@@ -165,7 +165,7 @@ - #else - static const AtomicString& LegacySystemFontFamily(); - #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - static void SetSystemFontFamily(const AtomicString&); - #endif - -@@ -282,7 +282,7 @@ - const FontFaceCreationParams&, - CString& name); - --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) - static AtomicString GetFamilyNameForCharacter(SkFontMgr*, - UChar32, - const FontDescription&, Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.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-third__party_WebKit_Source_platform_fonts_FontMetrics.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontMetrics.cpp (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontMetrics.cpp (nonexistent) @@ -1,29 +0,0 @@ ---- third_party/WebKit/Source/platform/fonts/FontMetrics.cpp.orig 2018-03-03 21:17:57.383299000 +0100 -+++ third_party/WebKit/Source/platform/fonts/FontMetrics.cpp 2018-03-03 21:18:37.525253000 +0100 -@@ -38,7 +38,7 @@ - - namespace blink { - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - // This is the largest VDMX table which we'll try to load and parse. - static const size_t kMaxVDMXTableSize = 1024 * 1024; // 1 MB - #endif -@@ -60,7 +60,7 @@ - int vdmx_ascent = 0, vdmx_descent = 0; - bool is_vdmx_valid = false; - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - // Manually digging up VDMX metrics is only applicable when bytecode hinting - // using FreeType. With DirectWrite or CoreText, no bytecode hinting is ever - // done. This code should be pushed into FreeType (hinted font metrics). -@@ -106,7 +106,7 @@ - visual_overflow_inflation_for_ascent = 1; - if (descent < metrics.fDescent) { - visual_overflow_inflation_for_descent = 1; --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - // When subpixel positioning is enabled, if the descent is rounded down, - // the descent part of the glyph may be truncated when displayed in a - // 'overflow: hidden' container. To avoid that, borrow 1 unit from the Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontMetrics.cpp ___________________________________________________________________ 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-chrome_browser_vr_sample_queue.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_vr_sample_queue.cc (revision 475100) +++ head/www/chromium/files/patch-chrome_browser_vr_sample_queue.cc (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/browser/vr/sample_queue.cc.orig 2018-03-24 12:29:50.123017000 +0100 -+++ chrome/browser/vr/sample_queue.cc 2018-03-24 12:30:25.632912000 +0100 -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include -+ - #include "chrome/browser/vr/sample_queue.h" - - namespace vr { Property changes on: head/www/chromium/files/patch-chrome_browser_vr_sample_queue.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-storage_browser_quota_quota__settings.cc =================================================================== --- head/www/chromium/files/patch-storage_browser_quota_quota__settings.cc (revision 475100) +++ head/www/chromium/files/patch-storage_browser_quota_quota__settings.cc (nonexistent) @@ -1,11 +0,0 @@ ---- storage/browser/quota/quota_settings.cc.orig 2017-06-05 19:03:11 UTC -+++ storage/browser/quota/quota_settings.cc -@@ -78,7 +78,7 @@ base::Optional CalculateNomina - 1000 * kMBytes; - #elif defined(OS_CHROMEOS) - 1000 * kMBytes; --#elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - 10000 * kMBytes; - #else - #error "Port: Need to define an OS accomodation value for unknown OS." Property changes on: head/www/chromium/files/patch-storage_browser_quota_quota__settings.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-third__party_libusb_BUILD.gn =================================================================== --- head/www/chromium/files/patch-third__party_libusb_BUILD.gn (revision 475100) +++ head/www/chromium/files/patch-third__party_libusb_BUILD.gn (nonexistent) @@ -1,43 +0,0 @@ ---- third_party/libusb/BUILD.gn.orig 2017-06-15 21:03:21.000000000 +0200 -+++ third_party/libusb/BUILD.gn 2017-06-16 20:36:59.253682000 +0200 -@@ -6,10 +6,24 @@ - - import("//build/config/features.gni") - --config("libusb_config") { -- include_dirs = [ "src/libusb" ] -+declare_args() { -+ use_system_libusb = is_bsd - } - -+if (use_system_libusb) { -+ config("libusb_config") { -+ libs = [ "usb" ] -+ } -+ -+ source_set("libusb") { -+ public_configs = [ ":libusb_config" ] -+ } -+} else { -+ config("libusb_config") { -+ include_dirs = [ "src/libusb" ] -+ } -+} -+ - config("libusb_warnings") { - visibility = [ ":*" ] - if (is_clang) { -@@ -21,6 +35,7 @@ - } - } - -+if (!use_system_libusb) { - static_library("libusb") { - sources = [ - "src/config.h", -@@ -144,4 +159,5 @@ - "src/msvc/stdint.h", - ] - } -+} - } Property changes on: head/www/chromium/files/patch-third__party_libusb_BUILD.gn ___________________________________________________________________ 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-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig 2017-09-05 21:05:39.000000000 +0200 -+++ third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp 2017-09-07 17:51:16.350712000 +0200 -@@ -49,6 +49,8 @@ - - #if defined(OS_WIN) - #include -+#elif defined(OS_FREEBSD) -+#include - #else - #include - #endif Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp ___________________________________________________________________ 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-third__party_WebKit_Source_platform_BUILD.gn =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_BUILD.gn (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_BUILD.gn (nonexistent) @@ -1,10 +0,0 @@ ---- third_party/WebKit/Source/platform/BUILD.gn.orig 2017-12-31 11:16:52.912677000 +0100 -+++ third_party/WebKit/Source/platform/BUILD.gn 2017-12-31 11:18:02.966134000 +0100 -@@ -148,6 +148,7 @@ - "//build/win:default_exe_manifest", - "//third_party/icu", - ] -+ libs = [ "cxxrt" ] - } - - # This isn't strictly necessary since we can just add the deps to "platform", Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_platform_BUILD.gn ___________________________________________________________________ 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_proxy_proxy__config__service__linux.cc =================================================================== --- head/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc (revision 475100) +++ head/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc (nonexistent) @@ -1,39 +0,0 @@ ---- net/proxy/proxy_config_service_linux.cc.orig 2018-03-20 23:05:28.000000000 +0100 -+++ net/proxy/proxy_config_service_linux.cc 2018-03-24 18:11:27.991396000 +0100 -@@ -6,7 +6,9 @@ - - #include - #include -+#if !defined(OS_BSD) - #include -+#endif - #include - - #include -@@ -483,6 +485,7 @@ - return default_value; - } - -+#if !defined(OS_BSD) - // This is the KDE version that reads kioslaverc and simulates gsettings. - // Doing this allows the main Delegate code, as well as the unit tests - // for it, to stay the same - and the settings map fairly well besides. -@@ -976,6 +979,7 @@ - - DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE); - }; -+#endif - - } // namespace - -@@ -1173,8 +1177,10 @@ - case base::nix::DESKTOP_ENVIRONMENT_KDE3: - case base::nix::DESKTOP_ENVIRONMENT_KDE4: - case base::nix::DESKTOP_ENVIRONMENT_KDE5: -+#if !defined(OS_BSD) - setting_getter_.reset(new SettingGetterImplKDE(env_var_getter_.get())); - break; -+#endif - case base::nix::DESKTOP_ENVIRONMENT_XFCE: - case base::nix::DESKTOP_ENVIRONMENT_OTHER: - break; Property changes on: head/www/chromium/files/patch-net_proxy_proxy__config__service__linux.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_browser_download_base__file.cc =================================================================== --- head/www/chromium/files/patch-content_browser_download_base__file.cc (revision 475100) +++ head/www/chromium/files/patch-content_browser_download_base__file.cc (nonexistent) @@ -1,20 +0,0 @@ ---- content/browser/download/base_file.cc.orig 2017-06-05 19:03:06 UTC -+++ content/browser/download/base_file.cc -@@ -387,7 +387,7 @@ DownloadInterruptReason BaseFile::LogInterruptReason( - return reason; - } - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - - namespace { - -@@ -470,7 +470,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn - } - return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED; - } --#else // !OS_WIN && !OS_MACOSX && !OS_LINUX -+#else // !OS_WIN && !OS_MACOSX && !OS_LINUX && !OS_BSD - DownloadInterruptReason BaseFile::AnnotateWithSourceInformation( - const std::string& client_guid, - const GURL& source_url, Property changes on: head/www/chromium/files/patch-content_browser_download_base__file.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-third__party_WebKit_Source_platform_fonts_FontCache.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp (nonexistent) @@ -1,23 +0,0 @@ ---- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig 2017-09-05 21:05:41.000000000 +0200 -+++ third_party/WebKit/Source/platform/fonts/FontCache.cpp 2017-09-06 21:33:11.655017000 +0200 -@@ -64,9 +64,9 @@ - - namespace blink { - --#if !defined(OS_WIN) && !defined(OS_LINUX) -+#if !defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD) - FontCache::FontCache() : purge_prevent_count_(0), font_manager_(nullptr) {} --#endif // !defined(OS_WIN) && !defined(OS_LINUX) -+#endif // !defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD) - - SkFontMgr* FontCache::static_font_manager_ = nullptr; - -@@ -85,7 +85,7 @@ - FontPlatformData* FontCache::SystemFontPlatformData( - const FontDescription& font_description) { - const AtomicString& family = FontCache::SystemFontFamily(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - if (family.IsEmpty() || family == FontFamilyNames::system_ui) - return nullptr; - #else Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp ___________________________________________________________________ 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-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp (nonexistent) @@ -1,14 +0,0 @@ ---- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig 2017-09-05 21:05:41.000000000 +0200 -+++ third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp 2017-09-06 22:02:32.472630000 +0200 -@@ -15,6 +15,11 @@ - extern "C" void* __libc_stack_end; // NOLINT - #endif - -+#if defined(OS_BSD) -+#include -+#include -+#endif -+ - namespace blink { - - static const char* g_avoid_optimization = nullptr; Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp ___________________________________________________________________ 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_proxy_proxy__service.cc =================================================================== --- head/www/chromium/files/patch-net_proxy_proxy__service.cc (revision 475100) +++ head/www/chromium/files/patch-net_proxy_proxy__service.cc (nonexistent) @@ -1,20 +0,0 @@ ---- net/proxy/proxy_service.cc.orig 2017-12-15 02:04:23.000000000 +0100 -+++ net/proxy/proxy_service.cc 2017-12-24 17:38:51.402197000 +0100 -@@ -46,7 +46,7 @@ - #elif defined(OS_MACOSX) - #include "net/proxy/proxy_config_service_mac.h" - #include "net/proxy/proxy_resolver_mac.h" --#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - #include "net/proxy/proxy_config_service_linux.h" - #elif defined(OS_ANDROID) - #include "net/proxy/proxy_config_service_android.h" -@@ -1496,7 +1496,7 @@ - << "profile_io_data.cc::CreateProxyConfigService and this should " - << "be used only for examples."; - return std::make_unique(); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - std::unique_ptr linux_config_service( - new ProxyConfigServiceLinux()); - Property changes on: head/www/chromium/files/patch-net_proxy_proxy__service.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-device_usb_usb__device__handle__impl.h =================================================================== --- head/www/chromium/files/patch-device_usb_usb__device__handle__impl.h (revision 475100) +++ head/www/chromium/files/patch-device_usb_usb__device__handle__impl.h (nonexistent) @@ -1,15 +0,0 @@ ---- device/usb/usb_device_handle_impl.h.orig 2017-04-19 19:06:34 UTC -+++ device/usb/usb_device_handle_impl.h -@@ -18,7 +18,12 @@ - #include "base/memory/ref_counted.h" - #include "base/threading/thread_checker.h" - #include "device/usb/usb_device_handle.h" -+#if defined(OS_FREEBSD) -+#include "libusb.h" -+#define LIBUSB_CALL -+#else - #include "third_party/libusb/src/libusb/libusb.h" -+#endif - - namespace base { - class SequencedTaskRunner; Property changes on: head/www/chromium/files/patch-device_usb_usb__device__handle__impl.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-chrome_browser_safe__browsing_permission__reporter.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc (revision 475100) +++ head/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/browser/safe_browsing/permission_reporter.cc.orig 2017-06-05 19:03:03 UTC -+++ chrome/browser/safe_browsing/permission_reporter.cc -@@ -188,7 +188,7 @@ bool PermissionReporter::BuildReport(const PermissionR - #if defined(OS_ANDROID) - report.set_platform_type(PermissionReport::ANDROID_PLATFORM); - #elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_CHROMEOS) || \ -- defined(OS_LINUX) -+ defined(OS_LINUX) || defined(OS_BSD) - report.set_platform_type(PermissionReport::DESKTOP_PLATFORM); - #else - #error Unsupported platform. Property changes on: head/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.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-components_assist_ranker_ranker_example_util.cc =================================================================== --- head/www/chromium/files/patch-components_assist_ranker_ranker_example_util.cc (revision 475100) +++ head/www/chromium/files/patch-components_assist_ranker_ranker_example_util.cc (nonexistent) @@ -1,11 +0,0 @@ ---- components/assist_ranker/ranker_example_util.cc.orig 2018-03-24 12:31:52.824752000 +0100 -+++ components/assist_ranker/ranker_example_util.cc 2018-03-24 12:32:32.654498000 +0100 -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include -+ - #include "components/assist_ranker/ranker_example_util.h" - #include "base/bit_cast.h" - #include "base/format_macros.h" Property changes on: head/www/chromium/files/patch-components_assist_ranker_ranker_example_util.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-third__party_WebKit_Source_platform_wtf_ContainerAnnotations.h =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ContainerAnnotations.h (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ContainerAnnotations.h (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/WebKit/Source/platform/wtf/ContainerAnnotations.h.orig 2017-09-05 21:05:41.000000000 +0200 -+++ third_party/WebKit/Source/platform/wtf/ContainerAnnotations.h 2017-09-06 22:18:52.135596000 +0200 -@@ -10,7 +10,7 @@ - - // TODO(ochang): Remove the ARCH_CPU_X86_64 condition to enable this for X86 - // once the crashes there have been fixed: http://crbug.com/461406 --#if defined(ADDRESS_SANITIZER) && defined(OS_LINUX) && defined(ARCH_CPU_X86_64) -+#if defined(ADDRESS_SANITIZER) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) - #define ANNOTATE_CONTIGUOUS_CONTAINER - #define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize) \ - if (buffer) { \ Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ContainerAnnotations.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-third__party_WebKit_Source_platform_wtf_ByteSwap.h =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ByteSwap.h (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ByteSwap.h (nonexistent) @@ -1,24 +0,0 @@ ---- third_party/WebKit/Source/platform/wtf/ByteSwap.h.orig 2017-06-05 19:03:26 UTC -+++ third_party/WebKit/Source/platform/wtf/ByteSwap.h -@@ -60,15 +60,21 @@ ALWAYS_INLINE uint16_t Bswap16(uint16_t x) { - - #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 -+#ifndef Bswap16 - ALWAYS_INLINE uint16_t Bswap16(uint16_t x) { - return __builtin_bswap16(x); - } -+#endif - - #endif - Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ByteSwap.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-media_capture_BUILD.gn =================================================================== --- head/www/chromium/files/patch-media_capture_BUILD.gn (revision 475100) +++ head/www/chromium/files/patch-media_capture_BUILD.gn (nonexistent) @@ -1,19 +0,0 @@ ---- media/capture/BUILD.gn.orig 2017-06-05 19:03:08 UTC -+++ media/capture/BUILD.gn -@@ -160,6 +160,16 @@ component("capture_lib") { - ] - } - -+ if (is_bsd) { -+ sources -= [ -+ "video/linux/video_capture_device_linux.cc", -+ "video/linux/video_capture_device_linux.h", -+ "video/linux/video_capture_device_factory_linux.cc", -+ "video/linux/video_capture_device_factory_linux.h", -+ "video/linux/v4l2_capture_delegate.cc", -+ ] -+ } -+ - if (is_win) { - deps += [ "//media/base/win" ] - libs = [ Property changes on: head/www/chromium/files/patch-media_capture_BUILD.gn ___________________________________________________________________ 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-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2017-09-05 21:05:41.000000000 +0200 -+++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp 2017-09-06 21:56:16.263371000 +0200 -@@ -73,7 +73,7 @@ - return AtomicString::FromUTF8(str.c_str(), str.size()); - } - --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) - // Android special locale for retrieving the color emoji font - // based on the proposed changes in UTR #51 for introducing - // an Emoji script code: -@@ -258,7 +258,7 @@ - } - #endif - --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - // On linux if the fontManager has been overridden then we should be calling - // the embedder provided font Manager rather than calling - // SkTypeface::CreateFromName which may redirect the call to the default font Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp ___________________________________________________________________ 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-third__party_WebKit_Source_core_html_canvas_CanvasAsyncBlobCreator.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_core_html_canvas_CanvasAsyncBlobCreator.cpp (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_core_html_canvas_CanvasAsyncBlobCreator.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp.orig 2018-03-03 21:15:48.546036000 +0100 -+++ third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp 2018-03-03 21:16:22.040188000 +0100 -@@ -31,7 +31,7 @@ - 0.001; // a small slack period between deadline and current time for safety - - /* The value is based on user statistics on Nov 2017. */ --#if (defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)) -+#if (defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)) - const double kIdleTaskStartTimeoutDelayMs = 1000.0; - #else - const double kIdleTaskStartTimeoutDelayMs = 4000.0; // For ChromeOS, Mobile Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_core_html_canvas_CanvasAsyncBlobCreator.cpp ___________________________________________________________________ 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-third__party_swiftshader_src_Common_Socket.cpp =================================================================== --- head/www/chromium/files/patch-third__party_swiftshader_src_Common_Socket.cpp (revision 475100) +++ head/www/chromium/files/patch-third__party_swiftshader_src_Common_Socket.cpp (nonexistent) @@ -1,10 +0,0 @@ ---- third_party/swiftshader/src/Common/Socket.cpp.orig 2017-06-26 22:11:33.917807000 +0200 -+++ third_party/swiftshader/src/Common/Socket.cpp 2017-06-26 22:11:54.516354000 +0200 -@@ -20,6 +20,7 @@ - #include - #include - #include -+ #include - #endif - - namespace sw Property changes on: head/www/chromium/files/patch-third__party_swiftshader_src_Common_Socket.cpp ___________________________________________________________________ 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-third__party_webrtc_system__wrappers_source_timestamp_extrapolator.cc =================================================================== --- head/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_timestamp_extrapolator.cc (revision 475100) +++ head/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_timestamp_extrapolator.cc (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/webrtc/system_wrappers/source/timestamp_extrapolator.cc.orig 2017-12-24 19:40:16.381935000 +0100 -+++ third_party/webrtc/system_wrappers/source/timestamp_extrapolator.cc 2017-12-24 19:40:27.636036000 +0100 -@@ -12,6 +12,8 @@ - - #include - -+#undef _P -+ - namespace webrtc { - - TimestampExtrapolator::TimestampExtrapolator(int64_t start_ms) Property changes on: head/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_timestamp_extrapolator.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-third__party_WebKit_Source_core_html_forms_InternalPopupMenu.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_core_html_forms_InternalPopupMenu.cpp (revision 475100) +++ head/www/chromium/files/patch-third__party_WebKit_Source_core_html_forms_InternalPopupMenu.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/WebKit/Source/core/html/forms/InternalPopupMenu.cpp.orig 2017-09-10 01:24:52.757075000 +0200 -+++ third_party/WebKit/Source/core/html/forms/InternalPopupMenu.cpp 2017-09-10 01:25:11.778614000 +0200 -@@ -157,7 +157,7 @@ - is_in_group_(false), - buffer_(buffer) { - DCHECK(buffer_); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // On other platforms, the