Date: Sat, 11 Mar 2023 06:00:45 GMT From: Robert Nagy <rnagy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: caf5f4c7c79d - 2023Q1 - www/ungoogled-chromium: update to 111.0.5563.64 Message-ID: <202303110600.32B60jax029646@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q1 has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=caf5f4c7c79daf2a846200fdcc4cda5e21d348dd commit caf5f4c7c79daf2a846200fdcc4cda5e21d348dd Author: Robert Nagy <rnagy@FreeBSD.org> AuthorDate: 2023-03-10 14:14:24 +0000 Commit: Robert Nagy <rnagy@FreeBSD.org> CommitDate: 2023-03-11 06:00:32 +0000 www/ungoogled-chromium: update to 111.0.5563.64 Approved by: rene (mentor) Security: https://vuxml.freebsd.org/freebsd/d357f6bb-0af4-4ac9-b096-eeec183ad829.html (cherry picked from commit aec9cb380ef07743425005ffcb6994c399ca10e1) --- www/ungoogled-chromium/Makefile | 2 +- www/ungoogled-chromium/distinfo | 14 +-- www/ungoogled-chromium/files/patch-BUILD.gn | 18 ++-- www/ungoogled-chromium/files/patch-base_BUILD.gn | 26 ++--- ...tion__allocator_address__space__randomization.h | 4 +- ...rtition__allocator_partition__address__space.cc | 4 +- ...cator_partition__allocator_partition__alloc.gni | 6 +- ...partition__allocator_partition__alloc__config.h | 38 +++---- ...tition__allocator_partition__alloc__constants.h | 10 +- ...artition__allocator_partition__alloc__forward.h | 4 +- ...locator_partition__allocator_partition__root.cc | 10 +- ...locator_partition__allocator_spinning__mutex.cc | 20 ++-- .../files/patch-base_debug_stack__trace.cc | 21 ++++ .../files/patch-base_debug_stack__trace__posix.cc | 26 ++--- .../files/patch-base_files_file__util__unittest.cc | 6 +- ...ch-base_posix_unix__domain__socket__unittest.cc | 6 +- .../files/patch-base_process_process__metrics.cc | 20 ++-- .../files/patch-base_process_process__metrics.h | 28 +++--- ...patch-base_process_process__metrics__freebsd.cc | 91 +++++++++-------- ...patch-base_process_process__metrics__openbsd.cc | 104 +++++++++---------- .../files/patch-base_process_process__unittest.cc | 4 +- .../patch-base_strings_safe__sprintf__unittest.cc | 6 +- .../files/patch-base_system_sys__info.cc | 4 +- .../files/patch-base_system_sys__info__posix.cc | 6 +- .../patch-base_test_launcher_test__launcher.cc | 4 +- ...patch-base_threading_platform__thread__posix.cc | 8 +- ...ch-base_threading_platform__thread__unittest.cc | 4 +- .../files/patch-build_config_BUILD.gn | 4 +- .../files/patch-build_config_compiler_BUILD.gn | 28 +++--- .../files/patch-build_config_linux_pkg-config.py | 4 +- .../files/patch-build_config_rust.gni | 4 +- .../files/patch-build_detect__host__arch.py | 4 +- .../files/patch-build_gn__run__binary.py | 4 +- .../files/patch-build_toolchain_gcc__toolchain.gni | 4 +- www/ungoogled-chromium/files/patch-cc_BUILD.gn | 6 +- .../files/patch-chrome_app_chrome__command__ids.h | 6 +- .../files/patch-chrome_app_chrome__main.cc | 6 +- .../patch-chrome_app_chrome__main__delegate.cc | 26 ++--- .../patch-chrome_app_generated__resources.grd | 16 +-- .../files/patch-chrome_app_settings__strings.grdp | 6 +- ...hrome_app_theme_chrome__unscaled__resources.grd | 10 +- .../patch-chrome_app_theme_theme__resources.grd | 8 +- .../files/patch-chrome_browser_about__flags.cc | 39 +++++--- ...ete_chrome__autocomplete__scheme__classifier.cc | 4 +- ...browser_background_background__mode__manager.cc | 4 +- .../patch-chrome_browser_browser__features.cc | 4 +- .../patch-chrome_browser_browser__process__impl.cc | 8 +- ..._browser_chrome__browser__interface__binders.cc | 12 +-- .../patch-chrome_browser_chrome__browser__main.cc | 6 +- ...ome_browser_chrome__content__browser__client.cc | 48 ++++++--- ...rome_browser_chrome__content__browser__client.h | 4 +- ...hrome__protocol__handler__registry__delegate.cc | 4 +- ...download_chrome__download__manager__delegate.cc | 6 +- ...h-chrome_browser_download_download__commands.cc | 6 +- ...ch-chrome_browser_download_download__commands.h | 4 +- ...hrome_browser_download_download__item__model.cc | 8 +- ...atch-chrome_browser_download_download__prefs.cc | 8 +- ...er_enterprise_connectors_connectors__service.cc | 4 +- ...t_device__trust__connector__service__factory.cc | 22 +---- ...ser_commands_key__rotation__command__factory.cc | 10 +- .../files/patch-chrome_browser_extensions_BUILD.gn | 4 +- ..._private_enterprise__reporting__private__api.cc | 10 +- ...__private_enterprise__reporting__private__api.h | 8 +- ...__private_passwords__private__delegate__impl.cc | 4 +- ...extensions_api_settings__private_prefs__util.cc | 6 +- ..._browser_extensions_external__provider__impl.cc | 6 +- ...e__file__system__access__permission__context.cc | 6 +- .../patch-chrome_browser_flag__descriptions.cc | 23 +++-- .../patch-chrome_browser_flag__descriptions.h | 21 ++-- ...chrome_browser_headless_headless__mode__util.cc | 6 +- ..._browser_media_webrtc_capture__policy__utils.cc | 20 ++++ ...wser_media_webrtc_chrome__screen__enumerator.cc | 47 +++++++++ ...owser_media_webrtc_chrome__screen__enumerator.h | 20 ++++ ...er_media_webrtc_webrtc__event__log__uploader.cc | 4 +- .../patch-chrome_browser_memory__details__linux.cc | 8 +- ...chrome__browser__main__extra__parts__metrics.cc | 8 +- ...ser_metrics_chrome__metrics__service__client.cc | 12 +-- .../patch-chrome_browser_platform__util__linux.cc | 4 +- ...onfiguration__policy__handler__list__factory.cc | 68 +++++++++---- .../patch-chrome_browser_prefs_browser__prefs.cc | 14 +-- ...er_prefs_pref__service__incognito__allowlist.cc | 4 +- ...er_printing_print__backend__service__manager.cc | 10 +- ...atch-chrome_browser_printing_printer__query.cc} | 8 +- ...hrome__browser__main__extra__parts__profiles.cc | 17 ++-- .../patch-chrome_browser_profiles_profile__impl.cc | 4 +- ...atch-chrome_browser_resources_settings_route.ts | 4 +- ...sync__confirmation_sync__confirmation__app.html | 10 +- ...tch-chrome_browser_sync_chrome__sync__client.cc | 14 +-- ...rowser_sync_device__info__sync__client__impl.cc | 4 +- ...h-chrome_browser_sync_sync__service__factory.cc | 8 +- ...me_browser_task__manager_sampling_task__group.h | 10 +- ..._task__manager_sampling_task__group__sampler.cc | 12 +-- .../files/patch-chrome_browser_ui_browser.h | 4 +- ...rome_browser_ui_browser__command__controller.cc | 10 +- .../files/patch-chrome_browser_ui_chrome__pages.cc | 4 +- .../files/patch-chrome_browser_ui_chrome__pages.h | 4 +- ...r_ui_startup_startup__browser__creator__impl.cc | 4 +- .../files/patch-chrome_browser_ui_tab__helpers.cc | 8 +- ...ui_task__manager_task__manager__table__model.cc | 8 +- ...h-chrome_browser_ui_views_accelerator__table.cc | 10 +- ...chrome_browser_ui_views_frame_browser__frame.cc | 12 +-- ...-chrome_browser_ui_views_frame_browser__view.cc | 4 +- ..._ui_views_frame_opaque__browser__frame__view.cc | 8 +- ...paque__browser__frame__view__layout__delegate.h | 4 +- ...e_picture__in__picture__browser__frame__view.cc | 34 +++---- ...me_picture__in__picture__browser__frame__view.h | 14 +-- ..._browser_ui_views_tabs_tab__drag__controller.cc | 14 +-- ...eb__apps_web__app__integration__test__driver.cc | 110 +++++++++++++++++++++ .../patch-chrome_browser_ui_webui_about__ui.cc | 6 +- ..._ui_webui_app__home_app__home__page__handler.cc | 13 +-- ...i_webui_chrome__web__ui__controller__factory.cc | 12 +-- ...i_connectors__internals_device__trust__utils.cc | 4 +- ...e_browser_ui_webui_management_management__ui.cc | 11 +++ ..._ui_webui_management_management__ui__handler.cc | 20 ++++ ...r_ui_webui_management_management__ui__handler.h | 11 +++ ..._browser_ui_webui_ntp_app__launcher__handler.cc | 11 +-- ...tings_settings__localized__strings__provider.cc | 14 +-- ...hrome_browser_ui_window__sizer_window__sizer.cc | 4 +- ...ions_commands_install__app__locally__command.cc | 11 +++ ...ications_extensions_extension__status__utils.cc | 10 +- ..._integration_os__integration__test__override.cc | 92 +++++++++++++++++ ...__integration_os__integration__test__override.h | 29 ++++++ ...tions_os__integration_shortcut__sub__manager.cc | 11 +++ ...lications_os__integration_web__app__shortcut.cc | 40 +------- ...plications_os__integration_web__app__shortcut.h | 24 +---- ..._os__integration_web__app__shortcut__manager.cc | 4 +- ...browser_web__applications_web__app__provider.cc | 4 +- ...thn_chrome__authenticator__request__delegate.cc | 4 +- .../files/patch-chrome_common_chrome__features.cc | 16 +-- .../files/patch-chrome_common_chrome__features.h | 10 +- .../files/patch-chrome_common_chrome__switches.cc | 4 +- .../files/patch-chrome_common_pref__names.cc | 23 +++-- .../files/patch-chrome_common_pref__names.h | 23 +++-- .../files/patch-chrome_common_url__constants.cc | 4 +- .../files/patch-chrome_common_url__constants.h | 4 +- .../patch-chrome_common_webui__url__constants.cc | 12 +-- .../patch-chrome_common_webui__url__constants.h | 8 +- ...ome_renderer_chrome__render__frame__observer.cc | 4 +- ...vices_printing_print__backend__service__impl.cc | 10 +- .../files/patch-chrome_test_BUILD.gn | 4 +- ...interaction_interaction__test__util__browser.cc | 6 +- .../files/patch-chrome_updater_ipc_ipc__names.h | 11 --- .../files/patch-chrome_updater_updater.cc | 11 --- .../files/patch-chrome_updater_util_posix__util.cc | 11 +-- ...hromecast_browser_cast__browser__main__parts.cc | 10 +- ...ecast_browser_cast__content__browser__client.cc | 4 +- ...tch-components_autofill__payments__strings.grdp | 4 +- ...utofill_core_browser_personal__data__manager.cc | 4 +- ...ill_core_common_autofill__payments__features.cc | 4 +- ...bedder__support_user__agent__utils__unittest.cc | 6 +- ...e__engagement_public_feature__configurations.cc | 4 +- ...eature__engagement_public_feature__constants.cc | 6 +- ...feature__engagement_public_feature__constants.h | 8 +- ...nts_feature__engagement_public_feature__list.cc | 8 +- ...ents_feature__engagement_public_feature__list.h | 14 +-- .../patch-components_feed_core_v2_proto__util.cc | 6 +- ...aint__preview_browser_paint__preview__client.cc | 4 +- ..._preview_player_player__compositor__delegate.cc | 4 +- ...nager_core_browser_login__database__unittest.cc | 8 +- ...ager_core_common_password__manager__features.cc | 15 +-- ...nager_core_common_password__manager__features.h | 4 +- ...icy_core_browser_policy__pref__mapping__test.cc | 4 +- ...licy_core_common_cloud_cloud__policy__client.cc | 4 +- ..._default__model_cross__device__user__segment.cc | 4 +- ...paint__preview__compositor__collection__impl.cc | 8 +- ..._ai_sandbox_screen__ai__sandbox__hook__linux.cc | 4 +- ...ch-components_viz_host_host__display__client.cc | 4 +- ...isplay__embedder_skia__output__surface__impl.cc | 4 +- ...omponents_viz_service_display_skia__renderer.cc | 4 +- ...e__sinks_root__compositor__frame__sink__impl.cc | 4 +- ...me__sinks_root__compositor__frame__sink__impl.h | 4 +- .../files/patch-content_app_content__main.cc | 4 +- ...atch-content_app_content__main__runner__impl.cc | 32 +++--- .../files/patch-content_browser_BUILD.gn | 4 +- .../patch-content_browser_browser__main__loop.cc | 8 +- ...wser_child__process__launcher__helper__linux.cc | 65 ++++++++++-- ..._compositor_viz__process__transport__factory.cc | 4 +- ...ent_browser_network__service__instance__impl.cc | 12 +-- ...er_renderer__host_back__forward__cache__impl.cc | 11 +++ ...r_renderer__host_render__process__host__impl.cc | 16 +-- ...er_renderer__host_render__process__host__impl.h | 8 +- ...wser_renderer__host_render__view__host__impl.cc | 4 +- ...derer__host_render__widget__host__view__aura.cc | 12 +-- ...h-content_browser_utility__sandbox__delegate.cc | 6 +- .../patch-content_browser_v8__snapshot__files.cc | 14 +-- ...wser_web__contents_web__contents__view__aura.cc | 4 +- ...browser_webui_web__ui__main__frame__observer.cc | 4 +- .../files/patch-content_common_BUILD.gn | 6 +- .../patch-content_gpu_gpu__sandbox__hook__linux.cc | 12 +-- ...-content_public_browser_render__process__host.h | 4 +- ...atch-content_public_common_content__features.cc | 21 ++-- ...patch-content_public_common_content__features.h | 13 +-- ...atch-content_public_common_content__switches.cc | 6 +- ...patch-content_public_common_content__switches.h | 6 +- ...patch-content_public_common_zygote_features.gni | 6 +- ...tch-content_public_test_mock__render__thread.cc | 4 +- .../files/patch-content_renderer_BUILD.gn | 4 +- ...patch-content_renderer_render__process__impl.cc | 13 +-- .../patch-content_renderer_render__thread__impl.cc | 14 +-- ...ent_renderer_renderer__blink__platform__impl.cc | 10 +- ...tent_renderer_renderer__blink__platform__impl.h | 6 +- .../files/patch-content_shell_BUILD.gn | 4 +- ...hell_utility_shell__content__utility__client.cc | 6 +- .../files/patch-content_test_BUILD.gn | 6 +- .../files/patch-content_utility_services.cc | 14 +-- .../files/patch-content_utility_utility__main.cc | 10 +- .../patch-device_gamepad_gamepad__provider.cc | 4 +- .../patch-extensions_browser_extension__prefs.cc | 4 +- ...tensions_common_api___permission__features.json | 6 +- ...h-google__apis_gcm_engine_heartbeat__manager.cc | 8 +- ...image_angle__vulkan__image__backing__factory.cc | 4 +- ...e_shared__image_external__vk__image__backing.cc | 6 +- ..._image_external__vk__image__backing__factory.cc | 4 +- ...ce_shared__image_gl__texture__image__backing.cc | 11 --- ...__image_gl__texture__image__backing__factory.cc | 11 --- ...ce_shared__image_wrapped__sk__image__backing.cc | 11 +++ ...__image_wrapped__sk__image__backing__factory.cc | 11 --- ...ommand__buffer_service_webgpu__decoder__impl.cc | 4 +- ...__buffer_tests_gl__oes__egl__image__unittest.cc | 4 +- ...ch-gpu_command__buffer_tests_gl__test__utils.cc | 4 +- .../files/patch-gpu_ipc_service_gpu__init.cc | 20 ++-- ...gpu_ipc_service_gpu__memory__buffer__factory.cc | 6 +- ...adless_lib_headless__content__main__delegate.cc | 8 +- .../files/patch-ipc_ipc__channel.h | 4 +- ...h-media_audio_audio__output__proxy__unittest.cc | 4 +- .../files/patch-media_audio_sndio_sndio__input.cc | 5 +- .../files/patch-media_base_media__switches.cc | 28 +----- .../files/patch-media_base_media__switches.h | 6 +- .../files/patch-media_base_supported__types.cc | 4 +- .../files/patch-media_base_video__frame.cc | 18 ++-- ...ideo_create__video__capture__device__factory.cc | 6 +- ..._capture_video_linux_v4l2__capture__delegate.cc | 8 +- ...a_capture_video_linux_v4l2__capture__delegate.h | 4 +- ...linux_video__capture__device__factory__linux.cc | 10 +- ...-media_gpu_chromeos_video__decoder__pipeline.cc | 27 ++++- ...ideo_gpu__memory__buffer__video__frame__pool.cc | 8 +- ...ia_video_video__encode__accelerator__adapter.cc | 6 +- ...eo_video__encode__accelerator__adapter__test.cc | 4 +- .../files/patch-media_webrtc_audio__processor.cc | 4 +- .../files/patch-mojo_core_channel.cc | 4 +- .../patch-mojo_public_tools_bindings_mojom.gni | 4 +- www/ungoogled-chromium/files/patch-net_BUILD.gn | 16 +-- .../patch-net_base_network__change__notifier.cc | 4 +- .../files/patch-net_cert_cert__verify__proc.cc | 4 +- .../patch-net_cert_cert__verify__proc__unittest.cc | 4 +- ...net_proxy__resolution_proxy__config__service.cc | 4 +- ..._tools_cert__verify__tool_cert__verify__tool.cc | 10 +- ..._url__request_url__request__context__builder.cc | 4 +- .../files/patch-pdf_pdfium_pdfium__engine.cc | 4 +- ...nting_mojom_printing__context__mojom__traits.cc | 4 +- .../files/patch-printing_print__settings.cc | 6 +- .../files/patch-printing_print__settings.h | 10 +- .../patch-printing_print__settings__conversion.cc | 4 +- ...ting_host_base_desktop__environment__options.cc | 11 +++ ...ch-remoting_host_basic__desktop__environment.cc | 4 +- .../files/patch-remoting_host_chromoting__host.cc | 4 +- ...atch-remoting_host_chromoting__host__context.cc | 4 +- ...patch-remoting_host_desktop__capturer__proxy.cc | 20 ++++ .../files/patch-remoting_host_host__attributes.cc | 4 +- .../files/patch-remoting_host_host__main.cc | 4 +- .../files/patch-remoting_host_it2me_it2me__host.cc | 29 ++++++ ...t_it2me_it2me__native__messaging__host__main.cc | 34 +++---- ...ch-remoting_host_me2me__desktop__environment.cc | 23 +++-- ...-remoting_host_mouse__cursor__monitor__proxy.cc | 11 +++ ...st_remote__open__url_remote__open__url__util.cc | 6 +- .../patch-remoting_host_remoting__me2me__host.cc | 66 ++++++++----- .../patch-remoting_host_setup_start__host__main.cc | 6 +- ...atch-sandbox_policy_freebsd_sandbox__freebsd.cc | 6 +- .../files/patch-sandbox_policy_mojom_sandbox.mojom | 8 +- ...atch-sandbox_policy_openbsd_sandbox__openbsd.cc | 8 +- .../files/patch-sandbox_policy_sandbox__type.cc | 26 ++--- .../files/patch-sandbox_policy_switches.cc | 6 +- .../files/patch-sandbox_policy_switches.h | 6 +- ...ices_cert__verifier_cert__verifier__creation.cc | 4 +- ...ices_device_geolocation_location__arbitrator.cc | 4 +- ...ch-services_device_hid_hid__connection__fido.cc | 8 +- ...services_device_hid_hid__connection__freebsd.cc | 8 +- ...patch-services_device_hid_hid__service__fido.cc | 13 +-- ...ch-services_device_hid_hid__service__freebsd.cc | 12 +-- .../patch-services_device_public_mojom_BUILD.gn | 4 +- ...ces_device_serial_serial__device__enumerator.cc | 6 +- ...ces_device_serial_serial__io__handler__posix.cc | 4 +- ...patch-services_device_usb_usb__service__fake.cc | 8 +- .../files/patch-services_network_BUILD.gn | 4 +- ...ture_public_mojom_video__capture__service.mojom | 4 +- ...y_abseil-cpp_absl_base_internal_raw__logging.cc | 16 +++ .../files/patch-third__party_angle_BUILD.gn | 38 ++----- ...h-third__party_angle_src_common_vulkan_BUILD.gn | 11 --- ...rty_angle_src_libANGLE_renderer_driver__utils.h | 4 +- ...ird__party_angle_src_third__party_volk_BUILD.gn | 11 --- ...blink_renderer_controller_blink__initializer.cc | 8 +- ...link_renderer_core_editing_editing__behavior.cc | 4 +- ...blink_renderer_core_exported_web__view__impl.cc | 6 +- ...y_blink_renderer_core_frame_web__frame__test.cc | 6 +- ...renderer_modules_ml_webnn_ml__graph__xnnpack.cc | 4 +- ...peerconnection_webrtc__audio__renderer__test.cc | 4 +- ...odules_webgl_webgl__rendering__context__base.cc | 4 +- ...h-third__party_blink_renderer_platform_BUILD.gn | 4 +- ...rty_blink_renderer_platform_fonts_font__cache.h | 8 +- ...nk_renderer_platform_fonts_font__description.cc | 4 +- ...nderer_platform_fonts_skia_font__cache__skia.cc | 6 +- ..._peerconnection_rtc__video__encoder__factory.cc | 4 +- ...derer_platform_runtime__enabled__features.json5 | 12 +-- ...widget_compositing_categorized__worker__pool.cc | 4 +- ...arty_blink_renderer_platform_wtf_stack__util.cc | 4 +- ..._renderer_platform_wtf_text_text__codec__icu.cc | 39 -------- ...rypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl | 6 +- ...ty_boringssl_src_util_generate__build__files.py | 6 +- ...ashpad_crashpad_build_crashpad__buildconfig.gni | 4 +- ...-third__party_crashpad_crashpad_client_BUILD.gn | 4 +- ...g_chromium_config_Chrome_openbsd_arm64_config.h | 23 +++-- ...onfig_Chrome_openbsd_arm64_config__components.h | 66 ++++++++++++- ..._chromium_config_Chrome_openbsd_ia32_config.asm | 23 +++-- ...eg_chromium_config_Chrome_openbsd_ia32_config.h | 25 +++-- ...config_Chrome_openbsd_ia32_config__components.h | 66 ++++++++++++- ...rd__party_libusb_src_libusb_os_threads__posix.c | 24 +++++ .../files/patch-third__party_libxml_src_dict.c | 22 ++--- ...rd__party_perfetto_include_perfetto_base_time.h | 20 +++- ...ch-third__party_skia_src_base_SkContainers.cpp} | 8 +- ...-third__party_sqlite_src_amalgamation_sqlite3.c | 6 +- ...tch-third__party_swiftshader_src_WSI_libXCB.cpp | 6 +- ...n-validation-layers_src_layers_vk__mem__alloc.h | 4 +- .../files/patch-third__party_webrtc_BUILD.gn | 4 +- ...rd__party_webrtc_modules_audio__device_BUILD.gn | 4 +- .../patch-third__party_webrtc_rtc__base_BUILD.gn | 11 --- ...son__schema__compiler_cpp__bundle__generator.py | 4 +- ...ols_json__schema__compiler_feature__compiler.py | 4 +- .../patch-tools_protoc__wrapper_protoc__wrapper.py | 4 +- .../files/patch-ui_base_cursor_cursor__factory.cc | 4 +- .../files/patch-ui_base_cursor_cursor__factory.h | 4 +- .../files/patch-ui_base_ui__base__features.cc | 6 +- .../files/patch-ui_base_webui_web__ui__util.cc | 4 +- .../files/patch-ui_base_x_x11__shm__image__pool.cc | 14 +-- .../files/patch-ui_color_color__id.h | 4 +- .../files/patch-ui_compositor_compositor.cc | 4 +- .../files/patch-ui_compositor_compositor.h | 4 +- www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn | 4 +- www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn | 8 +- .../files/patch-ui_gl_gl__features.h | 11 --- .../files/patch-ui_gl_gl__implementation.cc | 4 +- .../patch-ui_gtk_printing_print__dialog__gtk.cc | 4 +- ...platform_headless_headless__surface__factory.cc | 4 +- ...tform_wayland_host_wayland__toplevel__window.cc | 11 +++ ...atform_wayland_host_wayland__toplevel__window.h | 11 +++ ...i_ozone_platform_wayland_host_wayland__window.h | 11 +++ ...rm_wayland_host_xdg__toplevel__wrapper__impl.cc | 11 +++ ...ne_platform_wayland_ozone__platform__wayland.cc | 8 +- ...h-ui_ozone_platform_x11_ozone__platform__x11.cc | 4 +- .../patch-ui_views_controls_textfield_textfield.cc | 12 +-- .../patch-ui_views_controls_textfield_textfield.h | 4 +- .../files/patch-ui_views_corewm_tooltip__aura.cc | 4 +- ...__aura_desktop__window__tree__host__platform.cc | 4 +- ...e__host__platform__impl__interactive__uitest.cc | 4 +- .../patch-ui_views_window_dialog__delegate.cc | 4 +- www/ungoogled-chromium/files/patch-v8_BUILD.gn | 8 +- .../files/patch-v8_src_api_api.cc | 4 +- .../patch-v8_src_base_platform_platform-posix.cc | 6 +- .../files/patch-v8_src_execution_isolate.cc | 4 +- www/ungoogled-chromium/pkg-plist | 1 + 359 files changed, 2297 insertions(+), 1670 deletions(-) diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index c445afb68e02..a31212f0f63b 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 110.0.5481.177 +PORTVERSION= 111.0.5563.64 UGVERSION= ${DISTVERSION}-1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index 4d68ef72cc59..138cdfce1009 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1677157267 -SHA256 (chromium-110.0.5481.177.tar.xz) = 7b2f454d1195270a39f94a9ff6d8d68126be315e0da4e31c20f4ba9183a1c9b7 -SIZE (chromium-110.0.5481.177.tar.xz) = 1703390456 -SHA256 (ungoogled-chromium-110.0.5481.177-1.tar.gz) = 602c2bd0f93e5618f3a32a71a11d48a0c8aa881ac3e4dc0ba7d64fd97896c4a7 -SIZE (ungoogled-chromium-110.0.5481.177-1.tar.gz) = 671978 -SHA256 (chromium-110.0.5481.177-testdata.tar.xz) = f8c092b99b1a29cbd6e7deb6868c84ac4e05a276584332971c0a578a7187b06d -SIZE (chromium-110.0.5481.177-testdata.tar.xz) = 265092148 +TIMESTAMP = 1678446139 +SHA256 (chromium-111.0.5563.64.tar.xz) = 7d5ca0e2bdb22a97713e6bfce74c651006d71aa883056c8e2c2a148039fe4074 +SIZE (chromium-111.0.5563.64.tar.xz) = 1740670460 +SHA256 (ungoogled-chromium-111.0.5563.64-1.tar.gz) = 2ad44997d95ae66b36125bf62bf1308006ec62da26ba04f8b5480d7271675079 +SIZE (ungoogled-chromium-111.0.5563.64-1.tar.gz) = 672674 +SHA256 (chromium-111.0.5563.64-testdata.tar.xz) = 944ddbc5c47541498d18f0f4d49d8dfe2f38c3553e8d589c1150748c6c7383eb +SIZE (chromium-111.0.5563.64-testdata.tar.xz) = 263698728 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/ungoogled-chromium/files/patch-BUILD.gn b/www/ungoogled-chromium/files/patch-BUILD.gn index 6528678063ad..86116f19a56c 100644 --- a/www/ungoogled-chromium/files/patch-BUILD.gn +++ b/www/ungoogled-chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2023-02-11 09:11:04 UTC +--- BUILD.gn.orig 2023-03-10 11:01:21 UTC +++ BUILD.gn @@ -60,7 +60,7 @@ declare_args() { root_extra_deps = [] @@ -17,8 +17,8 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -425,7 +424,7 @@ group("gn_all") { - ] +@@ -417,7 +416,7 @@ group("gn_all") { + } } - if (is_linux || is_chromeos || is_android) { @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -616,6 +615,15 @@ group("gn_all") { +@@ -608,6 +607,15 @@ group("gn_all") { } } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:crash_inspector", -@@ -664,7 +672,7 @@ group("gn_all") { +@@ -656,7 +664,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -51,7 +51,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1086,7 +1094,7 @@ if (!is_ios) { +@@ -1078,7 +1086,7 @@ if (!is_ios) { ] } @@ -60,7 +60,7 @@ # WPT Webdriver tests runner # chrome/test/chromedriver/test/run_webdriver_tests.py script_test("webdriver_wpt_tests") { -@@ -1182,7 +1190,7 @@ if (!is_ios) { +@@ -1178,7 +1186,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,7 +69,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1191,7 +1199,7 @@ if (!is_ios) { +@@ -1187,7 +1195,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -78,7 +78,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1656,7 +1664,7 @@ group("chromium_builder_perf") { +@@ -1653,7 +1661,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/ungoogled-chromium/files/patch-base_BUILD.gn b/www/ungoogled-chromium/files/patch-base_BUILD.gn index d6b9c663f0ab..35bf548cd320 100644 --- a/www/ungoogled-chromium/files/patch-base_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2023-02-11 09:11:04 UTC +--- base/BUILD.gn.orig 2023-03-10 11:01:21 UTC +++ base/BUILD.gn -@@ -162,7 +162,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -168,7 +168,7 @@ buildflag_header("ios_cronet_buildflags") { flags = [ "CRONET_BUILD=$is_cronet_build" ] } @@ -9,7 +9,7 @@ buildflag_header("message_pump_buildflags") { header = "message_pump_buildflags.h" header_dir = "base/message_loop" -@@ -1052,7 +1052,7 @@ component("base") { +@@ -1053,7 +1053,7 @@ component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -18,7 +18,7 @@ sources += [ "profiler/stack_base_address_posix.cc", "profiler/stack_base_address_posix.h", -@@ -1063,6 +1063,14 @@ component("base") { +@@ -1064,6 +1064,14 @@ component("base") { "profiler/thread_delegate_posix.h", ] } @@ -33,7 +33,7 @@ } if (is_win) { -@@ -1550,11 +1558,23 @@ component("base") { +@@ -1544,11 +1552,23 @@ 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. @@ -58,7 +58,7 @@ if (use_allocator_shim) { sources += [ "allocator/partition_allocator/shim/allocator_shim.cc", -@@ -1582,7 +1602,7 @@ component("base") { +@@ -1576,7 +1596,7 @@ component("base") { ] configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ] } @@ -67,7 +67,7 @@ sources += [ "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h", "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h", -@@ -1623,7 +1643,7 @@ component("base") { +@@ -1617,7 +1637,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -76,7 +76,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2211,6 +2231,39 @@ component("base") { +@@ -2208,6 +2228,39 @@ component("base") { } } @@ -116,7 +116,7 @@ # iOS if (is_ios) { sources -= [ -@@ -2306,7 +2359,7 @@ component("base") { +@@ -2303,7 +2356,7 @@ component("base") { } if (dep_libevent) { @@ -125,7 +125,7 @@ } if (use_libevent) { -@@ -3560,7 +3613,7 @@ test("base_unittests") { +@@ -3556,7 +3609,7 @@ test("base_unittests") { } } @@ -134,7 +134,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3606,7 +3659,7 @@ test("base_unittests") { +@@ -3602,7 +3655,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -143,7 +143,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3617,7 +3670,7 @@ test("base_unittests") { +@@ -3613,7 +3666,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -152,7 +152,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3827,7 +3880,7 @@ test("base_unittests") { +@@ -3829,7 +3882,7 @@ test("base_unittests") { } } diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h index bbdbf6a76c02..3514d8f2f8d4 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-10-01 07:40:07 UTC +--- base/allocator/partition_allocator/address_space_randomization.h.orig 2023-03-10 11:01:21 UTC +++ base/allocator/partition_allocator/address_space_randomization.h @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) { @@ -9,7 +9,7 @@ // We shouldn't allocate system pages at all for sanitizer builds. However, // we do, and if random hint addresses interfere with address ranges -@@ -128,7 +128,7 @@ AslrMask(uintptr_t bits) { +@@ -124,7 +124,7 @@ AslrMask(uintptr_t bits) { return AslrAddress(0x20000000ULL); } diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc index e8725e5a81e6..fe455288d15b 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-02-11 09:11:04 UTC +--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-03-10 11:01:21 UTC +++ base/allocator/partition_allocator/partition_address_space.cc -@@ -440,7 +440,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting() +@@ -416,7 +416,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting() } #endif diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni index 451ea599b978..0261fab25a2f 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -1,7 +1,7 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-02-11 09:11:04 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-03-10 11:01:21 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -200,7 +200,7 @@ assert(!use_asan_unowned_ptr || is_asan, - "AsanUnownedPtr requires AddressSanitizer") +@@ -233,7 +233,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt + "AsanBackupRefPtr requires RawPtrHookableImpl") declare_args() { - enable_pkeys = is_linux && target_cpu == "x64" diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h index 80614a440ee2..aa630f131c07 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h @@ -1,29 +1,29 @@ ---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-02-11 09:11:04 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-03-10 11:01:21 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h -@@ -84,7 +84,7 @@ static_assert(sizeof(void*) != 8, ""); - +@@ -120,7 +120,7 @@ static_assert(sizeof(void*) != 8, ""); // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific // features such as futex(2). --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #define PA_HAS_LINUX_KERNEL - #endif - -@@ -220,7 +220,7 @@ constexpr bool kUseLazyCommit = false; + #define PA_CONFIG_HAS_LINUX_KERNEL() \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) + // On some platforms, we implement locking by spinning in userspace, then going + // into the kernel only if there is contention. This requires platform support, +@@ -267,7 +267,7 @@ constexpr bool kUseLazyCommit = false; // On these platforms, lock all the partitions before fork(), and unlock after. // This may be required on more platforms in the future. --#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #define PA_HAS_ATFORK_HANDLER - #endif + #define PA_CONFIG_HAS_ATFORK_HANDLER() \ +- (BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++ (BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) -@@ -264,7 +264,7 @@ constexpr bool kUseLazyCommit = false; - // + // PartitionAlloc uses PartitionRootEnumerator to acquire all + // PartitionRoots at BeforeFork and to release at AfterFork. +@@ -312,7 +312,7 @@ constexpr bool kUseLazyCommit = false; // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to // larger slot spans. --#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) -+#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD) - #define PA_PREFER_SMALLER_SLOT_SPANS - #endif + #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \ +- (BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))) ++ (BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD)) + // Enable shadow metadata. + // diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h index 2e3cb75a345d..5fc1c4ad9b2e 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-02-11 09:11:04 UTC +--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-03-10 11:01:21 UTC +++ base/allocator/partition_allocator/partition_alloc_constants.h @@ -91,7 +91,7 @@ PartitionPageShift() { return 18; // 256 KiB @@ -9,12 +9,12 @@ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t PartitionPageShift() { return PageAllocationGranularityShift() + 2; -@@ -278,7 +278,7 @@ constexpr size_t kNumPools = 3; +@@ -277,7 +277,7 @@ constexpr size_t kNumPools = 3; + // // When pointer compression is enabled, we cannot use large pools (at most // 8GB for each of the glued pools). - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \ -- defined(PA_POINTER_COMPRESSION) -+ defined(PA_POINTER_COMPRESSION) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) || BUILDFLAG(IS_BSD) constexpr size_t kPoolMaxSize = 8 * kGiB; #else constexpr size_t kPoolMaxSize = 16 * kGiB; diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__forward.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__forward.h index fbaa149594dc..4d2bf1e1e44c 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__forward.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__forward.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_forward.h.orig 2022-11-06 16:08:29 UTC +--- base/allocator/partition_allocator/partition_alloc_forward.h.orig 2023-03-10 11:01:21 UTC +++ base/allocator/partition_allocator/partition_alloc_forward.h -@@ -25,9 +25,13 @@ namespace internal { +@@ -27,9 +27,13 @@ namespace internal { // the second one 16. We could technically return something different for // malloc() and operator new(), but this would complicate things, and most of // our allocations are presumably coming from operator new() anyway. diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__root.cc index a193c0a9aa94..9eb8a4b38e78 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__root.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__root.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_root.cc.orig 2023-01-13 08:56:02 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2023-03-10 11:01:21 UTC +++ base/allocator/partition_allocator/partition_root.cc @@ -42,7 +42,7 @@ #include "wow64apiset.h" @@ -9,16 +9,16 @@ #include <pthread.h> #endif -@@ -239,7 +239,7 @@ void PartitionAllocMallocInitOnce() { - if (!g_global_init_called.compare_exchange_strong(expected, true)) +@@ -245,7 +245,7 @@ void PartitionAllocMallocInitOnce() { return; + } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -332,7 +332,7 @@ static size_t PartitionPurgeSlotSpan( +@@ -339,7 +339,7 @@ static size_t PartitionPurgeSlotSpan( constexpr size_t kMaxSlotCount = (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / MinPurgeableSlotSize(); @@ -27,7 +27,7 @@ // It's better for slot_usage to be stack-allocated and fixed-size, which // demands that its size be constexpr. On IS_APPLE and Linux on arm64, // PartitionPageSize() is always SystemPageSize() << 2, so regardless of -@@ -789,7 +789,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions +@@ -800,7 +800,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc index f99049492e24..284fcc7a5542 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc @@ -1,10 +1,11 @@ ---- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-10-01 07:40:07 UTC +--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2023-03-10 11:01:21 UTC +++ base/allocator/partition_allocator/spinning_mutex.cc -@@ -18,7 +18,15 @@ +@@ -18,7 +18,16 @@ - #if defined(PA_HAS_LINUX_KERNEL) + #if PA_CONFIG(HAS_LINUX_KERNEL) #include <errno.h> +#if defined(OS_OPENBSD) ++#include <sys/time.h> +#include <sys/futex.h> +#elif defined(OS_FREEBSD) +#include <sys/types.h> @@ -15,14 +16,17 @@ +#endif #include <sys/syscall.h> #include <unistd.h> - #endif // defined(PA_HAS_LINUX_KERNEL) -@@ -107,8 +115,13 @@ void SpinningMutex::FutexWait() { + #endif // PA_CONFIG(HAS_LINUX_KERNEL) +@@ -107,8 +116,16 @@ void SpinningMutex::FutexWait() { // |kLockedContended| anymore. Note that even without spurious wakeups, the // value of |state_| is not guaranteed when this returns, as another thread // may get the lock before we get to run. +#if defined(OS_FREEBSD) + int err = _umtx_op(&state_, UMTX_OP_WAIT_UINT_PRIVATE, + kLockedContended, nullptr, nullptr); ++#elif defined(OS_OPENBSD) ++ int err = futex(reinterpret_cast<volatile unsigned int *>(&state_), FUTEX_WAIT | FUTEX_PRIVATE_FLAG, ++ kLockedContended, nullptr, nullptr); +#else int err = syscall(SYS_futex, &state_, FUTEX_WAIT | FUTEX_PRIVATE_FLAG, kLockedContended, nullptr, nullptr, 0); @@ -30,18 +34,20 @@ if (err) { // These are programming error, check them. -@@ -120,8 +133,14 @@ void SpinningMutex::FutexWait() { +@@ -120,8 +137,16 @@ void SpinningMutex::FutexWait() { void SpinningMutex::FutexWake() { int saved_errno = errno; +#if defined(OS_FREEBSD) + long retval = _umtx_op(&state_, UMTX_OP_WAKE_PRIVATE, + 1 /* wake up a single waiter */, nullptr, nullptr); ++#elif defined(OS_OPENBSD) ++ long retval = futex(reinterpret_cast<volatile unsigned int *>(&state_), FUTEX_WAKE | FUTEX_PRIVATE_FLAG, ++ 1 /* wake up a single waiter */, nullptr, nullptr); +#else long retval = syscall(SYS_futex, &state_, FUTEX_WAKE | FUTEX_PRIVATE_FLAG, 1 /* wake up a single waiter */, nullptr, nullptr, 0); +#endif -+ PA_CHECK(retval != -1); errno = saved_errno; } diff --git a/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc b/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc new file mode 100644 index 000000000000..e7e599c9e9ca --- /dev/null +++ b/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc @@ -0,0 +1,21 @@ +--- base/debug/stack_trace.cc.orig 2023-03-10 11:01:21 UTC ++++ base/debug/stack_trace.cc +@@ -273,7 +273,9 @@ void StackTrace::Print() const { + } + + void StackTrace::OutputToStream(std::ostream* os) const { ++#if !BUILDFLAG(IS_BSD) + OutputToStreamWithPrefix(os, nullptr); ++#endif + } + + std::string StackTrace::ToString() const { +@@ -281,7 +283,7 @@ std::string StackTrace::ToString() const { + } + std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { + std::stringstream stream; +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD) + OutputToStreamWithPrefix(&stream, prefix_string); + #endif + return stream.str(); diff --git a/www/ungoogled-chromium/files/patch-base_debug_stack__trace__posix.cc b/www/ungoogled-chromium/files/patch-base_debug_stack__trace__posix.cc index 64a90bdb77b6..87c53e609e4b 100644 --- a/www/ungoogled-chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,6 +1,15 @@ ---- base/debug/stack_trace_posix.cc.orig 2023-02-11 09:11:04 UTC +--- base/debug/stack_trace_posix.cc.orig 2023-03-10 11:01:21 UTC +++ base/debug/stack_trace_posix.cc -@@ -39,7 +39,7 @@ +@@ -40,7 +40,7 @@ + // execinfo.h and backtrace(3) are really only present in glibc and in macOS + // libc. + #if BUILDFLAG(IS_APPLE) || \ +- (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__AIX)) ++ (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__AIX) && !BUILDFLAG(IS_BSD)) + #define HAVE_BACKTRACE + #include <execinfo.h> + #endif +@@ -58,7 +58,7 @@ #include <AvailabilityMacros.h> #endif @@ -9,7 +18,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -714,6 +714,9 @@ class SandboxSymbolizeHelper { +@@ -761,6 +761,9 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -19,7 +28,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -731,6 +734,7 @@ class SandboxSymbolizeHelper { +@@ -778,6 +781,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; @@ -27,12 +36,3 @@ } // Opens all object files and caches their file descriptors. -@@ -887,7 +891,7 @@ size_t CollectStackTrace(void** trace, size_t count) { - // If we do not have unwind tables, then try tracing using frame pointers. - return base::debug::TraceStackFramePointers(const_cast<const void**>(trace), - count, 0); --#elif !defined(__UCLIBC__) && !defined(_AIX) -+#elif !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD) - // Though the backtrace API man page does not list any possible negative - // return values, we take no chance. - return base::saturated_cast<size_t>( diff --git a/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc b/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc index 7247009422b8..b53006827443 100644 --- a/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_unittest.cc.orig 2023-01-13 08:56:02 UTC +--- base/files/file_util_unittest.cc.orig 2023-03-10 11:01:21 UTC +++ base/files/file_util_unittest.cc -@@ -3558,7 +3558,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3749,7 +3749,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -4281,7 +4281,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4472,7 +4472,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/ungoogled-chromium/files/patch-base_posix_unix__domain__socket__unittest.cc b/www/ungoogled-chromium/files/patch-base_posix_unix__domain__socket__unittest.cc index 969253ca926e..86367a4e590f 100644 --- a/www/ungoogled-chromium/files/patch-base_posix_unix__domain__socket__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_posix_unix__domain__socket__unittest.cc @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket_unittest.cc.orig 2022-10-01 07:40:07 UTC +--- base/posix/unix_domain_socket_unittest.cc.orig 2023-03-10 11:01:21 UTC +++ base/posix/unix_domain_socket_unittest.cc @@ -10,6 +10,8 @@ #include <sys/types.h> @@ -6,6 +6,6 @@ +#include <signal.h> + - #include "base/bind.h" - #include "base/callback_helpers.h" #include "base/files/file_util.h" + #include "base/files/scoped_file.h" + #include "base/functional/bind.h" diff --git a/www/ungoogled-chromium/files/patch-base_process_process__metrics.cc b/www/ungoogled-chromium/files/patch-base_process_process__metrics.cc index dcd528af9b77..bbecf45ca95a 100644 --- a/www/ungoogled-chromium/files/patch-base_process_process__metrics.cc +++ b/www/ungoogled-chromium/files/patch-base_process_process__metrics.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics.cc.orig 2023-01-13 08:56:02 UTC +--- base/process/process_metrics.cc.orig 2023-03-10 11:01:21 UTC +++ base/process/process_metrics.cc @@ -17,7 +17,7 @@ namespace base { namespace { @@ -18,16 +18,16 @@ GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -73,7 +73,7 @@ Value SystemMetrics::ToValue() const { - Value res(Value::Type::DICTIONARY); +@@ -73,7 +73,7 @@ Value::Dict SystemMetrics::ToDict() const { + Value::Dict res; - res.SetIntKey("committed_memory", static_cast<int>(committed_memory_)); + res.Set("committed_memory", static_cast<int>(committed_memory_)); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - Value meminfo = memory_info_.ToValue(); - Value vmstat = vmstat_info_.ToValue(); - meminfo.MergeDictionary(&vmstat); -@@ -99,7 +99,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create + Value::Dict meminfo = memory_info_.ToDict(); *** 11172 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303110600.32B60jax029646>