Date: Sat, 26 Oct 2019 22:00:05 +0000 (UTC) From: Kai Knoblich <kai@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r515731 - in head: . www/qt5-webengine www/qt5-webengine/files Message-ID: <201910262200.x9QM050c014013@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kai Date: Sat Oct 26 22:00:04 2019 New Revision: 515731 URL: https://svnweb.freebsd.org/changeset/ports/515731 Log: www/qt5-webengine: Update to 5.13.0 Under the hood runs Chromium 73.0.3683.105 with applied security fixes from Chrome up to version 74.0.3729.157. Most of the patches were synced with www/chromium 73.0.3683.103 (= r498089) with some re-added/modified patches from r497877 and r499210 to get also successful builds on aarch64. Some tweaking might still be needed to get positive build results on the armv7 architecture. Other notable changes: * GN keywords "use_system_{libusb,libcxx}" aren't used anymore thus both were removed from the FreeBSD specific qmake file "freebsd.pri". * In various GN files the OS is now identified as "freebsd" (prior it was "bsd") so "mkspecs/features/functions.prf" was changed accordingly. * The hook up of the sandbox feature is no longer excluded which led to some more patches (= patch-*crashpad* files) * Add "xorg" to USES as using USE_XORG alone is deprecated. Changelog: https://code.qt.io/cgit/qt/qtwebengine.git/tree/dist/changes-5.13.0 Approved by: tcberner (kde) Differential Revision: https://reviews.freebsd.org/D22095 Added: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_numerics_safe__math__shared__impl.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_posix_can__lower__nice__to.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__linux.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_detect__host__arch.py (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_test_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_content_app_crashpad.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_download_internal_common_base__file.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_metrics__log.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_services_filesystem_file__system__app.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_services_font_font__service__app.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_removable__device__constants.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_removable__device__constants.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_input_input__device__change__observer.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_native__event__observer.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_native__event__observer.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_service__manager_service__manager__context.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_storage__partition__impl.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_storage__partition__impl__map.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_shared__resources__data__source.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_app_content__packaged__services__manifest.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_app_v8__snapshot__overlay__manifest.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_use__zoom__for__dsf__policy.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_media_audio_audio__device__factory.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__delegate__factory.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_features_feature.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_shell_app_shell__main__delegate.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__request__context__manager.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__request__context__manager.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_mock__gpu__memory__buffer__manager.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_services_gpu__mojo__media__client.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_js_mojo__bindings__resources.grd (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_nqe_network__quality__estimator.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_socket__posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_tools_quic_quic__http__proxy__backend.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_backend_print__backend__cups.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_audio_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_content_simple__browser_simple__browser__service.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_device__service.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_serial_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_serial_serial__io__handler__posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor__linux.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_network_network__context.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_embedder_main.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_public_cpp_service__executable_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_sandbox_sandbox__type.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_driver__utils.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_threading.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cpu-aarch64-linux.c (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_breakpad_breakpad_src_common_simple__string__dictionary.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_build_crashpad__buildconfig.gni (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_client_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_client_crashpad__client__posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_address__types.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_capture__context.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_metrics.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_uuid.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_close__multiple.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_drop__privileges.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_signals.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_node_node.py (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_stubs_platform__macros.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_byte__order.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_ip__address.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_ip__address.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_string__utils.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle__freebsd.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_strings_app__locale__settings.grd (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_bubble_bubble__dialog__delegate__view.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_api.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_external-reference-table.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_gn_base_files_file__util.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_gn_base_files_scoped__file.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_gn_util_sys__info.cc (contents, props changed) Deleted: head/www/qt5-webengine/files/patch-configure.pri head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__unittest.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_thread__heap__usage__tracker.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__info__linux.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_sys__info__freebsd.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_sys__info__posix.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_json__schema_json__schema__validator.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_import_csv__reader.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__data__source__impl.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__data__source__impl.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__impl.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__impl.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_view__messages.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_browser_web__ui.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_browser_web__ui__data__source.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_serial_BUILD.gn head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_serial_serial__io__handler__posix.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__event__router__factory.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_core_validation__unittest.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_buffer.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_data__pipe.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_message__pipe.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__interfaces__freebsd.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__interfaces__freebsd.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_shared__impl_private_net__address__private__impl.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_catalog_public_cpp_manifest__parsing__util.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_public_cpp_standalone__service_BUILD.gn head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_public_cpp_standalone__service_standalone__service.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_gl_renderergl__utils.cpp head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_atomics.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_js__define.cpp head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_logging.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_byteorder.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_httpcommon.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_ipaddress.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physicalsocketserver.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physicalsocketserver.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_platform__thread.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_stringutils.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__implementation.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__view__factory.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_bubble_bubble__dialog__delegate.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_libsampler_sampler.cc head/www/qt5-webengine/files/patch-src_3rdparty_gn_tools_gn_args.cc head/www/qt5-webengine/files/patch-src_3rdparty_gn_util_exe__path.cc head/www/qt5-webengine/files/patch-src_3rdparty_gn_util_semaphore.cc head/www/qt5-webengine/files/patch-src_3rdparty_gn_util_semaphore.h head/www/qt5-webengine/files/patch-src_3rdparty_gn_util_ticks.cc head/www/qt5-webengine/files/patch-src_core_ozone_gl__surface__glx__qt.cpp Modified: head/UPDATING head/www/qt5-webengine/Makefile head/www/qt5-webengine/distinfo head/www/qt5-webengine/files/freebsd.pri head/www/qt5-webengine/files/patch-clang 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_debugger__posix.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_process_launch__posix.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__freebsd.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__freebsd.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn 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_linux_chrome.map 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_app_settings__strings.grdp 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_chrome__paths.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_features.gni head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_content__settings_core_browser_website__settings__registry.cc 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_browser_BUILD.gn head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_download_quarantine_quarantine__linux.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_feedback_anonymizer__tool.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_os__crypt.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_plugins_renderer_plugin__placeholder.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn 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_memory_swap__metrics__driver__impl__linux.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__linux.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_media_stream_processed__local__audio__source.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_renderer_renderer__blink__platform__impl.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_messaging_message__service.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_image__util.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.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_common_gpu__memory__buffer__support.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__content__browser__client.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__linux.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__linux.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_features.gni head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_zygote_host_zygote__host__impl__linux.h 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_blink_renderer_platform_fonts_font__cache.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_threading__pthreads.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_crc32c_src_src_crc32c__arm64__linux__check.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_core_SkCpu.cpp head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_ports_SkFontHost__FreeType.cpp head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.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_tools_variations_fieldtrial__to__struct.py head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params.h 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_mojo_buffer__types__struct__traits.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojo_buffer__types__struct__traits.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc head/www/qt5-webengine/files/patch-src_3rdparty_gn_base_files_file__posix.cc head/www/qt5-webengine/files/patch-src_3rdparty_gn_build_gen.py head/www/qt5-webengine/files/patch-src_core_core__module.pro head/www/qt5-webengine/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat Oct 26 21:59:43 2019 (r515730) +++ head/UPDATING Sat Oct 26 22:00:04 2019 (r515731) @@ -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. +20191026: + AFFECTS: users of www/qt5-webengine + AUTHOR: kai@FreeBSD.org + + Users that upgrade www/qt5-webengine without using pkg/poudriere might + experience failures due to conflicts with the installed version of 5.12.2. + + In that case, pkg delete -f the qt5-webengine package before building + the updated version. + 20191025: AFFECTS: users of x11/nvidia-driver (and slave ports) AUTHOR: danfe@FreeBSD.org Modified: head/www/qt5-webengine/Makefile ============================================================================== --- head/www/qt5-webengine/Makefile Sat Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/Makefile Sat Oct 26 22:00:04 2019 (r515731) @@ -18,7 +18,6 @@ PORTNAME= webengine DISTVERSION= ${QT5_VERSION} -PORTREVISION= 4 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -49,7 +48,7 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libwebp.so:graphics/webp DISTINFO_FILE= ${.CURDIR}/distinfo -QT5_VERSION= 5.12.2 +QT5_VERSION= 5.13.0 OPTIONS_SINGLE= AUDIO OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO @@ -74,7 +73,7 @@ SNDIO_VARS_OFF= QMAKE_CONFIGURE_ARGS+=-no-sndio # whether webenginewidgets is available, which fails when qmake processes all # .pro files at once. USES= gl gnome gperf jpeg python:2.7,build pkgconfig \ - qmake:norecursive,outsource qt-dist:5,webengine shebangfix + qmake:norecursive,outsource qt-dist:5,webengine shebangfix xorg USE_GL= gl USE_GNOME= glib20 libxml2 libxslt USE_QT= core declarative designer gui location network webchannel \ Modified: head/www/qt5-webengine/distinfo ============================================================================== --- head/www/qt5-webengine/distinfo Sat Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/distinfo Sat Oct 26 22:00:04 2019 (r515731) @@ -1,3 +1,3 @@ -TIMESTAMP = 1553273996 -SHA256 (KDE/Qt/5.12.2/qtwebengine-everywhere-src-5.12.2.tar.xz) = 082b1d6e60c1be61881bc8533acc67d9688620d6b3a538417f62b27b34ead493 -SIZE (KDE/Qt/5.12.2/qtwebengine-everywhere-src-5.12.2.tar.xz) = 249240772 +TIMESTAMP = 1561322470 +SHA256 (KDE/Qt/5.13.0/qtwebengine-everywhere-src-5.13.0.tar.xz) = e0af82ecee1ab41b6732697f667b98b7b0c53164bebcfaad8070e88b2e064efe +SIZE (KDE/Qt/5.13.0/qtwebengine-everywhere-src-5.13.0.tar.xz) = 256899724 Modified: head/www/qt5-webengine/files/freebsd.pri ============================================================================== --- head/www/qt5-webengine/files/freebsd.pri Sat Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/files/freebsd.pri Sat Oct 26 22:00:04 2019 (r515731) @@ -8,6 +8,4 @@ gn_args += enable_basic_printing=true \ # Once the port works better, we can think about readding the diverse `use_system_<foo>` # for bundled libraries. # For now, only add very few system libraries. -gn_args += use_system_yasm=true \ - use_system_libusb=true \ - use_system_libcxx=true +gn_args += use_system_yasm=true Modified: head/www/qt5-webengine/files/patch-clang ============================================================================== --- head/www/qt5-webengine/files/patch-clang Sat Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/files/patch-clang Sat Oct 26 22:00:04 2019 (r515731) @@ -40,7 +40,7 @@ --- src/3rdparty/chromium/third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig 2019-03-07 09:23:57 UTC +++ src/3rdparty/chromium/third_party/libjingle_xmpp/task_runner/taskrunner.cc -@@ -95,7 +95,7 @@ void TaskRunner::InternalRunTasks(bool in_destructor) +@@ -80,7 +80,7 @@ void TaskRunner::InternalRunTasks(bool in_destructor) std::vector<Task *>::iterator it; it = std::remove(tasks_.begin(), tasks_.end(), @@ -48,6 +48,7 @@ + static_cast<Task *>(NULL)); tasks_.erase(it, tasks_.end()); + tasks_running_ = false; --- 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 Modified: head/www/qt5-webengine/files/patch-mkspecs_features_functions.prf ============================================================================== --- head/www/qt5-webengine/files/patch-mkspecs_features_functions.prf Sat Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/files/patch-mkspecs_features_functions.prf Sat Oct 26 22:00:04 2019 (r515731) @@ -15,7 +15,7 @@ settings to gn. macos: return(mac) win32: return(win) linux: return(linux) -+ freebsd: return(bsd) ++ freebsd: return(freebsd) error(Unsupported platform) return(unknown) } Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn ============================================================================== --- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn Sat Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn Sat Oct 26 22:00:04 2019 (r515731) @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/BUILD.gn.orig 2019-01-16 10:59:47 UTC +--- src/3rdparty/chromium/BUILD.gn.orig 2019-03-01 17:04:22 UTC +++ src/3rdparty/chromium/BUILD.gn -@@ -356,7 +356,7 @@ group("gn_all") { +@@ -366,7 +366,7 @@ group("gn_all") { [ "//third_party/android_crazy_linker:android_crazy_linker_zip_fuzzer" ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -398,8 +398,6 @@ group("gn_all") { +@@ -408,8 +408,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -456,10 +454,6 @@ group("gn_all") { +@@ -466,10 +464,6 @@ group("gn_all") { "//chrome/test/chromedriver:chromedriver", "//chrome/test/chromedriver:chromedriver_tests", "//components/sync:run_sync_testserver", @@ -29,7 +29,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -527,10 +521,6 @@ group("gn_all") { +@@ -536,10 +530,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,16 +40,16 @@ ] if (!is_android) { -@@ -607,7 +597,7 @@ group("gn_all") { +@@ -614,7 +604,7 @@ group("gn_all") { host_os == "win" && !use_qt) { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } -- } else if (!is_android && !is_ios && !is_fuchsia) { -+ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) { +- } else if (!is_android && !is_ios && !is_fuchsia && !is_win) { ++ } else if (!is_android && !is_ios && !is_fuchsia && !is_win && !is_bsd) { deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -833,7 +823,6 @@ if (is_chromeos) { +@@ -853,7 +843,6 @@ if (is_chromeos) { "//ppapi/examples/video_decode", "//sandbox/linux:chrome_sandbox", "//sandbox/linux:sandbox_linux_unittests", @@ -57,7 +57,7 @@ # Blocked on https://github.com/catapult-project/catapult/issues/2297 #"//third_party/catapult/telemetry:bitmaptools", -@@ -956,7 +945,7 @@ if (!is_ios && !use_qt) { +@@ -958,7 +947,7 @@ if (!is_ios && !use_qt) { ] } @@ -66,7 +66,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -965,7 +954,7 @@ if (!is_ios && !use_qt) { +@@ -967,7 +956,7 @@ if (!is_ios && !use_qt) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -75,7 +75,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1090,9 +1079,6 @@ group("chromium_builder_perf") { +@@ -1091,9 +1080,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 Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn Sat Oct 26 22:00:04 2019 (r515731) @@ -1,17 +1,15 @@ ---- src/3rdparty/chromium/base/BUILD.gn.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/base/BUILD.gn.orig 2019-05-23 12:39:34 UTC +++ src/3rdparty/chromium/base/BUILD.gn -@@ -1248,8 +1248,8 @@ jumbo_component("base") { +@@ -1183,7 +1183,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. - if (!use_sysroot && (is_android || (is_linux && !is_chromecast && !use_qt)) && -- host_toolchain != "//build/toolchain/cros:host") { -+ if (!use_sysroot && (is_android || (is_linux && !is_chromecast && !use_qt) && !is_clang && -+ host_toolchain != "//build/toolchain/cros:host")) { ++ if (!use_sysroot && (is_android || (is_linux && !is_chromecast && !use_qt) && !is_clang) && + host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } - -@@ -1274,7 +1274,7 @@ jumbo_component("base") { +@@ -1209,7 +1209,7 @@ jumbo_component("base") { "allocator/allocator_shim_override_glibc_weak_symbols.h", ] deps += [ "//base/allocator:tcmalloc" ] @@ -20,7 +18,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ -@@ -1704,6 +1704,33 @@ jumbo_component("base") { +@@ -1749,6 +1749,33 @@ jumbo_component("base") { } } @@ -29,11 +27,10 @@ + "files/file_path_watcher_linux.cc", + "files/file_util_linux.cc", + "process/memory_linux.cc", -+ "process/process_linux.cc", + "process/process_handle_linux.cc", + "process/process_iterator_linux.cc", + "process/process_metrics_linux.cc", -+ "sys_info_linux.cc" ++ "system/sys_info_linux.cc" + ] + sources += [ + "files/file_path_watcher_kqueue.cc", @@ -43,18 +40,19 @@ + "process/process_handle_freebsd.cc", + "process/process_iterator_freebsd.cc", + "process/process_metrics_freebsd.cc", -+ "sys_info_freebsd.cc", ++ "system/sys_info_freebsd.cc", + ] + libs = [ + "execinfo", # logging.cc -+ "kvm" # process_metrics_freebsd ++ "kvm", # process_metrics_freebsd ++ "util" # process_metrics_freebsd + ] + } + # iOS if (is_ios) { set_sources_assignment_filter([]) -@@ -2693,6 +2720,12 @@ test("base_unittests") { +@@ -2805,6 +2832,12 @@ test("base_unittests") { ] set_sources_assignment_filter(sources_assignment_filter) } Added: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.cc Sat Oct 26 22:00:04 2019 (r515731) @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.cc.orig 2019-05-23 12:39:34 UTC ++++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.cc +@@ -115,7 +115,7 @@ void* AllocPages(void* address, + uintptr_t align_base_mask = ~align_offset_mask; + DCHECK(!(reinterpret_cast<uintptr_t>(address) & align_offset_mask)); + +-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS) + // On 64 bit Linux, we may need to adjust the address space limit for + // guarded allocations. + if (length >= kMinimumGuardedMemorySize) { Added: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h Sat Oct 26 22:00:04 2019 (r515731) @@ -0,0 +1,38 @@ +--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-05-23 12:39:34 UTC ++++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h +@@ -14,7 +14,7 @@ + #if defined(OS_MACOSX) + #include <mach/mach.h> + #endif +-#if defined(OS_LINUX) ++#if defined(OS_BSD) || defined(OS_LINUX) + #include <sys/resource.h> + + #include <algorithm> +@@ -48,7 +48,7 @@ int GetAccessFlags(PageAccessibilityConfiguration acce + } + } + +-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS) + + // Multiple guarded memory regions may exceed the process address space limit. + // This function will raise or lower the limit by |amount|. +@@ -68,7 +68,7 @@ bool AdjustAddressSpaceLimit(int64_t amount) { + // schemes that reduce that to 4 GiB. + constexpr size_t kMinimumGuardedMemorySize = 1ULL << 32; // 4 GiB + +-#endif // defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) ++#endif // (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS) + + void* SystemAllocPagesInternal(void* hint, + size_t length, +@@ -134,7 +134,7 @@ void SetSystemPagesAccessInternal( + void FreePagesInternal(void* address, size_t length) { + CHECK(!munmap(address, length)); + +-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS) + // Restore the address space limit. + if (length >= kMinimumGuardedMemorySize) { + CHECK(AdjustAddressSpaceLimit(-base::checked_cast<int64_t>(length))); Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_debugger__posix.cc ============================================================================== --- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_debugger__posix.cc Sat Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_debugger__posix.cc Sat Oct 26 22:00:04 2019 (r515731) @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/base/debug/debugger_posix.cc.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/base/debug/debugger_posix.cc.orig 2019-05-23 12:39:34 UTC +++ src/3rdparty/chromium/base/debug/debugger_posix.cc -@@ -84,7 +84,7 @@ bool BeingDebugged() { +@@ -86,7 +86,7 @@ bool BeingDebugged() { KERN_PROC, KERN_PROC_PID, getpid() -#if defined(OS_OPENBSD) -+#if defined(OS_BSD) ++#if defined(OS_BSD) , sizeof(struct kinfo_proc), 0 #endif -@@ -92,33 +92,37 @@ bool BeingDebugged() { +@@ -94,33 +94,35 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. @@ -19,21 +19,20 @@ + size_t info_size; -#if defined(OS_OPENBSD) - if (sysctl(mib, arraysize(mib), NULL, &info_size, NULL, 0) < 0) + if (sysctl(mib, base::size(mib), NULL, &info_size, NULL, 0) < 0) return -1; + info = (struct kinfo_proc *)malloc(info_size); -+ mib[5] = (info_size / sizeof(struct kinfo_proc)); -#endif -- int sysctl_result = sysctl(mib, arraysize(mib), &info, &info_size, NULL, 0); -+ int sysctl_result = sysctl(mib, arraysize(mib), info, &info_size, NULL, 0); +- int sysctl_result = sysctl(mib, base::size(mib), &info, &info_size, NULL, 0); ++ int sysctl_result = sysctl(mib, base::size(mib), info, &info_size, NULL, 0); DCHECK_EQ(sysctl_result, 0); if (sysctl_result != 0) { is_set = true; being_debugged = false; - return being_debugged; +- return being_debugged; + goto out; } Added: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace.cc Sat Oct 26 22:00:04 2019 (r515731) @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/debug/stack_trace.cc.orig 2019-05-23 12:39:34 UTC ++++ src/3rdparty/chromium/base/debug/stack_trace.cc +@@ -14,7 +14,7 @@ + + #if BUILDFLAG(CAN_UNWIND_WITH_FRAME_POINTERS) + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + #include <pthread.h> + #include "base/process/process_handle.h" + #include "base/threading/platform_thread.h" 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 Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc Sat Oct 26 22:00:04 2019 (r515731) @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/debug/stack_trace_posix.cc.orig 2018-11-13 18:25:11 UTC +--- 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 @@ -35,7 +35,7 @@ #include <AvailabilityMacros.h> @@ -9,16 +9,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -86,7 +86,7 @@ void DemangleSymbols(std::string* text) { - // Note: code in this function is NOT async-signal safe (std::string uses - // malloc internally). - --#if !defined(__UCLIBC__) && !defined(_AIX) -+#if !defined(__UCLIBC__) && !defined(_AIX) && !defined(OS_BSD) - std::string::size_type search_from = 0; - while (search_from < text->size()) { - // Look for the start of a mangled symbol, from search_from. -@@ -647,6 +647,11 @@ class SandboxSymbolizeHelper { +@@ -653,6 +653,11 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -30,7 +21,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -664,6 +669,7 @@ class SandboxSymbolizeHelper { +@@ -670,6 +675,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; Added: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc Sat Oct 26 22:00:04 2019 (r515731) @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/files/file_util_posix.cc.orig 2019-05-23 12:39:34 UTC ++++ src/3rdparty/chromium/base/files/file_util_posix.cc +@@ -407,7 +407,7 @@ bool CopyDirectoryExcl(const FilePath& from_path, + #endif // !defined(OS_NACL_NONSFI) + + bool CreateLocalNonBlockingPipe(int fds[2]) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0; + #else + int raw_fds[2]; Added: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_numerics_safe__math__shared__impl.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_numerics_safe__math__shared__impl.h Sat Oct 26 22:00:04 2019 (r515731) @@ -0,0 +1,13 @@ +--- src/3rdparty/chromium/base/numerics/safe_math_shared_impl.h.orig 2019-05-23 12:39:34 UTC ++++ src/3rdparty/chromium/base/numerics/safe_math_shared_impl.h +@@ -19,9 +19,7 @@ + + // Where available use builtin math overflow support on Clang and GCC. + #if !defined(__native_client__) && \ +- ((defined(__clang__) && \ +- ((__clang_major__ > 3) || \ +- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ ++ ((defined(__clang__) && (__clang_major__ > 6)) || \ + (defined(__GNUC__) && __GNUC__ >= 5)) + #include "base/numerics/safe_math_clang_gcc_impl.h" + #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) Added: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_posix_can__lower__nice__to.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_posix_can__lower__nice__to.cc Sat Oct 26 22:00:04 2019 (r515731) @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/base/posix/can_lower_nice_to.cc.orig 2019-03-01 17:04:22 UTC ++++ src/3rdparty/chromium/base/posix/can_lower_nice_to.cc +@@ -31,6 +31,9 @@ bool CanLowerNiceTo(int nice_value) { + if (geteuid() == 0) + return true; + ++#if defined(OS_BSD) ++ return false; ++#else + // 2. Skip checking the CAP_SYS_NICE permission because it would require + // libcap.so. + +@@ -54,6 +57,7 @@ bool CanLowerNiceTo(int nice_value) { + // And lowering niceness to |nice_value| is allowed if it is greater than or + // equal to the limit: + return nice_value >= lowest_nice_allowed; ++#endif + } + + } // namespace internal Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc ============================================================================== --- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc Sat Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc Sat Oct 26 22:00:04 2019 (r515731) @@ -1,10 +1,10 @@ ---- src/3rdparty/chromium/base/process/launch_posix.cc.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/base/process/launch_posix.cc.orig 2019-05-23 12:39:34 UTC +++ src/3rdparty/chromium/base/process/launch_posix.cc -@@ -65,6 +65,7 @@ - #include "base/feature_list.h" - #else - extern char** environ; -+#pragma weak environ +@@ -64,6 +64,7 @@ + #error "macOS should use launch_mac.cc" #endif + ++#pragma weak environ + extern char** environ; namespace base { Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__freebsd.cc ============================================================================== --- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__freebsd.cc Sat Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__freebsd.cc Sat Oct 26 22:00:04 2019 (r515731) @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_handle_freebsd.cc.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/base/process/process_handle_freebsd.cc.orig 2019-05-23 12:39:34 UTC +++ src/3rdparty/chromium/base/process/process_handle_freebsd.cc @@ -16,10 +16,13 @@ namespace base { @@ -8,7 +8,7 @@ + size_t length = sizeof(struct kinfo_proc); int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process }; - if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0) + if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) + return -1; + + if (length < sizeof(struct kinfo_proc)) Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__freebsd.cc ============================================================================== --- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__freebsd.cc Sat Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__freebsd.cc Sat Oct 26 22:00:04 2019 (r515731) @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_iterator_freebsd.cc.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/base/process/process_iterator_freebsd.cc.orig 2019-05-23 12:39:34 UTC +++ src/3rdparty/chromium/base/process/process_iterator_freebsd.cc @@ -10,6 +10,10 @@ #include <sys/sysctl.h> @@ -9,18 +9,18 @@ +#include <sys/types.h> + #include "base/logging.h" - #include "base/macros.h" + #include "base/stl_util.h" #include "base/strings/string_split.h" @@ -40,7 +44,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* num_of_kinfo_proc += 16; kinfo_procs_.resize(num_of_kinfo_proc); len = num_of_kinfo_proc * sizeof(struct kinfo_proc); -- if (sysctl(mib, arraysize(mib), &kinfo_procs_[0], &len, NULL, 0) <0) { -+ if (sysctl(mib, arraysize(mib), kinfo_procs_.data(), &len, NULL, 0) <0) { +- if (sysctl(mib, base::size(mib), &kinfo_procs_[0], &len, NULL, 0) < 0) { ++ if (sysctl(mib, base::size(mib), kinfo_procs_.data(), &len, NULL, 0) < 0) { // If we get a mem error, it just means we need a bigger buffer, so // loop around again. Anything else is a real error and give up. if (errno != ENOMEM) { -@@ -72,19 +76,13 @@ bool ProcessIterator::CheckForNextProcess() { +@@ -72,18 +76,13 @@ bool ProcessIterator::CheckForNextProcess() { for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) { size_t length; struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_]; @@ -31,15 +31,14 @@ continue; - length = 0; -- if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) < 0) { +- if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) { - LOG(ERROR) << "failed to figure out the buffer size for a command line"; - continue; - } - - data.resize(length); -- + data.resize(ARG_MAX); + length = ARG_MAX; - if (sysctl(mib, arraysize(mib), &data[0], &length, NULL, 0) < 0) { + + if (sysctl(mib, base::size(mib), &data[0], &length, NULL, 0) < 0) { LOG(ERROR) << "failed to fetch a commandline"; - continue; Added: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__linux.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__linux.cc Sat Oct 26 22:00:04 2019 (r515731) @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/base/process/process_linux.cc.orig 2019-05-23 12:39:34 UTC ++++ src/3rdparty/chromium/base/process/process_linux.cc +@@ -88,6 +88,7 @@ Time Process::CreationTime() const { + return Time(boot_time + start_offset); + } + ++#if !defined(OS_BSD) + // static + bool Process::CanBackgroundProcesses() { + #if defined(OS_CHROMEOS) +@@ -139,6 +140,7 @@ bool Process::SetProcessBackgrounded(bool background) + DPCHECK(result == 0); + return result == 0; + } ++#endif // !defined(OS_BSD) + + #if defined(OS_CHROMEOS) + bool IsProcessBackgroundedCGroup(const StringPiece& cgroup_contents) { Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc ============================================================================== --- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc Sat Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc Sat Oct 26 22:00:04 2019 (r515731) @@ -1,11 +1,20 @@ ---- src/3rdparty/chromium/base/process/process_metrics.cc.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/base/process/process_metrics.cc.orig 2019-05-23 12:39:34 UTC +++ src/3rdparty/chromium/base/process/process_metrics.cc -@@ -10,7 +10,7 @@ - #include "base/values.h" - #include "build/build_config.h" +@@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( + } + #endif -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) - namespace { - int CalculateEventsPerSecond(uint64_t event_count, - uint64_t* last_event_count, + int ProcessMetrics::CalculateIdleWakeupsPerSecond( + uint64_t absolute_idle_wakeups) { + return CalculateEventsPerSecond(absolute_idle_wakeups, +@@ -138,7 +138,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { + NOTIMPLEMENTED(); // http://crbug.com/120488 + return 0; + } +-#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + + #if defined(OS_MACOSX) + int ProcessMetrics::CalculatePackageIdleWakeupsPerSecond( Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h ============================================================================== --- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h Sat Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h Sat Oct 26 22:00:04 2019 (r515731) @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_metrics.h.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/base/process/process_metrics.h.orig 2019-05-23 12:39:34 UTC +++ src/3rdparty/chromium/base/process/process_metrics.h @@ -41,7 +41,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. @@ -18,21 +18,18 @@ // Convert a POSIX timeval to microseconds. BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv); -@@ -177,7 +177,7 @@ class BASE_EXPORT ProcessMetrics { - // otherwise. - bool GetIOCounters(IoCounters* io_counters) const; +@@ -92,7 +92,7 @@ class BASE_EXPORT ProcessMetrics { + // convenience wrapper for CreateProcessMetrics(). + static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); --#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_BSD) - // Returns the number of file descriptors currently open by the process, or - // -1 on error. - int GetOpenFdCount() const; -@@ -185,16 +185,16 @@ class BASE_EXPORT ProcessMetrics { - // Returns the soft limit of file descriptors that can be opened by the - // process, or -1 on error. +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + // Resident Set Size is a Linux/Android specific memory concept. Do not + // attempt to extend this to other platforms. + BASE_EXPORT size_t GetResidentSetSize() const; +@@ -199,14 +199,14 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; --#endif // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_BSD) + #endif // defined(OS_POSIX) -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) @@ -47,7 +44,7 @@ // Returns total memory usage of malloc. size_t GetMallocUsage(); -@@ -206,7 +206,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -218,7 +218,7 @@ class BASE_EXPORT ProcessMetrics { ProcessMetrics(ProcessHandle process, PortProvider* port_provider); #endif // !defined(OS_MACOSX) || defined(OS_IOS) @@ -56,16 +53,16 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if defined(OS_MACOSX) -@@ -229,7 +229,7 @@ class BASE_EXPORT ProcessMetrics { - TimeDelta last_cumulative_cpu_; - #endif +@@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics { + // Number of bytes transferred to/from disk in bytes. + uint64_t last_cumulative_disk_usage_ = 0; -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -275,7 +275,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -293,7 +293,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de #endif // defined(OS_POSIX) #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ @@ -74,7 +71,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -308,7 +308,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -326,7 +326,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int avail_phys = 0; #endif @@ -83,7 +80,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -323,7 +323,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -341,7 +341,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ @@ -92,7 +89,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -333,7 +333,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -351,7 +351,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int dirty = 0; int reclaimable = 0; #endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || @@ -101,9 +98,12 @@ #if defined(OS_CHROMEOS) int shmem = 0; -@@ -361,7 +361,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -377,9 +377,9 @@ struct BASE_EXPORT SystemMemoryInfoKB { + BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); + #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || - // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) +- // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) ++ // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD) -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc ============================================================================== --- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc Sat Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc Sat Oct 26 22:00:04 2019 (r515731) @@ -1,12 +1,21 @@ ---- src/3rdparty/chromium/base/process/process_metrics_freebsd.cc.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/base/process/process_metrics_freebsd.cc.orig 2019-05-23 12:39:34 UTC +++ src/3rdparty/chromium/base/process/process_metrics_freebsd.cc -@@ -14,11 +14,14 @@ +@@ -5,6 +5,7 @@ + #include "base/process/process_metrics.h" + + #include <stddef.h> ++#include <sys/types.h> + #include <sys/sysctl.h> + #include <sys/user.h> + #include <unistd.h> +@@ -14,11 +15,15 @@ #include "base/process/process_metrics_iocounters.h" #include "base/stl_util.h" +#include <unistd.h> /* getpagesize() */ +#include <fcntl.h> /* O_RDONLY */ +#include <kvm.h> ++#include <libutil.h> + namespace base { @@ -17,11 +26,10 @@ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( -@@ -68,5 +71,64 @@ size_t GetSystemCommitCharge() { - +@@ -69,4 +74,93 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } -+ + +int GetNumberOfThreads(ProcessHandle process) { + // Taken from FreeBSD top (usr.bin/top/machine.c) + @@ -43,8 +51,8 @@ + +bool GetSystemMemoryInfo(SystemMemoryInfoKB *meminfo) { + unsigned int mem_total, mem_free, swap_total, swap_used; -+ size_t length; -+ int pagesizeKB; ++ size_t length; ++ int pagesizeKB; + + pagesizeKB = getpagesize() / 1024; + @@ -76,9 +84,39 @@ + return true; +} + ++int ProcessMetrics::GetOpenFdCount() const { ++ struct kinfo_file * kif; ++ int cnt; ++ ++ if ((kif = kinfo_getfile(process_, &cnt)) == NULL) ++ return -1; ++ ++ free(kif); ++ ++ return cnt; ++} ++ ++int ProcessMetrics::GetOpenFdSoftLimit() const { ++ size_t length; ++ int total_count = 0; ++ int mib[] = { CTL_KERN, KERN_MAXFILESPERPROC }; ++ ++ length = sizeof(total_count); ++ ++ if (sysctl(mib, base::size(mib), &total_count, &length, NULL, 0) < 0) { ++ total_count = -1; ++ } ++ ++ return total_count; ++} ++ +uint64_t ProcessMetrics::GetVmSwapBytes() const { + NOTIMPLEMENTED(); + return 0; -+ } - ++} ++ ++int ProcessMetrics::GetIdleWakeupsPerSecond() { ++ NOTIMPLEMENTED(); ++ return 0; ++} } // namespace base Added: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc Sat Oct 26 22:00:04 2019 (r515731) @@ -0,0 +1,71 @@ +--- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig 2019-05-23 12:39:34 UTC ++++ src/3rdparty/chromium/base/system/sys_info_freebsd.cc +@@ -13,26 +13,58 @@ + namespace base { + + int64_t SysInfo::AmountOfPhysicalMemoryImpl() { +- int pages, page_size; ++ int pages, page_size, r = 0; + size_t size = sizeof(pages); +- sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); +- sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); +- if (pages == -1 || page_size == -1) { ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); ++ if(r == 0) ++ r =sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); ++ if(r == -1) { + NOTREACHED(); + return 0; + } + return static_cast<int64_t>(pages) * page_size; + } + +-// static +-uint64_t SysInfo::MaxSharedMemorySize() { +- size_t limit; +- size_t size = sizeof(limit); +- if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) { ++int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { ++ int page_size, r = 0; ++ unsigned pgfree, pginact, pgcache; ++ size_t size = sizeof(page_size); ++ size_t szpg = sizeof(pgfree); ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0); ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0); ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0); ++ if(r == -1) { + NOTREACHED(); + return 0; + } +- return static_cast<uint64_t>(limit); ++ return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size); ++} ++ ++// static ++std::string SysInfo::CPUModelName() { ++ int mib[] = { CTL_HW, HW_MODEL }; ++ char name[256]; ++ size_t size = base::size(name); ++ if (sysctl(mib, base::size(mib), &name, &size, NULL, 0) == 0) ++ return name; ++ return std::string(); ++} ++ ++int SysInfo::NumberOfProcessors() { ++ int mib[] = { CTL_HW, HW_NCPU }; ++ int ncpu; ++ size_t size = sizeof(ncpu); ++ if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) == -1) { ++ NOTREACHED(); ++ return 1; ++ } ++ return ncpu; + } + + } // namespace base Added: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc Sat Oct 26 22:00:04 2019 (r515731) @@ -0,0 +1,38 @@ +--- src/3rdparty/chromium/base/system/sys_info_posix.cc.orig 2019-05-23 12:39:34 UTC ++++ src/3rdparty/chromium/base/system/sys_info_posix.cc +@@ -38,7 +38,7 @@ + + namespace { + +-#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) ++#if !defined(OS_BSD) && !defined(OS_FUCHSIA) + int NumberOfProcessors() { + // sysconf returns the number of "logical" (not "physical") processors on both + // Mac and Linux. So we get the number of max available "logical" processors. +@@ -64,7 +64,7 @@ int NumberOfProcessors() { + + base::LazyInstance<base::internal::LazySysInfoValue<int, NumberOfProcessors>>:: + Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER; +-#endif // !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) ++#endif // !defined(OS_BSD) && !defined(OS_FUCHSIA) + + #if !defined(OS_FUCHSIA) + int64_t AmountOfVirtualMemory() { +@@ -132,7 +132,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, + + namespace base { + +-#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) ++#if !defined(OS_BSD) && !defined(OS_FUCHSIA) + int SysInfo::NumberOfProcessors() { + return g_lazy_number_of_processors.Get().value(); + } +@@ -225,6 +225,8 @@ std::string SysInfo::OperatingSystemArchitecture() { + arch = "x86"; + } else if (arch == "amd64") { + arch = "x86_64"; ++ } else if (arch == "arm64") { ++ arch = "aarch64"; + } else if (std::string(info.sysname) == "AIX") { + arch = "ppc64"; + } Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc ============================================================================== --- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc Sat Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc Sat Oct 26 22:00:04 2019 (r515731) @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/threading/platform_thread_linux.cc.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/base/threading/platform_thread_linux.cc.orig 2019-05-23 12:39:34 UTC +++ src/3rdparty/chromium/base/threading/platform_thread_linux.cc @@ -18,7 +18,9 @@ @@ -10,7 +10,16 @@ #include <sys/resource.h> #include <sys/time.h> #include <sys/types.h> -@@ -128,7 +130,7 @@ bool GetCurrentThreadPriorityForPlatform(ThreadPriorit +@@ -99,7 +101,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN + + Optional<bool> CanIncreaseCurrentThreadPriorityForPlatform( + ThreadPriority priority) { +-#if !defined(OS_NACL) ++#if !defined(OS_NACL) && !defined(OS_BSD) + // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke + // pthread_setschedparam in SetCurrentThreadPriorityForPlatform(). + struct rlimit rlim; +@@ -141,7 +143,7 @@ Optional<ThreadPriority> GetCurrentThreadPriorityForPl void PlatformThread::SetName(const std::string& name) { ThreadIdNameManager::GetInstance()->SetName(name); Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn ============================================================================== --- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn Sat Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn Sat Oct 26 22:00:04 2019 (r515731) @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/config/BUILD.gn.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/build/config/BUILD.gn.orig 2019-05-23 12:39:34 UTC +++ src/3rdparty/chromium/build/config/BUILD.gn -@@ -171,7 +171,7 @@ config("debug") { +@@ -166,7 +166,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } @@ -9,7 +9,7 @@ # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -273,9 +273,7 @@ config("default_libs") { +@@ -267,9 +267,7 @@ config("default_libs") { ] } else if (is_linux) { libs = [ @@ -19,12 +19,12 @@ ] } } -@@ -331,7 +329,7 @@ config("executable_config") { +@@ -346,7 +344,7 @@ config("executable_config") { "//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_executable_flags", ] - } else if (is_linux || is_android || current_os == "aix") { + } else if (is_linux || is_bsd || is_android || current_os == "aix") { - configs += [ "//build/config/gcc:executable_ldconfig" ] - if (is_android) { - configs += [ "//build/config/android:executable_config" ] + configs += [ "//build/config/gcc:executable_config" ] + if (is_chromecast) { + configs += [ "//build/config/chromecast:executable_config" ] Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn ============================================================================== --- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn Sat Oct 26 21:59:43 2019 (r515730) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn Sat Oct 26 22:00:04 2019 (r515731) @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/build/config/BUILDCONFIG.gn.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/build/config/BUILDCONFIG.gn.orig 2019-05-23 12:39:34 UTC +++ src/3rdparty/chromium/build/config/BUILDCONFIG.gn @@ -131,10 +131,10 @@ declare_args() { is_official_build = false # Whether we're a traditional desktop unix. - is_desktop_linux = current_os == "linux" -+ is_desktop_linux = current_os == "linux" || current_os == "bsd" ++ is_desktop_linux = current_os == "linux" || current_os == "freebsd" # Set to true when compiling with the Clang compiler. - is_clang = current_os != "linux" || -+ is_clang = current_os != "linux" || current_os == "bsd" || ++ is_clang = current_os != "linux" || current_os == "freebsd" || (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64") @@ -19,110 +19,30 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910262200.x9QM050c014013>