Index: head/www/chromium/Makefile =================================================================== --- head/www/chromium/Makefile (revision 448636) +++ head/www/chromium/Makefile (revision 448637) @@ -1,302 +1,293 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 59.0.3071.115 -PORTREVISION= 2 +PORTVERSION= 60.0.3112.101 CATEGORIES?= www -MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:source1 \ - LOCAL/cpm:source2 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:source1 \ - ${PORTNAME}-freetype2${EXTRACT_SUFX}:source2 +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 MPL +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 \ - libfreetype.so:print/freetype2 \ 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 .endif .if defined(GN_ONLY) -USES= compiler:c++11-lib ninja pkgconfig python:2,build shebangfix tar:xz +USES= compiler:c++11-lib 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 +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 gtk20 gtk30 libxml2 libxslt +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_media_router=true \ 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_experimental_allocator_shim=false \ 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. In theory it supports falling back to -# PulseAudio, but this is untested. +# 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}:source1 +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" .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-extract: - @${MV} ${WRKDIR}/freetype2 ${WRKSRC}/third_party/freetype/src - 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 shippen ones. + # 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/linux/node-linux-x64/bin - ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/linux/node-linux-x64/bin/node + @${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 448636) +++ head/www/chromium/distinfo (revision 448637) @@ -1,7 +1,5 @@ -TIMESTAMP = 1498576960 -SHA256 (chromium-59.0.3071.115.tar.xz) = 37cbc9955ae3b25cd4e9851a82ea97a0035021cc90658902938ad1c20f263170 -SIZE (chromium-59.0.3071.115.tar.xz) = 530808448 -SHA256 (chromium-freetype2.tar.xz) = 5bcb3d3da82905b2077ae0dcca52b99a25344c7e8dbdcd52691d69ab269356e3 -SIZE (chromium-freetype2.tar.xz) = 22847212 -SHA256 (chromium-59.0.3071.115-testdata.tar.xz) = a66e7b4a8f6002fe64b2b5609deb6eff2a0da442cb68e22ce404023021f20852 -SIZE (chromium-59.0.3071.115-testdata.tar.xz) = 124229320 +TIMESTAMP = 1502990445 +SHA256 (chromium-60.0.3112.101.tar.xz) = 0bfb6318af1c3cf82e8ac872e3da34cd3c013aadaab446d5097228101cec065e +SIZE (chromium-60.0.3112.101.tar.xz) = 537528240 +SHA256 (chromium-60.0.3112.101-testdata.tar.xz) = c22a3aa43af83b6ab3e97bbf9e44b4b00c6d7a9b50d3a528cfd8726b845f1f7e +SIZE (chromium-60.0.3112.101-testdata.tar.xz) = 124655656 Index: head/www/chromium/files/patch-services_service__manager_standalone_context.cc =================================================================== --- head/www/chromium/files/patch-services_service__manager_standalone_context.cc (revision 448636) +++ head/www/chromium/files/patch-services_service__manager_standalone_context.cc (nonexistent) @@ -1,11 +0,0 @@ ---- services/service_manager/standalone/context.cc.orig 2017-04-19 19:06:37 UTC -+++ services/service_manager/standalone/context.cc -@@ -133,7 +133,7 @@ Context::Context( - tracing::mojom::StartupPerformanceDataCollectorPtr collector; - BindInterface(service_manager(), source_identity, tracing_identity, - &collector); --#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - // CurrentProcessInfo::CreationTime is only defined on some platforms. - const base::Time creation_time = base::CurrentProcessInfo::CreationTime(); - collector->SetServiceManagerProcessCreationTime( Property changes on: head/www/chromium/files/patch-services_service__manager_standalone_context.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_BUILD.gn =================================================================== --- head/www/chromium/files/patch-third__party_libxml_BUILD.gn (revision 448636) +++ head/www/chromium/files/patch-third__party_libxml_BUILD.gn (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/libxml/BUILD.gn.orig 2017-04-19 19:06:52 UTC -+++ third_party/libxml/BUILD.gn -@@ -4,7 +4,7 @@ - - # Define an "os_include" variable that points at the OS-specific generated - # headers. These were generated by running the configure script offline. --if (is_linux || is_android || is_nacl) { -+if (is_linux || is_bsd || is_android || is_nacl) { - os_include = "linux" - } else if (is_mac || is_ios) { - os_include = "mac" Property changes on: head/www/chromium/files/patch-third__party_libxml_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-build__overrides_pdfium.gni =================================================================== --- head/www/chromium/files/patch-build__overrides_pdfium.gni (revision 448636) +++ head/www/chromium/files/patch-build__overrides_pdfium.gni (nonexistent) @@ -1,11 +0,0 @@ ---- build_overrides/pdfium.gni.orig 2017-06-05 19:03:01 UTC -+++ build_overrides/pdfium.gni -@@ -10,7 +10,7 @@ pdf_enable_xfa_override = false - - # Build PDFium either using the bundled FreeType, or using a third-party - # FreeType, configured by the embedder in //build/config/freetype. --pdf_bundle_freetype_override = !is_linux && !is_win -+pdf_bundle_freetype_override = false - - # Disable use of Skia backend. - pdf_use_skia_override = false Property changes on: head/www/chromium/files/patch-build__overrides_pdfium.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-chrome_chrome__paks.gni =================================================================== --- head/www/chromium/files/patch-chrome_chrome__paks.gni (revision 448636) +++ head/www/chromium/files/patch-chrome_chrome__paks.gni (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/chrome_paks.gni.orig 2017-06-05 19:03:03 UTC -+++ chrome/chrome_paks.gni -@@ -157,7 +157,7 @@ template("chrome_extra_paks") { - "//ui/file_manager:resources", - ] - } -- if (is_linux || is_mac) { -+ if (is_linux || is_bsd || is_mac) { - sources += [ "$root_gen_dir/headless/headless_lib_resources.pak" ] - deps += [ "//headless:resources" ] - } Property changes on: head/www/chromium/files/patch-chrome_chrome__paks.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-device_battery_BUILD.gn =================================================================== --- head/www/chromium/files/patch-device_battery_BUILD.gn (revision 448636) +++ head/www/chromium/files/patch-device_battery_BUILD.gn (nonexistent) @@ -1,11 +0,0 @@ ---- device/battery/BUILD.gn.orig 2017-06-05 19:03:07 UTC -+++ device/battery/BUILD.gn -@@ -48,7 +48,7 @@ if (!is_android) { - ] - } - -- if (is_linux && !is_chromeos) { -+ if ((is_linux || is_bsd) && !is_chromeos) { - if (use_dbus) { - configs += [ "//build/config/linux/dbus" ] - deps += [ "//dbus" ] Property changes on: head/www/chromium/files/patch-device_battery_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-remoting_host_BUILD.gn =================================================================== --- head/www/chromium/files/patch-remoting_host_BUILD.gn (revision 448636) +++ head/www/chromium/files/patch-remoting_host_BUILD.gn (nonexistent) @@ -1,47 +0,0 @@ ---- remoting/host/BUILD.gn.orig 2017-06-05 19:03:10 UTC -+++ remoting/host/BUILD.gn -@@ -325,7 +325,7 @@ static_library("host") { - deps += [ "//components/policy:generated" ] - } - -- if (is_linux && !is_chromeos) { -+ if ((is_linux || is_bsd) && !is_chromeos) { - libs += [ "pam" ] - } - -@@ -344,7 +344,7 @@ static_library("host") { - "input_injector_x11.cc", - "local_input_monitor_x11.cc", - ] -- if (is_linux) { -+ if (is_linux || is_bsd) { - # These will already be filtered out on non-Linux. - sources -= [ - "linux/unicode_to_keysym.cc", -@@ -530,7 +530,7 @@ source_set("unit_tests") { - "touch_injector_win_unittest.cc", - ] - -- if (!use_x11 && is_linux) { -+ if (!use_x11 && (is_linux || is_bsd)) { - sources -= [ "linux/unicode_to_keysym_unittest.cc" ] - } - if (use_ozone || is_chromeos) { -@@ -747,7 +747,7 @@ if (enable_me2me_host) { - if (is_desktop_linux) { - deps += [ "//build/config/linux/gtk" ] - } -- if ((is_linux && !is_chromeos) || is_mac) { -+ if ((is_linux && !is_chromeos) || is_mac || is_bsd) { - libs = [ "pam" ] - } - -@@ -817,7 +817,7 @@ if (enable_me2me_host) { - } - } - } -- if (is_chrome_branded && enable_me2me_host && is_linux && !is_chromeos) { -+ if (is_chrome_branded && enable_me2me_host && is_linux && is_bsd && !is_chromeos) { - group("remoting_me2me_host_archive") { - deps = [ - "//remoting/host/installer/linux:remoting_me2me_host_archive", Property changes on: head/www/chromium/files/patch-remoting_host_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-testing_gtest_src_gtest.cc =================================================================== --- head/www/chromium/files/patch-testing_gtest_src_gtest.cc (revision 448636) +++ head/www/chromium/files/patch-testing_gtest_src_gtest.cc (nonexistent) @@ -1,22 +0,0 @@ ---- testing/gtest/src/gtest.cc.orig 2017-06-05 19:04:13 UTC -+++ testing/gtest/src/gtest.cc -@@ -122,6 +122,10 @@ - - #endif // GTEST_OS_LINUX - -+#if GTEST_OS_FREEBSD -+# include -+#endif -+ - #if GTEST_HAS_EXCEPTIONS - # include - #endif -@@ -1930,7 +1934,7 @@ bool String::CaseInsensitiveWideCStringEquals(const wc - - #if GTEST_OS_WINDOWS - return _wcsicmp(lhs, rhs) == 0; --#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID -+#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID && !GTEST_OS_FREEBSD - return wcscasecmp(lhs, rhs) == 0; - #else - // Android, Mac OS X and Cygwin don't define wcscasecmp. Property changes on: head/www/chromium/files/patch-testing_gtest_src_gtest.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-mash_package_mash__packaged__service.cc =================================================================== --- head/www/chromium/files/patch-mash_package_mash__packaged__service.cc (revision 448636) +++ head/www/chromium/files/patch-mash_package_mash__packaged__service.cc (nonexistent) @@ -1,20 +0,0 @@ ---- mash/package/mash_packaged_service.cc.orig 2017-06-05 19:03:08 UTC -+++ mash/package/mash_packaged_service.cc -@@ -29,7 +29,7 @@ - #include "ash/touch_hud/mus/touch_hud_application.h" // nogncheck - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "components/font_service/font_service_app.h" - #endif - -@@ -106,7 +106,7 @@ std::unique_ptr MashPackaged - return base::WrapUnique(new mash::task_viewer::TaskViewer); - if (name == "test_ime_driver") - return base::WrapUnique(new ui::test::TestIMEApplication); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - if (name == "font_service") - return base::WrapUnique(new font_service::FontServiceApp); - #endif Property changes on: head/www/chromium/files/patch-mash_package_mash__packaged__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-media_ffmpeg_ffmpeg__common.h =================================================================== --- head/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h (revision 448636) +++ head/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h (nonexistent) @@ -1,25 +0,0 @@ ---- media/ffmpeg/ffmpeg_common.h.orig 2017-06-05 19:03:08 UTC -+++ media/ffmpeg/ffmpeg_common.h -@@ -23,10 +23,12 @@ - - // Include FFmpeg header files. - extern "C" { -+#if !defined(USE_SYSTEM_FFMPEG) - // Disable deprecated features which result in spammy compile warnings. This - // list of defines must mirror those in the 'defines' section of FFmpeg's - // BUILD.gn file or the headers below will generate different structures! - #define FF_API_CONVERGENCE_DURATION 0 -+#endif // !defined(USE_SYSTEM_FFMPEG) - // Upstream libavcodec/utils.c still uses the deprecated - // av_dup_packet(), causing deprecation warnings. - // The normal fix for such things is to disable the feature as below, -@@ -40,7 +42,9 @@ extern "C" { - MSVC_PUSH_DISABLE_WARNING(4244); - #include - #include -+#if !defined(USE_SYSTEM_FFMPEG) - #include -+#endif // !defined(USE_SYSTEM_FFMPEG) - #include - #include - #include Property changes on: head/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.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_app_mash_mash__runner.cc =================================================================== --- head/www/chromium/files/patch-chrome_app_mash_mash__runner.cc (revision 448636) +++ head/www/chromium/files/patch-chrome_app_mash_mash__runner.cc (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/app/mash/mash_runner.cc.orig 2017-06-05 19:03:01 UTC -+++ chrome/app/mash/mash_runner.cc -@@ -302,7 +302,7 @@ int MashMain() { - // TODO(sky): wire this up correctly. - service_manager::InitializeLogging(); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - base::AtExitManager exit_manager; - #endif - Property changes on: head/www/chromium/files/patch-chrome_app_mash_mash__runner.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-chrome_browser_resources_vulcanize.gni =================================================================== --- head/www/chromium/files/patch-chrome_browser_resources_vulcanize.gni (revision 448636) +++ head/www/chromium/files/patch-chrome_browser_resources_vulcanize.gni (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/browser/resources/vulcanize.gni.orig 2017-04-19 19:06:30 UTC -+++ chrome/browser/resources/vulcanize.gni -@@ -13,7 +13,7 @@ template("node") { - "//third_party/node/node_modules.tar.gz.sha1", - ] - -- if (is_linux) { -+ if (is_linux || is_bsd) { - inputs += [ "//third_party/node/linux/node-linux-x64.tar.gz.sha1" ] - } - if (is_win) { Property changes on: head/www/chromium/files/patch-chrome_browser_resources_vulcanize.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_skia_src_ports_SkFontHost_FreeType_common.cpp =================================================================== --- head/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost_FreeType_common.cpp (revision 448636) +++ head/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost_FreeType_common.cpp (nonexistent) @@ -1,140 +0,0 @@ ---- third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.orig 2017-06-27 15:42:02.870865000 +0200 -+++ third_party/skia/src/ports/SkFontHost_FreeType_common.cpp 2017-06-27 15:55:12.348145000 +0200 -@@ -395,8 +395,6 @@ - switch ( face->glyph->format ) { - case FT_GLYPH_FORMAT_OUTLINE: { - FT_Outline* outline = &face->glyph->outline; -- FT_BBox bbox; -- FT_Bitmap target; - - int dx = 0, dy = 0; - if (fRec.fFlags & SkScalerContext::kSubpixelPositioning_Flag) { -@@ -405,36 +403,97 @@ - // negate dy since freetype-y-goes-up and skia-y-goes-down - dy = -dy; - } -- FT_Outline_Get_CBox(outline, &bbox); -- /* -- what we really want to do for subpixel is -- offset(dx, dy) -- compute_bounds -- offset(bbox & !63) -- but that is two calls to offset, so we do the following, which -- achieves the same thing with only one offset call. -- */ -- FT_Outline_Translate(outline, dx - ((bbox.xMin + dx) & ~63), -- dy - ((bbox.yMin + dy) & ~63)); - -+ memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight); -+ - if (SkMask::kLCD16_Format == glyph.fMaskFormat) { -+ FT_Outline_Translate(outline, dx, dy); - FT_Error err = FT_Render_Glyph(face->glyph, doVert ? FT_RENDER_MODE_LCD_V : - FT_RENDER_MODE_LCD); - if (err) { - SK_TRACEFTR(err, "Could not render glyph."); -- sk_bzero(glyph.fImage, glyph.computeImageSize()); - return; - } -+ - SkMask mask; - glyph.toMask(&mask); -+#ifdef SK_SHOW_TEXT_BLIT_COVERAGE -+ memset(mask.fImage, 0x80, mask.fBounds.height() * mask.fRowBytes); -+#endif -+ FT_GlyphSlotRec& ftGlyph = *face->glyph; -+ -+ if (!SkIRect::Intersects(mask.fBounds, -+ SkIRect::MakeXYWH( ftGlyph.bitmap_left, -+ -ftGlyph.bitmap_top, -+ ftGlyph.bitmap.width, -+ ftGlyph.bitmap.rows))) -+ { -+ return; -+ } -+ -+ // If the FT_Bitmap extent is larger, discard bits of the bitmap outside the mask. -+ // If the SkMask extent is larger, shrink mask to fit bitmap (clearing discarded). -+ unsigned char* origBuffer = ftGlyph.bitmap.buffer; -+ // First align the top left (origin). -+ if (-ftGlyph.bitmap_top < mask.fBounds.fTop) { -+ int32_t topDiff = mask.fBounds.fTop - (-ftGlyph.bitmap_top); -+ ftGlyph.bitmap.buffer += ftGlyph.bitmap.pitch * topDiff; -+ ftGlyph.bitmap.rows -= topDiff; -+ ftGlyph.bitmap_top = -mask.fBounds.fTop; -+ } -+ if (ftGlyph.bitmap_left < mask.fBounds.fLeft) { -+ int32_t leftDiff = mask.fBounds.fLeft - ftGlyph.bitmap_left; -+ ftGlyph.bitmap.buffer += leftDiff; -+ ftGlyph.bitmap.width -= leftDiff; -+ ftGlyph.bitmap_left = mask.fBounds.fLeft; -+ } -+ if (mask.fBounds.fTop < -ftGlyph.bitmap_top) { -+ mask.fImage += mask.fRowBytes * (-ftGlyph.bitmap_top - mask.fBounds.fTop); -+ mask.fBounds.fTop = -ftGlyph.bitmap_top; -+ } -+ if (mask.fBounds.fLeft < ftGlyph.bitmap_left) { -+ mask.fImage += sizeof(uint16_t) * (ftGlyph.bitmap_left - mask.fBounds.fLeft); -+ mask.fBounds.fLeft = ftGlyph.bitmap_left; -+ } -+ // Origins aligned, clean up the width and height. -+ int ftVertScale = (doVert ? 3 : 1); -+ int ftHoriScale = (doVert ? 1 : 3); -+ if (mask.fBounds.height() * ftVertScale < SkToInt(ftGlyph.bitmap.rows)) { -+ ftGlyph.bitmap.rows = mask.fBounds.height() * ftVertScale; -+ } -+ if (mask.fBounds.width() * ftHoriScale < SkToInt(ftGlyph.bitmap.width)) { -+ ftGlyph.bitmap.width = mask.fBounds.width() * ftHoriScale; -+ } -+ if (SkToInt(ftGlyph.bitmap.rows) < mask.fBounds.height() * ftVertScale) { -+ mask.fBounds.fBottom = mask.fBounds.fTop + ftGlyph.bitmap.rows / ftVertScale; -+ } -+ if (SkToInt(ftGlyph.bitmap.width) < mask.fBounds.width() * ftHoriScale) { -+ mask.fBounds.fRight = mask.fBounds.fLeft + ftGlyph.bitmap.width / ftHoriScale; -+ } - if (fPreBlend.isApplicable()) { -- copyFT2LCD16(face->glyph->bitmap, mask, doBGR, -+ copyFT2LCD16(ftGlyph.bitmap, mask, doBGR, - fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); - } else { -- copyFT2LCD16(face->glyph->bitmap, mask, doBGR, -+ copyFT2LCD16(ftGlyph.bitmap, mask, doBGR, - fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); - } -+ // Restore the buffer pointer so FreeType can properly free it. -+ ftGlyph.bitmap.buffer = origBuffer; - } else { -+ FT_BBox bbox; -+ FT_Bitmap target; -+ FT_Outline_Get_CBox(outline, &bbox); -+ /* -+ what we really want to do for subpixel is -+ offset(dx, dy) -+ compute_bounds -+ offset(bbox & !63) -+ but that is two calls to offset, so we do the following, which -+ achieves the same thing with only one offset call. -+ */ -+ FT_Outline_Translate(outline, dx - ((bbox.xMin + dx) & ~63), -+ dy - ((bbox.yMin + dy) & ~63)); -+ - target.width = glyph.fWidth; - target.rows = glyph.fHeight; - target.pitch = glyph.rowBytes(); -@@ -442,8 +501,15 @@ - target.pixel_mode = compute_pixel_mode( (SkMask::Format)fRec.fMaskFormat); - target.num_grays = 256; - -- memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight); - FT_Outline_Get_Bitmap(face->glyph->library, outline, &target); -+#ifdef SK_SHOW_TEXT_BLIT_COVERAGE -+ for (int y = 0; y < glyph.fHeight; ++y) { -+ for (int x = 0; x < glyph.fWidth; ++x) { -+ uint8_t& a = ((uint8_t*)glyph.fImage)[(glyph.rowBytes() * y) + x]; -+ a = SkTMax(a, 0x20); -+ } -+ } -+#endif - } - } break; - Property changes on: head/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost_FreeType_common.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-services_device_time__zone__monitor_time__zone__monitor__linux.cc =================================================================== --- head/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc (revision 448636) +++ head/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc (nonexistent) @@ -1,22 +0,0 @@ ---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2017-06-05 19:03:11 UTC -+++ services/device/time_zone_monitor/time_zone_monitor_linux.cc -@@ -59,6 +59,9 @@ class TimeZoneMonitorLinuxImpl - main_task_runner_(base::ThreadTaskRunnerHandle::Get()), - file_task_runner_(file_task_runner), - owner_(owner) { -+ } -+ -+ void StartWatching() { - DCHECK(main_task_runner_->RunsTasksOnCurrentThread()); - file_task_runner_->PostTask( - FROM_HERE, -@@ -150,6 +153,9 @@ TimeZoneMonitorLinux::TimeZoneMonitorLinux( - // changed. - if (!getenv("TZ")) { - impl_ = new TimeZoneMonitorLinuxImpl(this, file_task_runner); -+ if (impl_.get()) { -+ impl_->StartWatching(); -+ } - } - } - Property changes on: head/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__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-build_config_freetype_BUILD.gn =================================================================== --- head/www/chromium/files/patch-build_config_freetype_BUILD.gn (revision 448636) +++ head/www/chromium/files/patch-build_config_freetype_BUILD.gn (nonexistent) @@ -1,11 +0,0 @@ ---- build/config/freetype/BUILD.gn.orig 2017-06-05 19:03:01 UTC -+++ build/config/freetype/BUILD.gn -@@ -9,7 +9,7 @@ group("freetype") { - public_deps = [ - "//third_party/freetype", - ] -- } else if (is_linux) { -+ } else if (is_linux || is_bsd) { - public_configs = [ "//build/linux:freetype_from_pkgconfig" ] - } - } Property changes on: head/www/chromium/files/patch-build_config_freetype_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_harfbuzz-ng_BUILD.gn =================================================================== --- head/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn (revision 448636) +++ head/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn (nonexistent) @@ -1,20 +0,0 @@ ---- third_party/harfbuzz-ng/BUILD.gn.orig 2017-06-05 19:03:27 UTC -+++ third_party/harfbuzz-ng/BUILD.gn -@@ -50,7 +50,7 @@ if (use_system_harfbuzz) { - - # See also chrome/browser/ui/libgtkui/BUILD.gn which pulls this. - config("pangoft2_link_hack") { -- if (is_linux && use_pango && !is_chromeos && !is_official_build && -+ if ((is_linux || is_bsd) && use_pango && !is_chromeos && !is_official_build && - current_cpu != "arm" && current_cpu != "mipsel" && !is_component_build) { - # These symbols are referenced from libpangoft2, which will be - # dynamically linked later. -@@ -201,7 +201,7 @@ if (use_system_harfbuzz) { - # in the tree, all symbols pango needs must be included, or - # pango uses mixed versions of harfbuzz and leads to crash. - # See crbug.com/462689. -- if (is_linux && use_pango && !is_chromeos && !is_official_build && -+ if ((is_linux || is_bsd) && use_pango && !is_chromeos && !is_official_build && - current_cpu != "arm" && current_cpu != "mipsel") { - deps += [ "//build/config/freetype" ] - configs -= [ "//build/config/gcc:symbol_visibility_hidden" ] Property changes on: head/www/chromium/files/patch-third__party_harfbuzz-ng_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_angle_gni_angle.gni =================================================================== --- head/www/chromium/files/patch-third__party_angle_gni_angle.gni (revision 448636) +++ head/www/chromium/files/patch-third__party_angle_gni_angle.gni (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/angle/gni/angle.gni.orig 2017-04-19 19:07:43 UTC -+++ third_party/angle/gni/angle.gni -@@ -20,6 +20,8 @@ if (is_win) { - import("//build/config/win/visual_studio_version.gni") - } else if (is_linux && use_x11 && !is_chromeos) { - angle_enable_gl = true -+} else if (is_bsd) { -+ angle_enable_gl = true - } else if (is_mac || ozone_platform_gbm) { - angle_enable_gl = true - } else if (is_android) { Property changes on: head/www/chromium/files/patch-third__party_angle_gni_angle.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-content_browser_devtools_protocol_color__picker.cc =================================================================== --- head/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc (revision 448636) +++ head/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc (nonexistent) @@ -1,11 +0,0 @@ ---- content/browser/devtools/protocol/color_picker.cc.orig 2017-06-05 19:03:06 UTC -+++ content/browser/devtools/protocol/color_picker.cc -@@ -154,7 +154,7 @@ void ColorPicker::UpdateCursor() { - // magnified projection only with centered hotspot. - // Mac Retina requires cursor to be > 120px in order to render smoothly. - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - const float kCursorSize = 63; - const float kDiameter = 63; - const float kHotspotOffset = 32; Property changes on: head/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.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-chrome_browser_ui_libgtkui_gtk_ui.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_libgtkui_gtk_ui.cc (revision 448636) +++ head/www/chromium/files/patch-chrome_browser_ui_libgtkui_gtk_ui.cc (nonexistent) @@ -1,60 +0,0 @@ ---- chrome/browser/ui/libgtkui/gtk_ui.cc.orig 2017-07-21 03:22:08.117746000 +0200 -+++ chrome/browser/ui/libgtkui/gtk_ui.cc 2017-07-21 03:25:59.536126000 +0200 -@@ -315,52 +315,15 @@ - return params; - } - --float GtkDpiToScaleFactor(int dpi) { -- // GTK multiplies the DPI by 1024 before storing it. -- return dpi / (1024 * kDefaultDPI); --} -- --gint GetGdkScreenSettingInt(const char* setting_name) { -- GValue value = G_VALUE_INIT; -- g_value_init(&value, G_TYPE_INT); -- if (!gdk_screen_get_setting(gdk_screen_get_default(), setting_name, &value)) -- return -1; -- return g_value_get_int(&value); --} -- --float GetScaleFromGdkScreenSettings() { -- gint window_scale = GetGdkScreenSettingInt("gdk-window-scaling-factor"); -- if (window_scale <= 0) -- return -1; -- gint font_dpi = GetGdkScreenSettingInt("gdk-unscaled-dpi"); -- if (font_dpi <= 0) -- return -1; -- return window_scale * GtkDpiToScaleFactor(font_dpi); --} -- --float GetScaleFromXftDPI() { -- GtkSettings* gtk_settings = gtk_settings_get_default(); -- CHECK(gtk_settings); -- gint gtk_dpi = -1; -- g_object_get(gtk_settings, "gtk-xft-dpi", >k_dpi, nullptr); -- if (gtk_dpi <= 0) -- return -1; -- return GtkDpiToScaleFactor(gtk_dpi); --} -- - float GetRawDeviceScaleFactor() { - if (display::Display::HasForceDeviceScaleFactor()) - return display::Display::GetForcedDeviceScaleFactor(); - -- float scale = GetScaleFromGdkScreenSettings(); -- if (scale > 0) -- return scale; -- -- scale = GetScaleFromXftDPI(); -- if (scale > 0) -- return scale; -- -- return 1; -+ GdkScreen* screen = gdk_screen_get_default(); -+ gint scale = gdk_screen_get_monitor_scale_factor( -+ screen, gdk_screen_get_primary_monitor(screen)); -+ gdouble resolution = gdk_screen_get_resolution(screen); -+ return resolution <= 0 ? scale : resolution * scale / kDefaultDPI; - } - - views::LinuxUI::NonClientMiddleClickAction GetDefaultMiddleClickAction() { Property changes on: head/www/chromium/files/patch-chrome_browser_ui_libgtkui_gtk_ui.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-media_filters_ffmpeg__demuxer.cc =================================================================== --- head/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc (revision 448636) +++ head/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc (nonexistent) @@ -1,18 +0,0 @@ ---- media/filters/ffmpeg_demuxer.cc.orig 2017-06-05 19:03:08 UTC -+++ media/filters/ffmpeg_demuxer.cc -@@ -1223,6 +1223,7 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const Pipelin - // If no estimate is found, the stream entry will be kInfiniteDuration. - std::vector start_time_estimates(format_context->nb_streams, - kInfiniteDuration); -+#if !defined(USE_SYSTEM_FFMPEG) - const AVFormatInternal* internal = format_context->internal; - if (internal && internal->packet_buffer && - format_context->start_time != static_cast(AV_NOPTS_VALUE)) { -@@ -1246,6 +1247,7 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const Pipelin - packet_buffer = packet_buffer->next; - } - } -+#endif // !defined(USE_SYSTEM_FFMPEG) - - std::unique_ptr media_tracks(new MediaTracks()); - Property changes on: head/www/chromium/files/patch-media_filters_ffmpeg__demuxer.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/audio_manager_openbsd.cc =================================================================== --- head/www/chromium/files/audio_manager_openbsd.cc (revision 448636) +++ head/www/chromium/files/audio_manager_openbsd.cc (revision 448637) @@ -1,205 +1,183 @@ // Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "base/metrics/histogram_macros.h" +#include "base/memory/ptr_util.h" #include "media/audio/openbsd/audio_manager_openbsd.h" #include "media/audio/audio_device_description.h" #include "media/audio/audio_output_dispatcher.h" -#if defined(USE_PULSEAUDIO) -#include "media/audio/pulse/audio_manager_pulse.h" -#endif #if defined(USE_SNDIO) #include "media/audio/sndio/sndio_input.h" #include "media/audio/sndio/sndio_output.h" #else #include "media/audio/fake_audio_manager.h" #endif #include "media/base/limits.h" #include "media/base/media_switches.h" namespace media { enum OpenBSDAudioIO { kPulse, kSndio, kAudioIOMax = kSndio }; #if defined(USE_SNDIO) // Maximum number of output streams that can be open simultaneously. static const int kMaxOutputStreams = 4; // Default sample rate for input and output streams. static const int kDefaultSampleRate = 48000; void AddDefaultDevice(AudioDeviceNames* device_names) { DCHECK(device_names->empty()); device_names->push_front(AudioDeviceName::CreateDefault()); } bool AudioManagerOpenBSD::HasAudioOutputDevices() { return true; } bool AudioManagerOpenBSD::HasAudioInputDevices() { return true; } void AudioManagerOpenBSD::ShowAudioInputSettings() { NOTIMPLEMENTED(); } void AudioManagerOpenBSD::GetAudioInputDeviceNames( AudioDeviceNames* device_names) { DCHECK(device_names->empty()); AddDefaultDevice(device_names); } void AudioManagerOpenBSD::GetAudioOutputDeviceNames( AudioDeviceNames* device_names) { AddDefaultDevice(device_names); } #if defined(USE_SNDIO) const char* AudioManagerOpenBSD::GetName() { return "SNDIO"; } #endif AudioParameters AudioManagerOpenBSD::GetInputStreamParameters( const std::string& device_id) { static const int kDefaultInputBufferSize = 1024; int user_buffer_size = GetUserBufferSize(); int buffer_size = user_buffer_size ? user_buffer_size : kDefaultInputBufferSize; return AudioParameters( AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, kDefaultSampleRate, 16, buffer_size); } -AudioManagerOpenBSD::AudioManagerOpenBSD( - scoped_refptr task_runner, - scoped_refptr worker_task_runner, - AudioLogFactory* audio_log_factory) - : AudioManagerBase(std::move(task_runner), - std::move(worker_task_runner), +AudioManagerOpenBSD::AudioManagerOpenBSD(std::unique_ptr audio_thread, + AudioLogFactory* audio_log_factory) + : AudioManagerBase(std::move(audio_thread), audio_log_factory) { DLOG(WARNING) << "AudioManagerOpenBSD"; SetMaxOutputStreamsAllowed(kMaxOutputStreams); } AudioManagerOpenBSD::~AudioManagerOpenBSD() { Shutdown(); } AudioOutputStream* AudioManagerOpenBSD::MakeLinearOutputStream( const AudioParameters& params, const LogCallback& log_callback) { DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); return MakeOutputStream(params); } AudioOutputStream* AudioManagerOpenBSD::MakeLowLatencyOutputStream( const AudioParameters& params, const std::string& device_id, const LogCallback& log_callback) { DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!"; DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); return MakeOutputStream(params); } AudioInputStream* AudioManagerOpenBSD::MakeLinearInputStream( const AudioParameters& params, const std::string& device_id, const LogCallback& log_callback) { DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); return MakeInputStream(params); } AudioInputStream* AudioManagerOpenBSD::MakeLowLatencyInputStream( const AudioParameters& params, const std::string& device_id, const LogCallback& log_callback) { DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); return MakeInputStream(params); } AudioParameters AudioManagerOpenBSD::GetPreferredOutputStreamParameters( const std::string& output_device_id, const AudioParameters& input_params) { // TODO(tommi): Support |output_device_id|. DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!"; static const int kDefaultOutputBufferSize = 2048; ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO; int sample_rate = kDefaultSampleRate; int buffer_size = kDefaultOutputBufferSize; int bits_per_sample = 16; if (input_params.IsValid()) { sample_rate = input_params.sample_rate(); bits_per_sample = input_params.bits_per_sample(); channel_layout = input_params.channel_layout(); buffer_size = std::min(buffer_size, input_params.frames_per_buffer()); } int user_buffer_size = GetUserBufferSize(); if (user_buffer_size) buffer_size = user_buffer_size; return AudioParameters( AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, sample_rate, bits_per_sample, buffer_size); } AudioInputStream* AudioManagerOpenBSD::MakeInputStream( const AudioParameters& params) { DLOG(WARNING) << "MakeInputStream"; return new SndioAudioInputStream(this, AudioDeviceDescription::kDefaultDeviceId, params); } AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream( const AudioParameters& params) { DLOG(WARNING) << "MakeOutputStream"; return new SndioAudioOutputStream(params, this); } #endif -ScopedAudioManagerPtr CreateAudioManager( - scoped_refptr task_runner, - scoped_refptr worker_task_runner, +std::unique_ptr CreateAudioManager( + std::unique_ptr audio_thread, AudioLogFactory* audio_log_factory) { DLOG(WARNING) << "CreateAudioManager"; -#if defined(USE_PULSEAUDIO) - // Do not move task runners when creating AudioManagerPulse. - // If the creation fails, we need to use the task runners to create other - // AudioManager implementations. - std::unique_ptr manager( - new AudioManagerPulse(task_runner, worker_task_runner, - audio_log_factory)); - if (manager->Init()) { - UMA_HISTOGRAM_ENUMERATION("Media.OpenBSDAudioIO", kPulse, kAudioIOMax + 1); - return std::move(manager); - } - DVLOG(1) << "PulseAudio is not available on the OS"; -#endif - #if defined(USE_SNDIO) UMA_HISTOGRAM_ENUMERATION("Media.OpenBSDAudioIO", kSndio, kAudioIOMax + 1); - return ScopedAudioManagerPtr( - new AudioManagerOpenBSD(std::move(task_runner), - std::move(worker_task_runner),audio_log_factory)); + return base::MakeUnique(std::move(audio_thread), + audio_log_factory); #else - return ScopedAudioManagerPtr( - new FakeAudioManager(std::move(task_runner), - std::move(worker_task_runner), audio_log_factory)); + return base::MakeUnique(std::move(audio_thread), + audio_log_factory); #endif } } // namespace media Index: head/www/chromium/files/audio_manager_openbsd.h =================================================================== --- head/www/chromium/files/audio_manager_openbsd.h (revision 448636) +++ head/www/chromium/files/audio_manager_openbsd.h (revision 448637) @@ -1,69 +1,66 @@ // Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #ifndef MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_ #define MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_ #include #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/threading/thread.h" #include "media/audio/audio_manager_base.h" namespace media { class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase { public: - AudioManagerOpenBSD( - scoped_refptr task_runner, - scoped_refptr worker_task_runner, - AudioLogFactory* audio_log_factory); + AudioManagerOpenBSD(std::unique_ptr audio_thread, + AudioLogFactory* audio_log_factory); + ~AudioManagerOpenBSD() override; // Implementation of AudioManager. bool HasAudioOutputDevices() override; bool HasAudioInputDevices() override; void ShowAudioInputSettings() override; void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override; void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override; AudioParameters GetInputStreamParameters( const std::string& device_id) override; const char* GetName() override; // Implementation of AudioManagerBase. AudioOutputStream* MakeLinearOutputStream( const AudioParameters& params, const LogCallback& log_callback) override; AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, const std::string& device_id, const LogCallback& log_callback) override; AudioInputStream* MakeLinearInputStream( const AudioParameters& params, const std::string& device_id, const LogCallback& log_callback) override; AudioInputStream* MakeLowLatencyInputStream( const AudioParameters& params, const std::string& device_id, const LogCallback& log_callback) override; protected: - ~AudioManagerOpenBSD() override; - AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, const AudioParameters& input_params) override; private: // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream. AudioOutputStream* MakeOutputStream(const AudioParameters& params); AudioInputStream* MakeInputStream(const AudioParameters& params); DISALLOW_COPY_AND_ASSIGN(AudioManagerOpenBSD); }; } // namespace media #endif // MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_ Index: head/www/chromium/files/patch-BUILD.gn =================================================================== --- head/www/chromium/files/patch-BUILD.gn (revision 448636) +++ head/www/chromium/files/patch-BUILD.gn (revision 448637) @@ -1,173 +1,162 @@ ---- BUILD.gn.orig 2017-06-05 19:03:00 UTC -+++ BUILD.gn -@@ -95,7 +95,7 @@ group("gn_all") { +--- BUILD.gn.orig 2017-07-25 21:04:48.000000000 +0200 ++++ BUILD.gn 2017-07-29 00:52:25.378843000 +0200 +@@ -92,7 +92,7 @@ ] } -- if (!is_ios && !is_android && !is_chromecast) { -+ if (!is_ios && !is_android && !is_bsd && !is_chromecast) { +- if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) { ++ if (!is_ios && !is_android && !is_bsd && !is_chromecast && !is_fuchsia) { deps += [ "//chrome", "//chrome/test:browser_tests", -@@ -153,7 +153,7 @@ group("gn_all") { +@@ -151,7 +151,7 @@ ] } -- if (!is_ios) { -+ if (!is_ios && !is_bsd) { - # TODO(GYP): Figure out which of these should actually build on iOS, - # and whether there should be other targets that are iOS-only and missing. +- if (!is_ios && !is_fuchsia) { ++ if (!is_ios && !is_bsd && !is_fuchsia) { deps += [ -@@ -199,7 +199,7 @@ group("gn_all") { - "//ui/touch_selection:ui_touch_selection_unittests", - "//url/ipc:url_ipc_unittests", + "//cc:cc_unittests", + "//chrome/test:telemetry_perf_unittests", +@@ -363,7 +363,7 @@ ] -- } else { -+ } else if (!is_bsd) { - deps += [ "//ios:all" ] } -@@ -359,7 +359,7 @@ group("gn_all") { - ] - } - - if (is_linux) { + if (is_linux || is_bsd) { # The following are definitely linux-only. deps += [ "//chrome:manpage", -@@ -382,9 +382,16 @@ group("gn_all") { +@@ -386,9 +386,16 @@ # TODO(dpranke): add the linux_dump_symbols flag? deps += [ "//chrome:linux_symbols" ] } + + if (is_bsd) { + deps -= [ + "//sandbox/linux:chrome_sandbox", + "//sandbox/linux:sandbox_linux_unittests", + ] + } } - if (is_ios || is_win || (is_linux && !is_chromeos)) { + if (is_ios || is_win || is_bsd || (is_linux && !is_chromeos)) { deps += [ "//base:base_i18n_perftests", "//base:base_perftests", -@@ -455,7 +462,7 @@ group("gn_all") { +@@ -459,7 +466,7 @@ if (enable_nacl) { deps += [ "//components/nacl/loader:nacl_loader_unittests" ] - if (is_linux) { + if (is_linux || is_bsd) { # TODO(dpranke): Figure out what platforms should actually have this. deps += [ "//components/nacl/loader:nacl_helper" ] -@@ -557,7 +564,7 @@ group("gn_all") { +@@ -557,7 +564,7 @@ deps += [ "//chrome/installer/mini_installer:next_version_mini_installer" ] } -- } else if (!is_android && !is_ios) { -+ } else if (!is_android && !is_ios && !is_bsd) { +- } else if (!is_android && !is_ios && !is_fuchsia) { ++ } else if (!is_android && !is_ios && !is_bsd && !is_fuchsia) { deps += [ "//breakpad:symupload($host_toolchain)" ] } -@@ -595,7 +602,7 @@ group("gn_all") { +@@ -588,7 +595,7 @@ deps += [ "//components/proximity_auth:proximity_auth_unittests" ] } - if (is_win || is_linux) { + if (is_win || is_linux || is_bsd) { deps += [ "//mash:all", "//media/mojo/services:media_service_unittests", -@@ -620,7 +627,7 @@ group("gn_all") { +@@ -606,7 +613,7 @@ } } - if (is_linux && !is_chromeos && !is_chromecast) { + if ((is_linux || is_bsd) && !is_chromeos && !is_chromecast) { # TODO(GYP): Figure out if any of these should be in gn_all # and figure out how cross-platform they are deps += [ -@@ -659,7 +666,7 @@ group("gn_all") { +@@ -644,7 +651,7 @@ } if (target_cpu == "x86" || target_cpu == "x64") { - if (!is_android) { + if (!is_android && !is_bsd) { deps += [ "//chrome/test:load_library_perf_tests" ] } deps += [ -@@ -667,7 +674,7 @@ group("gn_all") { +@@ -652,13 +659,13 @@ "//third_party/libjpeg_turbo:simd_asm", ] } - if (is_linux && current_toolchain == host_toolchain) { + if ((is_linux || is_bsd) && current_toolchain == host_toolchain) { deps += [ "//v8:v8_shell" ] } } -@@ -677,7 +684,7 @@ group("gn_all") { - } if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) || - (use_libfuzzer && is_mac)) { + (use_libfuzzer && is_mac) || is_bsd) { deps += [ "//testing/libfuzzer/fuzzers", "//testing/libfuzzer/tests:libfuzzer_tests", -@@ -828,7 +835,7 @@ if (is_chromeos) { +@@ -677,7 +684,7 @@ + deps += [ "//native_client_sdk/src:nacl_core_sdk" ] + } - group("gn_mojo_targets") { - testonly = true -- if (is_linux && !is_chromeos) { -+ if ((is_linux || is_bsd) && !is_chromeos) { - # TODO(GYP): Figure out if any of these should be in gn_all - # and figure out how cross-platform they are - deps = [ -@@ -854,7 +861,7 @@ group("gn_visibility") { +- if (is_linux && use_ozone) { ++ if ((is_linux || is_bsd ) && use_ozone) { + deps += [ + "//headless", + "//headless:headless_tests", +@@ -811,7 +818,7 @@ } } --if (!is_ios) { -+if (!is_ios || !is_bsd) { +-if (!is_ios && !is_fuchsia) { ++if (!is_ios && !is_bsd && !is_fuchsia) { # This group includes all of the targets needed to build and test Blink, # including running the layout tests (see below). group("blink_tests") { -@@ -921,7 +928,7 @@ if (!is_ios) { +@@ -879,7 +886,7 @@ data_deps += [ "//content/shell:content_shell_crash_service" ] } - if (!is_win && !is_android) { + if (!is_win && !is_android && !is_bsd) { data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -929,7 +936,7 @@ if (!is_ios) { +@@ -887,7 +894,7 @@ data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] } - if (is_linux) { + if (is_linux && !is_bsd) { data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] } -@@ -979,7 +986,7 @@ group("chromium_swarm_tests") { +@@ -941,7 +948,7 @@ group("chromium_builder_perf") { testonly = true -- if (!is_ios && !is_android && !is_chromecast) { -+ if (!is_ios && !is_android && !is_chromecast && !is_bsd) { +- if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) { ++ if (!is_ios && !is_android && !is_bsd && !is_chromecast && !is_fuchsia) { data_deps = [ "//cc:cc_perftests", "//chrome/test:load_library_perf_tests", -@@ -1009,7 +1016,7 @@ group("chromium_builder_perf") { +@@ -975,7 +982,7 @@ "//chrome/installer/mini_installer:mini_installer", "//chrome/test:angle_perftests", ] - } else { + } else if (!is_bsd) { data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] } } Index: head/www/chromium/files/patch-base_BUILD.gn =================================================================== --- head/www/chromium/files/patch-base_BUILD.gn (revision 448636) +++ head/www/chromium/files/patch-base_BUILD.gn (revision 448637) @@ -1,86 +1,92 @@ ---- base/BUILD.gn.orig 2017-06-05 21:03:00.000000000 +0200 -+++ base/BUILD.gn 2017-06-13 19:23:34.211227000 +0200 -@@ -1098,7 +1098,7 @@ +--- base/BUILD.gn.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/BUILD.gn 2017-08-02 22:12:25.442369000 +0200 +@@ -1106,7 +1106,7 @@ "base_paths_win.h", ] - if (is_linux) { + if (is_linux || is_bsd) { sources += [ "base_paths_posix.cc" ] } } -@@ -1157,6 +1157,9 @@ +@@ -1142,7 +1142,7 @@ + # Needed for if using newer C++ library than sysroot, except if + # building inside the cros_sdk environment - use host_toolchain as a + # more robust check for this. +- if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) && ++ if (!use_sysroot && (is_android || (is_linux && !is_chromecast) && !is_clang) && + host_toolchain != "//build/toolchain/cros:host") { + libs = [ "atomic" ] + } +@@ -1168,7 +1168,7 @@ + "allocator/allocator_shim_override_glibc_weak_symbols.h", + ] deps += [ "//base/allocator:tcmalloc" ] - } else if (is_linux && use_allocator == "none") { +- } else if (is_linux && use_allocator == "none") { ++ } else if (is_linux && !is_bsd && use_allocator == "none") { sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] -+ } else if (is_bsd && use_allocator == "none") { -+ # TODO move the code to "allocator_shim_default_dispatch_to_glibc.cc" -+ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ - "allocator/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc", -@@ -1172,6 +1175,33 @@ +@@ -1185,6 +1185,31 @@ } } + if (is_bsd) { + sources -= [ + "files/file_util_linux.cc", + "files/file_path_watcher_linux.cc", + "process/process_linux.cc", + "process/process_iterator_linux.cc", + "process/process_metrics_linux.cc", + "process/process_handle_linux.cc", + "sys_info_linux.cc", -+ "trace_event/malloc_dump_provider.cc", -+ "trace_event/malloc_dump_provider.h", + ] + sources += [ + "files/file_path_watcher_stub.cc", + "process/process_handle_freebsd.cc", + "process/process_iterator_freebsd.cc", + "process/process_metrics_freebsd.cc", + "sys_info_freebsd.cc", + ] + libs = [ + "execinfo", # logging.cc + "kvm" # process_metrics_freebsd + ] + } + + + # Allow more direct string conversions on platforms with native utf8 # strings if (is_mac || is_ios || is_chromeos || is_chromecast) { -@@ -1469,7 +1499,7 @@ +@@ -1520,7 +1545,7 @@ } # Linux. - if (is_linux) { + if (is_linux || is_bsd) { if (is_asan || is_lsan || is_msan || is_tsan) { # For llvm-sanitizer. data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ] -@@ -1494,7 +1524,7 @@ +@@ -1545,7 +1570,7 @@ "//base/third_party/xdg_user_dirs", ] } else { - # Non-Linux. + # Non-Linux/BSD. sources -= [ "nix/mime_util_xdg.cc", "nix/mime_util_xdg.h", -@@ -2325,6 +2355,12 @@ +@@ -2392,6 +2417,12 @@ "trace_event/trace_event_android_unittest.cc", ] set_sources_assignment_filter(sources_assignment_filter) + } + + if (is_bsd) { + sources -= [ + "debug/proc_maps_linux_unittest.cc", + ] } if (is_win) { Index: head/www/chromium/files/patch-base_debug_stack__trace.h =================================================================== --- head/www/chromium/files/patch-base_debug_stack__trace.h (nonexistent) +++ head/www/chromium/files/patch-base_debug_stack__trace.h (revision 448637) @@ -0,0 +1,10 @@ +--- base/debug/stack_trace.h.orig 2017-08-02 19:09:58.400190000 +0200 ++++ base/debug/stack_trace.h 2017-08-02 19:10:33.950334000 +0200 +@@ -16,6 +16,7 @@ + #include "build/build_config.h" + + #if defined(OS_POSIX) ++#include + #include + #endif + Property changes on: head/www/chromium/files/patch-base_debug_stack__trace.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-base_debug_stack__trace__posix.cc =================================================================== --- head/www/chromium/files/patch-base_debug_stack__trace__posix.cc (revision 448636) +++ head/www/chromium/files/patch-base_debug_stack__trace__posix.cc (revision 448637) @@ -1,30 +1,40 @@ ---- base/debug/stack_trace_posix.cc.orig 2017-04-19 19:06:28 UTC -+++ base/debug/stack_trace_posix.cc +--- base/debug/stack_trace_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/debug/stack_trace_posix.cc 2017-08-02 18:45:42.071358000 +0200 @@ -34,7 +34,7 @@ #include #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "base/debug/proc_maps_linux.h" #endif -@@ -575,6 +575,10 @@ class SandboxSymbolizeHelper { +@@ -574,6 +574,11 @@ // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { -+#if defined(OS_FREEBSD) ++#if defined(OS_BSD) + // TODO (rene) avoid link error, implement something? ++ NOTIMPLEMENTED(); + return false; +#else // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -590,6 +594,7 @@ class SandboxSymbolizeHelper { +@@ -589,6 +594,7 @@ is_initialized_ = true; return true; +#endif } // Opens all object files and caches their file descriptors. +@@ -721,7 +727,7 @@ + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. + +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if !defined(__UCLIBC__) && !defined(_AIX) && !defined(OS_BSD) + count = std::min(arraysize(trace_), count); + + // Though the backtrace API man page does not list any possible negative Index: head/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h =================================================================== --- head/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h (revision 448636) +++ head/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h (revision 448637) @@ -1,13 +1,13 @@ ---- base/files/file_path_watcher_kqueue.h.orig 2017-04-19 19:06:28 UTC +--- base/files/file_path_watcher_kqueue.h.orig 2017-06-05 19:03:00 UTC +++ base/files/file_path_watcher_kqueue.h @@ -5,6 +5,10 @@ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ #define BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ +#ifdef __FreeBSD__ +#include +#include +#endif #include #include Index: head/www/chromium/files/patch-base_files_file__util.h =================================================================== --- head/www/chromium/files/patch-base_files_file__util.h (revision 448636) +++ head/www/chromium/files/patch-base_files_file__util.h (revision 448637) @@ -1,11 +1,11 @@ ---- base/files/file_util.h.orig 2017-06-05 19:03:00 UTC -+++ base/files/file_util.h -@@ -406,7 +406,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +--- base/files/file_util.h.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/files/file_util.h 2017-07-29 00:57:11.269678000 +0200 +@@ -406,7 +406,7 @@ // the directory |path|, in the number of FilePath::CharType, or -1 on failure. BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) // Broad categories of file systems as returned by statfs() on Linux. enum FileSystemType { FILE_SYSTEM_UNKNOWN, // statfs failed. Index: head/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc =================================================================== --- head/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc (nonexistent) +++ head/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc (revision 448637) @@ -0,0 +1,11 @@ +--- base/files/memory_mapped_file_posix.cc.orig 2017-08-02 18:42:44.932652000 +0200 ++++ base/files/memory_mapped_file_posix.cc 2017-08-02 18:42:59.362655000 +0200 +@@ -114,7 +114,7 @@ + + #if defined(OS_ANDROID) && __ANDROID_API__ < 21 + do_manual_extension = true; +-#elif !defined(OS_MACOSX) ++#elif !defined(OS_MACOSX) && !defined(OS_BSD) + if (posix_fallocate(file_.GetPlatformFile(), region.offset, + region.size) != 0) { + DPLOG(ERROR) << "posix_fallocate " << file_.GetPlatformFile(); Property changes on: head/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-base_native__library__posix.cc =================================================================== --- head/www/chromium/files/patch-base_native__library__posix.cc (revision 448636) +++ head/www/chromium/files/patch-base_native__library__posix.cc (revision 448637) @@ -1,11 +1,11 @@ ---- base/native_library_posix.cc.orig 2017-06-05 19:03:00 UTC -+++ base/native_library_posix.cc -@@ -35,7 +35,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP +--- base/native_library_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/native_library_posix.cc 2017-08-02 21:02:05.991380000 +0200 +@@ -30,7 +30,7 @@ + // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892, + // and http://crbug.com/40794. + int flags = RTLD_LAZY; +-#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND) ++#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND) || defined(OS_BSD) + // Certain platforms don't define RTLD_DEEPBIND. Android dlopen() requires // further investigation, as it might vary across versions. Crash here to // warn developers that they're trying to rely on uncertain behavior. - CHECK(!options.prefer_own_symbols); --#else -+#elif !defined(OS_BSD) - if (options.prefer_own_symbols) - flags |= RTLD_DEEPBIND; - #endif Index: head/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc =================================================================== --- head/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc (revision 448636) +++ head/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc (revision 448637) @@ -1,45 +1,49 @@ ---- base/posix/unix_domain_socket_linux.cc.orig 2017-06-05 19:03:00 UTC -+++ base/posix/unix_domain_socket_linux.cc -@@ -23,6 +23,15 @@ +--- base/posix/unix_domain_socket_linux.cc.orig 2017-08-03 00:05:03.000000000 +0200 ++++ base/posix/unix_domain_socket_linux.cc 2017-08-10 00:44:31.627900000 +0200 +@@ -5,7 +5,10 @@ + #include "base/posix/unix_domain_socket_linux.h" - namespace base { + #include ++#include ++#include + #include ++#include + #include -+#if defined(OS_BSD) -+// Port over Linux ucred structure -+struct ucred { -+ pid_t pid; // process ID of the sending process -+ uid_t uid; // user ID of the sending process -+ gid_t gid; // group ID of the sending process -+}; -+#endif -+ + #include +@@ -25,6 +28,14 @@ + const size_t UnixDomainSocket::kMaxFileDescriptors = 16; - #if !defined(OS_NACL_NONSFI) -@@ -37,8 +46,14 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { - - // static - bool UnixDomainSocket::EnableReceiveProcessId(int fd) { -+#if defined(OS_BSD) -+ // XXX(rene) do this? : -+ // taken from dbus, Academic Free License 2.1 / GPL 2+ -+ return 0; // fake OK -+#else - const int enable = 1; - return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; ++#ifndef SCM_CREDENTIALS ++# define SCM_CREDENTIALS 0X9001 +#endif - } - #endif // !defined(OS_NACL_NONSFI) - -@@ -144,7 +159,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, - // The PNaCl toolchain for Non-SFI binary build does not support ++ ++#ifndef SO_PASSCRED ++# define SO_PASSCRED 0x9002 ++#endif ++ + #if !defined(OS_NACL_NONSFI) + bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { + int raw_socks[2]; +@@ -114,7 +125,7 @@ + CMSG_SPACE(sizeof(int) * kMaxFileDescriptors) + #if !defined(OS_NACL_NONSFI) + // The PNaCl toolchain for Non-SFI binary build does not support ucred. +- + CMSG_SPACE(sizeof(struct ucred)) ++ + CMSG_SPACE(sizeof(struct sockcred)) + #endif + ; + char control_buffer[kControlBufferSize]; +@@ -145,9 +156,9 @@ // SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && -+#if defined(OS_BSD) -+ 1) { // XXX(rene) carpet getting full ... -+#else cmsg->cmsg_type == SCM_CREDENTIALS) { -+#endif - DCHECK_EQ(payload_len, sizeof(struct ucred)); +- DCHECK_EQ(payload_len, sizeof(struct ucred)); ++ DCHECK_EQ(payload_len, sizeof(struct sockcred)); DCHECK_EQ(pid, -1); - pid = reinterpret_cast(CMSG_DATA(cmsg))->pid; +- pid = reinterpret_cast(CMSG_DATA(cmsg))->pid; ++ pid = getpid(); + } + #endif + } Index: head/www/chromium/files/patch-base_process_internal__linux.cc =================================================================== --- head/www/chromium/files/patch-base_process_internal__linux.cc (nonexistent) +++ head/www/chromium/files/patch-base_process_internal__linux.cc (revision 448637) @@ -0,0 +1,16 @@ +--- base/process/internal_linux.cc.orig 2017-08-10 00:00:17.842158000 +0200 ++++ base/process/internal_linux.cc 2017-08-10 00:02:37.838081000 +0200 +@@ -60,10 +60,13 @@ + // Synchronously reading files in /proc is safe. + ThreadRestrictions::ScopedAllowIO allow_io; + ++#if !defined(OS_BSD) + if (!ReadFileToString(file, buffer)) { + DLOG(WARNING) << "Failed to read " << file.MaybeAsASCII(); + return false; + } ++#endif ++ + return !buffer->empty(); + } + Property changes on: head/www/chromium/files/patch-base_process_internal__linux.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-base_process_memory.h =================================================================== --- head/www/chromium/files/patch-base_process_memory.h (revision 448636) +++ head/www/chromium/files/patch-base_process_memory.h (revision 448637) @@ -1,11 +1,11 @@ ---- base/process/memory.h.orig 2017-06-05 19:03:00 UTC -+++ base/process/memory.h -@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory(); +--- base/process/memory.h.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/process/memory.h 2017-07-29 01:01:15.601297000 +0200 +@@ -32,7 +32,7 @@ // Crash reporting classifies such crashes as OOM. BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size); --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_ANDROID) +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) BASE_EXPORT extern size_t g_oom_size; // The maximum allowed value for the OOM score. Index: head/www/chromium/files/patch-base_process_process__metrics.h =================================================================== --- head/www/chromium/files/patch-base_process_process__metrics.h (revision 448636) +++ head/www/chromium/files/patch-base_process_process__metrics.h (revision 448637) @@ -1,60 +1,58 @@ ---- base/process/process_metrics.h.orig 2017-06-05 19:03:00 UTC -+++ base/process/process_metrics.h +--- base/process/process_metrics.h.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/process/process_metrics.h 2017-08-01 22:08:56.153263000 +0200 @@ -22,6 +22,12 @@ #include "base/values.h" #include "build/build_config.h" +#if defined(OS_BSD) +#include +#include +#include +#endif + #if defined(OS_MACOSX) #include #include "base/process/port_provider_mac.h" -@@ -205,7 +211,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -215,7 +221,7 @@ // otherwise. bool GetIOCounters(IoCounters* io_counters) const; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) // Returns the number of file descriptors currently open by the process, or // -1 on error. int GetOpenFdCount() const; -@@ -213,7 +219,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -223,12 +229,12 @@ // Returns the soft limit of file descriptors that can be opened by the // process, or -1 on error. int GetOpenFdSoftLimit() const; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_AIX) ++#endif // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + // Bytes of swap as reported by /proc/[pid]/status. + uint64_t GetVmSwapBytes() const; +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + private: #if !defined(OS_MACOSX) || defined(OS_IOS) -@@ -289,7 +295,7 @@ BASE_EXPORT void SetFdLimit(unsigned int max_descripto +@@ -304,7 +310,7 @@ #endif // defined(OS_POSIX) #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) +- defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) ++ defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD) // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -383,13 +389,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK - // CPU-related ticks. Returns -1 on parse error. - // Exposed for testing. - BASE_EXPORT int ParseProcStatCPU(const std::string& input); -+#endif +@@ -352,7 +358,7 @@ + #endif -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) - // Get the number of threads of |process| as available in /proc//stat. - // This should be used with care as no synchronization with running threads is - // done. This is mostly useful to guarantee being single-threaded. - // Returns 0 on failure. - BASE_EXPORT int GetNumberOfThreads(ProcessHandle process); -+#endif - -+#if defined(OS_LINUX) || defined(OS_ANDROID) - // /proc/self/exe refers to the current executable. - BASE_EXPORT extern const char kProcSelfExe[]; - + #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ +- defined(OS_FUCHSIA) ++ defined(OS_FUCHSIA) || defined(OS_BSD) + int buffers = 0; + int cached = 0; + int active_anon = 0; Index: head/www/chromium/files/patch-base_process_process__posix.cc =================================================================== --- head/www/chromium/files/patch-base_process_process__posix.cc (revision 448636) +++ head/www/chromium/files/patch-base_process_process__posix.cc (revision 448637) @@ -1,89 +1,89 @@ ---- base/process/process_posix.cc.orig 2017-06-15 21:03:00.000000000 +0200 -+++ base/process/process_posix.cc 2017-06-19 15:25:27.760111000 +0200 -@@ -21,8 +21,18 @@ +--- base/process/process_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/process/process_posix.cc 2017-08-02 19:38:18.657740000 +0200 +@@ -22,8 +22,18 @@ #include #endif +#if defined(OS_BSD) +#include +#include +#include +#include +#endif + namespace { +const int kBackgroundPriority = 5; +const int kForegroundPriority = 0; + #if !defined(OS_NACL_NONSFI) bool WaitpidWithTimeout(base::ProcessHandle handle, -@@ -184,13 +194,13 @@ - base::ProcessHandle parent_pid = base::GetParentProcessId(handle); +@@ -186,13 +196,13 @@ base::ProcessHandle our_pid = base::GetCurrentProcessHandle(); + if (parent_pid != our_pid) { -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) // On Mac we can wait on non child processes. - return WaitForSingleNonChildProcess(handle, timeout); + /* return WaitForSingleNonChildProcess(handle, timeout); */ #else // Currently on Linux we can't handle non child processes. NOTIMPLEMENTED(); -#endif // OS_MACOSX +#endif // OS_MACOSX || OS_BSD } int status; -@@ -256,12 +266,16 @@ +@@ -258,12 +268,16 @@ return Process(handle); } --#if !defined(OS_LINUX) && !defined(OS_MACOSX) -+#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) +-#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) ++#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) && !defined(OS_BSD) // static bool Process::CanBackgroundProcesses() { return false; } --#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) +-#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) +#elif defined(OS_FREEBSD) +bool Process::CanBackgroundProcesses() { + return true; +} -+#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) ++#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) && !defined(OS_BSD) // static void Process::TerminateCurrentProcessImmediately(int exit_code) { -@@ -369,15 +383,31 @@ +@@ -371,15 +385,31 @@ bool Process::IsProcessBackgrounded() const { // See SetProcessBackgrounded(). DCHECK(IsValid()); +#if defined(OS_FREEBSD) + return true; +#else return false; +#endif } bool Process::SetProcessBackgrounded(bool value) { +#if !defined(OS_FREEBSD) // Not implemented for POSIX systems other than Linux and Mac. With POSIX, if // we were to lower the process priority we wouldn't be able to raise it back // to its initial priority. NOTIMPLEMENTED(); return false; +#else + DCHECK(IsValid()); + + if (!CanBackgroundProcesses()) + return false; + + int priority = value ? kBackgroundPriority : kForegroundPriority; + int result = setpriority(PRIO_PROCESS, process_, priority); + + return result == 0; +#endif // !defined(OS_FREEBSD) } - #endif // !defined(OS_LINUX) && !defined(OS_MACOSX) + #endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) Index: head/www/chromium/files/patch-base_sys__info__posix.cc =================================================================== --- head/www/chromium/files/patch-base_sys__info__posix.cc (revision 448636) +++ head/www/chromium/files/patch-base_sys__info__posix.cc (revision 448637) @@ -1,20 +1,20 @@ ---- base/sys_info_posix.cc.orig 2017-06-05 19:03:00 UTC -+++ base/sys_info_posix.cc +--- base/sys_info_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/sys_info_posix.cc 2017-08-02 21:19:06.172695000 +0200 @@ -35,7 +35,7 @@ namespace { --#if !defined(OS_OPENBSD) -+#if !defined(OS_BSD) +-#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) ++#if !defined(OS_BSD) && !defined(OS_FUCHSIA) int NumberOfProcessors() { // sysconf returns the number of "logical" (not "physical") processors on both // Mac and Linux. So we get the number of max available "logical" processors. -@@ -128,7 +128,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, +@@ -128,7 +128,7 @@ namespace base { --#if !defined(OS_OPENBSD) -+#if !defined(OS_BSD) +-#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) ++#if !defined(OS_BSD) && !defined(OS_FUCHSIA) int SysInfo::NumberOfProcessors() { return g_lazy_number_of_processors.Get().value(); } 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 (nonexistent) +++ head/www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc (revision 448637) @@ -0,0 +1,12 @@ +--- 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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-base_test_test__file__util__linux.cc =================================================================== --- head/www/chromium/files/patch-base_test_test__file__util__linux.cc (nonexistent) +++ head/www/chromium/files/patch-base_test_test__file__util__linux.cc (revision 448637) @@ -0,0 +1,13 @@ +--- base/test/test_file_util_linux.cc.orig 2017-08-10 16:14:03.505570000 +0200 ++++ base/test/test_file_util_linux.cc 2017-08-10 16:14:43.299690000 +0200 +@@ -20,8 +20,10 @@ + return false; + if (fdatasync(fd.get()) != 0) + return false; ++#if !defined(OS_BSD) + if (posix_fadvise(fd.get(), 0, 0, POSIX_FADV_DONTNEED) != 0) + return false; ++#endif + return true; + } + Property changes on: head/www/chromium/files/patch-base_test_test__file__util__linux.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-base_third__party_libevent_BUILD.gn =================================================================== --- head/www/chromium/files/patch-base_third__party_libevent_BUILD.gn (revision 448636) +++ head/www/chromium/files/patch-base_third__party_libevent_BUILD.gn (revision 448637) @@ -1,12 +1,16 @@ ---- base/third_party/libevent/BUILD.gn.orig 2017-04-19 19:06:28 UTC -+++ base/third_party/libevent/BUILD.gn -@@ -50,6 +50,9 @@ static_library("libevent") { +--- base/third_party/libevent/BUILD.gn.orig 2017-08-03 00:05:03.000000000 +0200 ++++ base/third_party/libevent/BUILD.gn 2017-08-03 14:47:35.196280000 +0200 +@@ -50,6 +50,13 @@ "linux/event-config.h", ] include_dirs = [ "linux" ] + } else if (is_bsd) { -+ sources += [ "kqueue.c" ] ++ sources += [ ++ "kqueue.c", ++ "freebsd/config.h", ++ "freebsd/event-config.h", ++ ] + include_dirs = [ "freebsd" ] } else if (is_android) { sources += [ "android/config.h", Index: head/www/chromium/files/patch-base_threading_platform__thread__linux.cc =================================================================== --- head/www/chromium/files/patch-base_threading_platform__thread__linux.cc (revision 448636) +++ head/www/chromium/files/patch-base_threading_platform__thread__linux.cc (revision 448637) @@ -1,30 +1,21 @@ ---- base/threading/platform_thread_linux.cc.orig 2017-06-05 19:03:01 UTC -+++ base/threading/platform_thread_linux.cc +--- base/threading/platform_thread_linux.cc.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/threading/platform_thread_linux.cc 2017-08-01 22:36:09.953380000 +0200 @@ -19,7 +19,9 @@ - #if !defined(OS_NACL) + #if !defined(OS_NACL) && !defined(OS_AIX) #include +#if !defined(OS_BSD) #include +#endif #include #include #include -@@ -130,7 +132,7 @@ void PlatformThread::SetName(const std::string& name) +@@ -130,7 +132,7 @@ ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); tracked_objects::ThreadData::InitializeThreadContext(name); --#if !defined(OS_NACL) -+#if !defined(OS_NACL) && !defined(OS_BSD) +-#if !defined(OS_NACL) && !defined(OS_AIX) ++#if !defined(OS_NACL) && !defined(OS_AIX) && !defined(OS_BSD) // On linux we can get the thread names to show up in the debugger by setting // the process name for the LWP. We don't want to do this for the main // thread because that would rename the process, causing tools like killall -@@ -150,7 +152,7 @@ void PlatformThread::SetName(const std::string& name) - #endif // !defined(OS_NACL) - } - --#if !defined(OS_NACL) -+#if !defined(OS_NACL) && !defined(OS_BSD) - // static - void PlatformThread::SetThreadPriority(PlatformThreadId thread_id, - ThreadPriority priority) { Index: head/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc =================================================================== --- head/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc (nonexistent) +++ head/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc (revision 448637) @@ -0,0 +1,21 @@ +--- base/trace_event/malloc_dump_provider.cc.orig 2017-08-02 18:33:27.773657000 +0200 ++++ base/trace_event/malloc_dump_provider.cc 2017-08-02 18:34:48.019053000 +0200 +@@ -21,6 +21,8 @@ + + #if defined(OS_MACOSX) + #include ++#elif defined(OS_BSD) ++#include "stdlib.h" + #else + #include + #endif +@@ -243,6 +245,9 @@ + allocated_objects_count = main_heap_info.block_count; + #elif defined(OS_FUCHSIA) + // TODO(fuchsia): Port, see https://crbug.com/706592. ++#elif defined(OS_BSD) ++ total_virtual_size = 0; ++ allocated_objects_size = 0; + #else + struct mallinfo info = mallinfo(); + DCHECK_GE(info.arena + info.hblkhd, info.uordblks); Property changes on: head/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-base_trace__event_trace__log.cc =================================================================== --- head/www/chromium/files/patch-base_trace__event_trace__log.cc (revision 448636) +++ head/www/chromium/files/patch-base_trace__event_trace__log.cc (revision 448637) @@ -1,20 +1,20 @@ ---- base/trace_event/trace_log.cc.orig 2017-06-05 19:03:01 UTC -+++ base/trace_event/trace_log.cc -@@ -1504,7 +1504,7 @@ void TraceLog::AddMetadataEventsWhileLocked() { - process_name_); +--- base/trace_event/trace_log.cc.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/trace_event/trace_log.cc 2017-08-01 22:41:16.236310000 +0200 +@@ -1501,7 +1501,7 @@ } --#if !defined(OS_NACL) && !defined(OS_IOS) -+#if !defined(OS_NACL) && !defined(OS_IOS) && !defined(OS_BSD) + // See https://crbug.com/726484 for Fuchsia. +-#if !defined(OS_NACL) && !defined(OS_IOS) && !defined(OS_FUCHSIA) ++#if !defined(OS_NACL) && !defined(OS_IOS) && !defined(OS_FUCHSIA) && !defined(OS_BSD) Time process_creation_time = CurrentProcessInfo::CreationTime(); if (!process_creation_time.is_null()) { TimeDelta process_uptime = Time::Now() - process_creation_time; -@@ -1512,7 +1512,7 @@ void TraceLog::AddMetadataEventsWhileLocked() { +@@ -1509,7 +1509,7 @@ current_thread_id, "process_uptime_seconds", "uptime", process_uptime.InSeconds()); } --#endif // !defined(OS_NACL) && !defined(OS_IOS) -+#endif // !defined(OS_NACL) && !defined(OS_IOS) && !defined(OS_BSD) +-#endif // !defined(OS_NACL) && !defined(OS_IOS) && !defined(OS_FUCHSIA) ++#endif // !defined(OS_NACL) && !defined(OS_IOS) && !defined(OS_FUCHSIA) && !defined(OS_BSD) if (!process_labels_.empty()) { std::vector labels; Index: head/www/chromium/files/patch-build_config_BUILD.gn =================================================================== --- head/www/chromium/files/patch-build_config_BUILD.gn (revision 448636) +++ head/www/chromium/files/patch-build_config_BUILD.gn (revision 448637) @@ -1,29 +1,29 @@ ---- build/config/BUILD.gn.orig 2017-06-05 19:03:01 UTC -+++ build/config/BUILD.gn -@@ -169,7 +169,7 @@ config("debug") { +--- build/config/BUILD.gn.orig 2017-07-25 21:04:48.000000000 +0200 ++++ build/config/BUILD.gn 2017-08-02 23:31:08.597825000 +0200 +@@ -166,7 +166,7 @@ # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } - } else if (is_linux && current_cpu == "x64" && enable_iterator_debugging) { + } else if ((is_linux || is_bsd) && current_cpu == "x64" && enable_iterator_debugging) { # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -258,7 +258,7 @@ config("default_libs") { +@@ -255,7 +255,7 @@ "CoreText.framework", "Foundation.framework", ] - } else if (is_linux) { + } else if (is_linux && !is_bsd) { libs = [ "dl", "rt", -@@ -292,7 +292,7 @@ config("executable_config") { +@@ -302,7 +302,7 @@ + "//build/config/ios:ios_dynamic_flags", + "//build/config/ios:ios_executable_flags", ] - } else if (is_ios) { - configs += [ "//build/config/ios:ios_dynamic_flags" ] -- } else if (is_linux || is_android) { -+ } else if (is_linux || is_android || is_bsd) { +- } else if (is_linux || is_android || current_os == "aix") { ++ } else if (is_linux || is_bsd || is_android || current_os == "aix") { configs += [ "//build/config/gcc:executable_ldconfig" ] if (is_android) { configs += [ "//build/config/android:executable_config" ] Index: head/www/chromium/files/patch-build_config_BUILDCONFIG.gn =================================================================== --- head/www/chromium/files/patch-build_config_BUILDCONFIG.gn (revision 448636) +++ head/www/chromium/files/patch-build_config_BUILDCONFIG.gn (revision 448637) @@ -1,66 +1,67 @@ ---- build/config/BUILDCONFIG.gn.orig 2017-06-05 19:03:01 UTC -+++ build/config/BUILDCONFIG.gn -@@ -131,12 +131,13 @@ declare_args() { +--- build/config/BUILDCONFIG.gn.orig 2017-08-03 00:05:04.000000000 +0200 ++++ build/config/BUILDCONFIG.gn 2017-08-09 23:42:27.032065000 +0200 +@@ -131,13 +131,13 @@ is_official_build = false # Whether we're a traditional desktop unix. - is_desktop_linux = current_os == "linux" + is_desktop_linux = current_os == "linux" || current_os == "bsd" # Set to true when compiling with the Clang compiler. Typically this is used # to configure warnings. - is_clang = current_os == "mac" || current_os == "ios" || -- current_os == "linux" || current_os == "chromeos" -+ current_os == "linux" || current_os == "chromeos" || -+ current_os == "bsd" + is_clang = + current_os == "mac" || current_os == "ios" || current_os == "chromeos" || +- current_os == "fuchsia" || ++ current_os == "fuchsia" || current_os == "bsd" || + (current_os == "linux" && current_cpu != "s390x" && + current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc") - # Allows the path to a custom target toolchain to be injected as a single - # argument, and set as the default toolchain. -@@ -185,8 +186,8 @@ if (host_toolchain == "") { +@@ -189,8 +189,8 @@ # TODO(dpranke): Add some sort of assert here that verifies that # no toolchain omitted host_toolchain from its toolchain_args(). - if (host_os == "linux") { - if (target_os != "linux") { + if (host_os == "linux" || host_os == "bsd") { + if (target_os != "linux" || target_os != "bsd") { # TODO(dpranke) - is_clang normally applies only to the target # build, and there is no way to indicate that you want to override # it for both the target build *and* the host build. Do we need to -@@ -222,7 +223,7 @@ if (target_os == "android") { +@@ -228,7 +228,7 @@ } else { _default_toolchain = "//build/toolchain/android:android_$target_cpu" } -} else if (target_os == "chromeos" || target_os == "linux") { +} else if (target_os == "chromeos" || target_os == "linux" || target_os == "bsd") { # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -342,8 +343,17 @@ if (current_os == "win" || current_os == "winrt_81" || +@@ -378,8 +378,18 @@ is_nacl = false is_posix = true is_win = false +} else if (current_os == "bsd") { + is_android = false + is_chromeos = false ++ is_fuchsia = false + is_ios = false + is_linux = false + is_bsd = true + is_mac = false + is_nacl = false + is_posix = true + is_win = false } - # ============================================================================= # SOURCES FILTERS # ============================================================================= -@@ -412,7 +422,7 @@ if (!is_ios) { +@@ -449,7 +459,7 @@ if (!is_mac && !is_ios) { sources_assignment_filter += [ "*.mm" ] } -if (!is_linux) { +if (!is_linux && !is_bsd) { sources_assignment_filter += [ "*_linux.h", "*_linux.cc", Index: head/www/chromium/files/patch-build_config_allocator.gni =================================================================== --- head/www/chromium/files/patch-build_config_allocator.gni (revision 448636) +++ head/www/chromium/files/patch-build_config_allocator.gni (revision 448637) @@ -1,11 +1,20 @@ ---- build/config/allocator.gni.orig 2017-06-05 19:03:01 UTC -+++ build/config/allocator.gni -@@ -18,7 +18,7 @@ if (is_android || current_cpu == "mipsel" || is_mac || +--- build/config/allocator.gni.orig 2017-07-25 21:04:48.000000000 +0200 ++++ build/config/allocator.gni 2017-08-01 23:13:58.535952000 +0200 +@@ -7,7 +7,7 @@ + # Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors. + if (is_android || current_cpu == "mipsel" || is_mac || is_ios || is_asan || + is_lsan || is_tsan || is_msan || is_win || is_syzyasan || is_fuchsia || +- (is_linux && target_cpu == "arm64")) { ++ (is_linux && target_cpu == "arm64") || is_bsd) { + _default_allocator = "none" + } else { + _default_allocator = "tcmalloc" +@@ -18,7 +18,7 @@ # against the debug CRT with "is_nacl=false". if ((is_linux || is_android || is_mac || (is_win && !is_component_build && !is_debug)) && !is_asan && !is_lsan && - !is_tsan && !is_msan) { + !is_tsan && !is_msan && !is_bsd) { - _default_use_experimental_allocator_shim = true + _default_use_allocator_shim = true } else { - _default_use_experimental_allocator_shim = false + _default_use_allocator_shim = false Index: head/www/chromium/files/patch-build_config_compiler_BUILD.gn =================================================================== --- head/www/chromium/files/patch-build_config_compiler_BUILD.gn (revision 448636) +++ head/www/chromium/files/patch-build_config_compiler_BUILD.gn (revision 448637) @@ -1,136 +1,101 @@ ---- build/config/compiler/BUILD.gn.orig 2017-06-05 21:03:01.000000000 +0200 -+++ build/config/compiler/BUILD.gn 2017-06-13 16:28:04.062660000 +0200 -@@ -37,7 +37,7 @@ +--- build/config/compiler/BUILD.gn.orig 2017-08-03 00:05:04.000000000 +0200 ++++ build/config/compiler/BUILD.gn 2017-08-10 00:34:22.540754000 +0200 +@@ -45,7 +45,7 @@ # only two architectures that are currently checked in). Turn this off when # you are using a custom toolchain and need to control -B in cflags. linux_use_bundled_binutils = - linux_use_bundled_binutils_override && is_linux && + linux_use_bundled_binutils_override && (is_linux && !is_bsd) && (current_cpu == "x64" || current_cpu == "x86") binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", root_build_dir) -@@ -156,7 +156,7 @@ +@@ -166,7 +166,7 @@ configs += [ "//build/config/win:compiler" ] } else if (is_android) { configs += [ "//build/config/android:compiler" ] - } else if (is_linux) { + } else if (is_linux || is_bsd) { configs += [ "//build/config/linux:compiler" ] } else if (is_nacl) { configs += [ "//build/config/nacl:compiler" ] -@@ -207,7 +207,7 @@ - +@@ -219,7 +219,7 @@ # Linker warnings. if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && -- !(is_android && use_order_profiling) && !is_mac && !is_ios) { -+ !(is_android && use_order_profiling) && !is_mac && !is_ios && !is_bsd) { + !(is_android && use_order_profiling) && !is_mac && !is_ios && +- current_os != "aix") { ++ current_os != "aix" && !is_bsd) { # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 # crbug.com/485542 -@@ -304,7 +304,7 @@ +@@ -316,7 +316,7 @@ # Linux/Android common flags setup. # --------------------------------- -- if (is_linux || is_android) { -+ if (is_linux || is_bsd || is_android) { +- if (is_linux || is_android || is_fuchsia) { ++ if (is_linux || is_android || is_bsd || is_fuchsia) { if (use_pic) { cflags += [ "-fPIC" ] ldflags += [ "-fPIC" ] -@@ -319,7 +319,7 @@ - "-Wl,-z,relro", - ] - if (!using_sanitizer) { -- if (!use_cfi_diag) { -+ if (!use_cfi_diag && !is_bsd) { - ldflags += [ "-Wl,-z,defs" ] - } - -@@ -429,14 +429,14 @@ - # clang-cl (used if is_win) doesn't expose this flag. - # Currently disabled for nacl since its toolchain lacks this flag (too old). - # TODO(zforman): Once nacl's toolchain is updated, remove check. -- if (is_clang && is_linux && strip_absolute_paths_from_debug_symbols) { -+ if (is_clang && (is_linux || is_bsd) && strip_absolute_paths_from_debug_symbols) { - absolute_path = rebase_path("//.") - cflags += [ "-fdebug-prefix-map=$absolute_path=." ] - } - - # C++11 compiler flags setup. - # --------------------------- -- if (is_linux || is_android || (is_nacl && is_clang)) { -+ if (is_linux || is_bsd || is_android || (is_nacl && is_clang)) { - # gnu++11 instead of c++11 is needed because some code uses typeof() (a - # GNU extension). - # TODO(thakis): Eventually switch this to c++11 instead, @@ -493,7 +493,7 @@ - ] + ldflags += [ "-flto" ] # Apply a lower LTO optimization level as the default is too slow. - if (is_linux) { + if (is_linux || is_bsd) { if (use_lld) { ldflags += [ "-Wl,--lto-O1" ] } else { -@@ -513,7 +513,7 @@ - # targeting ARM, without this flag, LTO produces a .text section that is - # larger than the maximum call displacement, preventing the linker from - # relocating calls (http://llvm.org/PR22999). +@@ -516,7 +516,7 @@ + # Also, when targeting ARM, without this flag, LTO produces a .text section + # that is larger than the maximum call displacement, preventing the linker + # from relocating calls (http://llvm.org/PR22999). - if (is_linux) { + if (is_linux || is_bsd) { - ldflags += [ "-Wl,-plugin-opt,-function-sections" ] - } - } -@@ -781,7 +781,7 @@ + if (use_lld) { + ldflags += [ + "-Wl,-mllvm,-function-sections", +@@ -794,7 +794,7 @@ # configs -= [ "//build/config/compiler:clang_stackrealign" ] # See https://crbug.com/556393 for details of where it must be avoided. config("clang_stackrealign") { - if (is_clang && current_cpu == "x86" && is_linux) { + if (is_clang && current_cpu == "x86" && (is_linux || is_bsd)) { cflags = [ # Align the stack on 16-byte boundaries, http://crbug.com/418554. "-mstack-alignment=16", -@@ -835,7 +835,7 @@ +@@ -848,7 +848,7 @@ # smaller. if (is_win) { configs += [ "//build/config/win:runtime_library" ] - } else if (is_linux) { + } else if (is_linux || is_bsd) { configs += [ "//build/config/linux:runtime_library" ] } else if (is_ios) { configs += [ "//build/config/ios:runtime_library" ] -@@ -1097,7 +1097,7 @@ +@@ -1111,7 +1111,7 @@ "-Wno-address-of-packed-member", # TODO(hans): https://crbug.com/681136 - "-Wno-unused-lambda-capture", + # "-Wno-unused-lambda-capture", # TODO(thakis ): https://crbug.com/683349 "-Wno-user-defined-warnings", -@@ -1137,7 +1137,7 @@ +@@ -1162,7 +1162,7 @@ ] if (!is_debug && !using_sanitizer && -- (!is_linux || !is_clang || is_official_build)) { -+ (!is_linux || !is_bsd || !is_clang || is_official_build)) { +- (!is_linux || !is_clang || is_official_build) && ++ (!is_linux || !is_bsd || !is_clang || is_official_build) && + current_cpu != "s390x" && current_cpu != "s390" && + current_cpu != "ppc64" && current_cpu != "ppc64") { # _FORTIFY_SOURCE isn't really supported by Clang now, see - # http://llvm.org/bugs/show_bug.cgi?id=16821. - # It seems to work fine with Ubuntu 12 headers though, so use it in -@@ -1196,7 +1196,7 @@ - ] - } - -- if (is_linux || is_android) { -+ if (is_linux || is_bsd || is_android) { - cflags_cc += [ - # Don't warn about hash_map in third-party code. - "-Wno-deprecated", -@@ -1644,7 +1644,7 @@ +@@ -1669,7 +1669,7 @@ "-g2", ] } else { - cflags = [ "-g2" ] + cflags = [ "-g0" ] } if (use_debug_fission) { cflags += [ "-gsplit-dwarf" ] Index: head/www/chromium/files/patch-chrome_app_chrome__main.cc =================================================================== --- head/www/chromium/files/patch-chrome_app_chrome__main.cc (revision 448636) +++ head/www/chromium/files/patch-chrome_app_chrome__main.cc (revision 448637) @@ -1,19 +1,11 @@ ---- chrome/app/chrome_main.cc.orig 2017-06-05 19:03:01 UTC -+++ chrome/app/chrome_main.cc -@@ -97,14 +97,14 @@ int ChromeMain(int argc, const char** argv) { +--- chrome/app/chrome_main.cc.orig 2017-07-25 21:04:49.000000000 +0200 ++++ chrome/app/chrome_main.cc 2017-08-01 23:35:54.553290000 +0200 +@@ -92,7 +92,7 @@ + const base::CommandLine* command_line(base::CommandLine::ForCurrentProcess()); ALLOW_UNUSED_LOCAL(command_line); - #endif --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) if (command_line->HasSwitch(switches::kHeadless)) { #if defined(OS_MACOSX) SetUpBundleOverrides(); - #endif - return headless::HeadlessShellMain(argc, argv); - } --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - - #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) - version_info::Channel channel = chrome::GetChannel(); Index: head/www/chromium/files/patch-chrome_app_mash_embedded_services.cc =================================================================== --- head/www/chromium/files/patch-chrome_app_mash_embedded_services.cc (nonexistent) +++ head/www/chromium/files/patch-chrome_app_mash_embedded_services.cc (revision 448637) @@ -0,0 +1,27 @@ +--- chrome/app/mash/embedded_services.cc.orig 2017-08-01 23:40:39.943252000 +0200 ++++ chrome/app/mash/embedded_services.cc 2017-08-01 23:42:02.268143000 +0200 +@@ -24,9 +24,9 @@ + #include "ash/touch_hud/mus/touch_hud_application.h" // nogncheck + #endif // defined(OS_CHROMEOS) + +-#if defined(OS_LINUX) && !defined(OS_ANDROID) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_ANDROID) + #include "components/font_service/font_service_app.h" +-#endif // defined(OS_LINUX) && !defined(OS_ANDROID) ++#endif // (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_ANDROID) + + std::unique_ptr CreateEmbeddedMashService( + const std::string& service_name) { +@@ -53,10 +53,10 @@ + return base::MakeUnique(); + if (service_name == "test_ime_driver") + return base::MakeUnique(); +-#if defined(OS_LINUX) && !defined(OS_ANDROID) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_ANDROID) + if (service_name == "font_service") + return base::MakeUnique(); +-#endif // defined(OS_LINUX) && !defined(OS_ANDROID) ++#endif // (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_ANDROID) + + return nullptr; + } Property changes on: head/www/chromium/files/patch-chrome_app_mash_embedded_services.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc (nonexistent) +++ head/www/chromium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc (revision 448637) @@ -0,0 +1,11 @@ +--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2017-08-01 23:43:54.195876000 +0200 ++++ chrome/browser/devtools/devtools_eye_dropper.cc 2017-08-01 23:44:16.153565000 +0200 +@@ -149,7 +149,7 @@ + // magnified projection only with centered hotspot. + // Mac Retina requires cursor to be > 120px in order to render smoothly. + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + const float kCursorSize = 63; + const float kDiameter = 63; + const float kHotspotOffset = 32; Property changes on: head/www/chromium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html =================================================================== --- head/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html (revision 448636) +++ head/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html (revision 448637) @@ -1,29 +1,29 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/resources/settings/appearance_page/appearance_page.html -@@ -72,7 +72,7 @@ - aria-label="$i18n{themes}" +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2017-07-25 21:04:51.000000000 +0200 ++++ chrome/browser/resources/settings/appearance_page/appearance_page.html 2017-08-01 23:52:53.177262000 +0200 +@@ -73,7 +73,7 @@ + actionable aria-label="$i18n{themes}" aria-describedby="themesSecondary"> - + - + - + -