git: 50b2e1d789a5 - 2023Q2 - www/ungoogled-chromium: update to 114.0.5735.90
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 06 Jun 2023 06:10:29 UTC
The branch 2023Q2 has been updated by rnagy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=50b2e1d789a5dbb61fe78866d0f18cc6d641939f
commit 50b2e1d789a5dbb61fe78866d0f18cc6d641939f
Author: Robert Nagy <rnagy@FreeBSD.org>
AuthorDate: 2023-06-06 06:09:17 +0000
Commit: Robert Nagy <rnagy@FreeBSD.org>
CommitDate: 2023-06-06 06:10:18 +0000
www/ungoogled-chromium: update to 114.0.5735.90
Approved by: rene (mentor, implicit)
Security: https://vuxml.freebsd.org/freebsd/fd87a250-ff78-11ed-8290-a8a1599412c6.html
(cherry picked from commit 46f8c7116958784455b61f14a097af905f235735)
---
www/ungoogled-chromium/Makefile | 45 +-
www/ungoogled-chromium/distinfo | 14 +-
www/ungoogled-chromium/files/patch-BUILD.gn | 82 +-
...patch-ash_display_mirror__window__controller.cc | 4 +-
www/ungoogled-chromium/files/patch-base_BUILD.gn | 22 +-
.../files/patch-base_allocator_dispatcher_tls.h | 4 +-
...llocator_partition__allocator_page__allocator.h | 4 +-
...__allocator_page__allocator__internals__posix.h | 4 +-
...cator_partition__allocator_partition__alloc.gni | 4 +-
...locator_partition__allocator_partition__root.cc | 10 +-
...tch-base_files_file__path__watcher__unittest.cc | 8 +-
.../files/patch-base_files_file__util__unittest.cc | 6 +-
...emory_madv__free__discardable__memory__posix.cc | 6 +-
.../files/patch-base_process_process__metrics.cc | 8 +-
.../patch-base_process_process__metrics__posix.cc | 4 +-
.../files/patch-base_rand__util.h | 4 +-
.../files/patch-base_system_sys__info.cc | 4 +-
.../files/patch-base_system_sys__info.h | 6 +-
.../patch-base_test_launcher_test__launcher.cc | 4 +-
.../files/patch-build_config_compiler_BUILD.gn | 31 +-
.../files/patch-build_config_rust.gni | 4 +-
.../files/patch-build_toolchain_gcc__toolchain.gni | 4 +-
www/ungoogled-chromium/files/patch-cc_BUILD.gn | 6 +-
.../patch-chrome_app_app__management__strings.grdp | 4 +-
.../files/patch-chrome_app_chrome__main.cc | 8 +-
.../patch-chrome_app_chrome__main__delegate.cc | 24 +-
.../patch-chrome_app_generated__resources.grd | 16 +-
.../files/patch-chrome_app_profiles__strings.grdp | 4 +-
.../files/patch-chrome_app_settings__strings.grdp | 6 +-
...hrome_app_theme_chrome__unscaled__resources.grd | 6 +-
.../files/patch-chrome_browser_about__flags.cc | 56 +-
...apps_app__service_publishers_extension__apps.cc | 11 +
...er_apps_platform__apps_platform__app__launch.cc | 4 +-
...ser_apps_platform__apps_platform__app__launch.h | 10 +-
...browser_background_background__mode__manager.cc | 4 +-
.../patch-chrome_browser_browser__features.cc | 10 +-
.../patch-chrome_browser_browser__process__impl.cc | 6 +-
..._browser_chrome__browser__interface__binders.cc | 16 +-
.../patch-chrome_browser_chrome__browser__main.cc | 10 +-
...ome_browser_chrome__content__browser__client.cc | 34 +-
...rome_browser_chrome__content__browser__client.h | 4 +-
...-chrome_browser_dev__ui__browser__resources.grd | 4 +-
...hrome_browser_download_download__item__model.cc | 4 +-
...atch-chrome_browser_download_download__prefs.cc | 18 +-
...ice__trust_signals_signals__service__factory.cc | 8 +-
.../files/patch-chrome_browser_extensions_BUILD.gn | 4 +-
...__private_passwords__private__delegate__impl.cc | 4 +-
...extensions_api_settings__private_prefs__util.cc | 6 +-
.../patch-chrome_browser_flag__descriptions.cc | 49 +-
.../patch-chrome_browser_flag__descriptions.h | 47 +-
..._browser_media_webrtc_capture__policy__utils.cc | 8 +-
...wser_media_webrtc_chrome__screen__enumerator.cc | 16 +-
...chrome__browser__main__extra__parts__metrics.cc | 10 +-
...ser_metrics_chrome__metrics__service__client.cc | 16 +-
...rowser_net_system__network__context__manager.cc | 14 +-
...browser_net_system__network__context__manager.h | 6 +-
...wser_policy_browser__signin__policy__handler.cc | 11 -
...onfiguration__policy__handler__list__factory.cc | 41 +-
...olicy_policy__value__and__status__aggregator.cc | 20 +
.../patch-chrome_browser_prefs_browser__prefs.cc | 18 +-
...er_printing_print__backend__service__manager.cc | 17 +-
...ser_printing_print__backend__service__manager.h | 11 +
...patch-chrome_browser_printing_printer__query.cc | 4 +-
...hrome__browser__main__extra__parts__profiles.cc | 16 +-
.../patch-chrome_browser_profiles_profile__impl.cc | 15 +-
...atch-chrome_browser_profiles_profiles__state.cc | 4 +-
...atch-chrome_browser_resources_settings_route.ts | 4 +-
...d__content__scanning_binary__upload__service.cc | 4 +-
..._user_supervised__user__navigation__observer.cc | 20 +
...tch-chrome_browser_sync_chrome__sync__client.cc | 8 +-
...h-chrome_browser_sync_sync__service__factory.cc | 8 +-
...me_browser_task__manager_sampling_task__group.h | 10 +-
.../patch-chrome_browser_themes_theme__service.cc | 6 +-
...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_omnibox_omnibox__pedal__implementations.cc | 11 +
...h-chrome_browser_ui_signin__view__controller.cc | 4 +-
...chrome_browser_ui_startup_bad__flags__prompt.cc | 4 +-
...browser_ui_startup_startup__browser__creator.cc | 8 +-
.../files/patch-chrome_browser_ui_tab__helpers.cc | 6 +-
.../files/patch-chrome_browser_ui_ui__features.cc | 11 +
.../files/patch-chrome_browser_ui_ui__features.h | 11 +
...chrome_browser_ui_views_frame_browser__frame.cc | 8 +-
...-chrome_browser_ui_views_frame_browser__frame.h | 4 +-
...-chrome_browser_ui_views_frame_browser__view.cc | 4 +-
...e_picture__in__picture__browser__frame__view.cc | 24 +-
...me_picture__in__picture__browser__frame__view.h | 6 +-
.../patch-chrome_browser_ui_views_tabs_tab.cc | 4 +-
..._browser_ui_views_tabs_tab__drag__controller.cc | 14 +-
...ui_views_tabs_tab__hover__card__bubble__view.cc | 4 +-
...eb__apps_web__app__integration__test__driver.cc | 20 +-
.../patch-chrome_browser_ui_webui_about__ui.cc | 6 +-
..._ui_webui_app__home_app__home__page__handler.cc | 6 +-
...i_webui_chrome__web__ui__controller__factory.cc | 14 +-
..._ui_webui_management_management__ui__handler.cc | 6 +-
...tings_settings__localized__strings__provider.cc | 21 +-
...er_web__applications_extension__status__utils.h | 4 +-
...ications_extensions_extension__status__utils.cc | 6 +-
..._integration_os__integration__test__override.cc | 92 -
...__integration_os__integration__test__override.h | 34 +-
...tions_os__integration_shortcut__sub__manager.cc | 4 +-
...gration_web__app__file__handler__registration.h | 8 +-
...s_test_os__integration__test__override__impl.cc | 128 ++
...ns_test_os__integration__test__override__impl.h | 38 +
...thn_chrome__authenticator__request__delegate.cc | 4 +-
.../files/patch-chrome_common_chrome__features.cc | 10 +-
.../files/patch-chrome_common_chrome__features.h | 8 +-
.../patch-chrome_common_chrome__paths__internal.h | 4 +-
.../files/patch-chrome_common_chrome__switches.cc | 4 +-
.../files/patch-chrome_common_chrome__switches.h | 4 +-
.../files/patch-chrome_common_pref__names.cc | 16 +-
.../files/patch-chrome_common_pref__names.h | 18 +-
.../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 +-
.../patch-chrome_updater_app_app__uninstall.cc | 20 +
.../files/patch-chrome_utility_services.cc | 6 +-
...utofill_core_browser_personal__data__manager.cc | 4 +-
...ill_core_common_autofill__payments__features.cc | 4 +-
.../patch-components_crash_core_common_BUILD.gn | 4 +-
...bedder__support_user__agent__utils__unittest.cc | 6 +-
...e__engagement_public_feature__configurations.cc | 10 +-
...eature__engagement_public_feature__constants.cc | 16 +-
...feature__engagement_public_feature__constants.h | 8 +-
...nts_feature__engagement_public_feature__list.cc | 12 +-
...ents_feature__engagement_public_feature__list.h | 24 +-
.../patch-components_flags__ui_flags__state.cc | 4 +-
...nts_gwp__asan_crash__handler_crash__analyzer.cc | 4 +-
.../files/patch-components_metrics_metrics__log.cc | 6 +-
...ponents_omnibox_browser_omnibox__edit__model.cc | 10 +
...ssword__manager_core_browser_login__database.cc | 8 +-
...nager_core_browser_login__database__unittest.cc | 8 +-
...ager_core_common_password__manager__features.cc | 6 +-
...nager_core_common_password__manager__features.h | 8 +-
...licy_core_common_cloud_cloud__policy__client.cc | 4 +-
...nts_power__metrics_energy__metrics__provider.cc | 20 +
...paint__preview__compositor__collection__impl.cc | 6 +-
..._paint__preview__compositor__collection__impl.h | 20 -
...ponents_update__client_update__query__params.cc | 4 +-
...nents_variations_service_variations__service.cc | 4 +-
.../patch-components_version__info_version__info.h | 14 +-
...nents_viz_common_gpu_dawn__context__provider.cc | 8 +-
...isplay__embedder_skia__output__surface__impl.cc | 4 +-
...omponents_viz_service_display_skia__renderer.cc | 4 +-
...e__sinks_root__compositor__frame__sink__impl.cc | 6 +-
...me__sinks_root__compositor__frame__sink__impl.h | 4 +-
...atch-content_app_content__main__runner__impl.cc | 20 +-
.../files/patch-content_browser_BUILD.gn | 4 +-
.../patch-content_browser_browser__main__loop.cc | 6 +-
...rowser_gpu_gpu__data__manager__impl__private.cc | 4 +-
...ser_media_frameless__media__interface__proxy.cc | 20 -
...ontent_browser_media_media__interface__proxy.cc | 20 -
...ent_browser_network__service__instance__impl.cc | 6 +-
...er_renderer__host_back__forward__cache__impl.cc | 4 +-
...rowser_renderer__host_delegated__frame__host.cc | 4 +-
...r_renderer__host_render__process__host__impl.cc | 14 +-
...er_renderer__host_render__process__host__impl.h | 10 +-
...wser_renderer__host_render__view__host__impl.cc | 4 +-
...derer__host_render__widget__host__view__aura.cc | 12 +-
...nderer__host_render__widget__host__view__aura.h | 4 +-
...patch-content_browser_utility__process__host.cc | 56 +
.../patch-content_browser_utility__process__host.h | 20 +
...r_utility__process__host__receiver__bindings.cc | 19 +-
...h-content_browser_utility__sandbox__delegate.cc | 4 +-
...browser_webui_web__ui__main__frame__observer.cc | 4 +-
.../files/patch-content_common_BUILD.gn | 6 +-
.../files/patch-content_gpu_BUILD.gn | 4 +-
.../files/patch-content_gpu_gpu__main.cc | 12 +-
...t_ppapi__plugin_ppapi__blink__platform__impl.cc | 4 +-
...nt_ppapi__plugin_ppapi__blink__platform__impl.h | 18 +-
...-content_public_browser_render__process__host.h | 4 +-
...atch-content_public_common_content__features.cc | 12 +-
...patch-content_public_common_content__features.h | 4 +-
...atch-content_public_common_content__switches.cc | 6 +-
...patch-content_public_common_content__switches.h | 6 +-
...patch-content_renderer_render__process__impl.cc | 6 +-
.../patch-content_renderer_render__thread__impl.cc | 8 +-
...ent_renderer_renderer__blink__platform__impl.cc | 15 +-
...tent_renderer_renderer__blink__platform__impl.h | 22 +-
.../files/patch-content_shell_BUILD.gn | 4 +-
.../files/patch-content_test_BUILD.gn | 6 +-
.../files/patch-content_utility_services.cc | 28 +-
...link__platform__with__sandbox__support__impl.cc | 4 +-
...blink__platform__with__sandbox__support__impl.h | 17 +-
.../files/patch-content_utility_utility__main.cc | 30 +-
...sions_browser_api_messaging_message__service.cc | 6 +-
...ivate_networking__private__delegate__factory.cc | 4 +-
.../patch-extensions_browser_extension__prefs.cc | 11 -
.../files/patch-extensions_browser_pref__names.cc | 11 -
.../files/patch-extensions_browser_pref__names.h | 11 -
.../files/patch-extensions_common_api_runtime.json | 4 +-
...er_api_runtime_shell__runtime__api__delegate.cc | 6 +-
..._command__buffer_service_gles2__cmd__decoder.cc | 4 +-
...e_shared__image_external__vk__image__backing.cc | 6 +-
..._image_external__vk__image__backing__factory.cc | 14 +-
...ce_shared__image_wrapped__sk__image__backing.cc | 4 +-
...ommand__buffer_service_webgpu__decoder__impl.cc | 4 +-
.../files/patch-gpu_ipc_service_gpu__init.cc | 22 +-
...ss_lib_browser_headless__web__contents__impl.cc | 4 +-
www/ungoogled-chromium/files/patch-media_BUILD.gn | 4 +-
.../files/patch-media_audio_BUILD.gn | 4 +-
.../patch-media_base_cdm__promise__adapter.cc | 14 +
.../files/patch-media_base_media__switches.cc | 24 +-
.../files/patch-media_base_media__switches.h | 13 +-
.../files/patch-media_base_video__frame.cc | 6 +-
.../files/patch-media_base_video__frame.h | 8 +-
.../files/patch-media_gpu_buffer__validation.cc | 4 +-
...-media_gpu_chromeos_video__decoder__pipeline.cc | 8 +-
.../patch-media_gpu_vaapi_vaapi__video__decoder.cc | 4 +-
.../files/patch-media_gpu_vaapi_vaapi__wrapper.cc | 8 +-
.../files/patch-media_media__options.gni | 6 +-
...stable__video__decoder__types__mojom__traits.cc | 15 +-
..._stable__video__decoder__types__mojom__traits.h | 4 +-
...ideo_gpu__memory__buffer__video__frame__pool.cc | 8 +-
.../patch-mojo_public_tools_bindings_mojom.gni | 4 +-
www/ungoogled-chromium/files/patch-net_BUILD.gn | 29 +-
.../patch-net_base_network__change__notifier.cc | 6 +-
...net_base_network__change__notifier__passive.cc} | 8 +-
.../files/patch-net_cert_cert__verifier.cc | 14 +-
.../files/patch-net_cert_cert__verify__proc.cc | 4 +-
.../files/patch-net_cert_cert__verify__proc.h | 4 +-
.../patch-net_cert_cert__verify__proc__unittest.cc | 16 +-
.../patch-net_cert_test__root__certs__unittest.cc | 12 +-
...xy__resolution_proxy__config__service__linux.cc | 12 +-
.../files/patch-net_socket_tcp__socket__posix.cc | 4 +-
.../files/patch-net_socket_udp__socket__posix.cc | 8 +-
...verify__tool_cert__verify__comparision__tool.cc | 4 +-
..._tools_cert__verify__tool_cert__verify__tool.cc | 8 +-
...h-remoting_codec_webrtc__video__encoder__vpx.cc | 4 +-
...ting_host_chromoting__host__services__client.cc | 6 +-
...tch-remoting_host_desktop__capturer__wrapper.cc | 13 +-
.../files/patch-remoting_host_host__attributes.cc | 6 +-
.../files/patch-remoting_host_it2me_it2me__host.cc | 8 +-
.../files/patch-sandbox_linux_BUILD.gn | 4 +-
.../files/patch-sandbox_policy_features.cc | 8 +-
.../files/patch-sandbox_policy_switches.cc | 4 +-
.../files/patch-sandbox_policy_switches.h | 4 +-
...ices_cert__verifier_cert__verifier__creation.cc | 12 +-
...ices_device_geolocation_location__arbitrator.cc | 4 +-
.../patch-services_device_public_mojom_BUILD.gn | 4 +-
.../files/patch-services_network_BUILD.gn | 4 +-
...rvices_network_network__sandbox__hook__linux.cc | 37 +-
.../patch-services_network_network__service.cc | 4 +-
.../patch-services_network_public_cpp_BUILD.gn | 11 +
.../patch-services_network_public_mojom_BUILD.gn | 25 +
...ionary_shared__dictionary__writer__in__memory.h | 11 +
...tor_public_cpp_memory__instrumentation_BUILD.gn | 4 +-
...video__capture_video__capture__service__impl.cc | 38 +
..._video__capture_video__capture__service__impl.h | 29 +
.../files/patch-third__party_angle_BUILD.gn | 8 +-
...ngle_src_gpu__info__util_SystemInfo__internal.h | 4 +-
...tch-third__party_angle_src_libANGLE_Display.cpp | 20 +-
...third__party_angle_src_libANGLE_formatutils.cpp | 4 +-
.../files/patch-third__party_angle_util_BUILD.gn | 4 +-
...h-third__party_blink_public_platform_platform.h | 4 +-
...blink_renderer_controller_blink__initializer.cc | 10 +-
...y_blink_renderer_core_frame_web__frame__test.cc | 6 +-
...erer_core_inspector_inspector__memory__agent.cc | 4 +-
...arty_blink_renderer_core_layout_layout__view.cc | 10 +-
...e_layout_ng_grid_ng__grid__layout__algorithm.cc | 33 +-
...ty_blink_renderer_modules_ml_webnn_features.gni | 8 +-
...renderer_modules_ml_webnn_ml__graph__xnnpack.cc | 4 +-
...odules_webgl_webgl__rendering__context__base.cc | 4 +-
...rty_blink_renderer_modules_webgpu_gpu__queue.cc | 14 +-
...h-third__party_blink_renderer_platform_BUILD.gn | 4 +-
...er_platform_graphics_video__frame__submitter.cc | 4 +-
...derer_platform_runtime__enabled__features.json5 | 21 +-
...platform_video__capture_video__capture__impl.cc | 11 +
...g_blink__categorized__worker__pool__delegate.cc | 11 +
...widget_compositing_categorized__worker__pool.cc | 11 -
.../files/patch-third__party_boringssl_BUILD.gn | 4 +-
..._party_dawn_include_dawn_native_VulkanBackend.h | 4 +-
...g_chromium_config_Chrome_openbsd_arm64_config.h | 751 -------
...onfig_Chrome_openbsd_arm64_config__components.h | 2128 -------------------
..._chromium_config_Chrome_openbsd_ia32_config.asm | 735 -------
...eg_chromium_config_Chrome_openbsd_ia32_config.h | 752 -------
...config_Chrome_openbsd_ia32_config__components.h | 2149 --------------------
...g_chromium_config_Chrome_openbsd_x64_config.asm | 735 -------
...peg_chromium_config_Chrome_openbsd_x64_config.h | 752 -------
..._config_Chrome_openbsd_x64_config__components.h | 2149 --------------------
..._party_ffmpeg_chromium_scripts_build__ffmpeg.py | 121 ++
.../files/patch-third__party_opus_BUILD.gn | 10 -
...y_pdfium_third__party_base_compiler__specific.h | 11 +
...etto_src_tracing_core_tracing__service__impl.cc | 4 +-
...atch-third__party_perfetto_src_tracing_track.cc | 4 +-
...vulkan-loader_src_loader_vk__loader__platform.h | 4 +-
...layers_src_layers_external_vma_vk__mem__alloc.h | 10 +-
...rd__party_webrtc_modules_audio__device_BUILD.gn | 4 +-
.../patch-third__party_webrtc_rtc__base_network.cc | 4 +-
...ols_json__schema__compiler_feature__compiler.py | 4 +-
...ch-tools_perf_chrome__telemetry__build_BUILD.gn | 6 +-
.../files/patch-ui_base_ime_text__input__client.h | 4 +-
.../patch-ui_base_resource_resource__bundle.cc | 4 +-
.../patch-ui_base_test_skia__gold__pixel__diff.cc | 4 +-
.../files/patch-ui_base_ui__base__features.cc | 15 +-
.../files/patch-ui_base_ui__base__features.h | 11 +
.../files/patch-ui_base_webui_web__ui__util.cc | 13 +-
.../files/patch-ui_color_color__id.h | 4 +-
.../files/patch-ui_compositor_compositor.cc | 4 +-
.../files/patch-ui_compositor_compositor.h | 4 +-
.../files/patch-ui_events_event.cc | 8 +-
www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn | 4 +-
.../files/patch-ui_gfx_codec_png__codec.cc | 6 +-
.../files/patch-ui_gfx_font__list.cc | 11 -
.../files/patch-ui_gfx_native__widget__types.h | 12 +-
.../files/patch-ui_native__theme_native__theme.h | 4 +-
.../files/patch-ui_ozone_common_features.cc | 11 +
...tform_wayland_host_wayland__toplevel__window.cc | 4 +-
...atform_wayland_host_wayland__toplevel__window.h | 4 +-
...rm_wayland_host_xdg__toplevel__wrapper__impl.cc | 4 +-
...ne_platform_wayland_ozone__platform__wayland.cc | 4 +-
..._platform__window_platform__window__delegate.cc | 4 +-
...i_platform__window_platform__window__delegate.h | 4 +-
.../patch-ui_views_controls_textfield_textfield.cc | 10 +-
.../patch-ui_views_controls_textfield_textfield.h | 4 +-
...__aura_desktop__window__tree__host__platform.cc | 4 +-
.../files/patch-ui_views_widget_widget.cc | 4 +-
www/ungoogled-chromium/files/patch-v8_BUILD.gn | 20 +-
.../files/patch-v8_src_api_api.cc | 6 +-
.../patch-v8_src_base_platform_platform-posix.cc | 6 +-
.../files/patch-v8_src_execution_isolate.cc | 6 +-
...bedded_platform-embedded-file-writer-generic.cc | 16 +-
...tch-v8_src_trap-handler_handler-inside-posix.cc | 6 +-
.../files/patch-v8_src_trap-handler_trap-handler.h | 6 +-
329 files changed, 2054 insertions(+), 11642 deletions(-)
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
index 07f88286d389..302b3c6f0755 100644
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= ungoogled-chromium
-PORTVERSION= 113.0.5672.126
+PORTVERSION= 114.0.5735.90
UGVERSION= ${DISTVERSION}-1
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
@@ -73,9 +73,9 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \
RUN_DEPENDS= xdg-open:devel/xdg-utils \
noto-basic>0:x11-fonts/noto-basic
-USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome iconv:wchar_t jpeg \
- localbase:ldflags ninja perl5 pkgconfig python:3.7+,build qt:5 shebangfix \
- tar:xz xorg
+USES= bison compiler:c++17-lang cpe desktop-file-utils gl gmake gnome \
+ iconv:wchar_t jpeg localbase:ldflags ninja perl5 pkgconfig \
+ python:3.7+,build qt:5 shebangfix tar:xz xorg
CPE_VENDOR= google
CPE_PRODUCT= chrome
@@ -119,7 +119,8 @@ GN_ARGS+= fatal_linker_warnings=false \
use_system_libjpeg=true \
use_udev=false \
extra_cxxflags="${CXXFLAGS}" \
- extra_ldflags="${LDFLAGS}"
+ extra_ldflags="${LDFLAGS}" \
+ ffmpeg_branding="${FFMPEG_BRAND}"
# sync with flags.gni
GN_ARGS+= build_with_tflite_lib=false \
@@ -171,10 +172,10 @@ ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/al
ALSA_VARS= GN_ARGS+=use_alsa=true
ALSA_VARS_OFF= GN_ARGS+=use_alsa=false
-CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \
- GN_ARGS+=proprietary_codecs=true
-CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \
- GN_ARGS+=proprietary_codecs=false
+CODECS_VARS= GN_ARGS+=proprietary_codecs=true \
+ FFMPEG_BRAND="Chrome"
+CODECS_VARS_OFF= GN_ARGS+=proprietary_codecs=false \
+ FFMPEG_BRAND="Chromium"
CUPS_LIB_DEPENDS= libcups.so:print/cups
CUPS_VARS= GN_ARGS+=use_cups=true
@@ -244,13 +245,24 @@ BINARY_ALIAS+= ar=/usr/bin/llvm-ar \
nm=/usr/bin/llvm-nm
.endif
-# swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
+# - swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
+# - map ffmpeg target to ${ARCH}
.if ${ARCH} == aarch64
PLIST_SUB+= NOT_AARCH64="@comment "
-.else
+FFMPEG_TARGET= arm64
+.elif ${ARCH} == amd64
+BUILD_DEPENDS+= nasm:devel/nasm
+PLIST_SUB+= NOT_AARCH64=""
+FFMPEG_TARGET= x64
+.elif ${ARCH} == i386
+BUILD_DEPENDS+= nasm:devel/nasm
PLIST_SUB+= NOT_AARCH64=""
+FFMPEG_TARGET= ia32
.endif
+FFMPEG_BDIR= ${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
+FFMPEG_CDIR= ${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
+
# Allow relocations against read-only segments (override lld default)
LDFLAGS_i386= -Wl,-znotext
@@ -290,10 +302,13 @@ pre-configure:
dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \
libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE}
# Chromium uses an unreleased version of FFmpeg, so configure it
-.for brand in Chrome Chromium
- ${CP} -R \
- ${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/linux/ \
- ${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/freebsd
+ cd ${WRKSRC}/third_party/ffmpeg && \
+ ${PYTHON_CMD} chromium/scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
+ --config-only --branding=${FFMPEG_BRAND}
+ cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
+ ${MKDIR} ${FFMPEG_CDIR}
+.for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
+ -${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
.endfor
do-configure:
diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo
index 3551498cb7d1..cbe98e9d0686 100644
--- a/www/ungoogled-chromium/distinfo
+++ b/www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1684563730
-SHA256 (chromium-113.0.5672.126.tar.xz) = 0def7cd594304d7675821d42a4207377af98e321a78a91ee5200aea55adc2d93
-SIZE (chromium-113.0.5672.126.tar.xz) = 1556790928
-SHA256 (ungoogled-chromium-113.0.5672.126-1.tar.gz) = 1025329c38041b3b8b200fe3405d4b873345e87cba6333e036b83ad2f0000d3e
-SIZE (ungoogled-chromium-113.0.5672.126-1.tar.gz) = 674145
-SHA256 (chromium-113.0.5672.126-testdata.tar.xz) = 89088e4cdc494ad5c468c7cf7e7ed26c4f76244d42ec74dac0ee141ead0fd6e6
-SIZE (chromium-113.0.5672.126-testdata.tar.xz) = 262980780
+TIMESTAMP = 1685990313
+SHA256 (chromium-114.0.5735.90.tar.xz) = 071a8620b6175923f91f0ce0e3a0b2b20bf350a7d1a0f5513c160df7c17526d8
+SIZE (chromium-114.0.5735.90.tar.xz) = 1570683592
+SHA256 (ungoogled-chromium-114.0.5735.90-1.tar.gz) = a96154372365e63444b4a3ee069636b53f59b74513e6d1a4e217713eb059db67
+SIZE (ungoogled-chromium-114.0.5735.90-1.tar.gz) = 679795
+SHA256 (chromium-114.0.5735.90-testdata.tar.xz) = 9ce66f3d7b60e5f74d0f4e4290b1e159b3346e4afb85373c745ac44fc1d14994
+SIZE (chromium-114.0.5735.90-testdata.tar.xz) = 256217488
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 58d02bbd3662..1c8f12a0d5c4 100644
--- a/www/ungoogled-chromium/files/patch-BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
---- BUILD.gn.orig 2023-05-05 12:12:41 UTC
+--- BUILD.gn.orig 2023-06-05 19:39:05 UTC
+++ BUILD.gn
-@@ -60,7 +60,7 @@ declare_args() {
+@@ -61,7 +61,7 @@ declare_args() {
root_extra_deps = []
}
@@ -9,49 +9,49 @@
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
-@@ -85,7 +85,6 @@ group("gn_all") {
- "//codelabs",
- "//components:components_unittests",
- "//components/gwp_asan:gwp_asan_unittests",
-- "//infra/orchestrator:orchestrator_all",
- "//net:net_unittests",
- "//sandbox:sandbox_unittests",
- "//services:services_unittests",
-@@ -426,7 +425,7 @@ group("gn_all") {
+@@ -95,7 +95,6 @@ group("gn_all") {
+ "//codelabs",
+ "//components:components_unittests",
+ "//components/gwp_asan:gwp_asan_unittests",
+- "//infra/orchestrator:orchestrator_all",
+ "//net:net_unittests",
+ "//sandbox:sandbox_unittests",
+ "//services:services_unittests",
+@@ -419,7 +418,7 @@ group("gn_all") {
+ }
}
- }
-- if (is_linux || is_chromeos || is_android) {
-+ if ((is_linux && !is_bsd) || is_chromeos || is_android) {
- deps += [
- "//third_party/breakpad:breakpad_unittests",
- "//third_party/breakpad:core-2-minidump",
-@@ -622,6 +621,15 @@ group("gn_all") {
+- if (is_linux || is_chromeos || is_android) {
++ if ((is_linux && !is_bsd) || is_chromeos || is_android) {
+ deps += [
+ "//third_party/breakpad:breakpad_unittests",
+ "//third_party/breakpad:core-2-minidump",
+@@ -611,6 +610,15 @@ group("gn_all") {
+ }
}
- }
-+ if (is_bsd) {
-+ deps -= [
-+ "//third_party/breakpad:dump_syms($host_toolchain)",
-+ "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
-+ "//third_party/breakpad:minidump_dump($host_toolchain)",
-+ "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
-+ ]
-+ }
++ if (is_bsd) {
++ deps -= [
++ "//third_party/breakpad:dump_syms($host_toolchain)",
++ "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
++ "//third_party/breakpad:minidump_dump($host_toolchain)",
++ "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
++ ]
++ }
+
- if (is_mac) {
- deps += [
- "//third_party/breakpad:dump_syms",
-@@ -669,7 +677,7 @@ group("gn_all") {
- host_os == "win") {
- deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
+ if (is_mac) {
+ deps += [
+ "//third_party/breakpad:dump_syms",
+@@ -658,7 +666,7 @@ group("gn_all") {
+ host_os == "win") {
+ 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) {
+ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-- } else if (!is_android && !is_ios && !is_fuchsia) {
-+ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) {
- deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
- }
-@@ -1092,7 +1100,7 @@ if (!is_ios) {
+@@ -1088,7 +1096,7 @@ if (!is_ios && !is_cronet_build) {
]
}
@@ -60,7 +60,7 @@
# WPT Webdriver tests runner
# chrome/test/chromedriver/test/run_webdriver_tests.py
script_test("webdriver_wpt_tests") {
-@@ -1192,7 +1200,7 @@ if (!is_ios) {
+@@ -1188,7 +1196,7 @@ if (!is_ios && !is_cronet_build) {
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)" ]
}
-@@ -1201,7 +1209,7 @@ if (!is_ios) {
+@@ -1197,7 +1205,7 @@ if (!is_ios && !is_cronet_build) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -78,7 +78,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
-@@ -1669,7 +1677,7 @@ group("chromium_builder_perf") {
+@@ -1664,7 +1672,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}
diff --git a/www/ungoogled-chromium/files/patch-ash_display_mirror__window__controller.cc b/www/ungoogled-chromium/files/patch-ash_display_mirror__window__controller.cc
index 860e3163ba7d..40146623de3a 100644
--- a/www/ungoogled-chromium/files/patch-ash_display_mirror__window__controller.cc
+++ b/www/ungoogled-chromium/files/patch-ash_display_mirror__window__controller.cc
@@ -1,6 +1,6 @@
---- ash/display/mirror_window_controller.cc.orig 2022-10-29 17:50:56 UTC
+--- ash/display/mirror_window_controller.cc.orig 2023-06-05 19:39:05 UTC
+++ ash/display/mirror_window_controller.cc
-@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow(
+@@ -296,7 +296,11 @@ void MirrorWindowController::UpdateWindow(
if (!base::Contains(display_info_list, iter->first,
&display::ManagedDisplayInfo::id)) {
CloseAndDeleteHost(iter->second, true);
diff --git a/www/ungoogled-chromium/files/patch-base_BUILD.gn b/www/ungoogled-chromium/files/patch-base_BUILD.gn
index ed38e02a0524..f259fecfbd2c 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-05-05 12:12:41 UTC
+--- base/BUILD.gn.orig 2023-06-05 19:39:05 UTC
+++ base/BUILD.gn
-@@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") {
+@@ -197,7 +197,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"
-@@ -1105,11 +1105,23 @@ component("base") {
+@@ -1100,11 +1100,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.
@@ -34,7 +34,7 @@
if (use_allocator_shim) {
sources += [
"allocator/partition_allocator/shim/allocator_shim.cc",
-@@ -1137,7 +1149,7 @@ component("base") {
+@@ -1132,7 +1144,7 @@ component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
@@ -43,7 +43,7 @@
sources += [
"allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
"allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
-@@ -1178,7 +1190,7 @@ component("base") {
+@@ -1173,7 +1185,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -52,7 +52,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -2135,6 +2147,43 @@ component("base") {
+@@ -2127,6 +2139,43 @@ component("base") {
}
}
@@ -96,7 +96,7 @@
# iOS
if (is_ios) {
sources += [
-@@ -2244,7 +2293,7 @@ component("base") {
+@@ -2236,7 +2285,7 @@ component("base") {
}
if (dep_libevent) {
@@ -105,7 +105,7 @@
}
if (use_libevent) {
-@@ -3562,7 +3611,7 @@ test("base_unittests") {
+@@ -3559,7 +3608,7 @@ test("base_unittests") {
]
}
@@ -114,7 +114,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
-@@ -3611,7 +3660,7 @@ test("base_unittests") {
+@@ -3608,7 +3657,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@@ -123,7 +123,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
-@@ -3622,7 +3671,7 @@ test("base_unittests") {
+@@ -3619,7 +3668,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -132,7 +132,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -3848,7 +3897,7 @@ test("base_unittests") {
+@@ -3843,7 +3892,7 @@ test("base_unittests") {
}
}
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_dispatcher_tls.h b/www/ungoogled-chromium/files/patch-base_allocator_dispatcher_tls.h
index d1f54c7aafeb..4df995cf06b5 100644
--- a/www/ungoogled-chromium/files/patch-base_allocator_dispatcher_tls.h
+++ b/www/ungoogled-chromium/files/patch-base_allocator_dispatcher_tls.h
@@ -1,6 +1,6 @@
---- base/allocator/dispatcher/tls.h.orig 2023-02-11 09:11:04 UTC
+--- base/allocator/dispatcher/tls.h.orig 2023-06-05 19:39:05 UTC
+++ base/allocator/dispatcher/tls.h
-@@ -51,7 +51,7 @@ struct BASE_EXPORT MMapAllocator {
+@@ -50,7 +50,7 @@ struct BASE_EXPORT MMapAllocator {
partition_alloc::PartitionPageSize();
#elif BUILDFLAG(IS_APPLE)
constexpr static size_t AllocationChunkSize = 16384;
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator.h
index 5f009ecca999..69ad7ed381aa 100644
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator.h
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/page_allocator.h.orig 2022-12-02 17:56:32 UTC
+--- base/allocator/partition_allocator/page_allocator.h.orig 2023-06-05 19:39:05 UTC
+++ base/allocator/partition_allocator/page_allocator.h
-@@ -231,7 +231,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
+@@ -238,7 +238,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
// recommitted. Do not assume that this will not change over time.
constexpr PA_COMPONENT_EXPORT(
PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
index 4bea35599953..7b0919bf7268 100644
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-05-05 12:12:41 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-06-05 19:39:05 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -383,8 +383,12 @@ bool TryRecommitSystemPagesInternal(
+@@ -387,8 +387,12 @@ bool TryRecommitSystemPagesInternal(
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);
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 2b195ed5dcf6..ee687865cd45 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,6 +1,6 @@
---- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-05-05 12:12:41 UTC
+--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-06-05 19:39:05 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
-@@ -285,7 +285,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
+@@ -305,7 +305,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
"AsanBackupRefPtr requires RawPtrHookableImpl")
declare_args() {
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 03593e710a3d..c13d50a007b0 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,6 +1,6 @@
---- base/allocator/partition_allocator/partition_root.cc.orig 2023-05-05 12:12:41 UTC
+--- base/allocator/partition_allocator/partition_root.cc.orig 2023-06-05 19:39:05 UTC
+++ base/allocator/partition_allocator/partition_root.cc
-@@ -43,7 +43,7 @@
+@@ -46,7 +46,7 @@
#include "wow64apiset.h"
#endif
@@ -9,7 +9,7 @@
#include <pthread.h>
#endif
-@@ -284,7 +284,7 @@ void PartitionAllocMallocInitOnce() {
+@@ -287,7 +287,7 @@ void PartitionAllocMallocInitOnce() {
return;
}
@@ -18,7 +18,7 @@
// 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.
-@@ -378,7 +378,7 @@ static size_t PartitionPurgeSlotSpan(
+@@ -381,7 +381,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
-@@ -850,7 +850,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
+@@ -853,7 +853,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_files_file__path__watcher__unittest.cc b/www/ungoogled-chromium/files/patch-base_files_file__path__watcher__unittest.cc
index ad2e7803bf75..b91c7278521b 100644
--- a/www/ungoogled-chromium/files/patch-base_files_file__path__watcher__unittest.cc
+++ b/www/ungoogled-chromium/files/patch-base_files_file__path__watcher__unittest.cc
@@ -1,6 +1,6 @@
---- base/files/file_path_watcher_unittest.cc.orig 2023-02-11 09:11:04 UTC
+--- base/files/file_path_watcher_unittest.cc.orig 2023-06-05 19:39:05 UTC
+++ base/files/file_path_watcher_unittest.cc
-@@ -521,7 +521,7 @@ TEST_F(FilePathWatcherTest, MAYBE_WatchDirectory) {
+@@ -473,7 +473,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
VLOG(1) << "Waiting for file1 creation";
ASSERT_TRUE(WaitForEvent());
@@ -9,7 +9,7 @@
// Mac implementation does not detect files modified in a directory.
ASSERT_TRUE(WriteFile(file1, "content v2"));
VLOG(1) << "Waiting for file1 modification";
-@@ -1345,7 +1345,7 @@ enum Permission {
+@@ -1275,7 +1275,7 @@ enum Permission {
Execute
};
@@ -18,7 +18,7 @@
bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
struct stat stat_buf;
-@@ -1376,7 +1376,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
+@@ -1306,7 +1306,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
}
#endif // BUILDFLAG(IS_APPLE)
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 23afe7fc269e..a7388b6af925 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-05-05 12:12:41 UTC
+--- base/files/file_util_unittest.cc.orig 2023-06-05 19:39:05 UTC
+++ base/files/file_util_unittest.cc
-@@ -3853,7 +3853,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
+@@ -3871,7 +3871,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";
-@@ -4576,7 +4576,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
+@@ -4594,7 +4594,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =
diff --git a/www/ungoogled-chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/ungoogled-chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc
index b621decda352..0efce0ad9c4b 100644
--- a/www/ungoogled-chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc
+++ b/www/ungoogled-chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc
@@ -1,6 +1,6 @@
---- base/memory/madv_free_discardable_memory_posix.cc.orig 2022-10-01 07:40:07 UTC
+--- base/memory/madv_free_discardable_memory_posix.cc.orig 2023-06-05 19:39:05 UTC
+++ base/memory/madv_free_discardable_memory_posix.cc
-@@ -295,6 +295,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
+@@ -306,6 +306,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
bool MadvFreeDiscardableMemoryPosix::IsResident() const {
DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
@@ -11,7 +11,7 @@
#if BUILDFLAG(IS_APPLE)
std::vector<char> vec(allocated_pages_);
#else
-@@ -310,6 +314,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
+@@ -321,6 +325,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
return false;
}
return true;
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 bbecf45ca95a..2fdde30d8a3a 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-03-10 11:01:21 UTC
+--- base/process/process_metrics.cc.orig 2023-06-05 19:39:05 UTC
+++ base/process/process_metrics.cc
@@ -17,7 +17,7 @@ namespace base {
namespace {
@@ -27,7 +27,7 @@
Value::Dict meminfo = memory_info_.ToDict();
meminfo.Merge(vmstat_info_.ToDict());
res.Set("meminfo", std::move(meminfo));
-@@ -98,7 +98,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
+@@ -100,7 +100,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
#endif // !BUILDFLAG(IS_MAC)
}
@@ -35,7 +35,7 @@
double ProcessMetrics::GetPlatformIndependentCPUUsage(
TimeDelta cumulative_cpu) {
TimeTicks time = TimeTicks::Now();
-@@ -124,7 +123,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
+@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
double ProcessMetrics::GetPlatformIndependentCPUUsage() {
return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage());
}
@@ -43,7 +43,7 @@
#if BUILDFLAG(IS_WIN)
double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) {
-@@ -155,7 +153,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
+@@ -157,7 +155,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/files/patch-base_process_process__metrics__posix.cc b/www/ungoogled-chromium/files/patch-base_process_process__metrics__posix.cc
index 1d8226ebb594..70d19dad131a 100644
--- a/www/ungoogled-chromium/files/patch-base_process_process__metrics__posix.cc
+++ b/www/ungoogled-chromium/files/patch-base_process_process__metrics__posix.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics_posix.cc.orig 2022-10-01 07:40:07 UTC
+--- base/process/process_metrics_posix.cc.orig 2023-06-05 19:39:05 UTC
+++ base/process/process_metrics_posix.cc
@@ -20,6 +20,8 @@
@@ -9,7 +9,7 @@
#else
#include <malloc.h>
#endif
-@@ -135,7 +137,7 @@ size_t ProcessMetrics::GetMallocUsage() {
+@@ -133,7 +135,7 @@ size_t ProcessMetrics::GetMallocUsage() {
return stats.size_in_use;
#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
return GetMallocUsageMallinfo();
diff --git a/www/ungoogled-chromium/files/patch-base_rand__util.h b/www/ungoogled-chromium/files/patch-base_rand__util.h
index dea2d8dc4e36..412bf8de4730 100644
--- a/www/ungoogled-chromium/files/patch-base_rand__util.h
+++ b/www/ungoogled-chromium/files/patch-base_rand__util.h
@@ -1,6 +1,6 @@
---- base/rand_util.h.orig 2022-12-02 17:56:32 UTC
+--- base/rand_util.h.orig 2023-06-05 19:39:05 UTC
+++ base/rand_util.h
-@@ -117,7 +117,7 @@ void RandomShuffle(Itr first, Itr last) {
+@@ -121,7 +121,7 @@ void RandomShuffle(Itr first, Itr last) {
std::shuffle(first, last, RandomBitGenerator());
}
diff --git a/www/ungoogled-chromium/files/patch-base_system_sys__info.cc b/www/ungoogled-chromium/files/patch-base_system_sys__info.cc
index 44c6389a5cdc..a4b7c21406e5 100644
--- a/www/ungoogled-chromium/files/patch-base_system_sys__info.cc
+++ b/www/ungoogled-chromium/files/patch-base_system_sys__info.cc
@@ -1,6 +1,6 @@
---- base/system/sys_info.cc.orig 2023-03-10 11:01:21 UTC
+--- base/system/sys_info.cc.orig 2023-06-05 19:39:05 UTC
+++ base/system/sys_info.cc
-@@ -106,7 +106,7 @@ std::string SysInfo::HardwareModelName() {
+@@ -148,7 +148,7 @@ std::string SysInfo::HardwareModelName() {
#endif
void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) {
diff --git a/www/ungoogled-chromium/files/patch-base_system_sys__info.h b/www/ungoogled-chromium/files/patch-base_system_sys__info.h
index 2650a8f2d8d5..8288244ee2ed 100644
--- a/www/ungoogled-chromium/files/patch-base_system_sys__info.h
+++ b/www/ungoogled-chromium/files/patch-base_system_sys__info.h
@@ -1,6 +1,6 @@
---- base/system/sys_info.h.orig 2023-02-11 09:11:04 UTC
+--- base/system/sys_info.h.orig 2023-06-05 19:39:05 UTC
+++ base/system/sys_info.h
-@@ -246,6 +246,8 @@ class BASE_EXPORT SysInfo {
+@@ -253,6 +253,8 @@ class BASE_EXPORT SysInfo {
static void SetIsCpuSecurityMitigationsEnabled(bool is_enabled);
#endif
@@ -9,7 +9,7 @@
private:
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo);
-@@ -257,7 +259,7 @@ class BASE_EXPORT SysInfo {
+@@ -264,7 +266,7 @@ class BASE_EXPORT SysInfo {
static HardwareInfo GetHardwareInfoSync();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/ungoogled-chromium/files/patch-base_test_launcher_test__launcher.cc b/www/ungoogled-chromium/files/patch-base_test_launcher_test__launcher.cc
index b5a50d6a9488..8d3239484de6 100644
--- a/www/ungoogled-chromium/files/patch-base_test_launcher_test__launcher.cc
+++ b/www/ungoogled-chromium/files/patch-base_test_launcher_test__launcher.cc
@@ -1,6 +1,6 @@
---- base/test/launcher/test_launcher.cc.orig 2023-03-10 11:01:21 UTC
+--- base/test/launcher/test_launcher.cc.orig 2023-06-05 19:39:05 UTC
+++ base/test/launcher/test_launcher.cc
-@@ -67,6 +67,7 @@
+@@ -69,6 +69,7 @@
#include "third_party/libxml/chromium/libxml_utils.h"
#if BUILDFLAG(IS_POSIX)
diff --git a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn
index db9f66592f8d..b6aa6d2518ff 100644
--- a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,4 +1,4 @@
---- build/config/compiler/BUILD.gn.orig 2023-05-05 12:12:41 UTC
+--- build/config/compiler/BUILD.gn.orig 2023-06-05 19:39:05 UTC
*** 19013 LINES SKIPPED ***