Index: head/www/chromium/Makefile =================================================================== --- head/www/chromium/Makefile (revision 449990) +++ head/www/chromium/Makefile (revision 449991) @@ -1,294 +1,300 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 60.0.3112.113 -PORTREVISION= 1 +PORTVERSION= 61.0.3163.79 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= python:lang/python \ bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \ .if !defined(GN_ONLY) BUILD_DEPENDS+= gperf:devel/gperf \ clang40:devel/llvm40 \ 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 .endif .if !defined(GN_ONLY) LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher \ libsnappy.so:archivers/snappy \ libFLAC.so:audio/flac \ 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 \ libcups.so:print/cups \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libgcrypt.so:security/libgcrypt \ libgnome-keyring.so:security/libgnome-keyring \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libxml2.so:textproc/libxml2 \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xdg-open:devel/xdg-utils \ droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf -ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS= aarch64 amd64 i386 .endif .if defined(GN_ONLY) -USES= compiler:c++11-lib ninja pkgconfig python:2,build shebangfix tar:xz +USES= compiler:c++14-lang ninja pkgconfig python:2,build shebangfix tar:xz .else USES= bison cpe desktop-file-utils execinfo jpeg ninja perl5 pkgconfig \ python:2,build shebangfix tar:xz .endif MAKE_ARGS= -C out/${BUILDTYPE} .if !defined(GN_ONLY) CPE_VENDOR= google CPE_PRODUCT= chrome 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 CC= clang40 CXX= clang++40 .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=false \ 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_cups=true \ use_gtk3=true \ use_lld=true \ use_sysroot=false \ use_system_libjpeg=true \ use_system_sqlite=false # chrome has additional patches # TODO: investigate building with these options: # use_system_icu use_system_harfbuzz 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 GCONF KERBEROS DRIVER CODECS_DESC= Compile and enable patented codecs like H.264 DRIVER_DESC= Install chromedriver OPTIONS_GROUP= AUDIO TESTS OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_GROUP_TESTS= DEBUG TEST OPTIONS_DEFAULT= ALSA CODECS DRIVER GCONF 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 DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_debug=true \ GN_BOOTSTRAP_FLAGS+=--debug \ WANTSPACE="lots of free diskspace (~ 8.5GB)" DEBUG_VARS_OFF= BUILDTYPE=Release \ GN_ARGS+=is_debug=false \ GN_ARGS+=symbol_level=0 \ GN_ARGS+=remove_webcore_debug_symbols=true \ WANTSPACE="a fair amount of free diskspace (~ 3.7GB)" DRIVER_MAKE_ARGS= chromedriver GCONF_USE= GNOME=gconf2 GCONF_VARS= GN_ARGS+=use_gconf=true GCONF_VARS_OFF= GN_ARGS+=use_gconf=false 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 # 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 # Work around base r261801 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100508 GN_ARGS+= extra_cxxflags="-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1" +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new +.endif + +.if ${ARCH} == aarch64 +GN_ARGS+= use_vulcanize=false .endif .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-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} && ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ ffmpeg flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE} .endif do-configure: # GN generator bootstrapping and generating ninja files cd ${WRKSRC} && ${SETENV} 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} ./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}/out/${BUILDTYPE}/chrome.1 ${STAGEDIR}${MANPREFIX}/man/man1 .for m in font_service test_ime_driver ui ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${m}.service \ ${STAGEDIR}${DATADIR} .endfor .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 chrome_200_percent headless_lib keyboard_resources \ resources mus_app_resources_100 mus_app_resources_200 mus_app_resources_strings \ views_mus_resources ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak \ ${STAGEDIR}${DATADIR} .endfor .for d in icudtl.dat natives_blob.bin snapshot_blob.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_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \ ${STAGEDIR}${DATADIR} 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 449990) +++ head/www/chromium/distinfo (revision 449991) @@ -1,5 +1,5 @@ -TIMESTAMP = 1504288636 -SHA256 (chromium-60.0.3112.113.tar.xz) = ebfce706a1ea02a92e35f360c7364d1184dacf040b59eade4cb51aa61a4fec59 -SIZE (chromium-60.0.3112.113.tar.xz) = 537527628 -SHA256 (chromium-60.0.3112.113-testdata.tar.xz) = 09b778c339f40d83bf0b66bad7de116277204f079b56569ddfd46899b5f76e66 -SIZE (chromium-60.0.3112.113-testdata.tar.xz) = 124651664 +TIMESTAMP = 1504708783 +SHA256 (chromium-61.0.3163.79.tar.xz) = bdbc139ed86f3b5d1ec3c3b00caeaef4f9ac2c363438f03dded56e217ad10727 +SIZE (chromium-61.0.3163.79.tar.xz) = 556218140 +SHA256 (chromium-61.0.3163.79-testdata.tar.xz) = fdef32059ce9f2c9f122207b8a2e165e7f961d3b175eca9ac59a3f1469984b27 +SIZE (chromium-61.0.3163.79-testdata.tar.xz) = 126580816 Index: head/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc =================================================================== --- head/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc (revision 449990) +++ head/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc (nonexistent) @@ -1,105 +0,0 @@ ---- components/tracing/common/process_metrics_memory_dump_provider.cc.orig 2017-08-03 00:05:11.000000000 +0200 -+++ components/tracing/common/process_metrics_memory_dump_provider.cc 2017-08-10 15:54:41.312710000 +0200 -@@ -57,7 +57,7 @@ - std::unique_ptr>>::Leaky - g_dump_providers_map = LAZY_INSTANCE_INITIALIZER; - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - const char kClearPeakRssCommand[] = "5"; - - const uint32_t kMaxLineSize = 4096; -@@ -194,13 +194,13 @@ - return num_scanned == 2; - } - --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - - std::unique_ptr CreateProcessMetrics( - base::ProcessId process) { - if (process == base::kNullProcessId) - return base::ProcessMetrics::CreateCurrentProcessMetrics(); --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - // Just pass ProcessId instead of handle since they are the same in linux and - // android. - return base::ProcessMetrics::CreateProcessMetrics(process); -@@ -209,7 +209,7 @@ - // additional information like ProcessHandle or port provider. - NOTREACHED(); - return std::unique_ptr(); --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - } - - } // namespace -@@ -221,7 +221,7 @@ - ProcessMetricsMemoryDumpProvider::FactoryFunction - ProcessMetricsMemoryDumpProvider::factory_for_testing = nullptr; - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - - // static - FILE* ProcessMetricsMemoryDumpProvider::proc_smaps_for_testing = nullptr; -@@ -248,7 +248,7 @@ - pmd->set_has_process_mmaps(); - return res; - } --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - - #if defined(OS_WIN) - bool ProcessMetricsMemoryDumpProvider::DumpProcessMemoryMaps( -@@ -637,7 +637,7 @@ - - uint64_t peak_rss_bytes = 0; - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || !defined(OS_BSD) - base::trace_event::ProcessMemoryTotals::PlatformPrivateFootprint footprint; - - base::ScopedFD autoclose; -@@ -673,7 +673,7 @@ - - #if !defined(OS_IOS) - peak_rss_bytes = process_metrics_->GetPeakWorkingSetSize(); --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - if (is_rss_peak_resettable_) { - std::string clear_refs_file = - "/proc/" + -@@ -714,7 +714,7 @@ - return true; - } - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - base::ScopedFD ProcessMetricsMemoryDumpProvider::OpenStatm() { - std::string name = - "/proc/" + -@@ -725,12 +725,12 @@ - DCHECK(fd.is_valid()); - return fd; - } --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - - void ProcessMetricsMemoryDumpProvider::PollFastMemoryTotal( - uint64_t* memory_total) { - *memory_total = 0; --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - - int statm_fd = fast_polling_statm_fd_for_testing; - if (statm_fd == -1) { -@@ -755,7 +755,7 @@ - } - - void ProcessMetricsMemoryDumpProvider::SuspendFastMemoryPolling() { --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - fast_polling_statm_fd_.reset(); - #endif - } Property changes on: head/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.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_webrtc_base_httpcommon.cc =================================================================== --- head/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc (revision 449990) +++ head/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/webrtc/base/httpcommon.cc.orig 2017-06-05 19:04:24 UTC -+++ third_party/webrtc/base/httpcommon.cc -@@ -384,7 +384,7 @@ bool HttpDateToSeconds(const std::string& date, time_t - gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60; - } - // TODO: Android should support timezone, see b/2441195 --#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID) || defined(BSD) -+#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD) - tm *tm_for_timezone = localtime(&gmt); - *seconds = gmt + tm_for_timezone->tm_gmtoff; - #else Property changes on: head/www/chromium/files/patch-third__party_webrtc_base_httpcommon.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_webrtc_base_ifaddrs__converter.h =================================================================== --- head/www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h (revision 449990) +++ head/www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/webrtc/base/ifaddrs_converter.h.orig 2017-04-19 19:07:52 UTC -+++ third_party/webrtc/base/ifaddrs_converter.h -@@ -14,6 +14,8 @@ - #if defined(WEBRTC_ANDROID) - #include "webrtc/base/ifaddrs-android.h" - #else -+#include -+#include - #include - #endif // WEBRTC_ANDROID - Property changes on: head/www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.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-base_task_scheduler_delayed_task_manager.cc =================================================================== --- head/www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc (revision 449990) +++ head/www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc (nonexistent) @@ -1,12 +0,0 @@ ---- base/task_scheduler/delayed_task_manager.cc.orig 2017-08-10 23:52:26.912451000 +0200 -+++ base/task_scheduler/delayed_task_manager.cc 2017-08-11 00:22:09.125479000 +0200 -@@ -70,9 +70,6 @@ - if (started_.IsSet()) { - AddDelayedTaskNow(std::move(task), delay, - std::move(post_task_now_callback)); -- } else { -- tasks_added_before_start_.push_back( -- {std::move(task), std::move(post_task_now_callback)}); - } - } - } Property changes on: head/www/chromium/files/patch-base_task_scheduler_delayed_task_manager.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-tools_gn_bootstrap_bootstrap.py =================================================================== --- head/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py (revision 449990) +++ head/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py (nonexistent) @@ -1,100 +0,0 @@ ---- tools/gn/bootstrap/bootstrap.py.orig 2017-08-03 00:05:40.000000000 +0200 -+++ tools/gn/bootstrap/bootstrap.py 2017-08-09 23:59:54.024577000 +0200 -@@ -23,6 +23,7 @@ - import shutil - import subprocess - import sys -+import platform - import tempfile - - BOOTSTRAP_DIR = os.path.dirname(os.path.abspath(__file__)) -@@ -31,9 +32,10 @@ - - is_win = sys.platform.startswith('win') - is_linux = sys.platform.startswith('linux') -+is_bsd = platform.system().lower().endswith('bsd') - is_mac = sys.platform.startswith('darwin') - is_aix = sys.platform.startswith('aix') --is_posix = is_linux or is_mac or is_aix -+is_posix = is_linux or is_mac or is_aix or is_bsd - - def check_call(cmd, **kwargs): - logging.debug('Running: %s', ' '.join(cmd)) -@@ -627,7 +629,7 @@ - 'cflags': cflags + ['-DHAVE_CONFIG_H'], - } - -- if is_linux or is_aix: -+ if is_linux or is_aix or is_bsd: - ldflags.extend(['-pthread']) - - static_libraries['xdg_user_dirs'] = { -@@ -642,16 +644,45 @@ - 'base/memory/shared_memory_tracker.cc', - 'base/nix/xdg_util.cc', - 'base/process/internal_linux.cc', -- 'base/process/memory_linux.cc', -+ #'base/process/memory_linux.cc', - 'base/process/process_handle_linux.cc', - 'base/process/process_info_linux.cc', -- 'base/process/process_iterator_linux.cc', -- 'base/process/process_linux.cc', -- 'base/process/process_metrics_linux.cc', -+ #'base/process/process_iterator_linux.cc', -+ #'base/process/process_linux.cc', -+ #'base/process/process_metrics_linux.cc', - 'base/strings/sys_string_conversions_posix.cc', -- 'base/sys_info_linux.cc', -+ #'base/sys_info_linux.cc', - 'base/threading/platform_thread_linux.cc', - ]) -+ if is_bsd: -+ libs.extend(['-lexecinfo', '-lkvm']) -+ ldflags.extend(['-pthread']) -+ -+ static_libraries['xdg_user_dirs'] = { -+ 'sources': [ -+ 'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', -+ ], -+ 'tool': 'cxx', -+ } -+ static_libraries['base']['sources'].extend([ -+ 'base/allocator/allocator_shim.cc', -+ 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc', -+ 'base/process/process_handle_' + platform.system().lower() + '.cc', -+ 'base/process/process_iterator_' + platform.system().lower() + '.cc', -+ 'base/process/process_metrics_'+ platform.system().lower() + '.cc', -+ 'base/sys_info_' + platform.system().lower() + '.cc', -+ 'base/task_scheduler/environment_config.cc', -+ ]) -+ static_libraries['libevent']['include_dirs'].extend([ -+ os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'freebsd') -+ ]) -+ static_libraries['libevent']['sources'].extend([ -+ 'base/third_party/libevent/kqueue.c', -+ ]) -+ -+ # Suppressing warnings -+ cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality']) -+ - if is_linux: - static_libraries['base']['sources'].extend([ - 'base/allocator/allocator_shim.cc', -@@ -663,17 +694,6 @@ - ]) - static_libraries['libevent']['sources'].extend([ - 'base/third_party/libevent/epoll.c', -- ]) -- else: -- libs.extend(['-lrt']) -- static_libraries['base']['sources'].extend([ -- 'base/process/internal_aix.cc' -- ]) -- static_libraries['libevent']['include_dirs'].extend([ -- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'aix') -- ]) -- static_libraries['libevent']['include_dirs'].extend([ -- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'compat') - ]) - - if is_mac: Property changes on: head/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py ___________________________________________________________________ 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_base_ipaddress.h =================================================================== --- head/www/chromium/files/patch-third__party_webrtc_base_ipaddress.h (revision 449990) +++ head/www/chromium/files/patch-third__party_webrtc_base_ipaddress.h (nonexistent) @@ -1,13 +0,0 @@ ---- third_party/webrtc/base/ipaddress.h.orig 2017-04-19 19:07:52 UTC -+++ third_party/webrtc/base/ipaddress.h -@@ -17,6 +17,10 @@ - #include - #include - #endif -+#if defined(WEBRTC_BSD) -+#include -+#include -+#endif - #if defined(WEBRTC_WIN) - #include - #include Property changes on: head/www/chromium/files/patch-third__party_webrtc_base_ipaddress.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-tools_grit_grit__rule.gni =================================================================== --- head/www/chromium/files/patch-tools_grit_grit__rule.gni (revision 449990) +++ head/www/chromium/files/patch-tools_grit_grit__rule.gni (nonexistent) @@ -1,11 +0,0 @@ ---- tools/grit/grit_rule.gni.orig 2017-06-05 19:03:30 UTC -+++ tools/grit/grit_rule.gni -@@ -214,7 +214,7 @@ if (current_toolchain != host_toolchain) { - "ios", - ] - } -- if (is_linux) { -+ if (is_linux || is_bsd) { - grit_defines += [ - "-t", - "linux2", Property changes on: head/www/chromium/files/patch-tools_grit_grit__rule.gni ___________________________________________________________________ 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_base_byteorder.h =================================================================== --- head/www/chromium/files/patch-third__party_webrtc_base_byteorder.h (revision 449990) +++ head/www/chromium/files/patch-third__party_webrtc_base_byteorder.h (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/webrtc/base/byteorder.h.orig 2017-06-05 19:04:24 UTC -+++ third_party/webrtc/base/byteorder.h -@@ -77,7 +77,7 @@ - #error RTC_ARCH_CPU_BIG_ENDIAN or RTC_ARCH_CPU_LITTLE_ENDIAN must be defined. - #endif // defined(RTC_ARCH_CPU_LITTLE_ENDIAN) - #elif defined(WEBRTC_POSIX) --#include -+#include - #endif - - namespace rtc { Property changes on: head/www/chromium/files/patch-third__party_webrtc_base_byteorder.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-components_policy_BUILD.gn =================================================================== --- head/www/chromium/files/patch-components_policy_BUILD.gn (revision 449990) +++ head/www/chromium/files/patch-components_policy_BUILD.gn (nonexistent) @@ -1,19 +0,0 @@ ---- components/policy/BUILD.gn.orig 2017-06-05 19:03:06 UTC -+++ components/policy/BUILD.gn -@@ -16,6 +16,7 @@ assert(!is_ios, "Policy should not be referenced on iO - gen_policy_templates_common = true - gen_policy_templates_win = is_win - gen_policy_templates_linux = is_linux -+gen_policy_templates_bsd = is_bsd - gen_policy_templates_android = is_android - gen_policy_templates_mac = is_mac - -@@ -169,7 +170,7 @@ grit("grit_policy_templates") { - outputs += policy_templates_android_outputs - defines += [ "gen_policy_templates_android" ] - } -- if (gen_policy_templates_linux) { -+ if (gen_policy_templates_linux || gen_policy_templates_bsd) { - outputs += policy_templates_linux_outputs - defines += [ "gen_policy_templates_linux" ] - } Property changes on: head/www/chromium/files/patch-components_policy_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_swiftshader_src_OpenGL_libEGL_EGLSurface.cpp =================================================================== --- head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_EGLSurface.cpp (revision 449990) +++ head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_EGLSurface.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/EGLSurface.cpp.orig 2017-06-26 22:17:25.800342000 +0200 -+++ third_party/swiftshader/src/OpenGL/libEGL/EGLSurface.cpp 2017-06-26 22:18:03.230149000 +0200 -@@ -26,7 +26,7 @@ - #include "common/debug.h" - #include "Main/FrameBuffer.hpp" - --#if defined(__linux__) && !defined(__ANDROID__) -+#if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__) - #include "Main/libX11.hpp" - #elif defined(_WIN32) - #include -@@ -278,7 +278,7 @@ - #elif defined(__ANDROID__) - int windowWidth; window->query(window, NATIVE_WINDOW_WIDTH, &windowWidth); - int windowHeight; window->query(window, NATIVE_WINDOW_HEIGHT, &windowHeight); -- #elif defined(__linux__) -+ #elif defined(__linux__) || defined(__FreeBSD__) - XWindowAttributes windowAttributes; - libX11->XGetWindowAttributes((::Display*)display->getNativeDisplay(), window, &windowAttributes); - Property changes on: head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_EGLSurface.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_base_BUILD.gn =================================================================== --- head/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn (revision 449990) +++ head/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn (nonexistent) @@ -1,18 +0,0 @@ ---- third_party/webrtc/base/BUILD.gn.orig 2017-06-05 19:04:24 UTC -+++ third_party/webrtc/base/BUILD.gn -@@ -567,7 +567,6 @@ rtc_static_library("rtc_base") { - - if (use_x11) { - libs += [ -- "dl", - "rt", - "Xext", - "X11", -@@ -578,7 +577,6 @@ rtc_static_library("rtc_base") { - - if (is_linux) { - libs += [ -- "dl", - "rt", - ] - } Property changes on: head/www/chromium/files/patch-third__party_webrtc_base_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-components_variations_proto_study.proto =================================================================== --- head/www/chromium/files/patch-components_variations_proto_study.proto (revision 449990) +++ head/www/chromium/files/patch-components_variations_proto_study.proto (nonexistent) @@ -1,10 +0,0 @@ ---- components/variations/proto/study.proto.orig 2017-04-19 19:06:33 UTC -+++ components/variations/proto/study.proto -@@ -188,6 +188,7 @@ message Study { - PLATFORM_CHROMEOS = 3; - PLATFORM_ANDROID = 4; - PLATFORM_IOS = 5; -+ PLATFORM_BSD = 6; - } - - // Possible form factors Chrome is running on. Property changes on: head/www/chromium/files/patch-components_variations_proto_study.proto ___________________________________________________________________ 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_ui_browser__view__prefs.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc (revision 449990) +++ head/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2017-04-19 19:06:30 UTC -+++ chrome/browser/ui/browser_view_prefs.cc -@@ -10,7 +10,7 @@ - #include "components/prefs/pref_registry_simple.h" - #include "components/prefs/pref_service.h" - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) - #include "ui/base/x/x11_util.h" // nogncheck - #endif - Property changes on: head/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.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_webrtc_base_network.h =================================================================== --- head/www/chromium/files/patch-third__party_webrtc_base_network.h (revision 449990) +++ head/www/chromium/files/patch-third__party_webrtc_base_network.h (nonexistent) @@ -1,13 +0,0 @@ ---- third_party/webrtc/base/network.h.orig 2017-04-19 19:07:52 UTC -+++ third_party/webrtc/base/network.h -@@ -24,6 +24,10 @@ - #include "webrtc/base/messagehandler.h" - #include "webrtc/base/sigslot.h" - -+#if defined(WEBRTC_BSD) -+#include -+#endif -+ - #if defined(WEBRTC_POSIX) - struct ifaddrs; - #endif // defined(WEBRTC_POSIX) Property changes on: head/www/chromium/files/patch-third__party_webrtc_base_network.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-remoting_host_setup_me2me_native_messaging_host_main.cc =================================================================== --- head/www/chromium/files/patch-remoting_host_setup_me2me_native_messaging_host_main.cc (revision 449990) +++ head/www/chromium/files/patch-remoting_host_setup_me2me_native_messaging_host_main.cc (nonexistent) @@ -1,20 +0,0 @@ ---- remoting/host/setup/me2me_native_messaging_host_main.cc.orig 2017-08-10 16:30:29.861339000 +0200 -+++ remoting/host/setup/me2me_native_messaging_host_main.cc 2017-08-10 16:31:13.891062000 +0200 -@@ -44,7 +44,7 @@ - #include "remoting/host/win/elevation_helpers.h" - #endif // defined(OS_WIN) - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - #include - #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) - -@@ -64,7 +64,7 @@ - base::mac::ScopedNSAutoreleasePool pool; - #endif // defined(OS_MACOSX) - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - // g_type_init will be deprecated in 2.36. 2.35 is the development - // version for 2.36, hence do not call g_type_init starting 2.35. - // http://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-init Property changes on: head/www/chromium/files/patch-remoting_host_setup_me2me_native_messaging_host_main.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_accessibility_browser__accessibility__manager.h =================================================================== --- head/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h (revision 449990) +++ head/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h (nonexistent) @@ -1,20 +0,0 @@ ---- content/browser/accessibility/browser_accessibility_manager.h.orig 2017-06-05 19:03:06 UTC -+++ content/browser/accessibility/browser_accessibility_manager.h -@@ -36,7 +36,7 @@ class BrowserAccessibilityManager; - class BrowserAccessibilityManagerAndroid; - #elif defined(OS_WIN) - class BrowserAccessibilityManagerWin; --#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11) -+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11) - class BrowserAccessibilityManagerAuraLinux; - #elif defined(OS_MACOSX) - class BrowserAccessibilityManagerMac; -@@ -251,7 +251,7 @@ class CONTENT_EXPORT BrowserAccessibilityManager : pub - BrowserAccessibilityManagerAndroid* ToBrowserAccessibilityManagerAndroid(); - #endif - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11) - BrowserAccessibilityManagerAuraLinux* - ToBrowserAccessibilityManagerAuraLinux(); - #endif Property changes on: head/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.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-crypto_nss__util.cc =================================================================== --- head/www/chromium/files/patch-crypto_nss__util.cc (revision 449990) +++ head/www/chromium/files/patch-crypto_nss__util.cc (nonexistent) @@ -1,24 +0,0 @@ ---- crypto/nss_util.cc.orig 2017-06-05 19:03:07 UTC -+++ crypto/nss_util.cc -@@ -20,7 +20,7 @@ - #include "base/threading/thread_task_runner_handle.h" - #include "crypto/nss_util_internal.h" - --#if defined(OS_OPENBSD) -+#if defined(OS_BSD) - #include - #include - #endif -@@ -150,10 +150,10 @@ void UseLocalCacheOfNSSDatabaseIfNFS(const base::FileP - base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN; - if (base::GetFileSystemType(database_dir, &fs_type)) - db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS); --#elif defined(OS_OPENBSD) -+#elif defined(OS_BSD) - struct statfs buf; - if (statfs(database_dir.value().c_str(), &buf) == 0) -- db_on_nfs = (strcmp(buf.f_fstypename, MOUNT_NFS) == 0); -+ db_on_nfs = (strcmp(buf.f_fstypename, "nfs") == 0); - #else - NOTIMPLEMENTED(); - #endif Property changes on: head/www/chromium/files/patch-crypto_nss__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-components_storage__monitor_storage__monitor.cc =================================================================== --- head/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc (revision 449990) +++ head/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc (nonexistent) @@ -1,18 +0,0 @@ ---- components/storage_monitor/storage_monitor.cc.orig 2017-06-05 19:03:06 UTC -+++ components/storage_monitor/storage_monitor.cc -@@ -85,6 +85,7 @@ std::vector StorageMonitor::GetAllAvailab - - void StorageMonitor::EnsureInitialized(base::Closure callback) { - DCHECK(thread_checker_.CalledOnValidThread()); -+//#if !defined(OS_BSD) //XXX(rene) why disabled? - if (initialized_) { - if (!callback.is_null()) - callback.Run(); -@@ -100,6 +101,7 @@ void StorageMonitor::EnsureInitialized(base::Closure c - - initializing_ = true; - Init(); -+//#endif - } - - bool StorageMonitor::IsInitialized() const { Property changes on: head/www/chromium/files/patch-components_storage__monitor_storage__monitor.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-ui_gfx_BUILD.gn =================================================================== --- head/www/chromium/files/patch-ui_gfx_BUILD.gn (revision 449990) +++ head/www/chromium/files/patch-ui_gfx_BUILD.gn (nonexistent) @@ -1,20 +0,0 @@ ---- ui/gfx/BUILD.gn.orig 2017-06-05 19:03:30 UTC -+++ ui/gfx/BUILD.gn -@@ -358,7 +358,7 @@ component("gfx") { - } - - # Linux. -- if (is_linux) { -+ if (is_linux || is_bsd) { - deps += [ "//build/linux:fontconfig" ] - } - -@@ -581,7 +581,7 @@ static_library("test_support") { - "test/ui_cocoa_test_helper.mm", - ] - } -- if (is_linux) { -+ if (is_linux || is_bsd) { - deps += [ "//build/linux:fontconfig" ] - } - } Property changes on: head/www/chromium/files/patch-ui_gfx_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-chrome_browser_ui_views_tabs_tab__strip.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc (revision 449990) +++ head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/tabs/tab_strip.cc.orig 2017-06-05 19:03:03 UTC -+++ chrome/browser/ui/views/tabs/tab_strip.cc -@@ -323,7 +323,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, views: - tab_strip_(tab_strip), - destroyed_(NULL) { - set_animate_on_state_change(true); --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) - set_triggerable_event_flags(triggerable_event_flags() | - ui::EF_MIDDLE_MOUSE_BUTTON); - #endif Property changes on: head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.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_webrtc_base_platform__thread.cc =================================================================== --- head/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc (revision 449990) +++ head/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc (nonexistent) @@ -1,42 +0,0 @@ ---- third_party/webrtc/base/platform_thread.cc.orig 2017-06-05 19:04:24 UTC -+++ third_party/webrtc/base/platform_thread.cc -@@ -15,11 +15,18 @@ - #include "webrtc/base/timeutils.h" - #include "webrtc/base/trace_event.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() { -@@ -29,6 +36,8 @@ PlatformThreadId CurrentThreadId() { - #elif defined(WEBRTC_POSIX) - #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS) - ret = pthread_mach_thread_np(pthread_self()); -+#elif defined(WEBRTC_BSD) -+ ret = reinterpret_cast(pthread_getthreadid_np()); - #elif defined(WEBRTC_LINUX) - ret = syscall(__NR_gettid); - #elif defined(WEBRTC_ANDROID) -@@ -72,7 +81,9 @@ void SetCurrentThreadName(const char* name) { - 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 ___________________________________________________________________ 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_tracing_common_process__metrics__memory__dump__provider.h =================================================================== --- head/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.h (revision 449990) +++ head/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.h (nonexistent) @@ -1,20 +0,0 @@ ---- components/tracing/common/process_metrics_memory_dump_provider.h.orig 2017-06-05 19:03:06 UTC -+++ components/tracing/common/process_metrics_memory_dump_provider.h -@@ -57,7 +57,7 @@ class TRACING_EXPORT ProcessMetricsMemoryDumpProvider - #elif defined(OS_WIN) - FRIEND_TEST_ALL_PREFIXES(ProcessMetricsMemoryDumpProviderTest, - TestWinModuleReading); --#elif defined(OS_LINUX) || defined(OS_ANDROID) -+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - FRIEND_TEST_ALL_PREFIXES(ProcessMetricsMemoryDumpProviderTest, - DoubleRegister); - #endif -@@ -70,7 +70,7 @@ class TRACING_EXPORT ProcessMetricsMemoryDumpProvider - static uint64_t rss_bytes_for_testing; - static FactoryFunction factory_for_testing; - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - static FILE* proc_smaps_for_testing; - static int fast_polling_statm_fd_for_testing; - Property changes on: head/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.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_webrtc_base_network.cc =================================================================== --- head/www/chromium/files/patch-third__party_webrtc_base_network.cc (revision 449990) +++ head/www/chromium/files/patch-third__party_webrtc_base_network.cc (nonexistent) @@ -1,29 +0,0 @@ ---- third_party/webrtc/base/network.cc.orig 2017-06-05 19:04:24 UTC -+++ third_party/webrtc/base/network.cc -@@ -14,7 +14,7 @@ - // linux/if.h can't be included at the same time as the posix sys/if.h, and - // it's transitively required by linux/route.h, so include that version on - // linux instead of the standard posix one. --#if defined(WEBRTC_LINUX) -+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) - #include - #include - #elif !defined(__native_client__) -@@ -658,7 +658,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_ - } - #endif // WEBRTC_WIN - --#if defined(WEBRTC_LINUX) -+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) - bool IsDefaultRoute(const std::string& network_name) { - FileStream fs; - if (!fs.Open("/proc/net/route", "r", nullptr)) { -@@ -701,7 +701,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo - strncmp(network.name().c_str(), "vboxnet", 7) == 0) { - return true; - } --#if defined(WEBRTC_LINUX) -+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) - // Make sure this is a default route, if we're ignoring non-defaults. - if (ignore_non_default_routes_ && !IsDefaultRoute(network.name())) { - return true; Property changes on: head/www/chromium/files/patch-third__party_webrtc_base_network.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_libxml_chromium_libxml__utils.cc =================================================================== --- head/www/chromium/files/patch-third__party_libxml_chromium_libxml__utils.cc (revision 449990) +++ head/www/chromium/files/patch-third__party_libxml_chromium_libxml__utils.cc (nonexistent) @@ -1,22 +0,0 @@ ---- third_party/libxml/chromium/libxml_utils.cc.orig 2017-06-05 19:03:28 UTC -+++ third_party/libxml/chromium/libxml_utils.cc -@@ -24,8 +24,7 @@ XmlReader::~XmlReader() { - - bool XmlReader::Load(const std::string& input) { - const int kParseOptions = XML_PARSE_RECOVER | // recover on errors -- XML_PARSE_NONET | // forbid network access -- XML_PARSE_NOXXE; // no external entities -+ XML_PARSE_NONET; // forbid network access - // TODO(evanm): Verify it's OK to pass NULL for the URL and encoding. - // The libxml code allows for these, but it's unclear what effect is has. - reader_ = xmlReaderForMemory(input.data(), static_cast(input.size()), -@@ -35,8 +34,7 @@ bool XmlReader::Load(const std::string& input) { - - bool XmlReader::LoadFile(const std::string& file_path) { - const int kParseOptions = XML_PARSE_RECOVER | // recover on errors -- XML_PARSE_NONET | // forbid network access -- XML_PARSE_NOXXE; // no external entities -+ XML_PARSE_NONET; // forbid network access - reader_ = xmlReaderForFile(file_path.c_str(), NULL, kParseOptions); - return reader_ != NULL; - } Property changes on: head/www/chromium/files/patch-third__party_libxml_chromium_libxml__utils.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_content__settings_core_browser_website__settings__registry.h =================================================================== --- head/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h (revision 449990) +++ head/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h (nonexistent) @@ -1,15 +0,0 @@ ---- components/content_settings/core/browser/website_settings_registry.h.orig 2017-04-19 19:06:32 UTC -+++ components/content_settings/core/browser/website_settings_registry.h -@@ -36,10 +36,11 @@ class WebsiteSettingsRegistry { - PLATFORM_MAC = 1 << 3, - PLATFORM_ANDROID = 1 << 4, - PLATFORM_IOS = 1 << 5, -+ PLATFORM_BSD = 1 << 6, - - // Settings only applied to win, mac, linux and chromeos. - DESKTOP = -- PLATFORM_WINDOWS | PLATFORM_LINUX | PLATFORM_CHROMEOS | PLATFORM_MAC, -+ PLATFORM_WINDOWS | PLATFORM_LINUX | PLATFORM_CHROMEOS | PLATFORM_MAC | PLATFORM_BSD, - - // Settings applied to all platforms, including win, mac, linux, chromeos, - // android, ios. Property changes on: head/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.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-ui_views_views__switches.cc =================================================================== --- head/www/chromium/files/patch-ui_views_views__switches.cc (revision 449990) +++ head/www/chromium/files/patch-ui_views_views__switches.cc (nonexistent) @@ -1,11 +0,0 @@ ---- ui/views/views_switches.cc.orig 2017-06-05 19:03:30 UTC -+++ ui/views/views_switches.cc -@@ -21,7 +21,7 @@ const char kDisableViewsRectBasedTargeting[] = - const char kDrawViewBoundsRects[] = "draw-view-bounds-rects"; - - bool IsRectBasedTargetingEnabled() { --#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - return !base::CommandLine::ForCurrentProcess()->HasSwitch( - kDisableViewsRectBasedTargeting); - #else Property changes on: head/www/chromium/files/patch-ui_views_views__switches.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_webrtc_base_stringutils.h =================================================================== --- head/www/chromium/files/patch-third__party_webrtc_base_stringutils.h (revision 449990) +++ head/www/chromium/files/patch-third__party_webrtc_base_stringutils.h (nonexistent) @@ -1,17 +0,0 @@ ---- third_party/webrtc/base/stringutils.h.orig 2017-04-19 19:07:52 UTC -+++ third_party/webrtc/base/stringutils.h -@@ -23,11 +23,11 @@ - #endif // WEBRTC_WIN - - #if defined(WEBRTC_POSIX) --#ifdef BSD -+#if defined(WEBRTC_BSD) || defined(BSD) - #include --#else // BSD -+#else // WEBRTC_BSD - #include --#endif // !BSD -+#endif // !WEBRTC_BSD - #endif // WEBRTC_POSIX - - #include Property changes on: head/www/chromium/files/patch-third__party_webrtc_base_stringutils.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-content_browser_accessibility_browser__accessibility.h =================================================================== --- head/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h (revision 449990) +++ head/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h (nonexistent) @@ -1,11 +0,0 @@ ---- content/browser/accessibility/browser_accessibility.h.orig 2017-06-05 19:03:06 UTC -+++ content/browser/accessibility/browser_accessibility.h -@@ -42,7 +42,7 @@ - #define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1 - #endif - --#if defined(OS_LINUX) && defined(USE_X11) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11) && !defined(OS_CHROMEOS) - #define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1 - #endif - Property changes on: head/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.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_webrtc_base_physicalsocketserver.cc =================================================================== --- head/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc (revision 449990) +++ head/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc (nonexistent) @@ -1,45 +0,0 @@ ---- third_party/webrtc/base/physicalsocketserver.cc.orig 2017-06-05 19:04:24 UTC -+++ third_party/webrtc/base/physicalsocketserver.cc -@@ -61,7 +61,11 @@ typedef void* SockOptArg; - - int64_t GetSocketRecvTimestamp(int socket) { - struct timeval tv_ioctl; -+#if defined(WEBRTC_BSD) -+ int ret = ioctl(socket, SO_TIMESTAMP, &tv_ioctl); -+#else - int ret = ioctl(socket, SIOCGSTAMP, &tv_ioctl); -+#endif - if (ret != 0) - return -1; - int64_t timestamp = -@@ -302,7 +306,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) - socklen_t optlen = sizeof(*value); - int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen); - if (ret != -1 && opt == OPT_DONTFRAGMENT) { --#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) -+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) - *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; - #endif - } -@@ -315,7 +319,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { - if (TranslateOption(opt, &slevel, &sopt) == -1) - return -1; - if (opt == OPT_DONTFRAGMENT) { --#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) -+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) - value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; - #endif - } -@@ -597,10 +601,10 @@ int PhysicalSocket::TranslateOption(Option opt, int* s - *slevel = IPPROTO_IP; - *sopt = IP_DONTFRAGMENT; - break; --#elif defined(WEBRTC_MAC) || defined(BSD) || defined(__native_client__) -+#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) || defined(__native_client__) - LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported."; - return -1; --#elif defined(WEBRTC_POSIX) -+#elif defined(WEBRTC_POSIX) && !defined(WEBRTC_BSD) - *slevel = IPPROTO_IP; - *sopt = IP_MTU_DISCOVER; - break; Property changes on: head/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.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_web_PopupMenuImpl.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp (revision 449990) +++ head/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig 2017-06-05 19:03:26 UTC -+++ third_party/WebKit/Source/web/PopupMenuImpl.cpp -@@ -155,7 +155,7 @@ class PopupMenuImpl::ItemIterationContext { - is_in_group_(false), - buffer_(buffer) { - DCHECK(buffer_); --#if OS(LINUX) -+#if OS(LINUX) || OS(BSD) - // On other platforms, the