svn commit: r558439 - in head: . www/qt5-webengine www/qt5-webengine/files
Kai Knoblich
kai at FreeBSD.org
Sat Dec 19 07:57:06 UTC 2020
Author: kai
Date: Sat Dec 19 07:57:02 2020
New Revision: 558439
URL: https://svnweb.freebsd.org/changeset/ports/558439
Log:
www/qt5-webengine: Update to 5.15.2
* Under the hood runs Chromium 83.0.4103.122 with security fixes up to
version 86.0.4240.183 and patches were taken from r540991 of www/chromium.
* Also adjust some patches to avoid hardcoding of ${LOCALBASE} and remove a
redundant blank line.
Changelog:
* [QTBUG-84632] Warn about QtWebengineProcess launching from network share
on Windows.
* [QTBUG-85363] Handle non-ASCII names for PulseAudio
* [QTBUG-85494] Fix regression crash when not handling
QQuickWebEngineNewViewRequest
* [QTBUG-85817] Fix crashes on resize
* [QTBUG-86672] Fix remapped menu key being mapped back to menu key
* [QTBUG-86945] Fix crash when opening a PDF in debug build on windows.
* [QTBUG-87129] Mention node.js build-time dependency
* The QtWebEngineProcess now has a version number
* The old compositor has been removed and can no longer be restored using
command line argument.
Approved by: tcberner (kde)
Differential Revision: https://reviews.freebsd.org/D27587
Added:
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory__internal.h (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__receiver__bindings.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_v8__snapshot__files.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_child_BUILD.gn (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_BUILD.gn (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__constants.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__constants.h (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_BUILD.gn (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_utility_BUILD.gn (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_headless_BUILD.gn (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__features.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_status.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_blink_webmediaplayer__impl.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_features.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_configured__proxy__resolution__service.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_driver__utils.cpp (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.h (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_thread__utils.h (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_subprocess.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_thread__task__runner.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_cpu__features.c (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__shm__image__pool.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.cc (contents, props changed)
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.h (contents, props changed)
head/www/qt5-webengine/files/patch-src_buildtools_config_linking.pri (contents, props changed)
head/www/qt5-webengine/files/patch-src_buildtools_configure.json (contents, props changed)
head/www/qt5-webengine/files/patch-src_core_config_linux.pri (contents, props changed)
Deleted:
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libxml.gn
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_safe__browsing_gen__file__type__proto.py
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_content_app_BUILD.gn
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_content_app_crashpad.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_db_v4__rice.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_db_v4__rice__unittest.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_gpu__process__transport__factory.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_software__browser__compositor__output__surface.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_software__browser__compositor__output__surface.h
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_libyuv__image__processor.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_linux_platform__video__frame__utils.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.h
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__resolution__service.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_embedder_set__process__title__linux.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_perfetto_trace__event__data__source.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_base_internal_unscaledcycleclock.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_thread__utils.h
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_virtual__destructors.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_include_private_GrTypesPriv.h
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_common__audio_wav__header.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_arm__features.c
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__shm__image__pool__base.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_host_host__context__factory__private.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.h
head/www/qt5-webengine/files/patch-src_buildtools_config_linux.pri
head/www/qt5-webengine/files/patch-src_pdf_pdfcore.pro
head/www/qt5-webengine/files/patch-src_tools_qwebengine__convert__dict_qwebengine__convert__dict.pro
Modified:
head/UPDATING
head/www/qt5-webengine/Makefile
head/www/qt5-webengine/distinfo
head/www/qt5-webengine/files/patch-clang
head/www/qt5-webengine/files/patch-configure.pri
head/www/qt5-webengine/files/patch-mkspecs_features_functions.prf
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_proc__maps__linux.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__stub.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_internal__linux.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_internal__linux.h
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__linux.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__copier__signal.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_compiler.gni
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_linux_BUILD.gn
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_sysroot.gni
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_cc_BUILD.gn
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_chromium__strings.grd
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_generated__resources.grd
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_google__chrome__strings.grd
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_features.gni
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_os__crypt.h
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__internals.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_shared__resources__data__source.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_BUILD.gn
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_app_content__main__delegate.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_app_content__main__delegate.h
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_media_audio_audio__device__factory.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_BUILD.gn
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.h
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__gl__representation.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.h
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__content__browser__client.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_headless_lib_headless__content__main__delegate.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel__common.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_video__frame__mojom__traits.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_services_gpu__mojo__media__client.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_sandbox_features.gni
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_network_network__context.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_fx__ge__linux.cpp
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator__internals__posix.h
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_build__config.h
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_unix__socket.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_tools_variations_fieldtrial__to__struct.py
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_data__pack.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_codec_jpeg__codec.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.h
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_webui_resources_js_cr.js
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc
head/www/qt5-webengine/files/patch-src_3rdparty_gn_build_gen.py
head/www/qt5-webengine/files/patch-src_buildtools_config_support.pri
head/www/qt5-webengine/files/patch-src_core_core__module.pro
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Sat Dec 19 07:46:52 2020 (r558438)
+++ head/UPDATING Sat Dec 19 07:57:02 2020 (r558439)
@@ -5,6 +5,16 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20201218:
+ AFFECTS: users of www/qt5-webengine
+ AUTHOR: kai at FreeBSD.org
+
+ Users that upgrade www/qt5-webengine without using pkg/poudriere might
+ experience failures due to conflicts with the installed version of 5.15.2.
+
+ In that case, pkg delete -f the qt5-webengine package before building
+ the updated version.
+
20201130:
AFFECTS: users of graphics/jpeg
AUTHOR: rene at FreeBSD.org
Modified: head/www/qt5-webengine/Makefile
==============================================================================
--- head/www/qt5-webengine/Makefile Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/Makefile Sat Dec 19 07:57:02 2020 (r558439)
@@ -18,7 +18,6 @@
PORTNAME= webengine
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 5
CATEGORIES= www
PKGNAMEPREFIX= qt5-
@@ -50,7 +49,7 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \
libwebp.so:graphics/webp
DISTINFO_FILE= ${.CURDIR}/distinfo
-QT5_VERSION= 5.15.0
+QT5_VERSION= 5.15.2
OPTIONS_SINGLE= AUDIO
OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO
@@ -84,7 +83,6 @@ USE_QT= core declarative gui location network printsu
USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xorgproto \
xrandr xrender xscrnsaver xtst
-
QMAKE_CONFIGURE_ARGS= -proprietary-codecs -system-ffmpeg
# We could just set it to an empty string as well. "all" does not account for
@@ -133,8 +131,16 @@ post-extract-SNDIO-on:
@${CP} ${FILESDIR}/audio_manager_openbsd.* \
${WRKSRC}/src/3rdparty/chromium/media/audio/openbsd
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
post-patch:
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ ${WRKSRC}/src/3rdparty/chromium/base/linux_util.cc \
+ ${WRKSRC}/src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni \
+ ${WRKSRC}/src/3rdparty/chromium/chrome/common/chrome_paths.cc \
+ ${WRKSRC}/src/3rdparty/chromium/third_party/pdfium/core/fxge/fx_ge_linux.cpp \
+ ${WRKSRC}/src/3rdparty/chromium/third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp \
+ ${WRKSRC}/src/3rdparty/gn/build/gen.py
+
+.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
@${REINPLACE_CMD} -e 's/icudtl.dat/icudtb.dat/' \
${WRKSRC}/src/core/core_module.pro
.endif
Modified: head/www/qt5-webengine/distinfo
==============================================================================
--- head/www/qt5-webengine/distinfo Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/distinfo Sat Dec 19 07:57:02 2020 (r558439)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1590608885
-SHA256 (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df
-SIZE (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = 278257432
+TIMESTAMP = 1606050276
+SHA256 (KDE/Qt/5.15.2/qtwebengine-everywhere-src-5.15.2.tar.xz) = c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0
+SIZE (KDE/Qt/5.15.2/qtwebengine-everywhere-src-5.15.2.tar.xz) = 280142544
Modified: head/www/qt5-webengine/files/patch-clang
==============================================================================
--- head/www/qt5-webengine/files/patch-clang Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/files/patch-clang Sat Dec 19 07:57:02 2020 (r558439)
@@ -38,50 +38,3 @@
EXPECT_CALL(callback_, OnError()).Times(2);
---- src/3rdparty/chromium/third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc.orig 2018-11-13 18:25:11 UTC
-+++ src/3rdparty/chromium/third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc
-@@ -439,7 +439,7 @@ CMapTable::CMapFormat0::Builder::Builder(
- }
-
- CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id)
-- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
-+ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
- CMapFormat::kFormat0,
- cmap_id) {
- }
-@@ -563,7 +563,7 @@ CMapTable::CMapFormat2::Builder::Builder(WritableFontD
- : CMapTable::CMap::Builder(data ? down_cast<WritableFontData*>(
- data->Slice(offset, data->ReadUShort(
- offset + Offset::kFormat0Length)))
-- : reinterpret_cast<WritableFontData*>(NULL),
-+ : static_cast<WritableFontData*>(NULL),
- CMapFormat::kFormat2, cmap_id) {
- // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix.
- }
-@@ -574,7 +574,7 @@ CMapTable::CMapFormat2::Builder::Builder(ReadableFontD
- : CMapTable::CMap::Builder(data ? down_cast<ReadableFontData*>(
- data->Slice(offset, data->ReadUShort(
- offset + Offset::kFormat0Length)))
-- : reinterpret_cast<ReadableFontData*>(NULL),
-+ : static_cast<ReadableFontData*>(NULL),
- CMapFormat::kFormat2, cmap_id) {
- // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix.
- }
-@@ -958,7 +958,7 @@ CMapTable::CMapFormat4::Builder::Builder(WritableFontD
- CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments,
- std::vector<int32_t>* glyph_id_array,
- const CMapId& cmap_id)
-- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
-+ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
- CMapFormat::kFormat4, cmap_id),
- segments_(segments->begin(), segments->end()),
- glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) {
-@@ -966,7 +966,7 @@ CMapTable::CMapFormat4::Builder::Builder(SegmentList*
- }
-
- CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id)
-- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
-+ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
- CMapFormat::kFormat4, cmap_id) {
- }
-
Modified: head/www/qt5-webengine/files/patch-configure.pri
==============================================================================
--- head/www/qt5-webengine/files/patch-configure.pri Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/files/patch-configure.pri Sat Dec 19 07:57:02 2020 (r558439)
@@ -1,21 +1,12 @@
---- configure.pri.orig 2020-04-08 09:41:36 UTC
+--- configure.pri.orig 2020-11-07 01:22:36 UTC
+++ configure.pri
-@@ -114,7 +114,7 @@ defineTest(qtwebengine_platformError) {
- defineTest(qtConfTest_detectPlatform) {
- QT_FOR_CONFIG += gui-private
-
-- !linux:!win32:!macos:!ios {
-+ !linux:!win32:!macos:!ios:!unix: {
- qtwebengine_platformError("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")
- } else {
- linux:qtwebengine_isLinuxPlatformSupported() {
-@@ -125,6 +125,9 @@ defineTest(qtConfTest_detectPlatform) {
- }
- macos:qtwebengine_isMacOsPlatformSupported() {
- $${1}.platform = "macos"
-+ }
-+ unix:qtwebengine_isLinuxPlatformSupported() {
-+ $${1}.platform = "linux"
- }
- ios:qtwebengine_isMacOsPlatformSupported() {
- $${1}.platform = "ios"
+@@ -123,6 +123,9 @@ defineTest(qtConfTest_detectPlatform) {
+ macos:qtwebengine_isMacOsPlatformSupported() {
+ $${1}.platform = "macos"
+ }
++ unix:qtwebengine_isLinuxPlatformSupported() {
++ $${1}.platform = "linux"
++ }
+ ios:qtwebengine_isMacOsPlatformSupported() {
+ $${1}.platform = "ios"
+ }
Modified: head/www/qt5-webengine/files/patch-mkspecs_features_functions.prf
==============================================================================
--- head/www/qt5-webengine/files/patch-mkspecs_features_functions.prf Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/files/patch-mkspecs_features_functions.prf Sat Dec 19 07:57:02 2020 (r558439)
@@ -1,14 +1,25 @@
---- mkspecs/features/functions.prf.orig 2019-12-03 07:18:02 UTC
+--- mkspecs/features/functions.prf.orig 2020-11-07 01:22:36 UTC
+++ mkspecs/features/functions.prf
-@@ -75,6 +75,7 @@ defineReplace(gnArgs) {
- linux: include($$QTWEBENGINE_ROOT/src/buildtools/config/linux.pri)
+@@ -84,6 +84,10 @@ defineReplace(gnWebEngineArgs) {
+ include($$QTWEBENGINE_ROOT/src/buildtools/config/windows.pri)
+ include($$QTWEBENGINE_ROOT/src/core/config/windows.pri)
+ }
++ freebsd {
++ include($$QTWEBENGINE_ROOT/src/buildtools/config/freebsd.pri)
++ include($$QTWEBENGINE_ROOT/src/core/config/linux.pri)
++ }
+ isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.)
+ return($$gn_args)
+ }
+@@ -93,6 +97,7 @@ defineReplace(gnPdfArgs) {
macos: include($$QTWEBENGINE_ROOT/src/buildtools/config/mac_osx.pri)
+ ios: include($$QTWEBENGINE_ROOT/src/pdf/config/ios.pri)
win32: include($$QTWEBENGINE_ROOT/src/buildtools/config/windows.pri)
+ freebsd: include($$QTWEBENGINE_ROOT/src/buildtools/config/freebsd.pri)
+ include($$QTWEBENGINE_ROOT/src/pdf/config/common.pri)
isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.)
return($$gn_args)
- }
-@@ -87,6 +88,7 @@ defineReplace(gnArch) {
+@@ -106,6 +111,7 @@ defineReplace(gnArch) {
contains(qtArch, "arm64"): return(arm64)
contains(qtArch, "mips"): return(mipsel)
contains(qtArch, "mips64"): return(mips64el)
@@ -16,7 +27,7 @@
return(unknown)
}
-@@ -94,6 +96,7 @@ defineReplace(gnOS) {
+@@ -113,6 +119,7 @@ defineReplace(gnOS) {
macos: return(mac)
win32: return(win)
linux: return(linux)
Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn
==============================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn Sat Dec 19 07:57:02 2020 (r558439)
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/BUILD.gn.orig 2019-11-27 21:12:25 UTC
+--- src/3rdparty/chromium/BUILD.gn.orig 2020-11-07 01:22:36 UTC
+++ src/3rdparty/chromium/BUILD.gn
-@@ -400,7 +400,7 @@ group("gn_all") {
+@@ -419,7 +419,7 @@ group("gn_all") {
]
}
@@ -9,7 +9,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
-@@ -441,8 +441,6 @@ group("gn_all") {
+@@ -460,8 +460,6 @@ group("gn_all") {
"//net:disk_cache_memory_test",
"//net:quic_client",
"//net:quic_server",
@@ -18,7 +18,7 @@
"//testing:empty_main",
]
-@@ -497,10 +495,6 @@ group("gn_all") {
+@@ -516,10 +514,6 @@ group("gn_all") {
"//chrome/test:load_library_perf_tests",
"//chrome/test:sync_performance_tests",
"//chrome/test/chromedriver:chromedriver",
@@ -29,7 +29,7 @@
"//media/cast:generate_barcode_video",
"//media/cast:generate_timecode_audio",
"//net:crash_cache",
-@@ -567,10 +561,6 @@ group("gn_all") {
+@@ -592,10 +586,6 @@ group("gn_all") {
"//mojo:mojo_perftests",
"//services/service_manager/public/cpp",
"//testing/gmock:gmock_main",
@@ -40,7 +40,7 @@
]
if (!is_android) {
-@@ -644,7 +634,7 @@ group("gn_all") {
+@@ -669,7 +659,7 @@ group("gn_all") {
host_os == "win" && !use_qt) {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@@ -49,7 +49,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-@@ -783,7 +773,6 @@ group("gn_all") {
+@@ -802,7 +792,6 @@ group("gn_all") {
"//chrome/browser/vr:vr_common_perftests",
"//chrome/browser/vr:vr_common_unittests",
"//chrome/browser/vr:vr_pixeltests",
@@ -57,15 +57,7 @@
]
if (is_desktop_linux && use_ozone) {
deps += [ "//chrome/browser/vr/testapp:vr_testapp" ]
-@@ -902,7 +891,6 @@ if (is_chromeos) {
- "//ppapi/examples/video_decode",
- "//sandbox/linux:chrome_sandbox",
- "//sandbox/linux:sandbox_linux_unittests",
-- "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
-
- # Blocked on https://github.com/catapult-project/catapult/issues/2297
- #"//third_party/catapult/telemetry:bitmaptools",
-@@ -1070,7 +1058,7 @@ if (!is_ios && !use_qt) {
+@@ -1085,7 +1074,7 @@ if (!is_ios && !use_qt) {
]
}
@@ -74,7 +66,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -1079,7 +1067,7 @@ if (!is_ios && !use_qt) {
+@@ -1094,7 +1083,7 @@ if (!is_ios && !use_qt) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -83,7 +75,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
-@@ -1221,9 +1209,6 @@ group("chromium_builder_perf") {
+@@ -1286,9 +1275,6 @@ group("chromium_builder_perf") {
if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn
==============================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn Sat Dec 19 07:57:02 2020 (r558439)
@@ -1,6 +1,52 @@
---- src/3rdparty/chromium/base/BUILD.gn.orig 2019-05-23 12:39:34 UTC
+--- src/3rdparty/chromium/base/BUILD.gn.orig 2020-11-07 01:22:36 UTC
+++ src/3rdparty/chromium/base/BUILD.gn
-@@ -1183,7 +1183,7 @@ jumbo_component("base") {
+@@ -59,7 +59,7 @@ declare_args() {
+ # replacement base::Location::Current(). On by default in non-official builds
+ # for testing purposes.
+ # TODO(https://crbug.com/974061): remove this eventually.
+- from_here_uses_location_builtins = !is_official_build
++ from_here_uses_location_builtins = !is_official_build && !is_bsd
+
+ # Unsafe developer build. Has developer-friendly features that may weaken or
+ # disable security measures like sandboxing or ASLR.
+@@ -929,7 +929,7 @@ jumbo_component("base") {
+ "timer/hi_res_timer_manager_posix.cc",
+ ]
+
+- if (!is_nacl && !is_mac && !is_ios) {
++ if (!is_nacl && !is_mac && !is_ios && !is_bsd) {
+ sources += [
+ "profiler/stack_copier_signal.cc",
+ "profiler/stack_copier_signal.h",
+@@ -938,6 +938,12 @@ jumbo_component("base") {
+ "profiler/thread_delegate_posix.h",
+ ]
+ }
++
++ if (is_bsd) {
++ sources += [
++ "profiler/stack_sampler_posix.cc",
++ ]
++ }
+ }
+
+ jumbo_excluded_sources = []
+@@ -1239,7 +1245,13 @@ jumbo_component("base") {
+ "process/process_metrics_linux.cc",
+ "threading/platform_thread_linux.cc",
+ ]
+- jumbo_excluded_sources += [ "process/memory_linux.cc" ]
++ # Omit this because it will be excluded via "is_bsd" further down in
++ # this file
++ # jumbo_excluded_sources += [ "process/memory_linux.cc" ]
++ # ...but remove the following files from jumbo merge otherwise it will
++ # emit errors of redefined variables
++ jumbo_excluded_sources += [ "metrics/histogram.cc" ]
++ jumbo_excluded_sources += [ "metrics/sparse_histogram.cc" ]
+ }
+
+ if (!is_nacl) {
+@@ -1324,7 +1336,7 @@ jumbo_component("base") {
# Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
@@ -9,7 +55,7 @@
host_toolchain != "//build/toolchain/cros:host") {
libs += [ "atomic" ]
}
-@@ -1209,7 +1209,7 @@ jumbo_component("base") {
+@@ -1350,7 +1362,7 @@ jumbo_component("base") {
"allocator/allocator_shim_override_glibc_weak_symbols.h",
]
deps += [ "//base/allocator:tcmalloc" ]
@@ -18,7 +64,7 @@
sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
} else if (is_android && use_allocator == "none") {
sources += [
-@@ -1749,6 +1749,33 @@ jumbo_component("base") {
+@@ -1947,6 +1959,33 @@ jumbo_component("base") {
}
}
@@ -51,11 +97,20 @@
+
# iOS
if (is_ios) {
- set_sources_assignment_filter([])
-@@ -2805,6 +2832,12 @@ test("base_unittests") {
+ sources -= [
+@@ -2903,7 +2942,7 @@ test("base_unittests") {
+ "posix/unix_domain_socket_unittest.cc",
+ "task/thread_pool/task_tracker_posix_unittest.cc",
]
- set_sources_assignment_filter(sources_assignment_filter)
+- if (!is_nacl && !is_mac && !is_ios) {
++ if (!is_nacl && !is_mac && !is_ios && !is_bsd) {
+ sources += [ "profiler/stack_copier_signal_unittest.cc" ]
+ }
}
+@@ -3092,6 +3131,12 @@ test("base_unittests") {
+
+ manifest = "//build/config/fuchsia/tests.cmx"
+ }
+
+ if (is_bsd) {
+ sources -= [
@@ -63,5 +118,5 @@
+ ]
+ }
- if (is_win) {
- deps += [ "//base:scoped_handle_test_dll" ]
+ if (!is_fuchsia && !is_ios) {
+ sources += [ "files/file_locking_unittest.cc" ]
Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc
==============================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc Sat Dec 19 07:57:02 2020 (r558439)
@@ -1,6 +1,16 @@
---- src/3rdparty/chromium/base/debug/elf_reader.cc.orig 2020-04-08 09:41:36 UTC
+--- src/3rdparty/chromium/base/debug/elf_reader.cc.orig 2020-11-07 01:22:36 UTC
+++ src/3rdparty/chromium/base/debug/elf_reader.cc
-@@ -98,6 +98,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
+@@ -35,7 +35,9 @@ using Nhdr = Elf64_Nhdr;
+ using Word = Elf64_Word;
+ #endif
+
++#if !defined(OS_BSD)
+ constexpr char kGnuNoteName[] = "GNU";
++#endif
+
+ // Returns a pointer to the header of the ELF binary mapped into memory,
+ // or a null pointer if the header is invalid.
+@@ -98,6 +100,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
bool found = false;
while (current_section < section_end) {
current_note = reinterpret_cast<const Nhdr*>(current_section);
@@ -8,7 +18,7 @@
if (current_note->n_type == NT_GNU_BUILD_ID) {
StringPiece note_name(current_section + sizeof(Nhdr),
current_note->n_namesz);
-@@ -107,6 +108,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
+@@ -107,6 +110,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
break;
}
}
Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_proc__maps__linux.cc
==============================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_proc__maps__linux.cc Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_proc__maps__linux.cc Sat Dec 19 07:57:02 2020 (r558439)
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/base/debug/proc_maps_linux.cc.orig 2017-01-26 00:49:07 UTC
+--- src/3rdparty/chromium/base/debug/proc_maps_linux.cc.orig 2020-11-07 01:22:36 UTC
+++ src/3rdparty/chromium/base/debug/proc_maps_linux.cc
@@ -12,7 +12,7 @@
#include "base/strings/string_split.h"
@@ -9,3 +9,133 @@
#include <inttypes.h>
#endif
+@@ -28,6 +28,11 @@
+ namespace base {
+ namespace debug {
+
++#if defined(OS_BSD)
++const char kProcSelfMapsPath[] = "/proc/curproc/map";
++#else
++const char kProcSelfMapsPath[] = "/proc/self/maps";
++
+ // Scans |proc_maps| starting from |pos| returning true if the gate VMA was
+ // found, otherwise returns false.
+ static bool ContainsGateVMA(std::string* proc_maps, size_t pos) {
+@@ -43,15 +48,16 @@ static bool ContainsGateVMA(std::string* proc_maps, si
+ return false;
+ #endif
+ }
++#endif
+
+ bool ReadProcMaps(std::string* proc_maps) {
+ // seq_file only writes out a page-sized amount on each call. Refer to header
+ // file for details.
+ const long kReadSize = sysconf(_SC_PAGESIZE);
+
+- base::ScopedFD fd(HANDLE_EINTR(open("/proc/self/maps", O_RDONLY)));
++ base::ScopedFD fd(HANDLE_EINTR(open(kProcSelfMapsPath, O_RDONLY)));
+ if (!fd.is_valid()) {
+- DPLOG(ERROR) << "Couldn't open /proc/self/maps";
++ DPLOG(ERROR) << "Couldn't open " << kProcSelfMapsPath;
+ return false;
+ }
+ proc_maps->clear();
+@@ -65,7 +71,7 @@ bool ReadProcMaps(std::string* proc_maps) {
+
+ ssize_t bytes_read = HANDLE_EINTR(read(fd.get(), buffer, kReadSize));
+ if (bytes_read < 0) {
+- DPLOG(ERROR) << "Couldn't read /proc/self/maps";
++ DPLOG(ERROR) << "Couldn't read " << kProcSelfMapsPath;
+ proc_maps->clear();
+ return false;
+ }
+@@ -76,6 +82,7 @@ bool ReadProcMaps(std::string* proc_maps) {
+ if (bytes_read == 0)
+ break;
+
++#if !defined(OS_BSD)
+ // The gate VMA is handled as a special case after seq_file has finished
+ // iterating through all entries in the virtual memory table.
+ //
+@@ -86,6 +93,7 @@ bool ReadProcMaps(std::string* proc_maps) {
+ // Avoid this by searching for the gate VMA and breaking early.
+ if (ContainsGateVMA(proc_maps, pos))
+ break;
++#endif
+ }
+
+ return true;
+@@ -114,10 +122,32 @@ bool ParseProcMaps(const std::string& input,
+ MappedMemoryRegion region;
+ const char* line = lines[i].c_str();
+ char permissions[5] = {'\0'}; // Ensure NUL-terminated string.
++ int path_index = 0;
++
++#if defined(OS_BSD)
++ if (lines[i].empty())
++ continue;
++
++
++ char cow;
++
++ // Format:
++ //
++ // start end resident private_resident obj perms ref_count shadow_count flags cow needs_copy type fullpath cred ruid
++ // 0x200000 0x202000 2 6 0xfffff80005be9000 r-- 3 1 0x1000 COW NC vnode /bin/cat NCH -1
++ //
++ if (sscanf(line, "%" SCNxPTR " %" SCNxPTR " %*ld %*ld %*llx %3c %*d %*d %*x %c%*s %*s %*s %n",
++ ®ion.start, ®ion.end, permissions, &cow, &path_index) < 4) {
++ DPLOG(WARNING) << "sscanf failed for line: " << line;
++ return false;
++ }
++
++ const char* fullpath = line + path_index;
++ const char* cred = strchr(fullpath, ' ');
++#else
+ uint8_t dev_major = 0;
+ uint8_t dev_minor = 0;
+ long inode = 0;
+- int path_index = 0;
+
+ // Sample format from man 5 proc:
+ //
+@@ -133,6 +163,7 @@ bool ParseProcMaps(const std::string& input,
+ DPLOG(WARNING) << "sscanf failed for line: " << line;
+ return false;
+ }
++#endif
+
+ region.permissions = 0;
+
+@@ -151,14 +182,31 @@ bool ParseProcMaps(const std::string& input,
+ else if (permissions[2] != '-')
+ return false;
+
++#if defined(OS_BSD)
++ if (cow == 'C') {
++ region.permissions |= MappedMemoryRegion::PRIVATE;
++ } else if (cow != 'N') {
++ DPLOG(WARNING) << "unknown value for COW in line " << line << ": " << cow;
++ return false;
++ }
++#else
+ if (permissions[3] == 'p')
+ region.permissions |= MappedMemoryRegion::PRIVATE;
+ else if (permissions[3] != 's' && permissions[3] != 'S') // Shared memory.
+ return false;
++#endif
+
+ // Pushing then assigning saves us a string copy.
+ regions.push_back(region);
++#if defined(OS_BSD)
++ if (cred != nullptr) {
++ regions.back().path.assign(line + path_index, cred - fullpath);
++ } else {
++ regions.back().path.assign(line + path_index);
++ }
++#else
+ regions.back().path.assign(line + path_index);
++#endif
+ }
+
+ regions_out->swap(regions);
Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc
==============================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc Sat Dec 19 07:57:02 2020 (r558439)
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/base/debug/stack_trace_posix.cc.orig 2019-05-23 12:39:34 UTC
+--- src/3rdparty/chromium/base/debug/stack_trace_posix.cc.orig 2020-11-07 01:22:36 UTC
+++ src/3rdparty/chromium/base/debug/stack_trace_posix.cc
@@ -35,7 +35,7 @@
#include <AvailabilityMacros.h>
@@ -9,23 +9,15 @@
#include "base/debug/proc_maps_linux.h"
#endif
-@@ -653,6 +653,11 @@ class SandboxSymbolizeHelper {
- // for the modules that are loaded in the current process.
- // Returns true on success.
- bool CacheMemoryRegions() {
+@@ -697,7 +697,11 @@ class SandboxSymbolizeHelper {
+ // Skip regions with empty file names.
+ continue;
+ }
+#if defined(OS_BSD)
-+ // TODO (rene) avoid link error, implement something?
-+ NOTIMPLEMENTED();
-+ return false;
-+#else
- // Reads /proc/self/maps.
- std::string contents;
- if (!ReadProcMaps(&contents)) {
-@@ -670,6 +675,7 @@ class SandboxSymbolizeHelper {
-
- is_initialized_ = true;
- return true;
++ if (region.path[0] == '-') {
++#else
+ if (region.path[0] == '[') {
+#endif
- }
-
- // Opens all object files and caches their file descriptors.
+ // Skip pseudo-paths, like [stack], [vdso], [heap], etc ...
+ continue;
+ }
Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher.cc
==============================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher.cc Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher.cc Sat Dec 19 07:57:02 2020 (r558439)
@@ -1,11 +1,15 @@
---- src/3rdparty/chromium/base/files/file_path_watcher.cc.orig 2019-11-27 21:12:25 UTC
+--- src/3rdparty/chromium/base/files/file_path_watcher.cc.orig 2020-11-07 01:22:36 UTC
+++ src/3rdparty/chromium/base/files/file_path_watcher.cc
-@@ -20,7 +20,7 @@ FilePathWatcher::~FilePathWatcher() {
+@@ -20,10 +20,10 @@ FilePathWatcher::~FilePathWatcher() {
// static
bool FilePathWatcher::RecursiveWatchAvailable() {
#if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN) || \
- defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX)
-+ defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD)
++ (defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_ANDROID) || defined(OS_AIX)
return true;
#else
- // FSEvents isn't available on iOS.
+- // FSEvents isn't available on iOS.
++ // FSEvents isn't available on iOS and the kqueue watcher.
+ return false;
+ #endif
+ }
Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__stub.cc
==============================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__stub.cc Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__stub.cc Sat Dec 19 07:57:02 2020 (r558439)
@@ -1,34 +1,41 @@
---- src/3rdparty/chromium/base/files/file_path_watcher_stub.cc.orig 2018-11-13 18:25:11 UTC
+--- src/3rdparty/chromium/base/files/file_path_watcher_stub.cc.orig 2020-11-07 01:22:36 UTC
+++ src/3rdparty/chromium/base/files/file_path_watcher_stub.cc
-@@ -5,10 +5,14 @@
- // This file exists for Unix systems which don't have the inotify headers, and
- // thus cannot build file_watcher_inotify.cc
+@@ -1,14 +1,15 @@
+-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Copyright 2014 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.
+-// This file exists for Unix systems which don't have the inotify headers, and
+-// thus cannot build file_watcher_inotify.cc
+
+-#include "base/files/file_path_watcher.h"
+#include <memory>
-+
- #include "base/files/file_path_watcher.h"
-+#include "base/files/file_path_watcher_kqueue.h"
++#include "base/files/file_path_watcher.h"
++#include "base/files/file_path_watcher_kqueue.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
+#include "build/build_config.h"
namespace base {
-@@ -22,12 +26,26 @@ class FilePathWatcherImpl : public FilePathWatcher::Pl
+@@ -22,12 +23,29 @@ class FilePathWatcherImpl : public FilePathWatcher::Pl
bool Watch(const FilePath& path,
bool recursive,
const FilePathWatcher::Callback& callback) override {
-- return false;
++#if defined(OS_BSD)
+ DCHECK(!impl_.get());
+ if (recursive) {
-+ if (!FilePathWatcher::RecursiveWatchAvailable())
-+ return false;
++ return false;
+ } else {
-+ impl_ = std::make_unique<FilePathWatcherKQueue>();
++ impl_ = std::make_unique<FilePathWatcherKQueue>();
+ }
+ DCHECK(impl_.get());
+ return impl_->Watch(path, recursive, callback);
++#else
+ return false;
++#endif
}
- void Cancel() override {}
Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc
==============================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc Sat Dec 19 07:57:02 2020 (r558439)
@@ -1,20 +1,20 @@
---- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2020-04-08 09:41:36 UTC
+--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2020-11-07 01:22:36 UTC
+++ src/3rdparty/chromium/base/i18n/icu_util.cc
-@@ -43,7 +43,7 @@
+@@ -49,7 +49,7 @@
#endif
#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
-- (defined(OS_LINUX) && !defined(IS_CHROMECAST))
-+ (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
+- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST))
++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD)
#include "third_party/icu/source/i18n/unicode/timezone.h"
#endif
-@@ -293,7 +293,7 @@ void InitializeIcuTimeZone() {
+@@ -345,7 +345,7 @@ void InitializeIcuTimeZone() {
fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
icu::TimeZone::adoptDefault(
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
--#elif defined(OS_LINUX) && !defined(IS_CHROMECAST)
-+#elif (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
- // To respond to the timezone change properly, the default timezone
+-#elif defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)
++#elif (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST)
+ // To respond to the time zone change properly, the default time zone
// cache in ICU has to be populated on starting up.
// See TimeZoneMonitorLinux::NotifyClientsFromImpl().
Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc
==============================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc Sat Dec 19 07:57:02 2020 (r558439)
@@ -1,20 +1,12 @@
---- src/3rdparty/chromium/base/linux_util.cc.orig 2020-03-16 14:04:24 UTC
+--- src/3rdparty/chromium/base/linux_util.cc.orig 2020-11-07 01:22:36 UTC
+++ src/3rdparty/chromium/base/linux_util.cc
-@@ -144,6 +144,8 @@ char g_linux_distro[kDistroSize] =
- "CrOS";
- #elif defined(OS_ANDROID)
- "Android";
-+#elif defined(OS_BSD)
-+ "BSD";
- #else // if defined(OS_LINUX)
- "Unknown";
- #endif
-@@ -164,7 +166,7 @@ BASE_EXPORT std::string GetKeyValueFromOSReleaseFileFo
- }
-
- std::string GetLinuxDistro() {
--#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
- return g_linux_distro;
- #elif defined(OS_LINUX)
- LinuxDistroHelper* distro_state_singleton = LinuxDistroHelper::GetInstance();
+@@ -78,6 +78,9 @@ class DistroNameGetter {
+ public:
+ DistroNameGetter() {
+ static const char* const kFilesToCheck[] = {"/etc/os-release",
++#if defined(OS_BSD)
++ "%%LOCALBASE%%/etc/os-release",
++#endif
+ "/usr/lib/os-release"};
+ for (const char* file : kFilesToCheck) {
+ if (ReadDistroFromOSReleaseFile(file))
Added: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory.cc Sat Dec 19 07:57:02 2020 (r558439)
@@ -0,0 +1,63 @@
+--- src/3rdparty/chromium/base/memory/discardable_memory.cc.orig 2020-11-07 01:22:36 UTC
++++ src/3rdparty/chromium/base/memory/discardable_memory.cc
+@@ -23,7 +23,7 @@ const base::Feature kMadvFreeDiscardableMemory{
+ "MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT};
+ #endif // defined(OS_POSIX)
+
+-#if defined(OS_ANDROID) || defined(OS_LINUX)
++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+ const base::Feature kDiscardableMemoryBackingTrial{
+ "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT};
+
+@@ -41,13 +41,13 @@ const base::FeatureParam<DiscardableMemoryTrialGroup>
+ DiscardableMemoryTrialGroup::kEmulatedSharedMemory,
+ &kDiscardableMemoryBackingParamOptions};
+
+-#endif // defined(OS_ANDROID) || defined(OS_LINUX)
++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+
+ } // namespace features
+
+ namespace {
+
+-#if defined(OS_ANDROID) || defined(OS_LINUX)
++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+
+ DiscardableMemoryBacking GetBackingForFieldTrial() {
+ DiscardableMemoryTrialGroup trial_group =
+@@ -61,11 +61,11 @@ DiscardableMemoryBacking GetBackingForFieldTrial() {
+ }
+ NOTREACHED();
+ }
+-#endif // defined(OS_ANDROID) || defined(OS_LINUX)
++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+
+ } // namespace
+
+-#if defined(OS_ANDROID) || defined(OS_LINUX)
++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+
+ // Probe capabilities of this device to determine whether we should participate
+ // in the discardable memory backing trial.
+@@ -87,18 +87,18 @@ DiscardableMemoryTrialGroup GetDiscardableMemoryBackin
+ DCHECK(DiscardableMemoryBackingFieldTrialIsEnabled());
+ return features::kDiscardableMemoryBackingParam.Get();
+ }
+-#endif // defined(OS_ANDROID) || defined(OS_LINUX)
++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+
+ DiscardableMemory::DiscardableMemory() = default;
+
+ DiscardableMemory::~DiscardableMemory() = default;
+
+ DiscardableMemoryBacking GetDiscardableMemoryBacking() {
+-#if defined(OS_ANDROID) || defined(OS_LINUX)
++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+ if (DiscardableMemoryBackingFieldTrialIsEnabled()) {
+ return GetBackingForFieldTrial();
+ }
+-#endif // defined(OS_ANDROID) || defined(OS_LINUX)
++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+
+ #if defined(OS_ANDROID)
+ if (ashmem_device_is_supported())
Added: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory__internal.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory__internal.h Sat Dec 19 07:57:02 2020 (r558439)
@@ -0,0 +1,19 @@
+--- src/3rdparty/chromium/base/memory/discardable_memory_internal.h.orig 2020-11-07 01:22:36 UTC
++++ src/3rdparty/chromium/base/memory/discardable_memory_internal.h
+@@ -10,7 +10,7 @@
+ #include "base/metrics/field_trial_params.h"
+ #include "build/build_config.h"
+
+-#if defined(OS_ANDROID) || defined(OS_LINUX)
++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+
+ namespace base {
+
+@@ -47,6 +47,6 @@ GetDiscardableMemoryBackingFieldTrialGroup();
+
+ } // namespace base
+
+-#endif // defined(OS_LINUX) || defined(OS_ANDROID)
++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+
+ #endif // BASE_MEMORY_DISCARDABLE_MEMORY_INTERNAL_H_
Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_internal__linux.cc
==============================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_internal__linux.cc Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_internal__linux.cc Sat Dec 19 07:57:02 2020 (r558439)
@@ -1,16 +1,97 @@
---- src/3rdparty/chromium/base/process/internal_linux.cc.orig 2018-11-13 18:25:11 UTC
+--- src/3rdparty/chromium/base/process/internal_linux.cc.orig 2020-11-07 01:22:36 UTC
+++ src/3rdparty/chromium/base/process/internal_linux.cc
-@@ -60,10 +60,13 @@ bool ReadProcFile(const FilePath& file, std::string* b
- // Synchronously reading files in /proc is safe.
- ThreadRestrictions::ScopedAllowIO allow_io;
+@@ -29,7 +29,11 @@ namespace internal {
-+#if !defined(OS_BSD)
- if (!ReadFileToString(file, buffer)) {
+ const char kProcDir[] = "/proc";
+
++#if defined(OS_BSD)
++const char kStatFile[] = "status";
++#else
+ const char kStatFile[] = "stat";
++#endif
+
+ FilePath GetProcPidDir(pid_t pid) {
+ return FilePath(kProcDir).Append(NumberToString(pid));
+@@ -64,6 +68,7 @@ bool ReadProcFile(const FilePath& file, std::string* b
DLOG(WARNING) << "Failed to read " << file.MaybeAsASCII();
return false;
}
-+#endif
+
return !buffer->empty();
}
+@@ -79,6 +84,22 @@ bool ParseProcStats(const std::string& stats_data,
+ if (stats_data.empty())
+ return false;
+
++#if defined(OS_BSD)
++ proc_stats->clear();
++
++ std::vector<std::string> other_stats = SplitString(
++ stats_data, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
++
++ for (const auto& i : other_stats) {
++ auto pos = i.find(',');
++
++ if (pos == std::string::npos) {
++ proc_stats->push_back(i);
++ } else {
++ proc_stats->push_back(i.substr(0, pos));
++ }
++ }
++#else
+ // The stat file is formatted as:
+ // pid (process name) data1 data2 .... dataN
+ // Look for the closing paren by scanning backwards, to avoid being fooled by
+@@ -108,6 +129,7 @@ bool ParseProcStats(const std::string& stats_data,
+ base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+ for (const auto& i : other_stats)
+ proc_stats->push_back(i);
++#endif
+ return true;
+ }
+
+@@ -155,7 +177,11 @@ int64_t ReadProcStatsAndGetFieldAsInt64(pid_t pid, Pro
+ }
+
+ int64_t ReadProcSelfStatsAndGetFieldAsInt64(ProcStatsFields field_num) {
++#if defined(OS_BSD)
++ FilePath stat_file = FilePath(kProcDir).Append("curproc").Append(kStatFile);
++#else
+ FilePath stat_file = FilePath(kProcDir).Append("self").Append(kStatFile);
++#endif
+ return ReadStatFileAndGetFieldAsInt64(stat_file, field_num);
+ }
+
+@@ -171,6 +197,9 @@ size_t ReadProcStatsAndGetFieldAsSizeT(pid_t pid,
+ }
+
+ Time GetBootTime() {
++#if defined(OS_BSD)
++ return Time();
++#else
+ FilePath path("/proc/stat");
+ std::string contents;
+ if (!ReadProcFile(path, &contents))
+@@ -184,9 +213,13 @@ Time GetBootTime() {
+ if (!StringToInt(btime_it->second, &btime))
+ return Time();
+ return Time::FromTimeT(btime);
++#endif
+ }
+
+ TimeDelta GetUserCpuTimeSinceBoot() {
++#if defined(OS_BSD)
++ return TimeDelta();
++#else
+ FilePath path("/proc/stat");
+ std::string contents;
+ if (!ReadProcFile(path, &contents))
+@@ -210,6 +243,7 @@ TimeDelta GetUserCpuTimeSinceBoot() {
+ return TimeDelta();
+
+ return ClockTicksToTimeDelta(user + nice);
++#endif
+ }
+
+ TimeDelta ClockTicksToTimeDelta(int clock_ticks) {
Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_internal__linux.h
==============================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_internal__linux.h Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_internal__linux.h Sat Dec 19 07:57:02 2020 (r558439)
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/base/process/internal_linux.h.orig 2017-01-26 00:49:07 UTC
+--- src/3rdparty/chromium/base/process/internal_linux.h.orig 2020-11-07 01:22:36 UTC
+++ src/3rdparty/chromium/base/process/internal_linux.h
@@ -14,6 +14,8 @@
@@ -9,3 +9,26 @@
namespace base {
class Time;
+@@ -50,6 +52,14 @@ bool ParseProcStats(const std::string& stats_data,
+ // If the ordering ever changes, carefully review functions that use these
+ // values.
+ enum ProcStatsFields {
++#if defined(OS_BSD)
++ VM_COMM = 0, // Command name.
++ VM_PPID = 2, // Parent process id.
++ VM_PGRP = 3, // Process group id.
++ VM_STARTTIME = 7, // The process start time.
++ VM_UTIME = 8, // The user time.
++ VM_STIME = 9, // The system time
++#else
+ VM_COMM = 1, // Filename of executable, without parentheses.
+ VM_STATE = 2, // Letter indicating the state of the process.
+ VM_PPID = 3, // PID of the parent.
+@@ -62,6 +72,7 @@ enum ProcStatsFields {
+ VM_STARTTIME = 21, // The time the process started in clock ticks.
+ VM_VSIZE = 22, // Virtual memory size in bytes.
+ VM_RSS = 23, // Resident Set Size in pages.
++#endif
+ };
+
+ // Reads the |field_num|th field from |proc_stats|. Returns 0 on failure.
Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__linux.cc
==============================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__linux.cc Sat Dec 19 07:46:52 2020 (r558438)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__linux.cc Sat Dec 19 07:57:02 2020 (r558439)
@@ -1,14 +1,27 @@
---- src/3rdparty/chromium/base/process/process_linux.cc.orig 2019-05-23 12:39:34 UTC
+--- src/3rdparty/chromium/base/process/process_linux.cc.orig 2020-11-07 01:22:36 UTC
+++ src/3rdparty/chromium/base/process/process_linux.cc
-@@ -88,6 +88,7 @@ Time Process::CreationTime() const {
+@@ -79,6 +79,9 @@ Time Process::CreationTime() const {
+ internal::VM_STARTTIME)
+ : internal::ReadProcStatsAndGetFieldAsInt64(
+ Pid(), internal::VM_STARTTIME);
++#if defined(OS_BSD)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list