svn commit: r466043 - in head/www/chromium: . files
Carlos J. Puga Medina
cpm at FreeBSD.org
Sat Mar 31 11:45:19 UTC 2018
Author: cpm
Date: Sat Mar 31 11:45:16 2018
New Revision: 466043
URL: https://svnweb.freebsd.org/changeset/ports/466043
Log:
www/chromium: update to 65.0.3325.181
Changelog: https://chromium.googlesource.com/chromium/src/+log/64.0.3282.186..65.0.3325.181?pretty=fuller&n=10000
MFH: 2018Q1
Security: https://vuxml.freebsd.org/freebsd/555af074-22b9-11e8-9799-54ee754af08e.html
Security: https://vuxml.freebsd.org/freebsd/3ae21918-31e3-11e8-927b-e8e0b747a45a.html
Added:
head/www/chromium/files/patch-chrome_browser_vr_sample_queue.cc (contents, props changed)
head/www/chromium/files/patch-components_assist_ranker_ranker_example_util.cc (contents, props changed)
head/www/chromium/files/patch-content_network_BUILD.gn (contents, props changed)
head/www/chromium/files/patch-content_public_common_zygote_features.gni (contents, props changed)
head/www/chromium/files/patch-gpu_config_gpu__info__collector__freebsd.cc (contents, props changed)
Deleted:
head/www/chromium/files/patch-base_trace__event_trace__log.cc
head/www/chromium/files/patch-build_linux_unbundle_freetype.gn
head/www/chromium/files/patch-build_linux_unbundle_harfbuzz-ng.gn
head/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py
head/www/chromium/files/patch-chrome_BUILD.gn
head/www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc
head/www/chromium/files/patch-components_password__manager_core_browser_password_manager.cc
head/www/chromium/files/patch-components_password__manager_core_browser_password_manager_metrics_util.cc
head/www/chromium/files/patch-components_password__manager_core_browser_password_manager_metrics_util.h
head/www/chromium/files/patch-components_password__manager_core_browser_password_store.cc
head/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
head/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
head/www/chromium/files/patch-content_browser_gpu_gpu__feature__checker__impl.cc
head/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
head/www/chromium/files/patch-content_browser_renderer__host_media_in_process_video_capture_device_launcher.cc
head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
head/www/chromium/files/patch-content_browser_utility__process__host__impl.cc
head/www/chromium/files/patch-content_common_content__switches__internal.cc
head/www/chromium/files/patch-gpu_config_gpu__info__collector.cc
Modified:
head/www/chromium/Makefile
head/www/chromium/distinfo
head/www/chromium/files/patch-base_process_process__metrics.h
head/www/chromium/files/patch-build_config_compiler_BUILD.gn
head/www/chromium/files/patch-chrome_browser_about__flags.cc
head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
head/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
head/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
head/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc
head/www/chromium/files/patch-components_feedback_anonymizer__tool.cc
head/www/chromium/files/patch-components_password__manager_core_browser_password_reuse_defines.h
head/www/chromium/files/patch-content_browser_BUILD.gn
head/www/chromium/files/patch-content_browser_browser__main__loop.cc
head/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
head/www/chromium/files/patch-content_common_BUILD.gn
head/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc
head/www/chromium/files/patch-device_usb_usb__error.cc
head/www/chromium/files/patch-device_usb_usb__service__impl.cc
head/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc
head/www/chromium/files/patch-extensions_common_feature_switch.cc
head/www/chromium/files/patch-gpu_config_BUILD.gn
head/www/chromium/files/patch-gpu_config_gpu__test__config.cc
head/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
head/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc
head/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc
head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h
head/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
head/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread.cc
head/www/chromium/files/patch-third__party_webrtc_webrtc.gni
head/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc
head/www/chromium/files/patch-ui_gfx_native_pixmap_handle.cc
head/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc
head/www/chromium/files/patch-v8_src_globals.h
head/www/chromium/pkg-plist
Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/Makefile Sat Mar 31 11:45:16 2018 (r466043)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 64.0.3282.186
-PORTREVISION= 2
+PORTVERSION= 65.0.3325.181
CATEGORIES?= www
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -50,12 +49,13 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi
libpng.so:graphics/png \
libwebp.so:graphics/webp \
libavcodec.so:multimedia/ffmpeg \
+ libvpx.so:multimedia/libvpx \
libopenh264.so:multimedia/openh264 \
libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz \
libharfbuzz-icu.so:print/harfbuzz-icu \
libgcrypt.so:security/libgcrypt \
- libgnome-keyring.so:security/libgnome-keyring \
+ libsecret-1.so:security/libsecret \
libnss3.so:security/nss \
libexpat.so:textproc/expat2 \
libxml2.so:textproc/libxml2 \
@@ -111,7 +111,6 @@ GN_ARGS+= clang_use_chrome_plugins=false \
enable_webrtc=true \
fieldtrial_testing_like_official_build=true \
is_clang=true \
- is_official_build=true \
toolkit_views=true \
treat_warnings_as_errors=false \
use_allocator="none" \
@@ -119,6 +118,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \
use_aura=true \
use_bundled_fontconfig=false \
use_custom_libcxx=false \
+ use_gnome_keyring=false \
use_gtk3=true \
use_lld=true \
use_sysroot=false \
@@ -144,13 +144,13 @@ GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoa
SUB_FILES= chromium-browser.desktop chrome
SUB_LIST+= COMMENT="${COMMENT}"
-OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER GCONF KERBEROS TEST
+OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS TEST
CODECS_DESC= Compile and enable patented codecs like H.264
DRIVER_DESC= Install chromedriver
OPTIONS_GROUP= AUDIO
OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO
-OPTIONS_DEFAULT= ALSA CODECS CUPS DRIVER GCONF KERBEROS
+OPTIONS_DEFAULT= ALSA CODECS CUPS DRIVER KERBEROS
OPTIONS_SUB= yes
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
@@ -174,19 +174,16 @@ DEBUG_VARS= BUILDTYPE=Debug \
GN_ARGS+=is_debug=true \
GN_ARGS+=is_component_build=false \
GN_BOOTSTRAP_FLAGS+=--debug \
- WANTSPACE="lots of free diskspace (~ 8.5GB)"
+ WANTSPACE="lots of free disk space (~ 12GB)"
DEBUG_VARS_OFF= BUILDTYPE=Release \
GN_ARGS+=is_debug=false \
+ GN_ARGS+=is_official_build=true \
GN_ARGS+=symbol_level=0 \
GN_ARGS+=remove_webcore_debug_symbols=true \
- WANTSPACE="a fair amount of free diskspace (~ 3.7GB)"
+ WANTSPACE="a fair amount of free disk space (~ 5.8GB)"
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
@@ -223,10 +220,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new
.endif
-.if ${ARCH} == aarch64
-GN_ARGS+= use_vulcanize=false
-.endif
-
.if !defined(GN_ONLY)
pre-everything::
@${ECHO_MSG}
@@ -252,7 +245,7 @@ pre-configure:
#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
./build/linux/unbundle/replace_gn_files.py --system-libraries \
- ffmpeg flac freetype harfbuzz-ng libdrm libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE}
+ ffmpeg flac freetype harfbuzz-ng libdrm libvpx libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE}
.endif
do-configure:
Modified: head/www/chromium/distinfo
==============================================================================
--- head/www/chromium/distinfo Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/distinfo Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1519947004
-SHA256 (chromium-64.0.3282.186.tar.xz) = 5fd0218759231ac00cc729235823592f6fd1e4a00ff64780a5fed7ab210f1860
-SIZE (chromium-64.0.3282.186.tar.xz) = 482247144
-SHA256 (chromium-64.0.3282.186-testdata.tar.xz) = edda88026371323a3515f6243c3ab35cc94a98527b0dd9afb057c9223987a913
-SIZE (chromium-64.0.3282.186-testdata.tar.xz) = 251883204
+TIMESTAMP = 1521889794
+SHA256 (chromium-65.0.3325.181.tar.xz) = 93666448c6b96ec83e6a35a64cff40db4eb92a154fe1db4e7dab4761d0e38687
+SIZE (chromium-65.0.3325.181.tar.xz) = 570386836
+SHA256 (chromium-65.0.3325.181-testdata.tar.xz) = 03018143ffe8c96ca2710e0c48bb19f1e122cf07394f15b73a814c2f6b2a3cdb
+SIZE (chromium-65.0.3325.181-testdata.tar.xz) = 252462976
Modified: head/www/chromium/files/patch-base_process_process__metrics.h
==============================================================================
--- head/www/chromium/files/patch-base_process_process__metrics.h Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-base_process_process__metrics.h Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,6 +1,6 @@
---- base/process/process_metrics.h.orig 2018-02-24 16:25:08.000000000 +0100
-+++ base/process/process_metrics.h 2018-03-03 19:17:04.829273000 +0100
-@@ -103,7 +103,7 @@
+--- base/process/process_metrics.h.orig 2018-03-20 23:05:14.000000000 +0100
++++ base/process/process_metrics.h 2018-03-24 12:20:53.523721000 +0100
+@@ -110,7 +110,7 @@
size_t image;
};
@@ -9,25 +9,45 @@
// Minor and major page fault counts since the process creation.
// Both counts are process-wide, and exclude child processes.
//
-@@ -245,7 +245,7 @@
+@@ -120,7 +120,7 @@
+ int64_t minor;
+ int64_t major;
+ };
+-#endif // defined(OS_LINUX) || defined(OS_ANDROID)
++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+
+ // Convert a POSIX timeval to microseconds.
+ BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv);
+@@ -252,7 +252,7 @@
// otherwise.
bool GetIOCounters(IoCounters* io_counters) const;
--#if defined(OS_LINUX) || defined(OS_AIX)
-+#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_BSD)
// Returns the number of file descriptors currently open by the process, or
// -1 on error.
int GetOpenFdCount() const;
-@@ -255,7 +255,7 @@
+@@ -260,16 +260,16 @@
+ // 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) || defined(OS_AIX)
+-#endif // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID)
++#endif // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) || 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;
-@@ -282,7 +282,7 @@
+ // Minor and major page fault count as reported by /proc/[pid]/stat.
+ // Returns true for success.
+ bool GetPageFaultCounts(PageFaultCounts* counts) const;
+-#endif // defined(OS_LINUX) || defined(OS_ANDROID)
++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+
+ // Returns total memory usage of malloc.
+ size_t GetMallocUsage();
+@@ -289,7 +289,7 @@
bool GetWorkingSetKBytesTotmaps(WorkingSetKBytes *ws_usage) const;
#endif
@@ -36,7 +56,7 @@
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
#endif
#if defined(OS_MACOSX)
-@@ -303,7 +303,7 @@
+@@ -310,7 +310,7 @@
TimeTicks last_cpu_time_;
int64_t last_system_time_;
@@ -45,7 +65,7 @@
// Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_;
uint64_t last_absolute_idle_wakeups_;
-@@ -351,7 +351,7 @@
+@@ -358,7 +358,7 @@
#endif // defined(OS_POSIX)
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
@@ -54,7 +74,7 @@
// Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS.
//
-@@ -384,7 +384,7 @@
+@@ -391,7 +391,7 @@
int avail_phys = 0;
#endif
@@ -63,7 +83,7 @@
// This provides an estimate of available memory as described here:
// https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
// NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always
-@@ -399,7 +399,7 @@
+@@ -406,7 +406,7 @@
#endif
#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \
@@ -72,7 +92,16 @@
int buffers = 0;
int cached = 0;
int active_anon = 0;
-@@ -437,7 +437,7 @@
+@@ -416,7 +416,7 @@
+ int dirty = 0;
+ int reclaimable = 0;
+ #endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) ||
+- // defined(OS_FUCHSIA)
++ // defined(OS_FUCHSIA) || defined(OS_BSD)
+
+ #if defined(OS_CHROMEOS)
+ int shmem = 0;
+@@ -444,7 +444,7 @@
#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
// defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA)
Modified: head/www/chromium/files/patch-build_config_compiler_BUILD.gn
==============================================================================
--- head/www/chromium/files/patch-build_config_compiler_BUILD.gn Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-build_config_compiler_BUILD.gn Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,5 +1,5 @@
---- build/config/compiler/BUILD.gn.orig 2018-02-24 16:25:08.000000000 +0100
-+++ build/config/compiler/BUILD.gn 2018-03-03 19:36:38.111753000 +0100
+--- build/config/compiler/BUILD.gn.orig 2018-03-20 23:05:14.000000000 +0100
++++ build/config/compiler/BUILD.gn 2018-03-24 12:40:43.469299000 +0100
@@ -48,7 +48,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.
@@ -9,16 +9,7 @@
(current_cpu == "x64" || current_cpu == "x86")
binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
root_build_dir)
-@@ -223,7 +223,7 @@
- # Linker warnings.
- if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
- !(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
-@@ -327,8 +327,6 @@
+@@ -365,8 +365,6 @@
"-Wl,-z,relro",
]
if (!using_sanitizer) {
@@ -27,7 +18,7 @@
# Functions interposed by the sanitizers can make ld think
# that some libraries aren't needed when they actually are,
# http://crbug.com/234010. As workaround, disable --as-needed.
-@@ -425,7 +423,7 @@
+@@ -469,7 +467,7 @@
# TODO(hans): Remove this once Clang generates better optimized debug info by
# default. https://crbug.com/765793
if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
@@ -36,7 +27,7 @@
cflags += [
"-Xclang",
"-mllvm",
-@@ -622,7 +620,7 @@
+@@ -667,7 +665,7 @@
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@@ -45,7 +36,7 @@
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
}
-@@ -1280,27 +1278,8 @@
+@@ -1317,27 +1315,8 @@
# TODO(hans): https://crbug.com/637306
"-Wno-address-of-packed-member",
@@ -73,7 +64,7 @@
]
} else if (use_xcode_clang) {
cflags += [
-@@ -1920,7 +1899,7 @@
+@@ -1952,7 +1931,7 @@
# [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f
cflags += [ "-gdwarf-3" ]
}
@@ -82,7 +73,7 @@
}
if (use_debug_fission && !is_nacl) {
cflags += [ "-gsplit-dwarf" ]
-@@ -1934,7 +1913,7 @@
+@@ -1966,7 +1945,7 @@
# DWARF info may be corrupt; offsets in a range list entry are in different
# sections" there. Maybe just a bug in nacl_switch_32.S.
if (!is_mac && !is_ios && !is_nacl && target_cpu != "x86" &&
@@ -91,3 +82,12 @@
if (is_clang) {
# This flag enables the GNU-format pubnames and pubtypes sections,
# which lld needs in order to generate a correct GDB index.
+@@ -2052,7 +2031,7 @@
+ if (!is_win && fatal_linker_warnings &&
+ !(is_chromeos && current_cpu == "arm") &&
+ !(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
Modified: head/www/chromium/files/patch-chrome_browser_about__flags.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_about__flags.cc Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-chrome_browser_about__flags.cc Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,24 +1,6 @@
---- chrome/browser/about_flags.cc.orig 2017-12-15 02:04:07.000000000 +0100
-+++ chrome/browser/about_flags.cc 2017-12-24 00:29:31.459851000 +0100
-@@ -878,7 +878,7 @@
- {"Learning", kSpeculativeResourcePrefetchingLearning,
- arraysize(kSpeculativeResourcePrefetchingLearning), nullptr}};
-
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- const FeatureEntry::FeatureParam kPauseBackgroundTabsMinimalEngagment[] = {
- {pausetabs::kFeatureName, pausetabs::kModeParamMinimal}};
-
-@@ -1875,7 +1875,7 @@
- ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX,
- switches::kDisableTranslateNewUX)},
- #endif // OS_MACOSX
--#if defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
- {"translate-2016q2-ui", flag_descriptions::kTranslate2016q2UiName,
- flag_descriptions::kTranslate2016q2UiDescription,
- kOsCrOS | kOsWin | kOsLinux,
-@@ -2407,12 +2407,12 @@
+--- chrome/browser/about_flags.cc.orig 2018-03-20 23:05:16.000000000 +0100
++++ chrome/browser/about_flags.cc 2018-03-24 13:04:35.001279000 +0100
+@@ -2429,12 +2429,12 @@
flag_descriptions::kEnableMaterialDesignExtensionsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)},
#endif // ENABLE_EXTENSIONS
@@ -33,7 +15,7 @@
{"enable-origin-trials", flag_descriptions::kOriginTrialsName,
flag_descriptions::kOriginTrialsDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kOriginTrials)},
-@@ -3008,7 +3008,7 @@
+@@ -3047,7 +3047,7 @@
flag_descriptions::kLeftToRightUrlsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kLeftToRightUrls)},
@@ -42,12 +24,12 @@
{"omnibox-entity-suggestions",
flag_descriptions::kOmniboxEntitySuggestionsName,
flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop,
-@@ -3086,7 +3086,7 @@
- FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)},
- #endif // OS_ANDROID
+@@ -3066,7 +3066,7 @@
+ {"enable-new-app-menu-icon", flag_descriptions::kEnableNewAppMenuIconName,
+ flag_descriptions::kEnableNewAppMenuIconDescription, kOsDesktop,
+ FEATURE_VALUE_TYPE(features::kAnimatedAppMenuIcon)},
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || 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)
- {pausetabs::kFeatureName, flag_descriptions::kPauseBackgroundTabsName,
- flag_descriptions::kPauseBackgroundTabsDescription, kOsDesktop,
- FEATURE_WITH_PARAMS_VALUE_TYPE(pausetabs::kFeature,
+ #if defined(OS_ANDROID)
+ {"enable-custom-feedback-ui",
Modified: head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,16 +1,16 @@
---- chrome/browser/chrome_browser_main.cc.orig 2017-12-15 02:04:08.000000000 +0100
-+++ chrome/browser/chrome_browser_main.cc 2017-12-24 00:42:50.301023000 +0100
-@@ -193,7 +193,7 @@
- #include "chrome/browser/offline_pages/offline_page_info_handler.h"
- #endif
+--- chrome/browser/chrome_browser_main.cc.orig 2018-03-20 23:05:16.000000000 +0100
++++ chrome/browser/chrome_browser_main.cc 2018-03-24 22:37:46.110352000 +0100
+@@ -206,7 +206,7 @@
+ #include "chromeos/settings/cros_settings_names.h"
+ #endif // defined(OS_CHROMEOS)
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
#include "chrome/browser/first_run/upgrade_util_linux.h"
#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-@@ -287,7 +287,7 @@
- #endif
+@@ -244,7 +244,7 @@
+ #endif // defined(OS_WIN)
#if defined(OS_WIN) || defined(OS_MACOSX) || \
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
@@ -18,7 +18,7 @@
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#endif
-@@ -719,7 +719,7 @@
+@@ -737,7 +737,7 @@
field_trial_synchronizer_ = new FieldTrialSynchronizer();
#if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -27,21 +27,16 @@
metrics::DesktopSessionDurationTracker::Initialize();
#endif
metrics::RendererUptimeTracker::Initialize();
-@@ -1122,11 +1122,11 @@
+@@ -1145,7 +1145,7 @@
}
#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
++#if defined(OS_LINUX)
// Set the product channel for crash reports.
- base::debug::SetCrashKeyValue(crash_keys::kChannel,
- chrome::GetChannelString());
--#endif // defined(OS_LINUX) || defined(OS_OPENBSD)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
-
- #if defined(OS_MACOSX)
- // Get the Keychain API to register for distributed notifications on the main
-@@ -1327,7 +1327,7 @@
+ breakpad::SetChannelCrashKey(chrome::GetChannelString());
+ #endif // defined(OS_LINUX) || defined(OS_OPENBSD)
+@@ -1351,7 +1351,7 @@
// Start the tab manager here so that we give the most amount of time for the
// other services to start up before we start adjusting the oom priority.
Modified: head/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,20 +1,20 @@
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2017-06-05 19:03:02 UTC
-+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -84,7 +84,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
- settings_private::PrefType::PREF_TYPE_BOOLEAN;
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2018-03-20 23:05:17.000000000 +0100
++++ chrome/browser/extensions/api/settings_private/prefs_util.cc 2018-03-24 13:17:26.753666000 +0100
+@@ -102,7 +102,7 @@
+ settings_api::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] =
- settings_private::PrefType::PREF_TYPE_BOOLEAN;
+ settings_api::PrefType::PREF_TYPE_BOOLEAN;
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
(*s_whitelist)[::prefs::kUseCustomChromeFrame] =
- settings_private::PrefType::PREF_TYPE_BOOLEAN;
+ settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
-@@ -94,7 +94,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
+@@ -112,7 +112,7 @@
// Appearance settings.
(*s_whitelist)[::prefs::kCurrentThemeID] =
- settings_private::PrefType::PREF_TYPE_STRING;
+ settings_api::PrefType::PREF_TYPE_STRING;
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
(*s_whitelist)[::prefs::kUsesSystemTheme] =
- settings_private::PrefType::PREF_TYPE_BOOLEAN;
+ settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
Modified: head/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,20 +1,20 @@
---- chrome/browser/extensions/external_provider_impl.cc.orig 2017-06-05 19:03:02 UTC
-+++ chrome/browser/extensions/external_provider_impl.cc
-@@ -655,7 +655,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+--- chrome/browser/extensions/external_provider_impl.cc.orig 2018-03-20 23:05:17.000000000 +0100
++++ chrome/browser/extensions/external_provider_impl.cc 2018-03-24 13:22:20.011401000 +0100
+@@ -689,7 +689,7 @@
Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD,
oem_extension_creation_flags));
}
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
if (!profile->IsLegacySupervised()) {
- provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
+ provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
-@@ -681,7 +681,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -717,7 +717,7 @@
bundled_extension_creation_flags));
// Define a per-user source of external extensions.
-#if defined(OS_MACOSX) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD))
+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD))
- provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
- service, new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS,
- ExternalPrefLoader::NONE, nullptr),
+ provider_list->push_back(std::make_unique<ExternalProviderImpl>(
+ service,
+ new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS,
Added: head/www/chromium/files/patch-chrome_browser_vr_sample_queue.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_vr_sample_queue.cc Sat Mar 31 11:45:16 2018 (r466043)
@@ -0,0 +1,11 @@
+--- chrome/browser/vr/sample_queue.cc.orig 2018-03-24 12:29:50.123017000 +0100
++++ chrome/browser/vr/sample_queue.cc 2018-03-24 12:30:25.632912000 +0100
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include <stdint.h>
++
+ #include "chrome/browser/vr/sample_queue.h"
+
+ namespace vr {
Modified: head/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,23 +1,11 @@
---- chrome/service/cloud_print/print_system.cc.orig 2018-02-24 15:25:11 UTC
-+++ chrome/service/cloud_print/print_system.cc
-@@ -5,6 +5,7 @@
- #include "chrome/service/cloud_print/print_system.h"
-
- #include "base/guid.h"
-+#include "build/build_config.h"
-
- namespace cloud_print {
-
-@@ -35,5 +36,12 @@ std::string PrintSystem::GenerateProxyId
+--- chrome/service/cloud_print/print_system.cc.orig 2018-03-24 13:33:28.414570000 +0100
++++ chrome/service/cloud_print/print_system.cc 2018-03-24 13:31:35.144592000 +0100
+@@ -36,7 +36,7 @@
return base::GenerateGUID();
}
+-#if defined(OS_LINUX) && !defined(USE_CUPS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(USE_CUPS)
-+scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
-+ const base::DictionaryValue*) {
-+ return nullptr;
-+}
-+#endif
-+
- } // namespace cloud_print
-
+ scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
+ const base::DictionaryValue*) {
+ return nullptr;
Added: head/www/chromium/files/patch-components_assist_ranker_ranker_example_util.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components_assist_ranker_ranker_example_util.cc Sat Mar 31 11:45:16 2018 (r466043)
@@ -0,0 +1,11 @@
+--- components/assist_ranker/ranker_example_util.cc.orig 2018-03-24 12:31:52.824752000 +0100
++++ components/assist_ranker/ranker_example_util.cc 2018-03-24 12:32:32.654498000 +0100
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include <math.h>
++
+ #include "components/assist_ranker/ranker_example_util.h"
+ #include "base/bit_cast.h"
+ #include "base/format_macros.h"
Modified: head/www/chromium/files/patch-components_feedback_anonymizer__tool.cc
==============================================================================
--- head/www/chromium/files/patch-components_feedback_anonymizer__tool.cc Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-components_feedback_anonymizer__tool.cc Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,9 +1,9 @@
---- components/feedback/anonymizer_tool.cc.orig 2017-04-19 19:06:32 UTC
-+++ components/feedback/anonymizer_tool.cc
-@@ -10,7 +10,11 @@
- #include "base/strings/string_number_conversions.h"
+--- components/feedback/anonymizer_tool.cc.orig 2018-03-20 23:05:22.000000000 +0100
++++ components/feedback/anonymizer_tool.cc 2018-03-24 13:39:35.199314000 +0100
+@@ -11,7 +11,11 @@
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
+ #include "content/public/browser/browser_thread.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
Modified: head/www/chromium/files/patch-components_password__manager_core_browser_password_reuse_defines.h
==============================================================================
--- head/www/chromium/files/patch-components_password__manager_core_browser_password_reuse_defines.h Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-components_password__manager_core_browser_password_reuse_defines.h Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,11 +1,11 @@
---- components/password_manager/core/browser/password_reuse_defines.h.orig 2017-09-08 16:48:55.608982000 +0200
-+++ components/password_manager/core/browser/password_reuse_defines.h 2017-09-08 16:49:07.942575000 +0200
+--- components/password_manager/core/browser/password_reuse_defines.h.orig 2018-03-20 23:05:22.000000000 +0100
++++ components/password_manager/core/browser/password_reuse_defines.h 2018-03-24 13:50:16.794379000 +0100
@@ -6,7 +6,7 @@
#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_REUSE_DEFINES_H_
#if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS)) || \
-- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+- defined(OS_LINUX) || defined(OS_CHROMEOS)
++ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
// Enable the detection when the sync password is typed not on the sync domain.
#define SYNC_PASSWORD_REUSE_DETECTION_ENABLED
#endif
Modified: head/www/chromium/files/patch-content_browser_BUILD.gn
==============================================================================
--- head/www/chromium/files/patch-content_browser_BUILD.gn Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-content_browser_BUILD.gn Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,6 +1,6 @@
---- content/browser/BUILD.gn.orig 2017-12-15 02:04:16.000000000 +0100
-+++ content/browser/BUILD.gn 2017-12-30 02:42:45.654369000 +0100
-@@ -1674,11 +1674,6 @@
+--- content/browser/BUILD.gn.orig 2018-03-20 23:05:23.000000000 +0100
++++ content/browser/BUILD.gn 2018-03-24 19:29:32.232928000 +0100
+@@ -1711,11 +1711,6 @@
"tracing/cros_tracing_agent.cc",
"tracing/cros_tracing_agent.h",
]
@@ -11,8 +11,8 @@
- ]
}
- if (is_fuchsia) {
-@@ -2123,6 +2118,17 @@
+ if (is_chromecast && is_linux) {
+@@ -2191,6 +2186,16 @@
deps += [
"//chromeos",
"//chromeos:power_manager_proto",
@@ -21,7 +21,6 @@
+ sources -= [
+ "zygote_host/zygote_communication_linux.cc",
+ "zygote_host/zygote_communication_linux.h",
-+ "zygote_host/zygote_handle_linux.cc",
+ "zygote_host/zygote_host_impl_linux.cc",
+ "zygote_host/zygote_host_impl_linux.h",
+ "../zygote/zygote_linux.cc",
Modified: head/www/chromium/files/patch-content_browser_browser__main__loop.cc
==============================================================================
--- head/www/chromium/files/patch-content_browser_browser__main__loop.cc Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-content_browser_browser__main__loop.cc Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,6 +1,6 @@
---- content/browser/browser_main_loop.cc.orig 2018-02-24 16:25:14.000000000 +0100
-+++ content/browser/browser_main_loop.cc 2018-03-04 10:01:31.265940000 +0100
-@@ -206,7 +206,7 @@
+--- content/browser/browser_main_loop.cc.orig 2018-03-20 23:05:23.000000000 +0100
++++ content/browser/browser_main_loop.cc 2018-03-24 14:03:10.531359000 +0100
+@@ -212,7 +212,7 @@
#include "base/fuchsia/default_job.h"
#endif // defined(OS_FUCHSIA)
@@ -9,7 +9,7 @@
#include "content/browser/sandbox_host_linux.h"
#include "content/browser/zygote_host/zygote_host_impl_linux.h"
-@@ -244,6 +244,11 @@
+@@ -254,6 +254,11 @@
#include "services/ui/common/image_cursors_set.h"
#endif
@@ -21,25 +21,7 @@
// One of the linux specific headers defines this as a macro.
#ifdef DestroyAll
#undef DestroyAll
-@@ -253,7 +258,7 @@
- namespace {
-
- #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \
-- !defined(OS_FUCHSIA)
-+ !defined(OS_FUCHSIA) && !defined(OS_BSD)
- void SetupSandbox(const base::CommandLine& parsed_command_line) {
- TRACE_EVENT0("startup", "SetupSandbox");
- // SandboxHostLinux needs to be initialized even if the sandbox and
-@@ -276,7 +281,7 @@
- generic_zygote->GetSandboxStatus());
- }
- #endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \
-- // !defined(OS_FUCHSIA)
-+ // !defined(OS_FUCHSIA) && !defined(OS_BSD)
-
- #if defined(USE_GLIB)
- static void GLibLogHandler(const gchar* log_domain,
-@@ -619,10 +624,15 @@
+@@ -655,10 +660,15 @@
TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \
@@ -56,18 +38,3 @@
#endif
#if defined(USE_X11)
-@@ -1691,12 +1701,12 @@
- base::WrapUnique<SwapMetricsDriver::Delegate>(
- new SwapMetricsDelegateUma()));
-
--#if !defined(OS_FUCHSIA)
-+#if !defined(OS_FUCHSIA) && !defined(OS_BSD)
- swap_metrics_driver_ =
- SwapMetricsDriver::Create(std::move(delegate), kSwapMetricsInterval);
- if (swap_metrics_driver_)
- swap_metrics_driver_->Start();
--#endif // !defined(OS_FUCHSIA)
-+#endif // !defined(OS_FUCHSIA) && !defined(OS_BSD)
- }
-
- bool BrowserMainLoop::InitializeToolkit() {
Modified: head/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
==============================================================================
--- head/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,6 +1,16 @@
---- content/browser/child_process_launcher_helper_linux.cc.orig 2017-07-25 21:04:55.000000000 +0200
-+++ content/browser/child_process_launcher_helper_linux.cc 2017-08-02 00:41:59.942814000 +0200
-@@ -66,6 +66,7 @@
+--- content/browser/child_process_launcher_helper_linux.cc.orig 2018-03-20 23:05:23.000000000 +0100
++++ content/browser/child_process_launcher_helper_linux.cc 2018-03-24 23:20:38.539917000 +0100
+@@ -17,7 +17,9 @@
+ #include "content/public/common/content_switches.h"
+ #include "content/public/common/result_codes.h"
+ #include "content/public/common/sandboxed_process_launcher_delegate.h"
++#if !defined(OS_BSD)
+ #include "content/public/common/zygote_handle.h"
++#endif
+ #include "gpu/config/gpu_switches.h"
+ #include "services/service_manager/sandbox/linux/sandbox_linux.h"
+
+@@ -70,6 +72,7 @@
int* launch_result) {
*is_synchronous_launch = true;
@@ -8,7 +18,7 @@
ZygoteHandle zygote_handle =
base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote)
? nullptr
-@@ -82,6 +83,7 @@
+@@ -101,6 +104,7 @@
process.zygote = zygote_handle;
return process;
}
@@ -16,7 +26,7 @@
Process process;
process.process = base::LaunchProcess(*command_line(), options);
-@@ -100,10 +102,12 @@
+@@ -118,10 +122,12 @@
const ChildProcessLauncherHelper::Process& process,
bool known_dead,
int* exit_code) {
@@ -29,7 +39,7 @@
if (known_dead) {
return base::GetKnownDeadTerminationStatus(
process.process.Handle(), exit_code);
-@@ -122,13 +126,17 @@
+@@ -140,13 +146,17 @@
ChildProcessLauncherHelper::Process process) {
process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
// On POSIX, we must additionally reap the child.
Modified: head/www/chromium/files/patch-content_common_BUILD.gn
==============================================================================
--- head/www/chromium/files/patch-content_common_BUILD.gn Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-content_common_BUILD.gn Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,23 +1,16 @@
---- content/common/BUILD.gn.orig 2018-02-24 16:25:14.000000000 +0100
-+++ content/common/BUILD.gn 2018-03-04 05:26:02.504662000 +0100
-@@ -503,7 +503,7 @@
+--- content/common/BUILD.gn.orig 2018-03-20 23:05:24.000000000 +0100
++++ content/common/BUILD.gn 2018-03-29 12:47:23.480593000 +0200
+@@ -431,6 +431,13 @@
+ libs += [ "android" ]
}
- if (!use_seccomp_bpf) {
-- if (is_linux && current_cpu != "s390x" && current_cpu != "ppc64") {
-+ if (is_linux && current_cpu != "s390x" && current_cpu != "ppc64" && !is_bsd) {
- sources -= [
- "sandbox_linux/bpf_base_policy_linux.cc",
- "sandbox_linux/bpf_base_policy_linux.h",
-@@ -519,6 +519,11 @@
- "sandbox_linux/bpf_renderer_policy_linux.h",
- "sandbox_linux/bpf_utility_policy_linux.cc",
- "sandbox_linux/bpf_utility_policy_linux.h",
-+ ]
-+ }
-+ if (is_bsd) {
-+ sources -= [
-+ "quarantine/quarantine_linux.cc",
- ]
- }
- }
++ if (is_bsd) {
++ sources -= [
++ "quarantine/quarantine_linux.cc",
++ "sandbox_init_linux.cc",
++ ]
++ }
++
+ if (is_debug && !is_component_build && enable_plugins) {
+ # Content depends on the PPAPI message logging stuff; if this isn't here,
+ # some unit test binaries won't compile. This only worked in release mode
Added: head/www/chromium/files/patch-content_network_BUILD.gn
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-content_network_BUILD.gn Sat Mar 31 11:45:16 2018 (r466043)
@@ -0,0 +1,13 @@
+--- content/network/BUILD.gn.orig 2018-03-29 12:51:25.325665000 +0200
++++ content/network/BUILD.gn 2018-03-29 12:56:34.023437000 +0200
+@@ -75,6 +75,10 @@
+ "url_request_context_builder_mojo.cc",
+ ]
+
++ if (is_bsd) {
++ sources -= [ "network_sandbox_hook_linux.cc" ]
++ }
++
+ configs += [ "//content:content_implementation" ]
+
+ deps = [
Added: head/www/chromium/files/patch-content_public_common_zygote_features.gni
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-content_public_common_zygote_features.gni Sat Mar 31 11:45:16 2018 (r466043)
@@ -0,0 +1,8 @@
+--- content/public/common/zygote_features.gni.orig 2018-03-24 12:14:17.829148000 +0100
++++ content/public/common/zygote_features.gni 2018-03-24 12:14:28.619495000 +0100
+@@ -2,4 +2,4 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-use_zygote_handle = is_posix && !is_android && !is_mac && !is_fuchsia
++use_zygote_handle = is_posix && !is_android && !is_mac && !is_fuchsia && !is_bsd
Modified: head/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc
==============================================================================
--- head/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,14 +1,13 @@
---- device/usb/usb_device_handle_impl.cc.orig 2017-04-19 19:06:34 UTC
-+++ device/usb/usb_device_handle_impl.cc
+--- device/usb/usb_device_handle_impl.cc.orig 2018-03-20 23:05:25.000000000 +0100
++++ device/usb/usb_device_handle_impl.cc 2018-03-24 17:28:45.532305000 +0100
@@ -25,7 +25,11 @@
+ #include "device/usb/usb_device_impl.h"
#include "device/usb/usb_error.h"
#include "device/usb/usb_service.h"
- #include "net/base/io_buffer.h"
--#include "third_party/libusb/src/libusb/libusb.h"
+#if defined(OS_FREEBSD)
-+# include "libusb.h"
++#include "libusb.h"
+#else
-+# include "third_party/libusb/src/libusb/libusb.h"
+ #include "third_party/libusb/src/libusb/libusb.h"
+#endif
namespace device {
Modified: head/www/chromium/files/patch-device_usb_usb__error.cc
==============================================================================
--- head/www/chromium/files/patch-device_usb_usb__error.cc Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-device_usb_usb__error.cc Sat Mar 31 11:45:16 2018 (r466043)
@@ -4,7 +4,7 @@
#include "device/usb/usb_error.h"
-+#if defined(__FreeBSD__)
++#if defined(OS_FREEBSD)
+#include "libusb.h"
+#else
#include "third_party/libusb/src/libusb/libusb.h"
Modified: head/www/chromium/files/patch-device_usb_usb__service__impl.cc
==============================================================================
--- head/www/chromium/files/patch-device_usb_usb__service__impl.cc Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-device_usb_usb__service__impl.cc Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,19 +1,18 @@
---- device/usb/usb_service_impl.cc.orig 2017-06-05 19:03:07 UTC
-+++ device/usb/usb_service_impl.cc
-@@ -25,7 +25,11 @@
+--- device/usb/usb_service_impl.cc.orig 2018-03-20 23:05:25.000000000 +0100
++++ device/usb/usb_service_impl.cc 2018-03-24 17:34:53.453193000 +0100
+@@ -27,7 +27,11 @@
+ #include "device/usb/usb_device_handle.h"
#include "device/usb/usb_error.h"
#include "device/usb/webusb_descriptors.h"
- #include "net/base/io_buffer.h"
--#include "third_party/libusb/src/libusb/libusb.h"
+#if defined(OS_FREEBSD)
-+# include <libusb.h>
++#include "libusb.h"
+#else
-+# include "third_party/libusb/src/libusb/libusb.h"
+ #include "third_party/libusb/src/libusb/libusb.h"
+#endif
#if defined(OS_WIN)
#define INITGUID
-@@ -231,8 +235,10 @@ UsbServiceImpl::UsbServiceImpl(
+@@ -227,8 +231,10 @@
}
UsbServiceImpl::~UsbServiceImpl() {
@@ -24,7 +23,7 @@
for (auto* platform_device : ignored_devices_)
libusb_unref_device(platform_device);
}
-@@ -289,6 +295,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon
+@@ -285,6 +291,7 @@
context_ = std::move(context);
@@ -32,7 +31,7 @@
int rv = libusb_hotplug_register_callback(
context_->context(),
static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
-@@ -301,6 +308,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon
+@@ -297,6 +304,7 @@
// This will call any enumeration callbacks queued while initializing.
RefreshDevices();
@@ -40,7 +39,7 @@
#if defined(OS_WIN)
DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
-@@ -500,6 +508,7 @@ void UsbServiceImpl::RemoveDevice(scoped_refptr<UsbDev
+@@ -496,6 +504,7 @@
device->OnDisconnect();
}
@@ -48,11 +47,11 @@
// static
int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
PlatformUsbDevice device,
-@@ -530,6 +539,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb
+@@ -526,6 +535,7 @@
return 0;
}
+#endif // !defined(OS_FREEBSD)
void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
Modified: head/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc
==============================================================================
--- head/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,9 +1,9 @@
---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2017-04-19 19:06:34 UTC
-+++ extensions/browser/api/declarative_webrequest/webrequest_action.cc
-@@ -29,7 +29,11 @@
+--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2018-03-20 23:05:25.000000000 +0100
++++ extensions/browser/api/declarative_webrequest/webrequest_action.cc 2018-03-24 17:41:04.749250000 +0100
+@@ -28,7 +28,11 @@
+ #include "extensions/common/extension.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
#include "net/http/http_util.h"
- #include "net/url_request/url_request.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
Modified: head/www/chromium/files/patch-extensions_common_feature_switch.cc
==============================================================================
--- head/www/chromium/files/patch-extensions_common_feature_switch.cc Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-extensions_common_feature_switch.cc Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,14 +1,14 @@
---- extensions/common/feature_switch.cc.orig 2018-02-24 16:25:15.000000000 +0100
-+++ extensions/common/feature_switch.cc 2018-03-04 02:30:07.857694000 +0100
-@@ -50,11 +50,7 @@
+--- extensions/common/feature_switch.cc.orig 2018-03-20 23:05:25.000000000 +0100
++++ extensions/common/feature_switch.cc 2018-03-24 17:46:50.886191000 +0100
+@@ -46,11 +46,7 @@
FeatureSwitch::DEFAULT_ENABLED),
load_media_router_component_extension(
kLoadMediaRouterComponentExtensionFlag,
-#if defined(GOOGLE_CHROME_BUILD)
- FeatureSwitch::DEFAULT_ENABLED),
+ FeatureSwitch::DEFAULT_ENABLED)
-#else
-- FeatureSwitch::DEFAULT_DISABLED),
+- FeatureSwitch::DEFAULT_DISABLED)
-#endif // defined(GOOGLE_CHROME_BUILD)
- yield_between_content_script_runs(
- switches::kYieldBetweenContentScriptRuns,
- kYieldBetweenContentScriptRunsFieldTrial,
+ {
+ }
+
Modified: head/www/chromium/files/patch-gpu_config_BUILD.gn
==============================================================================
--- head/www/chromium/files/patch-gpu_config_BUILD.gn Sat Mar 31 11:35:58 2018 (r466042)
+++ head/www/chromium/files/patch-gpu_config_BUILD.gn Sat Mar 31 11:45:16 2018 (r466043)
@@ -1,13 +1,14 @@
---- gpu/config/BUILD.gn.orig 2017-06-05 19:03:08 UTC
-+++ gpu/config/BUILD.gn
-@@ -99,6 +99,10 @@ source_set("config_sources") {
+--- gpu/config/BUILD.gn.orig 2018-03-20 23:05:26.000000000 +0100
++++ gpu/config/BUILD.gn 2018-03-26 13:38:50.564110000 +0200
+@@ -107,6 +107,11 @@
"gpu_util.h",
]
+ if (is_bsd) {
+ sources -= [ "gpu_info_collector_linux.cc" ]
++ sources += [ "gpu_info_collector_freebsd.cc" ]
+ }
+
- sources += process_json_outputs
-
- configs += [
+ if (is_fuchsia) {
+ sources += [ "gpu_info_collector_fuchsia.cc" ]
+ }
Added: head/www/chromium/files/patch-gpu_config_gpu__info__collector__freebsd.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-gpu_config_gpu__info__collector__freebsd.cc Sat Mar 31 11:45:16 2018 (r466043)
@@ -0,0 +1,31 @@
+--- gpu/config/gpu_info_collector_freebsd.cc.orig 2018-03-26 13:34:20.147630000 +0200
++++ gpu/config/gpu_info_collector_freebsd.cc 2018-03-26 13:35:09.089367000 +0200
+@@ -0,0 +1,28 @@
++// Copyright 2017 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 "gpu/config/gpu_info_collector.h"
++
++namespace gpu {
++
++CollectInfoResult CollectContextGraphicsInfo(GPUInfo* gpu_info) {
++ NOTIMPLEMENTED();
++ return kCollectInfoFatalFailure;
++}
++
++CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list