svn commit: r431727 - in branches/2017Q1/www/chromium: . files
Carlos J. Puga Medina
cpm at FreeBSD.org
Tue Jan 17 10:12:54 UTC 2017
Author: cpm
Date: Tue Jan 17 10:12:50 2017
New Revision: 431727
URL: https://svnweb.freebsd.org/changeset/ports/431727
Log:
MFH: r431706
www/chromium: update to 55.0.2883.87
Reviewed by: rene
Security: https://www.vuxml.org/freebsd/603fe0a1-bb26-11e6-8e5a-3065ec8fd3ec.html
Approved by: ports-secteam (junovitch)
Added:
branches/2017Q1/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc
- copied unchanged from r431706, head/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc
branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc
- copied unchanged from r431706, head/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc
branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc
- copied unchanged from r431706, head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc
branches/2017Q1/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
- copied unchanged from r431706, head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
branches/2017Q1/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc
- copied unchanged from r431706, head/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc
branches/2017Q1/www/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc
- copied unchanged from r431706, head/www/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc
branches/2017Q1/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc
- copied unchanged from r431706, head/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc
branches/2017Q1/www/chromium/files/patch-content_browser_memory__memory__monitor.cc
- copied unchanged from r431706, head/www/chromium/files/patch-content_browser_memory__memory__monitor.cc
branches/2017Q1/www/chromium/files/patch-content_browser_memory__memory__monitor__linux.cc
- copied unchanged from r431706, head/www/chromium/files/patch-content_browser_memory__memory__monitor__linux.cc
branches/2017Q1/www/chromium/files/patch-content_gpu__in__process__gpu__thread.cc
- copied unchanged from r431706, head/www/chromium/files/patch-content_gpu__in__process__gpu__thread.cc
branches/2017Q1/www/chromium/files/patch-device_geolocation_location__arbitrator.cc
- copied unchanged from r431706, head/www/chromium/files/patch-device_geolocation_location__arbitrator.cc
branches/2017Q1/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc
- copied unchanged from r431706, head/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc
branches/2017Q1/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc
- copied unchanged from r431706, head/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc
branches/2017Q1/www/chromium/files/patch-extensions_browser_api_networking_private_networking__private__event__router__factory.cc
- copied unchanged from r431706, head/www/chromium/files/patch-extensions_browser_api_networking_private_networking__private__event__router__factory.cc
branches/2017Q1/www/chromium/files/patch-gpu_ipc_service__gpu__init.cc
- copied unchanged from r431706, head/www/chromium/files/patch-gpu_ipc_service__gpu__init.cc
branches/2017Q1/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
- copied unchanged from r431706, head/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
branches/2017Q1/www/chromium/files/patch-net_tools_get_server_time_get__server__time.cc
- copied unchanged from r431706, head/www/chromium/files/patch-net_tools_get_server_time_get__server__time.cc
branches/2017Q1/www/chromium/files/patch-net_udp_udp__socket__posix.cc
- copied unchanged from r431706, head/www/chromium/files/patch-net_udp_udp__socket__posix.cc
branches/2017Q1/www/chromium/files/patch-net_url_request_url__request__context__builder.cc
- copied unchanged from r431706, head/www/chromium/files/patch-net_url_request_url__request__context__builder.cc
branches/2017Q1/www/chromium/files/patch-services_ui_BUILD.gn
- copied unchanged from r431706, head/www/chromium/files/patch-services_ui_BUILD.gn
branches/2017Q1/www/chromium/files/patch-services_ui_ime_BUILD.gn
- copied unchanged from r431706, head/www/chromium/files/patch-services_ui_ime_BUILD.gn
branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn
- copied unchanged from r431706, head/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn
branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn
- copied unchanged from r431706, head/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn
branches/2017Q1/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h
- copied unchanged from r431706, head/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h
branches/2017Q1/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py
- copied unchanged from r431706, head/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py
branches/2017Q1/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
- copied unchanged from r431706, head/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
Deleted:
branches/2017Q1/www/chromium/files/extra-patch-gcc
branches/2017Q1/www/chromium/files/patch-base_strings_safe__sprintf.cc
branches/2017Q1/www/chromium/files/patch-chrome_browser_media_webrtc__log__uploader.cc
branches/2017Q1/www/chromium/files/patch-chrome_common_extensions_api_schemas.gni
branches/2017Q1/www/chromium/files/patch-chrome_common_variations_BUILD.gn
branches/2017Q1/www/chromium/files/patch-components_autofill_core_browser_form__structure.cc
branches/2017Q1/www/chromium/files/patch-content_browser_download_base__file__linux.cc
branches/2017Q1/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__device__client.cc
branches/2017Q1/www/chromium/files/patch-content_browser_time__zone__monitor.cc
branches/2017Q1/www/chromium/files/patch-content_browser_time__zone__monitor__linux.cc
branches/2017Q1/www/chromium/files/patch-device_geolocation_location__arbitrator__impl.cc
branches/2017Q1/www/chromium/files/patch-extensions_browser_BUILD.gn
branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_core_BUILD.gn
branches/2017Q1/www/chromium/files/patch-third__party_cython_rules.gni
branches/2017Q1/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_generate__gyp.py
branches/2017Q1/www/chromium/files/patch-third__party_pdfium_core_fxcrt_include_fx__system.h
branches/2017Q1/www/chromium/files/patch-tools_gn_gn__unittests.isolate
branches/2017Q1/www/chromium/files/patch-ui_app__list_app__list__menu.cc
Modified:
branches/2017Q1/www/chromium/Makefile
branches/2017Q1/www/chromium/distinfo
branches/2017Q1/www/chromium/files/extra-patch-clang
branches/2017Q1/www/chromium/files/patch-BUILD.gn
branches/2017Q1/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
branches/2017Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn
branches/2017Q1/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
branches/2017Q1/www/chromium/files/patch-chrome_browser_BUILD.gn
branches/2017Q1/www/chromium/files/patch-chrome_browser_about__flags.cc
branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_BUILD.gn
branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc
branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
branches/2017Q1/www/chromium/files/patch-chrome_common_pref__names.h
branches/2017Q1/www/chromium/files/patch-chrome_test_BUILD.gn
branches/2017Q1/www/chromium/files/patch-components_BUILD.gn
branches/2017Q1/www/chromium/files/patch-components_metrics_BUILD.gn
branches/2017Q1/www/chromium/files/patch-components_storage__monitor_BUILD.gn
branches/2017Q1/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc
branches/2017Q1/www/chromium/files/patch-content_browser_BUILD.gn
branches/2017Q1/www/chromium/files/patch-content_browser_browser__main__loop.cc
branches/2017Q1/www/chromium/files/patch-content_browser_child__process__launcher.cc
branches/2017Q1/www/chromium/files/patch-content_browser_download_base__file.cc
branches/2017Q1/www/chromium/files/patch-content_gpu_gpu__main.cc
branches/2017Q1/www/chromium/files/patch-content_test_BUILD.gn
branches/2017Q1/www/chromium/files/patch-gpu_ipc_service_BUILD.gn
branches/2017Q1/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn
branches/2017Q1/www/chromium/files/patch-mojo_BUILD.gn
branches/2017Q1/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp
branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h
branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp
branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h
branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp
branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp
branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp
branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp
branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp
branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h
branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h
branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h
branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp
branches/2017Q1/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn
branches/2017Q1/www/chromium/files/patch-ui_gl_BUILD.gn
branches/2017Q1/www/chromium/files/patch-ui_views_BUILD.gn
branches/2017Q1/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
branches/2017Q1/www/chromium/files/patch-ui_webui_resources_js_icon.js
branches/2017Q1/www/chromium/files/patch-v8_BUILD.gn
branches/2017Q1/www/chromium/pkg-plist
Directory Properties:
branches/2017Q1/ (props changed)
Modified: branches/2017Q1/www/chromium/Makefile
==============================================================================
--- branches/2017Q1/www/chromium/Makefile Tue Jan 17 10:11:16 2017 (r431726)
+++ branches/2017Q1/www/chromium/Makefile Tue Jan 17 10:12:50 2017 (r431727)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 54.0.2840.100
-PORTREVISION= 1
+PORTVERSION= 55.0.2883.87
CATEGORIES= www
MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
@@ -14,11 +13,12 @@ COMMENT= Google web browser based on Web
LICENSE= BSD3CLAUSE LGPL21 MPL
LICENSE_COMB= multi
-BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:devel/gperf \
- bash:shells/bash \
+BUILD_DEPENDS= bash:shells/bash \
+ clang39:devel/llvm39 \
python:lang/python \
- yasm:devel/yasm \
flock:sysutils/flock \
+ gperf:devel/gperf \
+ yasm:devel/yasm \
${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
@@ -61,7 +61,7 @@ USES= compiler bison cpe desktop-file-u
CPE_VENDOR= google
CPE_PRODUCT= chrome
USE_PERL5= build
-USE_XORG= scrnsaverproto x11 xcomposite xcursor xext xdamage xfixes xi \
+USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \
xproto xrandr xrender xscrnsaver xtst
USE_GNOME= atk glib20 gtk20 dconf libxslt libxml2
MAKE_ARGS= -C out/${BUILDTYPE}
@@ -71,13 +71,12 @@ INSTALLS_ICONS= yes
# TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn)
#
-# Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all the variables.
+# 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+= \
+GN_ARGS+= is_clang=true \
clang_use_chrome_plugins=false \
- enable_hevc_demuxing=true \
enable_media_router=true \
enable_nacl=false \
enable_remoting=false \
@@ -104,12 +103,15 @@ GN_ARGS+= google_api_key="AIzaSyBsp9n41J
SUB_FILES= chromium-browser.desktop chrome
SUB_LIST+= COMMENT="${COMMENT}"
-OPTIONS_DEFINE= ALSA CODECS GCONF PULSEAUDIO TEST KERBEROS DEBUG DRIVER
+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
+OPTIONS_GROUP_TESTS= DEBUG TEST
-OPTIONS_DEFAULT= ALSA CODECS GCONF KERBEROS
-OPTIONS_SUB= yes
+OPTIONS_DEFAULT= CODECS GCONF KERBEROS ALSA PULSEAUDIO
+OPTIONS_SUB= yes
GCONF_USE= GNOME=gconf2
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
@@ -130,9 +132,27 @@ GN_ARGS+= use_alsa=false
.if ${PORT_OPTIONS:MCODECS}
GN_ARGS+= ffmpeg_branding="Chrome"
GN_ARGS+= proprietary_codecs=true
+GN_ARGS+= enable_hevc_demuxing=true
.else
GN_ARGS+= ffmpeg_branding="Chromium"
GN_ARGS+= proprietary_codecs=false
+GN_ARGS+= enable_hevc_demuxing=false
+.endif
+
+DEBUG_MAKE_ENV= V=1
+.if ${PORT_OPTIONS:MDEBUG}
+BUILDTYPE= Debug
+GN_ARGS+= is_debug=true
+GN_BOOTSTRAP_FLAGS+= --debug
+#GN_ARGS+= is_component_build=true
+.else
+BUILDTYPE= Release
+.if ${ARCH} == amd64
+GN_ARGS+= use_lld=true # harder, better, faster, stronger
+.endif
+GN_ARGS+= is_debug=false
+GN_ARGS+= symbol_level=0
+GN_ARGS+= remove_webcore_debug_symbols=true
.endif
.if ${PORT_OPTIONS:MGCONF}
@@ -141,6 +161,12 @@ GN_ARGS+= use_gconf=true
GN_ARGS+= use_gconf=false
.endif
+.if ${PORT_OPTIONS:MKERBEROS}
+GN_ARGS+= use_kerberos=true
+.else
+GN_ARGS+= use_kerberos=false
+.endif
+
.if ${PORT_OPTIONS:MPULSEAUDIO}
GN_ARGS+= use_pulseaudio=true
.else
@@ -152,55 +178,29 @@ GN_ARGS+= use_pulseaudio=false
ALL_TARGET+= ${TEST_TARGETS}
.endif
-DEBUG_MAKE_ENV= V=1
-.if ${PORT_OPTIONS:MDEBUG}
-BUILDTYPE= Debug
-GN_ARGS+= is_debug=true
-GN_BOOTSTRAP_FLAGS+= --debug
-#GN_ARGS+= is_component_build = true
-.else
-BUILDTYPE= Release
-.if ${ARCH} == amd64
-GN_ARGS+= use_lld=true # harder, better, faster, stronger
-.endif
-GN_ARGS+= is_debug=false
-GN_ARGS+= symbol_level=0
-GN_ARGS+= remove_webcore_debug_symbols=true
-.endif
-
-MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \
- GPERF="${LOCALBASE}/bin/gperf"
-
.include <bsd.port.pre.mk>
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-GN_ARGS+= gcc_version=${CXX:S/g++//}
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc
-.else
-BUILD_DEPENDS+= clang39:devel/llvm39
CC= clang39
CXX= clang++39
-# /usr/local/include unlike gcc isn't clang's default
+#optionally set AR, LD, NM, READELF ?
+
+# 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
-GN_ARGS+= is_clang=true
+# TODO: move this big extra to small ones
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang
-.endif
.if ${OPSYS} == FreeBSD
-.if ${OSVERSION} < 1100508
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old
-.else
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new
-.endif
-
.if ${OSVERSION} < 1100000
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10
.endif
-.endif
-.if ! ${PORT_OPTIONS:MKERBEROS}
-GN_ARGS+= use_kerberos=true
+.if ${OSVERSION} < 1200017 || (${OSVERSION} >= 1100507 && ${OSVERSION} < 1200000)
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old
+.else
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new
+.endif
.endif
pre-everything::
@@ -228,7 +228,8 @@ pre-configure:
do-configure:
# GN generator bootstrapping and generating ninja files
- cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} ${PYTHON_CMD} \
+ 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}
cd ${WRKSRC} && ${SETENV} ./out/${BUILDTYPE}/gn \
gen --args='${GN_ARGS}' out/${BUILDTYPE}
Modified: branches/2017Q1/www/chromium/distinfo
==============================================================================
--- branches/2017Q1/www/chromium/distinfo Tue Jan 17 10:11:16 2017 (r431726)
+++ branches/2017Q1/www/chromium/distinfo Tue Jan 17 10:12:50 2017 (r431727)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1478859835
-SHA256 (chromium-54.0.2840.100.tar.xz) = e2e7f54a780c93ec2e933af09e1126837e6cf940b57213d39f36d58df10c89df
-SIZE (chromium-54.0.2840.100.tar.xz) = 479762112
-SHA256 (chromium-54.0.2840.100-testdata.tar.xz) = 44319fea6de4dbb1f6d0bbeeec633b69b7064f53a54893df5b720935a6d27460
-SIZE (chromium-54.0.2840.100-testdata.tar.xz) = 123519620
+TIMESTAMP = 1481977811
+SHA256 (chromium-55.0.2883.87.tar.xz) = e81bd3140d9c84dfee04d9a94686dfe6a20ae79475d84f17154c5536dcb81a58
+SIZE (chromium-55.0.2883.87.tar.xz) = 511249724
+SHA256 (chromium-55.0.2883.87-testdata.tar.xz) = 24ee31dfe7c665cfce5e6e826d2864292585f5b95dd5ead235d0edf89f2f38c0
+SIZE (chromium-55.0.2883.87-testdata.tar.xz) = 124466280
Modified: branches/2017Q1/www/chromium/files/extra-patch-clang
==============================================================================
--- branches/2017Q1/www/chromium/files/extra-patch-clang Tue Jan 17 10:11:16 2017 (r431726)
+++ branches/2017Q1/www/chromium/files/extra-patch-clang Tue Jan 17 10:12:50 2017 (r431727)
@@ -52,17 +52,6 @@
}
// Helper function to verify the most common test expectations.
---- components/sync_sessions/synced_session_tracker.cc.orig 2016-01-21 13:04:41.772845558 +0100
-+++ components/sync_sessions/synced_session_tracker.cc 2016-01-21 13:05:17.652842509 +0100
-@@ -286,7 +286,7 @@
- }
- DCHECK(window_ptr);
- DCHECK_EQ(window_ptr->window_id.id(), window_id);
-- DCHECK_EQ(reinterpret_cast<sessions::SessionWindow*>(NULL),
-+ DCHECK_EQ(static_cast<sessions::SessionWindow*>(NULL),
- GetSession(session_tag)->windows[window_id]);
- GetSession(session_tag)->windows[window_id] = window_ptr;
- }
--- media/audio/audio_output_proxy_unittest.cc 2015-04-15 00:18:55.000000000 +0200
+++ media/audio/audio_output_proxy_unittest.cc 2015-04-18 22:02:38.000000000 +0200
@@ -387,7 +387,7 @@
Modified: branches/2017Q1/www/chromium/files/patch-BUILD.gn
==============================================================================
--- branches/2017Q1/www/chromium/files/patch-BUILD.gn Tue Jan 17 10:11:16 2017 (r431726)
+++ branches/2017Q1/www/chromium/files/patch-BUILD.gn Tue Jan 17 10:12:50 2017 (r431727)
@@ -1,6 +1,6 @@
---- BUILD.gn.orig 2016-10-06 04:02:07.000000000 +0300
-+++ BUILD.gn 2016-10-13 10:32:25.742762000 +0300
-@@ -201,7 +201,7 @@
+--- BUILD.gn.orig 2016-12-01 23:02:04 UTC
++++ BUILD.gn
+@@ -215,7 +215,7 @@ group("both_gn_and_gyp") {
]
}
@@ -9,7 +9,7 @@
deps += [
"//chrome",
"//chrome/test:browser_tests",
-@@ -260,7 +260,7 @@
+@@ -274,7 +274,7 @@ group("both_gn_and_gyp") {
]
}
@@ -18,7 +18,7 @@
# 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.
deps += [
-@@ -300,7 +300,7 @@
+@@ -316,7 +316,7 @@ group("both_gn_and_gyp") {
"//ui/touch_selection:ui_touch_selection_unittests",
"//url/ipc:url_ipc_unittests",
]
@@ -27,7 +27,7 @@
deps += [ "//ios:all" ]
}
-@@ -457,7 +457,7 @@
+@@ -474,7 +474,7 @@ group("both_gn_and_gyp") {
]
}
@@ -36,7 +36,7 @@
# The following are definitely linux-only.
deps += [
"//chrome:manpage",
-@@ -484,9 +484,16 @@
+@@ -501,9 +501,16 @@ group("both_gn_and_gyp") {
# TODO(dpranke): add the linux_dump_symbols flag?
deps += [ "//chrome:linux_symbols" ]
}
@@ -54,7 +54,7 @@
deps += [
"//base:base_i18n_perftests",
"//base:base_perftests",
-@@ -555,7 +562,7 @@
+@@ -574,7 +581,7 @@ group("both_gn_and_gyp") {
if (enable_nacl) {
deps += [ "//components/nacl/loader:nacl_loader_unittests" ]
@@ -63,7 +63,7 @@
# TODO(dpranke): Figure out what platforms should actually have this.
deps += [ "//components/nacl/loader:nacl_helper" ]
-@@ -664,7 +671,7 @@
+@@ -688,7 +695,7 @@ group("both_gn_and_gyp") {
deps +=
[ "//chrome/installer/mini_installer:next_version_mini_installer" ]
}
@@ -72,8 +72,8 @@
deps += [ "//breakpad:symupload($host_toolchain)" ]
}
-@@ -713,7 +720,7 @@
- deps += [ "//chrome/tools/disable_outdated_build_detector" ]
+@@ -736,7 +743,7 @@ group("gn_only") {
+ ]
}
- if (is_win || is_linux) {
@@ -81,7 +81,7 @@
deps += [
"//mash:all",
"//media/mojo/services:media_mojo_shell_unittests",
-@@ -726,7 +733,7 @@
+@@ -749,7 +756,7 @@ group("gn_only") {
]
}
@@ -90,7 +90,7 @@
# TODO(GYP): Figure out if any of these should be in gn_all
# and figure out how cross-platform they are
deps += [
-@@ -793,7 +800,7 @@
+@@ -816,7 +823,7 @@ group("gn_only") {
]
if (target_cpu == "x86" || target_cpu == "x64") {
@@ -99,7 +99,7 @@
deps += [ "//chrome/test:load_library_perf_tests" ]
}
deps += [
-@@ -801,7 +808,7 @@
+@@ -824,7 +831,7 @@ group("gn_only") {
"//third_party/libjpeg_turbo:simd_asm",
]
}
@@ -108,7 +108,7 @@
deps += [ "//v8:v8_shell" ]
}
}
-@@ -811,7 +818,7 @@
+@@ -834,7 +841,7 @@ group("gn_only") {
}
if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) ||
@@ -117,7 +117,7 @@
deps += [
"//testing/libfuzzer/fuzzers",
"//testing/libfuzzer/tests:libfuzzer_tests",
-@@ -847,7 +854,7 @@
+@@ -876,7 +883,7 @@ group("gn_only") {
group("gn_mojo_targets") {
testonly = true
@@ -126,7 +126,7 @@
# TODO(GYP): Figure out if any of these should be in gn_all
# and figure out how cross-platform they are
deps = [
-@@ -872,7 +879,7 @@
+@@ -901,7 +908,7 @@ group("gn_visibility") {
}
}
@@ -135,7 +135,7 @@
# This group includes all of the targets needed to build and test Blink,
# including running the layout tests (see below).
group("blink_tests") {
-@@ -906,7 +913,7 @@
+@@ -935,7 +942,7 @@ if (!is_ios) {
]
}
@@ -144,21 +144,21 @@
deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -935,7 +942,7 @@
+@@ -961,7 +968,7 @@ group("chromium_swarm_tests") {
group("chromium_builder_perf") {
testonly = true
- if (!is_ios && !is_android && !is_chromecast) {
+ if (!is_ios && !is_android && !is_chromecast && !is_bsd) {
- deps = [
+ data_deps = [
"//cc:cc_perftests",
"//chrome/test:load_library_perf_tests",
-@@ -965,7 +972,7 @@
+@@ -992,7 +999,7 @@ group("chromium_builder_perf") {
"//chrome/installer/mini_installer:mini_installer",
"//third_party/angle/src/tests:angle_perftests",
]
- } else {
+ } else if (!is_bsd) {
- deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
+ data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
}
}
Modified: branches/2017Q1/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
==============================================================================
--- branches/2017Q1/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc Tue Jan 17 10:11:16 2017 (r431726)
+++ branches/2017Q1/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc Tue Jan 17 10:12:50 2017 (r431727)
@@ -1,9 +1,11 @@
---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2016-08-03 22:02:10.000000000 +0300
-+++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc 2016-09-21 22:14:12.220734000 +0300
-@@ -3,17 +3,28 @@
+--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2016-12-01 23:02:05 UTC
++++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -3,19 +3,28 @@
// found in the LICENSE file.
#include "base/allocator/allocator_shim.h"
+-
+-#include <malloc.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <malloc_np.h>
@@ -25,17 +27,17 @@
+void* __memalign(size_t alignment, size_t size) {
+ void *ret;
+ if (__posix_memalign(&ret, alignment, size) != 0) {
-+ return nullptr;
++ return nullptr;
+ } else {
-+ return ret;
++ return ret;
+ }
+}
-+int __posix_memalign(void **ptr, size_t alignment, size_t size);
++int __posix_memalign(void **ptr, size_t alignment, size_t size);
+void __free(void* ptr);
} // extern "C"
namespace {
-@@ -21,23 +32,27 @@
+@@ -23,23 +32,23 @@ namespace {
using base::allocator::AllocatorDispatch;
void* GlibcMalloc(const AllocatorDispatch*, size_t size) {
@@ -58,13 +60,9 @@
+ return __memalign(alignment, size);
}
-+/* int GlibcPosixMemalign(const AllocatorDispatch*, void** ptr, size_t alignment, size_t size) { */
-+/* return __posix_memalign(ptr, alignment, size); */
-+/* } */
-+
void GlibcFree(const AllocatorDispatch*, void* address) {
- __libc_free(address);
+ __free(address);
}
- } // namespace
+ size_t GlibcGetSizeEstimate(const AllocatorDispatch*, void* address) {
Copied: branches/2017Q1/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc (from r431706, head/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q1/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc Tue Jan 17 10:12:50 2017 (r431727, copy of r431706, head/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc)
@@ -0,0 +1,16 @@
+--- base/debug/scoped_thread_heap_usage.cc.orig 2016-12-12 23:57:03 UTC
++++ base/debug/scoped_thread_heap_usage.cc
+@@ -14,11 +14,13 @@
+ #include "base/threading/thread_local_storage.h"
+ #include "build/build_config.h"
+
++#if !defined(OS_BSD)
+ #if defined(OS_MACOSX) || defined(OS_IOS)
+ #include <malloc/malloc.h>
+ #else
+ #include <malloc.h>
+ #endif
++#endif
+
+ namespace base {
+ namespace debug {
Modified: branches/2017Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn
==============================================================================
--- branches/2017Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn Tue Jan 17 10:11:16 2017 (r431726)
+++ branches/2017Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn Tue Jan 17 10:12:50 2017 (r431727)
@@ -1,6 +1,6 @@
---- build/config/compiler/BUILD.gn.orig 2016-10-06 04:02:08.000000000 +0300
-+++ build/config/compiler/BUILD.gn 2016-10-24 23:25:32.101459000 +0300
-@@ -141,7 +141,7 @@
+--- build/config/compiler/BUILD.gn.orig 2016-12-01 23:02:05 UTC
++++ build/config/compiler/BUILD.gn
+@@ -153,7 +153,7 @@ config("compiler") {
configs += [ "//build/config/win:compiler" ]
} else if (is_android) {
configs += [ "//build/config/android:compiler" ]
@@ -9,7 +9,7 @@
configs += [ "//build/config/linux:compiler" ]
} else if (is_nacl) {
configs += [ "//build/config/nacl:compiler" ]
-@@ -271,7 +271,7 @@
+@@ -280,7 +280,7 @@ config("compiler") {
# Linux/Android common flags setup.
# ---------------------------------
@@ -18,7 +18,7 @@
cflags += [
"-fPIC",
"-pipe", # Use pipes for communicating between sub-processes. Faster.
-@@ -376,14 +376,14 @@
+@@ -407,14 +407,14 @@ config("compiler") {
# 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.
@@ -35,16 +35,16 @@
# 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,
-@@ -441,7 +441,7 @@
- ldflags += [ "-flto" ]
+@@ -464,7 +464,7 @@ config("compiler") {
+ ]
- # 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 {
-@@ -460,7 +460,7 @@
+ # 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 {
+@@ -484,7 +484,7 @@ config("compiler") {
# 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).
@@ -52,8 +52,8 @@
+ if (is_linux || is_bsd) {
ldflags += [ "-Wl,-plugin-opt,-function-sections" ]
}
-
-@@ -738,7 +738,7 @@
+ }
+@@ -755,7 +755,7 @@ config("compiler_codegen") {
# configs -= [ "//build/config/compiler:clang_stackrealign" ]
# See https://crbug.com/556393 for details of where it must be avoided.
config("clang_stackrealign") {
@@ -62,7 +62,7 @@
cflags = [
# Align the stack on 16-byte boundaries, http://crbug.com/418554.
"-mstack-alignment=16",
-@@ -773,7 +773,7 @@
+@@ -790,7 +790,7 @@ config("runtime_library") {
# smaller.
if (is_win) {
configs += [ "//build/config/win:runtime_library" ]
@@ -71,7 +71,7 @@
configs += [ "//build/config/linux:runtime_library" ]
} else if (is_ios) {
configs += [ "//build/config/ios:runtime_library" ]
-@@ -1032,7 +1032,7 @@
+@@ -1050,7 +1050,7 @@ config("default_warnings") {
"-Wno-nonportable-include-path",
# TODO(hans): https://crbug.com/637306
@@ -80,7 +80,7 @@
]
}
}
-@@ -1064,7 +1064,7 @@
+@@ -1082,7 +1082,7 @@ config("chromium_code") {
]
if (!is_debug && !using_sanitizer &&
@@ -89,7 +89,7 @@
# _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
-@@ -1124,7 +1124,7 @@
+@@ -1140,7 +1140,7 @@ config("no_chromium_code") {
]
}
Modified: branches/2017Q1/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
==============================================================================
--- branches/2017Q1/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni Tue Jan 17 10:11:16 2017 (r431726)
+++ branches/2017Q1/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni Tue Jan 17 10:12:50 2017 (r431727)
@@ -1,6 +1,6 @@
---- build/toolchain/gcc_toolchain.gni.orig 2016-11-10 20:02:09 UTC
-+++ build/toolchain/gcc_toolchain.gni
-@@ -10,6 +10,11 @@ import("//build/toolchain/cc_wrapper.gni
+--- build/toolchain/gcc_toolchain.gni.orig 2016-12-09 05:04:14.000000000 +0000
++++ build/toolchain/gcc_toolchain.gni 2016-12-21 23:03:46.063519000 +0000
+@@ -11,6 +11,11 @@
import("//build/toolchain/goma.gni")
import("//build/toolchain/toolchain.gni")
@@ -12,7 +12,7 @@
# This template defines a toolchain for something that works like gcc
# (including clang).
#
-@@ -453,14 +458,28 @@ template("clang_toolchain") {
+@@ -482,14 +487,23 @@
}
gcc_toolchain(target_name) {
@@ -20,12 +20,11 @@
- cc = "$prefix/clang"
- cxx = "$prefix/clang++"
- ld = cxx
+-
+- readelf = "${toolprefix}readelf"
+- ar = "${toolprefix}ar"
+- nm = "${toolprefix}nm"
+ if (is_bsd) {
-+ # cc = getenv("CC")
-+ # assert(cc != "", "CC env must me set with >= clang39")
-+ # cxx = getenv("CXX")
-+ # assert(cxx != "", "CXX env must me set with >= clang++39")
-+ # ld = cxx
+ cc = "${toolprefix}clang39"
+ cxx = "${toolprefix}clang++39"
+ ld = cxx
@@ -37,10 +36,7 @@
+ cc = "$prefix/clang"
+ cxx = "$prefix/clang++"
+ ld = cxx
-
-- readelf = "${toolprefix}readelf"
-- ar = "${toolprefix}ar"
-- nm = "${toolprefix}nm"
++
+ readelf = "${toolprefix}readelf"
+ ar = "${toolprefix}ar"
+ nm = "${toolprefix}nm"
Modified: branches/2017Q1/www/chromium/files/patch-chrome_browser_BUILD.gn
==============================================================================
--- branches/2017Q1/www/chromium/files/patch-chrome_browser_BUILD.gn Tue Jan 17 10:11:16 2017 (r431726)
+++ branches/2017Q1/www/chromium/files/patch-chrome_browser_BUILD.gn Tue Jan 17 10:12:50 2017 (r431727)
@@ -1,6 +1,6 @@
---- chrome/browser/BUILD.gn.orig 2016-08-03 22:02:11.000000000 +0300
-+++ chrome/browser/BUILD.gn 2016-09-27 09:40:30.879973000 +0300
-@@ -540,7 +540,7 @@
+--- chrome/browser/BUILD.gn.orig 2016-12-01 23:02:06 UTC
++++ chrome/browser/BUILD.gn
+@@ -2105,7 +2105,7 @@ split_static_library("browser") {
deps += [ "//device/udev_linux" ]
}
@@ -9,44 +9,12 @@
deps += [ "//third_party/speech-dispatcher" ]
}
-@@ -730,6 +730,22 @@
- sources += rebase_path(gypi_values.chrome_browser_non_mobile_sources,
- ".",
- "//chrome")
-+ if (is_bsd) {
-+ sources -= [
-+ "media_galleries/linux/mtp_device_delegate_impl_linux.cc",
-+ "media_galleries/linux/mtp_device_delegate_impl_linux.h",
-+ "media_galleries/linux/mtp_device_object_enumerator.cc",
-+ "media_galleries/linux/mtp_device_object_enumerator.h",
-+ "media_galleries/linux/mtp_device_task_helper.cc",
-+ "media_galleries/linux/mtp_device_task_helper.h",
-+ "media_galleries/linux/mtp_device_task_helper_map_service.cc",
-+ "media_galleries/linux/mtp_device_task_helper_map_service.h",
-+ "media_galleries/linux/mtp_read_file_worker.cc",
-+ "media_galleries/linux/mtp_read_file_worker.h",
-+ "media_galleries/linux/snapshot_file_details.cc",
-+ "media_galleries/linux/snapshot_file_details.h",
-+ ]
-+ }
- }
-
- if (!is_chrome_branded) {
-@@ -857,7 +873,7 @@
+@@ -3439,7 +3439,7 @@ split_static_library("browser") {
}
}
- if (is_linux) {
+ if (is_linux || is_bsd) {
if (use_aura) {
- configs += [ "//build/config/linux/dbus" ]
- deps += [
-@@ -871,7 +887,7 @@
- }
- }
-
-- if (is_linux || is_win) {
-+ if (is_linux || is_bsd || is_win) {
- sources += rebase_path(gypi_values.chrome_browser_non_mac_desktop_sources,
- ".",
- "//chrome")
+ deps += [ "//build/linux:fontconfig" ]
+ if (use_dbus) {
Modified: branches/2017Q1/www/chromium/files/patch-chrome_browser_about__flags.cc
==============================================================================
--- branches/2017Q1/www/chromium/files/patch-chrome_browser_about__flags.cc Tue Jan 17 10:11:16 2017 (r431726)
+++ branches/2017Q1/www/chromium/files/patch-chrome_browser_about__flags.cc Tue Jan 17 10:12:50 2017 (r431727)
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig 2016-05-11 19:02:13 UTC
+--- chrome/browser/about_flags.cc.orig 2016-12-01 23:02:06 UTC
+++ chrome/browser/about_flags.cc
-@@ -673,7 +673,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -766,7 +766,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsLinux | kOsCrOS | kOsWin | kOsAndroid,
ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling,
switches::kDisableSmoothScrolling)},
@@ -9,10 +9,10 @@
{"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME,
IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION,
// Uses the system preference on Mac (a different implementation).
-@@ -1729,7 +1729,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1771,7 +1771,7 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop,
- SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignExtensions)},
- #endif
+ FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)},
+ #endif // ENABLE_EXTENSIONS
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
{"enable-input-ime-api", IDS_FLAGS_ENABLE_INPUT_IME_API_NAME,
Copied: branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc (from r431706, head/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc Tue Jan 17 10:12:50 2017 (r431727, copy of r431706, head/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc)
@@ -0,0 +1,11 @@
+--- chrome/browser/extensions/api/omnibox/omnibox_api.cc.orig 2016-12-16 03:22:03.040835000 +0000
++++ chrome/browser/extensions/api/omnibox/omnibox_api.cc 2016-12-16 03:22:24.317714000 +0000
+@@ -45,7 +45,7 @@
+ // Pref key for omnibox.setDefaultSuggestion.
+ const char kOmniboxDefaultSuggestion[] = "omnibox_default_suggestion";
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ static const int kOmniboxIconPaddingLeft = 2;
+ static const int kOmniboxIconPaddingRight = 2;
+ #elif defined(OS_MACOSX)
Copied: branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc (from r431706, head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc Tue Jan 17 10:12:50 2017 (r431727, copy of r431706, head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc)
@@ -0,0 +1,11 @@
+--- chrome/browser/extensions/bookmark_app_helper.cc.orig 2016-12-16 03:24:27.367808000 +0000
++++ chrome/browser/extensions/bookmark_app_helper.cc 2016-12-16 03:24:51.798418000 +0000
+@@ -707,7 +707,7 @@
+ #if !defined(OS_MACOSX)
+ #if !defined(USE_ASH)
+ web_app::ShortcutLocations creation_locations;
+-#if defined(OS_LINUX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+ creation_locations.on_desktop = true;
+ #else
+ creation_locations.on_desktop = false;
Modified: branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
==============================================================================
--- branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc Tue Jan 17 10:11:16 2017 (r431726)
+++ branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc Tue Jan 17 10:12:50 2017 (r431727)
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2016-05-11 19:02:14 UTC
-+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
-@@ -64,7 +64,7 @@
+--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2016-12-01 23:02:07.000000000 +0000
++++ chrome/browser/extensions/browser_context_keyed_service_factories.cc 2016-12-16 19:35:19.489404000 +0000
+@@ -62,7 +62,7 @@
#include "chrome/browser/chromeos/extensions/media_player_api.h"
#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
#include "chrome/browser/extensions/api/log_private/log_private_api.h"
@@ -9,12 +9,12 @@
#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
#endif
-@@ -105,7 +105,7 @@ void EnsureBrowserContextKeyedServiceFac
+@@ -103,7 +103,7 @@
#if defined(OS_CHROMEOS)
extensions::InputImeAPI::GetFactoryInstance();
extensions::InputMethodAPI::GetFactoryInstance();
-#elif defined(OS_LINUX) || defined(OS_WIN)
-+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
++#elif defined(OS_LINUX) || defined(OS_WIN) && !defined(OS_BSD)
extensions::InputImeAPI::GetFactoryInstance();
#endif
extensions::LanguageSettingsPrivateDelegateFactory::GetInstance();
Modified: branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
==============================================================================
--- branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc Tue Jan 17 10:11:16 2017 (r431726)
+++ branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc Tue Jan 17 10:12:50 2017 (r431727)
@@ -1,20 +1,20 @@
---- chrome/browser/extensions/external_provider_impl.cc.orig 2016-05-11 19:02:14 UTC
+--- chrome/browser/extensions/external_provider_impl.cc.orig 2016-12-01 23:02:07 UTC
+++ chrome/browser/extensions/external_provider_impl.cc
-@@ -645,7 +645,7 @@ void ExternalProviderImpl::CreateExterna
- Manifest::EXTERNAL_PREF_DOWNLOAD,
- oem_extension_creation_flags)));
+@@ -638,7 +638,7 @@ void ExternalProviderImpl::CreateExterna
+ 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(
- linked_ptr<ExternalProviderInterface>(
-@@ -687,7 +687,7 @@ void ExternalProviderImpl::CreateExterna
- bundled_extension_creation_flags)));
+ provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
+ service,
+@@ -664,7 +664,7 @@ void ExternalProviderImpl::CreateExterna
+ 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(
- linked_ptr<ExternalProviderInterface>(
- new ExternalProviderImpl(
+ provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
+ service, new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS,
+ ExternalPrefLoader::NONE, nullptr),
Copied: branches/2017Q1/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc (from r431706, head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q1/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc Tue Jan 17 10:12:50 2017 (r431727, copy of r431706, head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc)
@@ -0,0 +1,11 @@
+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2016-12-01 23:02:07 UTC
++++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
+@@ -344,6 +344,8 @@ void WebRtcLogUploader::SetupMultipart(
+ const char product[] = "Chrome_Android";
+ #elif defined(OS_CHROMEOS)
+ const char product[] = "Chrome_ChromeOS";
++#elif defined(OS_FREEBSD)
++ const char product[] = "Chrome_FreeBSD";
+ #else
+ #error Platform not supported.
+ #endif
Copied: branches/2017Q1/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc (from r431706, head/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q1/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc Tue Jan 17 10:12:50 2017 (r431727, copy of r431706, head/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc)
@@ -0,0 +1,11 @@
+--- chrome/browser/net/async_dns_field_trial.cc.orig 2016-12-16 03:12:55.927001000 +0000
++++ chrome/browser/net/async_dns_field_trial.cc 2016-12-16 03:13:16.445410000 +0000
+@@ -61,7 +61,7 @@
+ } // namespace
+
+ bool ConfigureAsyncDnsFieldTrial() {
+-#if defined(OS_CHROMEOS) || defined(OS_MACOSX)
++#if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_BSD)
+ const bool kDefault = true;
+ #else
+ const bool kDefault = false;
Copied: branches/2017Q1/www/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc (from r431706, head/www/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q1/www/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc Tue Jan 17 10:12:50 2017 (r431727, copy of r431706, head/www/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc)
@@ -0,0 +1,29 @@
+--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2016-12-18 00:37:45.100012000 +0100
++++ chrome/browser/renderer_context_menu/render_view_context_menu.cc 2016-12-18 00:42:54.851203000 +0100
+@@ -1325,7 +1325,7 @@
+ // 'Undo' and 'Redo' for text input with no suggestions and no text selected.
+ // We make an exception for OS X as context clicking will select the closest
+ // word. In this case both items are always shown.
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO,
+ IDS_CONTENT_CONTEXT_UNDO);
+ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO,
+@@ -1361,7 +1361,7 @@
+ if (!use_spelling)
+ return;
+
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS,
+ IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS);
+ #else
+@@ -1602,7 +1602,7 @@
+ case IDC_CHECK_SPELLING_WHILE_TYPING:
+ return prefs->GetBoolean(spellcheck::prefs::kEnableSpellcheck);
+
+-#if !defined(OS_MACOSX) && defined(OS_POSIX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD) && defined(OS_POSIX)
+ // TODO(suzhe): this should not be enabled for password fields.
+ case IDC_INPUT_METHODS_MENU:
+ return true;
Modified: branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_BUILD.gn
==============================================================================
--- branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_BUILD.gn Tue Jan 17 10:11:16 2017 (r431726)
+++ branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_BUILD.gn Tue Jan 17 10:12:50 2017 (r431727)
@@ -1,11 +1,11 @@
---- chrome/browser/ui/BUILD.gn.orig 2016-08-03 22:02:13.000000000 +0300
-+++ chrome/browser/ui/BUILD.gn 2016-09-03 00:04:02.109457000 +0300
-@@ -503,7 +503,7 @@
- "//ui/events:dom_keycode_converter",
- ]
+--- chrome/browser/ui/BUILD.gn.orig 2016-12-01 23:02:08 UTC
++++ chrome/browser/ui/BUILD.gn
+@@ -3024,7 +3024,7 @@ split_static_library("ui") {
+ ]
+ }
}
- if (is_linux) { # Both desktop Linux and ChromeOS.
+ if (is_linux || is_bsd) { # Both desktop Linux and ChromeOS.
- sources += rebase_path(gypi_values.chrome_browser_ui_linux_sources,
- ".",
- "//chrome")
+ sources += [
+ "certificate_dialogs.cc",
+ "certificate_dialogs.h",
Modified: branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc
==============================================================================
--- branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc Tue Jan 17 10:11:16 2017 (r431726)
+++ branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc Tue Jan 17 10:12:50 2017 (r431727)
@@ -1,15 +1,15 @@
---- chrome/browser/ui/browser_view_prefs.cc.orig 2016-10-06 04:02:13.000000000 +0300
-+++ chrome/browser/ui/browser_view_prefs.cc 2016-10-13 05:59:52.802478000 +0300
+--- chrome/browser/ui/browser_view_prefs.cc.orig 2016-12-01 23:02:08 UTC
++++ chrome/browser/ui/browser_view_prefs.cc
@@ -10,7 +10,7 @@
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
- #include "ui/base/x/x11_util.h"
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+ #include "ui/base/x/x11_util.h" // nogncheck
#endif
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ void RegisterBrowserViewLocalPrefs(PrefR
void RegisterBrowserViewProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
Modified: branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
==============================================================================
--- branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc Tue Jan 17 10:11:16 2017 (r431726)
+++ branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc Tue Jan 17 10:12:50 2017 (r431727)
@@ -1,11 +1,11 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2016-05-11 19:02:16 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2016-12-01 23:02:08 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
-@@ -88,7 +88,7 @@
+@@ -91,7 +91,7 @@
#include "components/user_manager/user_manager.h"
#endif
-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_FREEBSD))
- #include "ui/events/devices/x11/touch_factory_x11.h"
+ #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck
#endif
Copied: branches/2017Q1/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc (from r431706, head/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q1/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc Tue Jan 17 10:12:50 2017 (r431727, copy of r431706, head/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc)
@@ -0,0 +1,14 @@
+--- chrome/common/extensions/chrome_extensions_client.cc.orig 2016-12-16 03:27:01.063936000 +0000
++++ chrome/common/extensions/chrome_extensions_client.cc 2016-12-16 03:29:25.710522000 +0000
+@@ -103,7 +103,10 @@
+ static base::LazyInstance<ChromeExtensionsClient> g_client =
+ LAZY_INSTANCE_INITIALIZER;
+
+-ChromeExtensionsClient::ChromeExtensionsClient() {}
++ChromeExtensionsClient::ChromeExtensionsClient()
++ : chrome_api_permissions_(ChromeAPIPermissions()),
++ extensions_api_permissions_(ExtensionsAPIPermissions()) {
++}
+
+ ChromeExtensionsClient::~ChromeExtensionsClient() {
+ }
Modified: branches/2017Q1/www/chromium/files/patch-chrome_common_pref__names.h
==============================================================================
--- branches/2017Q1/www/chromium/files/patch-chrome_common_pref__names.h Tue Jan 17 10:11:16 2017 (r431726)
+++ branches/2017Q1/www/chromium/files/patch-chrome_common_pref__names.h Tue Jan 17 10:12:50 2017 (r431727)
@@ -1,15 +1,15 @@
---- chrome/common/pref_names.h.orig 2016-10-06 04:02:14.000000000 +0300
-+++ chrome/common/pref_names.h 2016-10-14 07:01:22.105649000 +0300
-@@ -315,7 +315,7 @@
+--- chrome/common/pref_names.h.orig 2016-12-01 23:02:09 UTC
++++ chrome/common/pref_names.h
+@@ -312,7 +312,7 @@ extern const char kForceGoogleSafeSearch
+ extern const char kForceYouTubeRestrict[];
+ extern const char kForceSessionSync[];
extern const char kAllowedDomainsForApps[];
- extern const char kLastClearBrowsingDataTime[];
- extern const char kClearBrowsingDataHistoryNoticeShownTimes[];
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
extern const char kUsesSystemTheme[];
#endif
extern const char kCurrentThemePackFilename[];
-@@ -347,7 +347,7 @@
+@@ -345,7 +345,7 @@ extern const char kDefaultBrowserSetting
#if defined(OS_MACOSX)
extern const char kShowUpdatePromotionInfoBar[];
#endif
@@ -18,7 +18,7 @@
extern const char kUseCustomChromeFrame[];
#endif
extern const char kBackShortcutBubbleShownCount[];
-@@ -496,7 +496,7 @@
+@@ -493,7 +493,7 @@ extern const char kAppWindowPlacement[];
extern const char kDownloadDefaultDirectory[];
extern const char kDownloadExtensionsToOpen[];
extern const char kDownloadDirUpgraded[];
Modified: branches/2017Q1/www/chromium/files/patch-chrome_test_BUILD.gn
==============================================================================
--- branches/2017Q1/www/chromium/files/patch-chrome_test_BUILD.gn Tue Jan 17 10:11:16 2017 (r431726)
+++ branches/2017Q1/www/chromium/files/patch-chrome_test_BUILD.gn Tue Jan 17 10:12:50 2017 (r431727)
@@ -1,6 +1,6 @@
---- chrome/test/BUILD.gn.orig 2016-10-06 04:02:14.000000000 +0300
-+++ chrome/test/BUILD.gn 2016-10-13 06:28:37.584668000 +0300
-@@ -179,7 +179,7 @@
+--- chrome/test/BUILD.gn.orig 2016-12-01 23:02:09 UTC
++++ chrome/test/BUILD.gn
+@@ -179,7 +179,7 @@ static_library("test_support") {
]
}
@@ -9,7 +9,7 @@
public_deps += [ "//crypto:platform" ]
}
if (is_mac) {
-@@ -383,7 +383,7 @@
+@@ -449,7 +449,7 @@ if (!is_android) {
"$root_out_dir/test_page.css.mock-http-headers",
"$root_out_dir/ui_test.pak",
]
@@ -18,8 +18,8 @@
data += [
"$root_out_dir/chrome_100_percent.pak",
"$root_out_dir/chrome_200_percent.pak",
-@@ -391,7 +391,7 @@
- "$root_out_dir/locales/fr.pak",
+@@ -458,7 +458,7 @@ if (!is_android) {
+ "$root_out_dir/resources.pak",
]
}
- if (is_linux) {
@@ -27,16 +27,16 @@
data += [ "$root_out_dir/libppapi_tests.so" ]
}
-@@ -462,7 +462,7 @@
- ".",
- "//chrome")
+@@ -559,7 +559,7 @@ if (!is_android) {
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list