From fe9bc9d89bf06658ce064498e3e81e3000b36168 Mon Sep 17 00:00:00 2001
From: purplerain <purplerain@secbsd.org>
Date: Mon, 20 May 2024 13:42:05 +0000
Subject: [PATCH] update to 124.0.6367.207

---
 www/ungoogled-chromium/Makefile               |  56 ++-
 www/ungoogled-chromium/distinfo               |  14 +-
 www/ungoogled-chromium/patches/patch-BUILD_gn |  18 +-
 ...tch-apps_ui_views_app_window_frame_view_cc |   2 +-
 .../patches/patch-base_BUILD_gn               |  37 +-
 .../patch-base_allocator_dispatcher_tls_h     |   6 +-
 ...ase_allocator_partition_allocator_BUILD_gn |  12 -
 ...ition_allocator_page_allocator_constants_h |  39 --
 ...cator_partition_allocator_page_allocator_h |  12 -
 ...ition_allocator_partition_address_space_cc |  12 -
 ...r_partition_alloc_base_compiler_specific_h |  33 --
 ...or_partition_alloc_base_rand_util_posix_cc |  14 -
 ...oc_base_threading_platform_thread_posix_cc |  12 -
 ...rtition_allocator_partition_alloc_config_h |  30 --
 ...tion_allocator_partition_alloc_constants_h |  22 --
 ...or_partition_allocator_partition_alloc_gni |  21 +-
 ...ition_allocator_partition_page_constants_h |  12 -
 ...ion_allocator_src_partition_alloc_BUILD_gn |  12 +
 ...ition_alloc_address_space_randomization_h} |   8 +-
 ...partition_alloc_page_allocator_constants_h |  12 +
 ...cator_src_partition_alloc_page_allocator_h |  12 +
 ...on_alloc_page_allocator_internals_posix_h} |   8 +-
 ...tion_alloc_base_debug_stack_trace_posix_cc |  35 ++
 ...oc_partition_alloc_base_rand_util_posix_cc |  14 +
 ...ion_alloc_base_threading_platform_thread_h |  12 +
 ...hreading_platform_thread_internal_posix_h} |   6 +-
 ...oc_base_threading_platform_thread_posix_cc |  12 +
 ...c_partition_alloc_partition_alloc_config_h |  21 +
 ...artition_alloc_partition_alloc_constants_h |  12 +
 ...partition_alloc_partition_alloc_forward_h} |   6 +-
 ...tor_src_partition_alloc_partition_root_cc} |  21 +-
 ...tor_src_partition_alloc_spinning_mutex_cc} |  16 +-
 ...c_partition_alloc_starscan_stack_stack_cc} |   6 +-
 ...c_partition_alloc_thread_isolation_pkey_cc |  12 +
 .../patches/patch-base_base_paths_posix_cc    |  16 +-
 .../patches/patch-base_base_switches_cc       |  12 -
 .../patches/patch-base_base_switches_h        |  12 -
 .../patches/patch-base_compiler_specific_h    |  40 +-
 .../patch-base_debug_debugger_posix_cc        |   5 +-
 .../patches/patch-base_debug_elf_reader_cc    |  25 +-
 .../patches/patch-base_debug_stack_trace_cc   |  36 +-
 .../patch-base_debug_stack_trace_posix_cc     |  35 +-
 .../patch-base_files_file_path_watcher_h      |   2 +-
 ...h-base_files_file_path_watcher_unittest_cc |   6 +-
 .../patch-base_files_file_util_posix_cc       |   5 +-
 .../patch-base_files_file_util_unittest_cc    |   4 +-
 .../patch-base_functional_unretained_traits_h |  16 +-
 .../patches/patch-base_i18n_icu_util_cc       |   4 +-
 .../patches/patch-base_linux_util_cc          |   9 +-
 .../patches/patch-base_logging_unittest_cc    |   2 +-
 ...ase_memory_platform_shared_memory_region_h |  10 +-
 .../patch-base_native_library_unittest_cc     |   2 +-
 .../patches/patch-base_posix_sysctl_cc        |  11 +
 .../patch-base_posix_unix_domain_socket_cc    |  18 +
 .../patch-base_process_internal_linux_h       |  21 +
 .../patches/patch-base_process_kill_h         |   2 +-
 .../patch-base_process_launch_posix_cc        |   2 +-
 .../patch-base_process_memory_linux_cc        |   8 +-
 ...tch-base_process_process_handle_freebsd_cc |   2 +-
 .../patch-base_process_process_handle_h       |   2 +-
 ...tch-base_process_process_handle_openbsd_cc |  96 +++--
 .../patch-base_process_process_metrics_cc     |  11 +-
 ...ch-base_process_process_metrics_freebsd_cc |  49 ++-
 .../patch-base_process_process_metrics_h      |  35 +-
 ...ch-base_process_process_metrics_openbsd_cc |  79 ++--
 ...h-base_process_process_metrics_unittest_cc |  22 +-
 .../patch-base_process_process_unittest_cc    |   2 +-
 .../patch-base_profiler_module_cache_cc       |   2 +-
 ...profiler_sampling_profiler_thread_token_cc |   2 +-
 ..._profiler_sampling_profiler_thread_token_h |   4 +-
 ...-base_profiler_stack_base_address_posix_cc |  11 +-
 ...filer_stack_sampling_profiler_test_util_cc |   2 +-
 ...ofiler_stack_sampling_profiler_unittest_cc |   2 +-
 ...tch-base_profiler_thread_delegate_posix_cc |   8 +-
 .../patches/patch-base_rand_util_h            |   2 +-
 .../patches/patch-base_rand_util_posix_cc     |  32 +-
 .../patch-base_synchronization_lock_impl_h    |   4 +-
 .../patches/patch-base_syslog_logging_cc      |   4 +-
 .../patches/patch-base_system_sys_info_cc     |   2 +-
 .../patches/patch-base_system_sys_info_h      |   4 +-
 .../patch-base_system_sys_info_openbsd_cc     |  32 +-
 .../patch-base_system_sys_info_posix_cc       |  10 +-
 .../patch-base_system_sys_info_unittest_cc    |   2 +-
 .../patch-base_test_launcher_test_launcher_cc |   2 +-
 .../patch-base_test_test_file_util_posix_cc   |   2 +-
 .../patch-base_threading_hang_watcher_cc      |  12 +
 ...atch-base_threading_platform_thread_bsd_cc |   4 +-
 .../patch-base_threading_platform_thread_h    |  12 +
 ...hreading_platform_thread_internal_posix_cc |   2 +-
 ...ch-base_threading_platform_thread_posix_cc |  17 +-
 ...base_threading_platform_thread_unittest_cc |   6 +-
 ...h-base_trace_event_malloc_dump_provider_cc |   6 +-
 ...ch-base_trace_event_process_memory_dump_cc |   4 +-
 .../patch-base_trace_event_trace_log_cc       |  17 -
 .../patches/patch-build_config_clang_BUILD_gn |  12 +
 .../patch-build_config_compiler_BUILD_gn      |  71 ++--
 .../patch-build_config_compiler_pgo_BUILD_gn  |  20 -
 .../patches/patch-build_config_ozone_gni      |   2 +-
 .../patches/patch-build_config_rust_gni       |  14 +
 .../patch-build_linux_unbundle_libusb_gn      |   5 +-
 .../patch-build_linux_unbundle_libwebp_gn     |  28 ++
 ...h-build_linux_unbundle_replace_gn_files_py |  11 -
 .../patches/patch-build_rust_std_BUILD_gn     |  11 +
 .../patch-build_toolchain_gcc_toolchain_gni   |   8 +-
 .../patch-build_toolchain_toolchain_gni       |   2 +-
 .../patches/patch-cc_BUILD_gn                 |   6 +-
 .../patches/patch-cc_base_features_cc         |   8 +-
 .../patches/patch-cc_paint_paint_op_writer_h  |  42 --
 ...tch-chrome_app_app_management_strings_grdp |  12 -
 .../patches/patch-chrome_app_chrome_main_cc   |  19 +-
 .../patch-chrome_app_chrome_main_delegate_cc  |  60 ++-
 .../patch-chrome_app_chromium_strings_grd     |  39 --
 .../patch-chrome_app_generated_resources_grd  |  93 -----
 ...patch-chrome_app_google_chrome_strings_grd |  39 --
 .../patch-chrome_app_profiles_strings_grdp    |  12 -
 .../patch-chrome_app_settings_strings_grdp    |  21 -
 ...me_app_theme_chrome_unscaled_resources_grd |  30 --
 ...patch-chrome_app_theme_theme_resources_grd |  60 ---
 .../patches/patch-chrome_browser_BUILD_gn     |   2 +-
 .../patch-chrome_browser_about_flags_cc       | 184 +++++----
 ...rowser_accessibility_pdf_ocr_controller_cc |  12 +
 ...chrome_browser_after_startup_task_utils_cc |   6 +-
 ...s_app_service_publishers_extension_apps_cc |   8 +-
 ..._apps_platform_apps_platform_app_launch_cc |  61 ++-
 ...r_apps_platform_apps_platform_app_launch_h |   4 +-
 ...wser_background_background_mode_manager_cc |   2 +-
 ...er_background_background_mode_optimizer_cc |   2 +-
 .../patch-chrome_browser_browser_features_cc  |  11 +-
 ...tch-chrome_browser_browser_process_impl_cc |   8 +-
 ...atch-chrome_browser_browser_process_impl_h |   2 +-
 ...rowser_chrome_browser_interface_binders_cc |  31 +-
 ...atch-chrome_browser_chrome_browser_main_cc |  61 ++-
 ...r_chrome_browser_main_extra_parts_linux_cc |   6 +-
 ...r_chrome_browser_main_extra_parts_ozone_cc |  12 +
 ...hrome_browser_chrome_browser_main_linux_cc |  27 +-
 ...chrome_browser_chrome_browser_main_linux_h |  12 +
 ...hrome_browser_chrome_browser_main_posix_cc |   2 +-
 ...e_browser_chrome_content_browser_client_cc |  67 ++--
 ...me_browser_chrome_content_browser_client_h |   8 +-
 ...pdater_widevine_cdm_component_installer_cc |  30 ++
 ...t_settings_one_time_permission_provider_cc |  31 --
 .../patches/patch-chrome_browser_defaults_cc  |   6 +-
 ...d_bubble_download_bubble_update_service_cc |  33 --
 ...wnload_chrome_download_manager_delegate_cc |   6 +-
 ...hrome_browser_download_download_commands_h |   2 +-
 ...e_browser_download_download_file_picker_cc |   6 +-
 ...me_browser_download_download_item_model_cc |   8 +-
 ...-chrome_browser_download_download_prefs_cc |  22 +-
 ...h-chrome_browser_download_download_prefs_h |   4 +-
 ...r_management_browser_management_service_cc |  30 ++
 ...er_management_browser_management_service_h |  12 +
 ...tors_analysis_analysis_service_settings_cc |   7 +-
 ...tors_analysis_content_analysis_delegate_cc |  21 -
 ...nterprise_connectors_connectors_manager_cc |  83 ----
 ...enterprise_connectors_connectors_manager_h |  57 ---
 ...nterprise_connectors_connectors_service_cc |   2 +-
 ..._device_trust_connector_service_factory_cc |  18 +-
 ...vice_trust_device_trust_service_factory_cc |   4 +-
 ...r_commands_key_rotation_command_factory_cc |   4 +-
 ...rs_reporting_browser_crash_event_router_cc |   8 +-
 ...ctors_reporting_crash_reporting_context_cc |   4 +-
 ...ors_reporting_realtime_reporting_client_cc |   8 +-
 ...tors_reporting_realtime_reporting_client_h |   4 +-
 ...e_commands_cbcm_remote_commands_factory_cc |   8 +-
 ..._enterprise_signals_device_info_fetcher_cc |  18 +-
 ...ser_enterprise_watermark_watermark_view_cc |  21 +
 .../patch-chrome_browser_extensions_BUILD_gn  |   2 +-
 ...browser_context_keyed_service_factories_cc |   8 +-
 ...te_chrome_desktop_report_request_helper_cc |   4 +-
 ...prise_reporting_private_conversion_utils_h |   2 +-
 ...rivate_enterprise_reporting_private_api_cc |   8 +-
 ...nagement_chrome_management_api_delegate_cc |  12 +
 ...messaging_native_process_launcher_posix_cc |   2 +-
 ...private_passwords_private_delegate_impl_cc |   2 +-
 ...api_runtime_chrome_runtime_api_delegate_cc |   2 +-
 ...ensions_api_settings_private_prefs_util_cc |  20 +-
 ...me_browser_extensions_api_tabs_tabs_api_cc |  12 +-
 ...ging_private_webrtc_logging_private_api_cc |   2 +-
 ...i_webstore_private_webstore_private_api_cc |   8 +-
 ...owser_extensions_external_provider_impl_cc |   4 +-
 ...e_file_system_access_permission_context_cc |   2 +-
 .../patch-chrome_browser_flag_descriptions_cc |  81 ++--
 .../patch-chrome_browser_flag_descriptions_h  |  77 ++--
 ...ome_browser_headless_headless_mode_util_cc |  20 +-
 ...hrome_browser_intranet_redirect_detector_h |   2 +-
 ...ia_galleries_media_file_system_registry_cc |   2 +-
 ...me_browser_media_router_discovery_BUILD_gn |   4 +-
 ...r_media_webrtc_chrome_screen_enumerator_cc |  10 +-
 ...er_media_webrtc_chrome_screen_enumerator_h |   6 +-
 ..._webrtc_desktop_media_picker_controller_cc |  12 +
 ..._media_webrtc_webrtc_event_log_uploader_cc |  12 -
 ...rowser_media_webrtc_webrtc_log_uploader_cc |  18 +-
 ..._media_webrtc_webrtc_logging_controller_cc |   4 +-
 ...r_media_webrtc_webrtc_logging_controller_h |   4 +-
 .../patch-chrome_browser_memory_details_cc    |   2 +-
 ...chrome_browser_main_extra_parts_metrics_cc |  10 +-
 ..._chrome_browser_main_extra_parts_metrics_h |   4 +-
 ...r_metrics_chrome_metrics_service_client_cc |  67 +++-
 ...ics_power_process_metrics_recorder_util_cc |   2 +-
 ...e_browser_metrics_power_process_monitor_cc |  12 +-
 ...me_browser_metrics_power_process_monitor_h |   4 +-
 ...wser_net_system_network_context_manager_cc | 112 +++++-
 ...owser_net_system_network_context_manager_h |  22 +-
 ..._browser_new_tab_page_new_tab_page_util_cc |  11 +-
 ..._manager_chrome_password_manager_client_cc |  21 +
 ..._manager_password_reuse_manager_factory_cc |   2 +-
 ...atch-chrome_browser_platform_util_linux_cc |   6 +-
 ...ser_cloud_management_controller_desktop_cc |  16 +-
 ...nfiguration_policy_handler_list_factory_cc | 143 +++++--
 ...device_management_service_configuration_cc |   4 +-
 ...licy_policy_value_and_status_aggregator_cc |   4 +-
 ...atch-chrome_browser_prefs_browser_prefs_cc |  62 +--
 ..._prefs_pref_service_incognito_allowlist_cc |   2 +-
 ..._printing_print_backend_service_manager_cc |  10 +-
 ...h-chrome_browser_printing_printer_query_cc |   2 +-
 ...hrome_browser_main_extra_parts_profiles_cc |  54 ++-
 ...ch-chrome_browser_profiles_profile_impl_cc |   4 +-
 ...-chrome_browser_profiles_profiles_state_cc |   2 +-
 ...hrome_browser_renderer_preferences_util_cc |   6 +-
 ...ces_sandbox_internals_sandbox_internals_ts |  30 --
 ...ppearance_page_appearance_browser_proxy_ts |  21 -
 ...tings_appearance_page_appearance_page_html |  30 --
 ...ettings_appearance_page_appearance_page_ts |  57 ---
 ...chrome_browser_resources_settings_route_ts |  12 -
 ...nc_confirmation_sync_confirmation_app_html |  21 -
 ..._content_scanning_binary_upload_service_cc |   2 +-
 ...wsing_download_protection_file_analyzer_cc |   8 +-
 ...owsing_download_protection_file_analyzer_h |   4 +-
 ...nt_reporting_incident_reporting_service_cc |   2 +-
 ...owser_screen_ai_screen_ai_install_state_cc |  21 +
 ...wser_screen_ai_screen_ai_service_router_cc |  21 +
 ..._search_engine_choice_client_side_trial_cc |  12 +
 ...ce_search_engine_choice_service_factory_cc |  21 +
 ...b_to_self_receiving_ui_handler_registry_cc |   4 +-
 ...to_self_send_tab_to_self_client_service_cc |   4 +-
 ...ser_sharing_sharing_device_registration_cc |   2 +-
 ...r_sharing_sharing_handler_registry_impl_cc |   2 +-
 ...upervised_user_extensions_delegate_impl_cc |  12 +
 ...user_supervised_user_extensions_manager_cc |  21 +
 ..._user_supervised_user_extensions_manager_h |  12 +
 ...ser_supervised_user_navigation_observer_cc |   4 +-
 ...-chrome_browser_sync_chrome_sync_client_cc |  10 +-
 ...hrome_browser_sync_sync_service_factory_cc |  10 +-
 ...h-chrome_browser_sync_sync_service_util_cc |  21 +
 ...browser_task_manager_sampling_task_group_h |   6 +-
 ...ask_manager_sampling_task_group_sampler_cc |  10 +-
 ...task_manager_sampling_task_manager_impl_cc |   2 +-
 ...tch-chrome_browser_themes_theme_service_cc |   4 +-
 ...rome_browser_ui_actions_chrome_action_id_h |  12 +
 ...wser_ui_autofill_chrome_autofill_client_cc |  18 -
 ...ayments_desktop_payments_window_manager_cc |  21 +
 ...payments_desktop_payments_window_manager_h |  39 ++
 ...e_browser_ui_browser_command_controller_cc |  12 +-
 .../patches/patch-chrome_browser_ui_browser_h |   4 +-
 ...atch-chrome_browser_ui_browser_ui_prefs_cc |  12 +
 .../patch-chrome_browser_ui_chrome_pages_cc   |  10 +-
 .../patch-chrome_browser_ui_chrome_pages_h    |   4 +-
 ...xclusive_access_exclusive_access_bubble_cc |   2 +-
 ...rowser_ui_omnibox_chrome_omnibox_client_cc |  22 --
 ...i_omnibox_omnibox_pedal_implementations_cc |   2 +-
 ...llers_relaunch_chrome_bubble_controller_cc |  21 +
 ...asswords_manage_passwords_ui_controller_cc |  21 +
 ...owser_ui_signin_signin_view_controller_cc} |  10 +-
 ..._signin_signin_view_controller_delegate_h} |   8 +-
 ...ome_browser_ui_startup_bad_flags_prompt_cc |   2 +-
 ...wser_ui_startup_startup_browser_creator_cc |   8 +-
 ...ui_startup_startup_browser_creator_impl_cc |   2 +-
 ...browser_ui_startup_startup_tab_provider_cc |  21 +
 .../patch-chrome_browser_ui_tab_helpers_cc    |   4 +-
 ...i_task_manager_task_manager_table_model_cc |   2 +-
 .../patch-chrome_browser_ui_ui_features_cc    |   2 +-
 .../patch-chrome_browser_ui_ui_features_h     |   2 +-
 ...rome_browser_ui_views_accelerator_table_cc |   4 +-
 ...s_chrome_browser_main_extra_parts_views_cc |  20 +-
 ...e_browser_ui_views_chrome_views_delegate_h |   2 +-
 ...er_ui_views_compose_compose_dialog_view_cc |  12 +
 ...views_eye_dropper_eye_dropper_view_aura_cc |  12 -
 ...me_browser_ui_views_frame_browser_frame_cc |  29 +-
 ...ome_browser_ui_views_frame_browser_frame_h |  29 +-
 ...s_frame_browser_frame_view_layout_linux_cc |  12 +
 ..._browser_frame_view_layout_linux_native_cc |  12 +
 ...ui_views_frame_browser_frame_view_linux_cc |  21 +
 ...ser_non_client_frame_view_factory_views_cc |   9 -
 ...ome_browser_ui_views_frame_browser_view_cc |   2 +-
 ...i_views_frame_opaque_browser_frame_view_cc |  14 +-
 ...ui_views_frame_opaque_browser_frame_view_h |  12 +-
 ...paque_browser_frame_view_layout_delegate_h |  12 +-
 ...e_picture_in_picture_browser_frame_view_cc |  46 +--
 ...me_picture_in_picture_browser_frame_view_h |  31 +-
 ...ome_browser_ui_views_hung_renderer_view_cc |   2 +-
 ...ews_passwords_password_bubble_view_base_cc |  21 +
 ...i_views_profiles_profile_menu_view_base_cc |   2 +-
 ...s_signin_view_controller_delegate_views_cc |  32 +-
 ...es_signin_view_controller_delegate_views_h |  15 +-
 ...browser_ui_views_tab_search_bubble_host_cc |   2 +-
 .../patch-chrome_browser_ui_views_tabs_tab_cc |   4 +-
 ...owser_ui_views_tabs_tab_drag_controller_cc |  16 +-
 ...i_views_tabs_tab_hover_card_bubble_view_cc |   2 +-
 ...ui_views_tabs_tab_hover_card_controller_cc |  12 -
 ...e_browser_ui_views_tabs_tab_style_views_cc |   2 +-
 ...ducation_browser_user_education_service_cc |  12 +
 ...eb_apps_web_app_integration_test_driver_cc |  24 +-
 ...wser_ui_web_applications_web_app_dialogs_h |  12 +
 ...eb_applications_web_app_ui_manager_impl_cc |  21 +
 ...web_applications_web_app_ui_manager_impl_h |  12 +
 ...chrome_browser_ui_webauthn_sheet_models_cc |  15 -
 ...chrome_browser_ui_webui_about_about_ui_cc} |  10 +-
 ...ui_webui_app_home_app_home_page_handler_cc |  16 +-
 ..._webui_chrome_web_ui_controller_factory_cc |  14 +-
 ...connectors_internals_device_trust_utils_cc |   8 +-
 ...owser_ui_webui_management_management_ui_cc |  15 +-
 ..._webui_management_management_ui_handler_cc |  12 +-
 ...i_webui_management_management_ui_handler_h |   4 +-
 ...owser_ui_webui_ntp_app_launcher_handler_cc |  12 -
 ...ui_password_manager_promo_cards_handler_cc |  21 +
 ...nager_promo_cards_relaunch_chrome_promo_cc |  21 +
 ...rowser_ui_webui_realbox_realbox_handler_cc |  21 -
 ...bui_settings_accessibility_main_handler_cc |  12 +
 ...ebui_settings_accessibility_main_handler_h |  12 +
 ...ngs_settings_localized_strings_provider_cc |  49 ++-
 ...ns_commands_install_app_locally_command_cc |   2 +-
 ..._web_applications_extension_status_utils_h |  14 +-
 ...tions_extensions_extension_status_utils_cc |  16 +-
 ...ons_os_integration_shortcut_sub_manager_cc |   2 +-
 ...ration_web_app_file_handler_registration_h |   2 +-
 ...os_integration_web_app_shortcut_manager_cc |   2 +-
 ...lications_policy_web_app_policy_manager_cc |  12 +
 ..._test_os_integration_test_override_impl_cc |   8 +-
 ...rowser_web_applications_web_app_helpers_cc |  12 +
 ...er_web_applications_web_app_install_info_h |  12 +
 ...n_chrome_authenticator_request_delegate_cc |   2 +-
 .../patch-chrome_common_chrome_features_cc    |  32 +-
 .../patch-chrome_common_chrome_features_h     |  18 +-
 .../patch-chrome_common_chrome_paths_cc       |  39 +-
 .../patch-chrome_common_chrome_paths_h        |  12 +-
 .../patch-chrome_common_chrome_paths_linux_cc |   4 +-
 .../patch-chrome_common_chrome_switches_cc    |   2 +-
 .../patch-chrome_common_chrome_switches_h     |   2 +-
 ...ch-chrome_common_media_cdm_registration_cc |  53 +++
 ...a_component_widevine_cdm_hint_file_linux_h |  12 +
 .../patches/patch-chrome_common_pref_names_h  |  41 +-
 .../patch-chrome_common_url_constants_cc      |  12 -
 .../patch-chrome_common_url_constants_h       |   8 +-
 ...patch-chrome_common_webui_url_constants_cc |  12 +-
 .../patch-chrome_common_webui_url_constants_h |   9 +-
 ...e_renderer_chrome_render_frame_observer_cc |   2 +-
 ...ces_printing_print_backend_service_impl_cc |  12 +-
 .../patches/patch-chrome_test_BUILD_gn        |  12 -
 ...h-chrome_test_chromedriver_capabilities_cc |  27 --
 ..._test_chromedriver_chrome_chrome_finder_cc |  23 +-
 ...me_test_chromedriver_chrome_client_hints_h |  11 -
 ...hrome_test_chromedriver_chrome_launcher_cc |   2 +-
 .../patch-chrome_updater_configurator_cc      |   6 +-
 .../patch-chrome_updater_util_posix_util_cc   |   2 +-
 .../patches/patch-chrome_utility_services_cc  |  12 +-
 ...ast_browser_cast_content_browser_client_cc |   2 +-
 ...fill_core_browser_personal_data_manager_cc |   4 +-
 ..._core_common_autofill_payments_features_cc |   2 +-
 ...ents_autofill_core_common_autofill_util_cc |   2 +-
 ...-components_autofill_payments_strings_grdp |  12 -
 ...nts_commerce_core_commerce_feature_list_cc |  21 +
 ...components_components_chromium_strings_grd |  12 -
 ...nents_components_google_chrome_strings_grd |  12 -
 ...trained_window_constrained_window_views_cc |  12 +
 ..._core_browser_website_settings_registry_cc |   2 +-
 ...ponents_cookie_config_cookie_store_util_cc |   2 +-
 .../patch-components_crash_core_app_BUILD_gn  |  24 +-
 ...ts_crash_core_app_crashpad_handler_main_cc |  21 +
 ...re_browser_user_permission_service_impl_cc |   2 +-
 ...rvice_discardable_shared_memory_manager_cc |   2 +-
 ...nents_embedder_support_user_agent_utils_cc |   2 +-
 ...omponents_eye_dropper_eye_dropper_view_cc} |   8 +-
 ...ngagement_public_feature_configurations_cc |  26 +-
 ...ure_engagement_public_feature_constants_cc |  19 +-
 ...ture_engagement_public_feature_constants_h |  26 +-
 ..._feature_engagement_public_feature_list_cc |  28 +-
 ...s_feature_engagement_public_feature_list_h |  56 ++-
 ...feed_core_v2_feed_network_impl_unittest_cc |   2 +-
 ...tch-components_gwp_asan_client_gwp_asan_cc |  11 +-
 ...nents_gwp_asan_client_gwp_asan_features_cc |  12 +
 ...tch-components_live_caption_caption_util_h |   2 +-
 .../patch-components_management_strings_grdp  |  12 -
 ...onents_media_router_common_media_source_cc |  12 +
 ...roviders_cast_channel_cast_message_util_cc |   2 +-
 .../patch-components_metrics_metrics_log_cc   |   8 +-
 ...ts_named_mojo_ipc_server_connection_info_h |   6 +-
 ...-components_neterror_resources_neterror_js |   2 +-
 ...or_browser_network_session_configurator_cc |   2 +-
 ...r_network_session_configurator_unittest_cc |   2 +-
 ...tch-components_new_or_sad_tab_strings_grdp |  21 -
 ...ents_omnibox_browser_omnibox_edit_model_cc |  11 -
 ...tion_guide_core_optimization_guide_util_cc |   4 +-
 ...ization_guide_core_tflite_model_executor_h |  63 ---
 ...nt_preview_browser_paint_preview_client_cc |  16 +-
 ...w_browser_paint_preview_client_unittest_cc |  16 +-
 ...eview_player_player_compositor_delegate_cc |  16 +-
 ...core_browser_features_password_features_cc |  21 +
 ..._core_browser_features_password_features_h |  12 +
 ...ord_manager_core_browser_login_database_cc |  30 --
 ...er_core_browser_login_database_unittest_cc |  30 --
 ...ager_core_browser_password_form_manager_cc |  30 ++
 ...d_manager_core_browser_password_manager_cc |  12 +
 ...sword_store_login_database_async_helper_cc |  12 +
 ..._password_store_login_database_unittest_cc |  12 +
 ..._core_browser_sync_password_sync_bridge_cc |  11 +-
 ...nager_core_browser_ui_passwords_grouper_cc |  15 -
 ...r_core_common_password_manager_features_cc |   9 -
 ...er_core_common_password_manager_features_h |  11 +-
 ..._core_common_password_manager_pref_names_h |  12 +
 ...ents_performance_manager_public_features_h |   4 +-
 ...y_core_browser_policy_pref_mapping_test_cc |   2 +-
 ...y_core_common_cloud_cloud_policy_client_cc |   2 +-
 ...icy_core_common_cloud_cloud_policy_util_cc |   6 +-
 ...policy_core_common_policy_loader_common_cc |   8 +-
 ...ponents_policy_core_common_policy_paths_cc |  12 +
 ...ponents_policy_core_common_policy_utils_cc |  12 +
 ...nts_policy_tools_generate_policy_source_py |   2 +-
 ...ore_browser_db_v4_protocol_manager_util_cc |   2 +-
 ...ine_choice_search_engine_choice_service_cc |  12 +
 ...nts_search_engines_template_url_service_cc |  12 +
 ...default_model_cross_device_user_segment_cc |   2 +-
 ...aint_preview_compositor_collection_impl_cc |   8 +-
 ...ai_sandbox_screen_ai_sandbox_hook_linux_cc |  19 -
 ..._ai_sandbox_screen_ai_sandbox_hook_linux_h |  17 -
 ...ces_screen_ai_screen_ai_library_wrapper_cc |  30 --
 ...ents_signin_public_base_signin_switches_cc |  21 +
 ...nents_signin_public_base_signin_switches_h |  12 +
 ...etric_utils_common_startup_metric_utils_cc |   2 +-
 .../patch-components_storage_monitor_BUILD_gn |   4 +-
 ...ervised_user_core_browser_proto_fetcher_cc |  40 --
 ...pervised_user_core_browser_proto_fetcher_h |  22 --
 ...er_core_browser_supervised_user_service_cc |  12 +-
 ...ts_supervised_user_core_common_features_cc |  21 +
 ...nts_supervised_user_core_common_features_h |  12 +
 ...s_supervised_user_core_common_pref_names_h |  12 +
 .../patch-components_sync_base_features_cc    |  12 +
 .../patch-components_system_cpu_cpu_probe_cc  |  13 +
 ...ormatter_spoof_checks_idn_spoof_checker_cc |   2 +-
 ...s_user_education_views_help_bubble_view_cc |   2 +-
 ...s_service_google_groups_updater_service_cc |  12 -
 ...s_variations_service_variations_service_cc |   2 +-
 ...components_viz_host_host_display_client_cc |  10 +-
 ...-components_viz_host_host_display_client_h |  14 +-
 ...splay_embedder_skia_output_surface_impl_cc |  12 +-
 ...mbedder_skia_output_surface_impl_on_gpu_cc |  16 -
 ...isplay_embedder_software_output_surface_cc |   4 +-
 ...display_embedder_software_output_surface_h |   2 +-
 ...nents_viz_service_display_skia_renderer_cc |   2 +-
 ...e_sinks_root_compositor_frame_sink_impl_cc |  20 +-
 ...me_sinks_root_compositor_frame_sink_impl_h |  12 +-
 ...components_viz_test_fake_display_client_cc |   6 +-
 ...-components_viz_test_fake_display_client_h |   8 +-
 ...-components_viz_test_mock_display_client_h |  12 +-
 ...bauthn_core_browser_passkey_sync_bridge_cc |  27 --
 .../patches/patch-content_app_content_main_cc |   2 +-
 ...ch-content_app_content_main_runner_impl_cc |  20 +-
 .../patches/patch-content_browser_BUILD_gn    |   2 +-
 ...tch-content_browser_audio_audio_service_cc |   4 +-
 ...browser_browser_child_process_host_impl_cc |  23 +-
 ..._browser_browser_child_process_host_impl_h |  21 +
 ...ild_process_host_impl_receiver_bindings_cc |  12 +
 ...patch-content_browser_browser_main_loop_cc |   6 +-
 ...nt_browser_child_process_launcher_helper_h |  12 +
 ...ser_child_process_launcher_helper_linux_cc |  18 +-
 ...rowser_child_thread_type_switcher_linux_cc |  21 +
 ...ompositor_viz_process_transport_factory_cc |  10 +-
 ...er_devtools_devtools_frontend_host_impl_cc |  39 ++
 ...ser_devtools_devtools_frontend_host_impl_h |  12 +
 ...r_devtools_protocol_system_info_handler_cc |   2 +-
 ...h-content_browser_download_save_package_cc |  17 -
 ...s_file_system_access_local_path_watcher_cc |  12 +
 ...ont_access_font_enumeration_data_source_cc |   6 +-
 ...tch-content_browser_gpu_compositor_util_cc |  24 +-
 ...ntent_browser_gpu_gpu_data_manager_impl_cc |   2 +-
 ...ontent_browser_gpu_gpu_data_manager_impl_h |   2 +-
 ...owser_gpu_gpu_data_manager_impl_private_cc |   2 +-
 ...rowser_gpu_gpu_data_manager_impl_private_h |   4 +-
 ...gpu_gpu_memory_buffer_manager_singleton_cc |   6 +-
 ...ch-content_browser_gpu_gpu_process_host_cc |  18 +-
 ...group_header_direct_from_seller_signals_cc |  15 -
 ..._media_media_keys_listener_manager_impl_cc |  12 +-
 ...t_browser_network_service_instance_impl_cc |   8 +-
 ...wser_renderer_host_delegated_frame_host_cc |   2 +-
 ...a_service_video_capture_device_launcher_cc |   4 +-
 ...er_renderer_host_render_frame_host_impl_cc |  41 --
 ..._renderer_host_render_process_host_impl_cc |  23 +-
 ...r_renderer_host_render_process_host_impl_h |   2 +-
 ...ser_renderer_host_render_view_host_impl_cc |   8 +-
 ...derer_host_render_widget_host_view_aura_cc |  16 +-
 ...nderer_host_render_widget_host_view_aura_h |   2 +-
 ...t_render_widget_host_view_event_handler_cc |   2 +-
 ...e_worker_service_worker_context_wrapper_cc |  16 -
 ...ch-content_browser_utility_process_host_cc |  46 ++-
 ...tch-content_browser_utility_process_host_h |  12 +-
 ..._utility_process_host_receiver_bindings_cc |  14 +-
 ...ontent_browser_utility_sandbox_delegate_cc |  12 +-
 ...ser_web_contents_web_contents_view_aura_cc |   6 +-
 ...wser_zygote_host_zygote_host_impl_linux_cc |  16 +-
 .../patches/patch-content_child_BUILD_gn      |  17 +
 .../patch-content_child_child_process_cc      |  10 +-
 .../patches/patch-content_common_BUILD_gn     |  49 ++-
 .../patches/patch-content_common_features_cc  |  21 +
 .../patches/patch-content_common_features_h   |  21 +
 ...ontent_common_gpu_pre_sandbox_hook_bsd_cc} |  13 +-
 ...-content_common_gpu_pre_sandbox_hook_bsd_h |  24 ++
 ...ontent_common_gpu_pre_sandbox_hook_linux_h |  17 +
 ...ontent_common_mojo_core_library_support_cc |   2 +-
 .../patches/patch-content_gpu_BUILD_gn        |  21 -
 .../patch-content_gpu_gpu_child_thread_cc     |  22 ++
 .../patches/patch-content_gpu_gpu_main_cc     |  31 +-
 .../patch-content_gpu_gpu_sandbox_hook_bsd_h  |  20 -
 ..._ppapi_plugin_ppapi_blink_platform_impl_cc |   6 +-
 ...t_ppapi_plugin_ppapi_blink_platform_impl_h |   2 +-
 ...t_public_browser_content_browser_client_cc |  12 +
 ...ent_public_browser_service_process_host_cc |  12 +
 ...web_ui_browser_interface_broker_registry_h |  17 -
 ...public_common_common_param_traits_macros_h |  12 -
 ...-content_public_common_content_features_cc |  17 +-
 ...h-content_public_common_content_features_h |  12 -
 ...-content_public_common_content_switches_cc |   4 +-
 ...h-content_public_common_content_switches_h |   4 +-
 ...-content_public_test_mock_render_thread_cc |  12 -
 .../patches/patch-content_renderer_BUILD_gn   |  17 -
 ...ch-content_renderer_render_process_impl_cc |  25 +-
 ...tch-content_renderer_render_thread_impl_cc |  10 +-
 ...t_renderer_renderer_blink_platform_impl_cc |  14 +-
 ...nt_renderer_renderer_blink_platform_impl_h |   2 +-
 .../patches/patch-content_shell_BUILD_gn      |   2 +-
 ...h-content_shell_app_shell_main_delegate_cc |   2 +-
 ..._shell_browser_shell_browser_main_parts_cc |  10 +-
 .../patches/patch-content_test_BUILD_gn       |  21 -
 .../patches/patch-content_utility_services_cc |  60 ++-
 ...h_speech_recognition_sandbox_hook_linux_cc |   6 +-
 .../patch-content_utility_utility_main_cc     |  58 ++-
 ...tch-content_utility_utility_thread_impl_cc |  22 ++
 .../patch-content_zygote_zygote_linux_cc      |   2 +-
 ...atch-device_bluetooth_bluetooth_adapter_cc |   2 +-
 .../patches/patch-device_gamepad_BUILD_gn     |   2 +-
 ...browser_context_keyed_service_factories_cc |   4 +-
 ...s_browser_api_management_management_api_cc |  12 +
 ...s_browser_api_messaging_message_service_cc |   2 +-
 ...ate_networking_private_delegate_factory_cc |   8 +-
 ...sions_common_api__permission_features_json |   2 +-
 .../patch-extensions_common_api_runtime_json  |   2 +-
 .../patch-extensions_common_command_cc        |   2 +-
 ...xtensions_shell_app_shell_main_delegate_cc |   8 +-
 ...buffer_common_gpu_memory_buffer_support_cc |   2 +-
 ...nd_buffer_service_dawn_context_provider_cc |   6 +-
 ...ommand_buffer_service_gles2_cmd_decoder_cc |   2 +-
 ...mage_angle_vulkan_image_backing_factory_cc |   2 +-
 ..._shared_image_external_vk_image_backing_cc |  12 +-
 ...image_external_vk_image_backing_factory_cc |  15 +-
 ...rvice_shared_image_shared_image_factory_cc |   2 +-
 ...rvice_shared_image_shared_image_manager_cc |   2 +-
 ...e_shared_image_wrapped_sk_image_backing_cc |   2 +-
 ...mand_buffer_service_webgpu_decoder_impl_cc |  21 +-
 .../patch-gpu_config_gpu_control_list_cc      |   2 +-
 .../patch-gpu_config_gpu_finch_features_cc    |  23 +-
 .../patch-gpu_config_gpu_info_collector_cc    |  12 +
 .../patches/patch-gpu_ipc_service_gpu_init_cc |  18 +-
 .../patches/patch-gpu_ipc_service_x_util_h    |  15 +-
 .../patch-gpu_vulkan_generate_bindings_py     |   2 +-
 .../patch-gpu_vulkan_semaphore_handle_cc      |  21 +
 .../patch-gpu_vulkan_vulkan_device_queue_cc   |   2 +-
 .../patch-gpu_vulkan_vulkan_device_queue_h    |   2 +-
 ...tch-gpu_vulkan_vulkan_function_pointers_cc |   6 +-
 ...atch-gpu_vulkan_vulkan_function_pointers_h |   6 +-
 .../patches/patch-gpu_vulkan_vulkan_util_cc   |   2 +-
 ...owser_headless_browser_main_parts_posix_cc |   6 +-
 ...rowser_headless_request_context_manager_cc |   2 +-
 ...less_lib_headless_content_main_delegate_cc |   2 +-
 .../patches/patch-ipc_ipc_channel_h           |   2 +-
 .../patches/patch-ipc_ipc_message_utils_cc    |   2 +-
 .../patches/patch-media_BUILD_gn              |   2 +-
 .../patches/patch-media_audio_BUILD_gn        |   4 +-
 .../patch-media_audio_audio_input_device_cc   |   2 +-
 .../patch-media_base_cdm_promise_adapter_cc   |  17 -
 .../patch-media_base_libaom_thread_wrapper_cc |  25 ++
 .../patch-media_base_libvpx_thread_wrapper_cc |  26 ++
 .../patch-media_base_media_switches_cc        |  70 +++-
 .../patches/patch-media_base_media_switches_h |  25 +-
 .../patch-media_base_scopedfd_helper_h        |  12 -
 .../patches/patch-media_base_video_frame_cc   |  16 +-
 .../patches/patch-media_base_video_frame_h    |  10 +-
 ...video_fake_video_capture_device_factory_cc |   2 +-
 ...edia_capture_video_linux_fake_v4l2_impl_cc |   2 +-
 ...pture_video_linux_v4l2_capture_delegate_cc |  58 ++-
 ...apture_video_linux_v4l2_capture_delegate_h |  11 +-
 ...linux_video_capture_device_factory_v4l2_cc |  38 +-
 ...deo_capture_buffer_tracker_factory_impl_cc |   4 +-
 ...pture_video_video_capture_device_client_cc |   2 +-
 .../patch-media_cdm_library_cdm_cdm_paths_gni |  12 +
 .../patch-media_gpu_buffer_validation_cc      |  31 +-
 ...chromeos_libyuv_image_processor_backend_cc |  30 ++
 ..._chromeos_mailbox_video_frame_converter_cc |  12 +
 ...u_chromeos_native_pixmap_frame_resource_cc |  12 +
 ...gpu_chromeos_platform_video_frame_utils_cc |  30 ++
 ...dia_gpu_chromeos_video_decoder_pipeline_cc |  15 +-
 ...pu_gpu_video_encode_accelerator_factory_cc |   2 +-
 ...dware_video_decoding_sandbox_hook_linux_cc |  14 +-
 ...dware_video_encoding_sandbox_hook_linux_cc |   2 +-
 ...tch-media_gpu_vaapi_vaapi_video_decoder_cc |   4 +-
 .../patch-media_gpu_vaapi_vaapi_wrapper_cc    |  21 +-
 .../patches/patch-media_media_options_gni     |   4 +-
 ...stable_video_decoder_types_mojom_traits_cc |   4 +-
 ..._stable_video_decoder_types_mojom_traits_h |   2 +-
 ...atch-media_video_fake_gpu_memory_buffer_cc |  10 +-
 ...ideo_gpu_memory_buffer_video_frame_pool_cc |   8 +-
 ..._video_video_encode_accelerator_adapter_cc |   4 +-
 .../patch-media_webrtc_audio_processor_cc     |   2 +-
 .../patches/patch-media_webrtc_helpers_cc     |  16 +-
 .../patch-media_webrtc_helpers_unittests_cc   |  29 +-
 .../patch-mojo_public_c_system_thunks_cc      |   4 +-
 ...patch-mojo_public_tools_bindings_mojom_gni |   4 +-
 .../patches/patch-net_BUILD_gn                |  20 +-
 .../patches/patch-net_base_features_cc        |  25 +-
 .../patch-net_base_network_change_notifier_cc |   2 +-
 .../patches/patch-net_cert_cert_verifier_cc   |  12 -
 .../patch-net_cert_cert_verify_proc_cc        |  12 -
 .../patches/patch-net_cert_cert_verify_proc_h |   2 +-
 ...atch-net_cert_cert_verify_proc_unittest_cc |  21 -
 ...patch-net_cert_test_root_certs_unittest_cc |  12 -
 .../patches/patch-net_dns_BUILD_gn            |   6 +-
 .../patches/patch-net_dns_address_info_cc     |   2 +-
 .../patch-net_dns_address_sorter_posix_cc     |   2 +-
 .../patch-net_dns_host_resolver_cache_cc      |  15 -
 .../patches/patch-net_dns_public_BUILD_gn     |   2 +-
 .../patch-net_dns_public_scoped_res_state_h   |   2 +-
 .../patch-net_filter_zstd_source_stream_cc    |  11 +
 ...ch-net_http_http_auth_handler_negotiate_cc |  12 +
 .../patch-net_http_http_auth_preferences_cc   |  12 +
 .../patch-net_http_http_auth_preferences_h    |  30 ++
 ...y_resolution_proxy_config_service_linux_cc |   6 +-
 .../patch-net_socket_udp_socket_posix_cc      |  16 +-
 .../patch-net_socket_udp_socket_unittest_cc   |  10 +-
 .../patch-net_third_party_quiche_BUILD_gn     |   2 +-
 ...erify_tool_cert_verify_comparision_tool_cc |   2 +-
 ...tools_cert_verify_tool_cert_verify_tool_cc |  19 +-
 ...url_request_url_request_context_builder_cc |   2 +-
 ...tch-net_url_request_url_request_context_cc |   2 +-
 ...atch-net_url_request_url_request_context_h |   2 +-
 .../patches/patch-pdf_pdfium_pdfium_engine_cc |   2 +-
 ...ing_mojom_printing_context_mojom_traits_cc |  17 +-
 ...ting_mojom_printing_context_mojom_traits_h |   2 +-
 .../patches/patch-printing_print_settings_cc  |   8 +-
 ...atch-printing_print_settings_conversion_cc |   2 +-
 .../patches/patch-printing_print_settings_h   |  21 +-
 .../patch-printing_printing_context_linux_cc  |   4 +-
 ...andbox_print_backend_sandbox_hook_linux_cc |   4 +-
 ...g_host_base_desktop_environment_options_cc |   2 +-
 ...remoting_host_basic_desktop_environment_cc |   2 +-
 .../patch-remoting_host_chromoting_host_cc    |   2 +-
 .../patch-remoting_host_client_session_cc     |  12 +
 ...ch-remoting_host_desktop_capturer_proxy_cc |   4 +-
 ...-remoting_host_desktop_capturer_wrapper_cc |   6 +-
 .../patch-remoting_host_heartbeat_sender_cc   |  12 -
 .../patch-remoting_host_host_attributes_cc    |   2 +-
 .../patch-remoting_host_it2me_it2me_host_cc   |   6 +-
 .../patch-remoting_host_policy_watcher_cc     |   2 +-
 ...patch-remoting_host_remoting_me2me_host_cc |  40 +-
 ...tch-remoting_host_setup_start_host_main_cc |  10 +-
 ...n_remote_webauthn_caller_security_utils_cc |   6 +-
 ...h-remoting_protocol_webrtc_video_stream_cc |   2 +-
 ...ch-remoting_resources_remoting_strings_grd |  21 -
 .../patches/patch-sandbox_policy_BUILD_gn     |  10 +-
 .../patches/patch-sandbox_policy_features_cc  |  11 +-
 .../patches/patch-sandbox_policy_features_h   |  12 +
 .../patch-sandbox_policy_mojom_sandbox_mojom  |   2 +-
 ...-sandbox_policy_openbsd_sandbox_openbsd_cc |  10 +-
 .../patches/patch-sandbox_policy_sandbox_cc   |   2 +-
 .../patch-sandbox_policy_sandbox_type_cc      |  22 +-
 .../patches/patch-sandbox_policy_switches_cc  |   4 +-
 .../patches/patch-sandbox_policy_switches_h   |   4 +-
 ...services_audio_audio_sandbox_hook_linux_cc |   6 +-
 ...es_cert_verifier_cert_verifier_creation_cc |  29 --
 .../patches/patch-services_device_BUILD_gn    |   2 +-
 ...vices_device_compute_pressure_cpu_probe_cc |  11 -
 ..._device_geolocation_location_arbitrator_cc |   4 +-
 .../patch-services_device_hid_BUILD_gn        |   2 +-
 ...public_cpp_generic_sensor_sensor_reading_h |  12 +
 .../patch-services_device_usb_BUILD_gn        |   6 +-
 .../patches/patch-services_network_BUILD_gn   |   4 +-
 .../patch-services_network_network_context_cc |  21 +
 .../patch-services_network_network_context_h  |  12 +
 ...ices_network_network_sandbox_hook_linux_cc |  10 +-
 .../patch-services_network_network_service_cc |  20 +-
 .../patch-services_network_network_service_h  |  30 ++
 ...patch-services_network_public_cpp_BUILD_gn |   2 +-
 ...tch-services_network_public_mojom_BUILD_gn |   4 +-
 ..._on_device_model_on_device_model_service_h |  23 ++
 ...rvices_on_device_model_pre_sandbox_init_cc |  39 ++
 ...strumentation_queued_request_dispatcher_cc |  14 +-
 ...services_screen_ai_public_cpp_utilities_cc |  30 ++
 ...ai_sandbox_screen_ai_sandbox_hook_linux_cc |  19 +
 ..._ai_sandbox_screen_ai_sandbox_hook_linux_h |  17 +
 ...stack_sampling_tracing_sampler_profiler_cc |   2 +-
 ...ideo_capture_video_capture_service_impl_cc |  30 +-
 ...video_capture_video_capture_service_impl_h |  26 +-
 .../patch-skia_ext_SkMemory_new_handler_cpp   |  11 +-
 .../patches/patch-skia_ext_font_utils_cc      |  21 +
 ...-third_party_abseil-cpp_absl_base_config_h |   4 +-
 ...seil-cpp_absl_base_internal_raw_logging_cc |  17 -
 ...y_abseil-cpp_absl_base_internal_sysinfo_cc |  25 +-
 ...time_internal_cctz_src_time_zone_format_cc |  12 -
 .../patches/patch-third_party_angle_BUILD_gn  |   6 +-
 ...rd_party_angle_src_common_system_utils_cpp |  12 +
 ...ty_angle_src_common_system_utils_linux_cpp |  36 ++
 ...third_party_angle_src_libANGLE_Display_cpp |  14 +-
 ...d_party_angle_src_libANGLE_formatutils_cpp |   2 +-
 ...ences_renderer_preferences_mojom_traits_cc |   2 +-
 ...enderer_preferences_renderer_preferences_h |   2 +-
 ...rences_renderer_preferences_mojom_traits_h |   2 +-
 ...ird_party_blink_public_platform_platform_h |   2 +-
 ...d_party_blink_public_platform_web_vector_h |   2 +-
 ...k_renderer_controller_blink_initializer_cc |   6 +-
 ..._renderer_core_editing_editing_behavior_cc |   2 +-
 ...nk_renderer_core_exported_web_view_impl_cc |   4 +-
 ...link_renderer_core_frame_web_frame_test_cc |   4 +-
 ...e_html_canvas_canvas_async_blob_creator_cc |   2 +-
 ...ml_parser_html_document_parser_fastpath_cc |  15 -
 ...r_core_inspector_inspector_memory_agent_cc |   8 +-
 ...blink_renderer_core_layout_layout_view_cc} |  16 +-
 ...layout_ng_grid_ng_grid_layout_algorithm_cc |  31 --
 ...re_layout_ng_physical_fragment_rare_data_h |  11 -
 ...ore_paint_object_paint_properties_sparse_h |  14 -
 ...y_blink_renderer_core_paint_paint_layer_cc |   2 +-
 ...nderer_core_scroll_scrollbar_theme_aura_cc |   4 +-
 ...y_blink_renderer_core_xml_xslt_processor_h |  15 +
 ...enderer_core_xml_xslt_processor_libxslt_cc |  15 +
 ...er_modules_canvas_canvas2d_canvas_style_cc |  34 --
 ...audio_audio_renderer_mixer_manager_test_cc |   2 +-
 ...ink_renderer_modules_ml_webnn_features_gni |  16 +-
 ...derer_modules_ml_webnn_ml_graph_xnnpack_cc |   2 +-
 ...erconnection_webrtc_audio_renderer_test_cc |   2 +-
 ...ules_webaudio_audio_worklet_thread_test_cc |   2 +-
 ...ules_webgl_webgl_rendering_context_base_cc |   2 +-
 ...blink_renderer_modules_webgpu_gpu_queue_cc |   6 +-
 ...ird_party_blink_renderer_platform_BUILD_gn |   2 +-
 ...link_renderer_platform_fonts_font_cache_cc |   4 +-
 ...blink_renderer_platform_fonts_font_cache_h |  10 +-
 ...enderer_platform_fonts_font_description_cc |   6 +-
 ...nk_renderer_platform_fonts_font_metrics_cc |  14 +-
 ...ink_renderer_platform_fonts_font_palette_h |  27 --
 ...er_platform_fonts_palette_interpolation_cc |  16 -
 ...rer_platform_fonts_skia_font_cache_skia_cc |   4 +-
 ...platform_graphics_video_frame_submitter_cc |   2 +-
 ...on_partition_alloc_memory_dump_provider_cc |  14 +-
 ...eerconnection_rtc_video_encoder_factory_cc |   2 +-
 ...er_platform_runtime_enabled_features_json5 |  51 ++-
 ...atform_video_capture_video_capture_impl_cc |   6 +-
 ...nderer_platform_wtf_text_text_codec_icu_cc |  19 +
 ...boringssl_src_util_generate_build_files_py |   4 +-
 .../patch-third_party_cpuinfo_cpuinfo_gni     |   8 +-
 ..._party_crashpad_crashpad_util_misc_uuid_cc |   2 +-
 ...hpad_crashpad_util_posix_close_multiple_cc |   2 +-
 ...y_dawn_include_dawn_native_VulkanBackend_h |   2 +-
 ...hird_party_dawn_src_dawn_common_Platform_h |   2 +-
 ..._dawn_src_dawn_native_vulkan_BackendVk_cpp |   2 +-
 ...party_distributed_point_functions_BUILD_gn |  13 -
 .../patches/patch-third_party_ffmpeg_BUILD_gn |   2 +-
 ...ty_ffmpeg_chromium_scripts_build_ffmpeg_py | 148 +++----
 ...ffmpeg_chromium_scripts_robo_lib_config_py |  96 ++---
 .../patch-third_party_ffmpeg_configure        |  11 -
 ...-third_party_ffmpeg_libavcodec_x86_fft_asm | 109 ------
 ...hird_party_ffmpeg_libavutil_x86_x86inc_asm |   2 +-
 ...ch-third_party_fontconfig_include_config_h |  64 +--
 ...-third_party_leveldatabase_env_chromium_cc |   2 +-
 ...ource_libaom_aom_ports_aarch64_cpudetect_c |  40 +-
 ...atch-third_party_libc++_src_src_chrono_cpp |  12 +
 ...++_src_src_filesystem_filesystem_clock_cpp |  12 +
 ...d_party_libc++abi_src_src_cxa_guard_impl_h |  25 ++
 .../patch-third_party_libsync_src_sync_c      |  10 +-
 ...tch-third_party_libusb_src_libusb_libusb_h |  12 +
 ...ource_libvpx_vpx_ports_aarch64_cpudetect_c |  28 ++
 .../patch-third_party_libxml_linux_config_h   |  13 -
 .../patch-third_party_libxml_src_dict_c       |  42 --
 ...ldoca_src_maldoca_base_get_runfiles_dir_cc |   6 +-
 ..._color_utilities_src_cpp_palettes_tones_cc |   2 +-
 .../patches/patch-third_party_node_node_gni   |  12 +
 ...y_pdfium_core_fxge_linux_fx_linux_impl_cpp |  12 +-
 .../patch-third_party_pdfium_pdfium_gni       |   2 +-
 ...dfium_third_party_base_compiler_specific_h |  12 -
 ...arty_perfetto_include_perfetto_base_time_h |   6 +-
 ...o_include_perfetto_ext_base_thread_utils_h |   2 +-
 ...rd_party_perfetto_src_base_string_utils_cc |   2 +-
 ...ce_processor_db_storage_numeric_storage_cc |  17 -
 ...rfetto_src_tracing_core_clock_snapshots_cc |  13 +
 ...o_src_tracing_core_tracing_service_impl_cc |  13 -
 ..._party_skia_src_ports_SkMemory_malloc_cpp} |  14 +-
 ...rty_speech-dispatcher_libspeechd_version_h |  33 ++
 ...rd_party_speech-dispatcher_speechd_types_h | 143 +++++++
 ...rd_party_sqlite_src_amalgamation_sqlite3_c |   4 +-
 ..._fonts_fontconfig_fontconfig_util_linux_cc |   2 +-
 .../patch-third_party_tflite_features_gni     |  13 +-
 .../patch-third_party_unrar_src_crypt_cpp     |   2 +-
 ...rty_vulkan-deps_vulkan-loader_src_BUILD_gn |   2 +-
 ...kan-loader_src_loader_vk_loader_platform_h |   4 +-
 ...rc_layers_stateless_sl_instance_device_cpp |  18 -
 ...n-layers_src_layers_utils_vk_layer_utils_h |  12 -
 ...ers_vulkan_generated_vk_extension_helper_h |  16 -
 ...an_memory_allocator_include_vk_mem_alloc_h |  18 +-
 .../patches/patch-third_party_webrtc_BUILD_gn |   2 +-
 ...party_webrtc_modules_audio_device_BUILD_gn |   2 +-
 ...capture_linux_x11_x_server_pixel_buffer_cc |  20 +-
 ..._webrtc_rtc_base_physical_socket_server_cc |  63 ++-
 ...y_webrtc_rtc_base_physical_socket_server_h |   6 +-
 ...atch-third_party_widevine_cdm_widevine_gni |  12 +
 .../patches/patch-third_party_zlib_BUILD_gn   |   6 +-
 .../patch-third_party_zlib_cpu_features_c     |  26 +-
 .../patch-tools_gn_bootstrap_bootstrap_py     |  12 +
 .../patches/patch-tools_gn_build_gen_py       |   4 +-
 .../patch-tools_grit_grit_node_base_py        |  13 +
 ...s_json_schema_compiler_feature_compiler_py |   2 +-
 ...memory_partition_allocator_inspect_utils_h |   2 +-
 ...tools_perf_chrome_telemetry_build_BUILD_gn |   2 +-
 ...tch-tools_protoc_wrapper_protoc_wrapper_py |   2 +-
 .../patches/patch-ui_aura_screen_ozone_cc     |   2 +-
 .../patches/patch-ui_aura_screen_ozone_h      |   4 +-
 ...h-ui_base_clipboard_clipboard_constants_cc |   2 +-
 ...ch-ui_base_clipboard_clipboard_constants_h |   2 +-
 ...-ui_base_clipboard_clipboard_non_backed_cc |  12 +
 .../patch-ui_base_cursor_cursor_factory_cc    |   2 +-
 ...op_os_exchange_data_provider_non_backed_cc |   6 +-
 ...atch-ui_base_ime_fake_text_input_client_cc |   2 +-
 ...patch-ui_base_ime_fake_text_input_client_h |   2 +-
 ..._base_ime_init_input_method_initializer_cc |  30 ++
 .../patches/patch-ui_base_test_ui_controls_h  |  12 +
 .../patches/patch-ui_base_ui_base_features_cc |  28 +-
 .../patches/patch-ui_base_ui_base_features_h  |  21 -
 .../patches/patch-ui_base_ui_base_switches_cc |  19 +
 .../patches/patch-ui_base_ui_base_switches_h  |  17 +
 .../patches/patch-ui_base_ui_base_types_h     |  12 -
 .../patch-ui_base_webui_web_ui_util_cc        |  12 +-
 .../patch-ui_base_x_x11_cursor_factory_cc     |   2 +-
 .../patch-ui_base_x_x11_cursor_factory_h      |   6 +-
 .../patch-ui_base_x_x11_cursor_loader_cc      |  12 +-
 .../patch-ui_base_x_x11_display_manager_cc    |  21 +
 .../patch-ui_base_x_x11_display_util_cc       | 368 ++++++++++++++++++
 .../patch-ui_base_x_x11_shm_image_pool_cc     |  26 +-
 .../patches/patch-ui_base_x_x11_util_cc       |  26 ++
 .../patches/patch-ui_base_x_x11_util_h        |  16 +
 .../patches/patch-ui_color_color_id_h         |   2 +-
 .../patch-ui_color_color_provider_utils_cc    |   2 +-
 .../patches/patch-ui_compositor_compositor_cc |  10 +-
 .../patches/patch-ui_compositor_compositor_h  |  12 +-
 .../patch-ui_compositor_compositor_observer_h |  10 +-
 .../patches/patch-ui_display_screen_h         |   2 +-
 ...nts_devices_x11_device_data_manager_x11_cc |   2 +-
 .../patches/patch-ui_events_event_cc          |   8 +-
 ...s_gesture_detection_motion_event_generic_h |  11 -
 ...i_events_keycodes_dom_keycode_converter_cc |   6 +-
 ...ui_events_keycodes_dom_keycode_converter_h |   2 +-
 .../patches/patch-ui_gfx_BUILD_gn             |   2 +-
 .../patches/patch-ui_gfx_canvas_skia_cc       |   2 +-
 .../patches/patch-ui_gfx_codec_png_codec_cc   |   4 +-
 .../patch-ui_gfx_font_fallback_linux_cc       |   2 +-
 .../patches/patch-ui_gfx_font_render_params_h |   8 +-
 .../patch-ui_gfx_font_render_params_linux_cc  |   4 +-
 .../patches/patch-ui_gfx_font_util_cc         |   6 +-
 .../patches/patch-ui_gfx_gpu_memory_buffer_h  |   2 +-
 ...i_gfx_linux_client_native_pixmap_dmabuf_cc |  26 --
 .../patches/patch-ui_gfx_linux_dmabuf_uapi_h  |  37 ++
 .../patches/patch-ui_gfx_linux_gbm_wrapper_cc |  12 +
 ...x_mojom_native_handle_types_mojom_traits_h |   8 +-
 .../patch-ui_gfx_native_widget_types_h        |   4 +-
 .../patch-ui_gfx_platform_font_skia_cc        |   6 +-
 .../patches/patch-ui_gfx_switches_cc          |   2 +-
 .../patches/patch-ui_gfx_switches_h           |   4 +-
 .../patch-ui_gfx_x_generated_protos_dri3_cc   |   4 +-
 .../patch-ui_gfx_x_generated_protos_shm_cc    |   4 +-
 .../patches/patch-ui_gfx_x_xlib_support_cc    |   4 +-
 .../patches/patch-ui_gl_BUILD_gn              |   8 +-
 .../patches/patch-ui_gl_gl_context_cc         |   2 +-
 .../patches/patch-ui_gl_gl_implementation_cc  |   2 +-
 .../patches/patch-ui_gl_gl_switches_cc        |  19 +-
 .../patches/patch-ui_gtk_gtk_ui_cc            |  23 --
 .../patch-ui_gtk_printing_print_dialog_gtk_cc |   2 +-
 ...message_center_views_message_popup_view_cc |   2 +-
 ...patch-ui_native_theme_native_theme_base_cc |   6 +-
 ...h-ui_native_theme_native_theme_features_cc |  21 +
 .../patch-ui_native_theme_native_theme_h      |   2 +-
 ...atform_headless_ozone_platform_headless_cc |   2 +-
 ...headless_vulkan_implementation_headless_cc |  20 +-
 ...ne_platform_wayland_common_wayland_util_cc |  12 +
 ...m_wayland_emulate_wayland_input_emulate_cc |  12 +
 ...rm_wayland_emulate_wayland_input_emulate_h |  12 +
 ...latform_wayland_host_wayland_connection_cc |  12 +
 ...yland_host_wayland_input_method_context_cc |  12 +
 ...rm_wayland_host_wayland_toplevel_window_cc |   6 +-
 ...orm_wayland_host_wayland_toplevel_window_h |  10 +-
 ...ne_platform_wayland_host_wayland_window_cc |  15 +-
 ...one_platform_wayland_host_wayland_window_h |  14 +-
 ..._wayland_host_xdg_toplevel_wrapper_impl_cc |  12 +-
 ..._wayland_host_zwp_text_input_wrapper_v1_cc |   4 +-
 ...platform_wayland_ozone_platform_wayland_cc |  17 +-
 ...i_ozone_platform_x11_ozone_platform_x11_cc |  12 -
 ..._platform_x11_vulkan_implementation_x11_cc |   2 +-
 ...-ui_ozone_platform_x11_x11_screen_ozone_cc |  28 +-
 ...h-ui_ozone_platform_x11_x11_screen_ozone_h |  37 +-
 .../patch-ui_ozone_platform_x11_x11_window_cc |  12 +
 .../patch-ui_ozone_public_ozone_platform_h    |  12 -
 .../patch-ui_ozone_public_platform_screen_cc  |  12 -
 .../patch-ui_ozone_public_platform_screen_h   |  21 -
 ...ozone_test_mock_platform_window_delegate_h |   6 +-
 ...latform_window_platform_window_delegate_cc |   6 +-
 ...platform_window_platform_window_delegate_h |   6 +-
 ...m_window_platform_window_init_properties_h |   4 +-
 .../patches/patch-ui_qt_BUILD_gn              |  12 +
 .../patch-ui_strings_app_locale_settings_grd  |  12 -
 ...h-ui_views_controls_textfield_textfield_cc |  14 +-
 ...ch-ui_views_controls_textfield_textfield_h |   6 +-
 .../patch-ui_views_corewm_tooltip_aura_cc     |   2 +-
 .../patch-ui_views_focus_focus_manager_cc     |   4 +-
 .../patch-ui_views_style_platform_style_cc    |  10 +-
 ..._ui_controls_factory_desktop_aura_ozone_cc |  12 +
 .../patches/patch-ui_views_views_delegate_h   |   2 +-
 ...top_aura_desktop_drag_drop_client_ozone_cc |   4 +-
 ...ktop_aura_desktop_drag_drop_client_ozone_h |   4 +-
 ...idget_desktop_aura_desktop_screen_ozone_cc |  12 -
 ..._aura_desktop_window_tree_host_platform_cc |   8 +-
 ...e_host_platform_impl_interactive_uitest_cc |   2 +-
 .../patch-ui_views_widget_root_view_cc        |  12 +
 .../patches/patch-ui_views_widget_widget_cc   |   2 +-
 .../patches/patch-ui_views_widget_widget_h    |   2 +-
 .../patch-ui_views_window_dialog_delegate_cc  |   2 +-
 .../patch-ui_views_window_frame_background_cc |   4 +-
 .../patches/patch-v8_BUILD_gn                 |  20 +-
 .../patches/patch-v8_include_v8-internal_h    |   6 +-
 .../patches/patch-v8_include_v8config_h       |   6 +-
 .../patches/patch-v8_src_api_api_cc           |   4 +-
 ...tch-v8_src_base_platform_platform-posix_cc |  12 +-
 ..._baseline_x64_baseline-assembler-x64-inl_h |  14 -
 .../patch-v8_src_builtins_x64_builtins-x64_cc |  56 ---
 .../patch-v8_src_codegen_x64_assembler-x64_cc |  43 --
 .../patch-v8_src_codegen_x64_assembler-x64_h  |  22 --
 ...-v8_src_codegen_x64_macro-assembler-x64_cc |  21 -
 ...h-v8_src_codegen_x64_macro-assembler-x64_h |  21 -
 ...compiler_backend_x64_code-generator-x64_cc |  17 -
 ...-v8_src_deoptimizer_x64_deoptimizer-x64_cc |  12 -
 .../patch-v8_src_diagnostics_perf-jit_cc      |   4 +-
 .../patches/patch-v8_src_execution_isolate_cc |  10 +-
 .../patches/patch-v8_src_flags_flags_cc       |  10 +-
 ..._src_maglev_x64_maglev-assembler-x64-inl_h |  15 -
 ...-v8_src_maglev_x64_maglev-assembler-x64_cc |  17 -
 ...c_regexp_x64_regexp-macro-assembler-x64_cc |  23 --
 ...rc_regexp_x64_regexp-macro-assembler-x64_h |  13 -
 ...dded_platform-embedded-file-writer-base_cc |   2 +-
 ...8_src_trap-handler_handler-inside-posix_cc |   4 +-
 ...aseline_ia32_liftoff-assembler-ia32-inl_h} |  36 +-
 .../patch-v8_src_wasm_jump-table-assembler_cc |  52 ---
 .../patch-v8_src_wasm_jump-table-assembler_h  |  17 -
 ...eblayer_browser_browser_main_parts_impl_cc |  21 -
 ...yer_browser_content_browser_client_impl_cc |  21 -
 ...ayer_browser_content_browser_client_impl_h |  12 -
 ..._browser_system_network_context_manager_cc |  12 -
 .../patch-weblayer_common_weblayer_paths_cc   |  21 -
 www/ungoogled-chromium/pkg/PFRAG.swiftshader  |   1 +
 www/ungoogled-chromium/pkg/PLIST              |   1 -
 958 files changed, 7372 insertions(+), 6231 deletions(-)
 delete mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_BUILD_gn
 delete mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_constants_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_address_space_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_compiler_specific_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_rand_util_posix_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_threading_platform_thread_posix_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_config_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_constants_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_page_constants_h
 create mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_BUILD_gn
 rename www/ungoogled-chromium/patches/{patch-base_allocator_partition_allocator_address_space_randomization_h => patch-base_allocator_partition_allocator_src_partition_alloc_address_space_randomization_h} (66%)
 create mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_page_allocator_constants_h
 create mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_page_allocator_h
 rename www/ungoogled-chromium/patches/{patch-base_allocator_partition_allocator_page_allocator_internals_posix_h => patch-base_allocator_partition_allocator_src_partition_alloc_page_allocator_internals_posix_h} (57%)
 create mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_debug_stack_trace_posix_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_rand_util_posix_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_threading_platform_thread_h
 rename www/ungoogled-chromium/patches/{patch-base_allocator_partition_allocator_partition_alloc_base_threading_platform_thread_internal_posix_h => patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_threading_platform_thread_internal_posix_h} (53%)
 create mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_threading_platform_thread_posix_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_config_h
 create mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_constants_h
 rename www/ungoogled-chromium/patches/{patch-base_allocator_partition_allocator_partition_alloc_forward_h => patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_forward_h} (70%)
 rename www/ungoogled-chromium/patches/{patch-base_allocator_partition_allocator_partition_root_cc => patch-base_allocator_partition_allocator_src_partition_alloc_partition_root_cc} (52%)
 rename www/ungoogled-chromium/patches/{patch-base_allocator_partition_allocator_spinning_mutex_cc => patch-base_allocator_partition_allocator_src_partition_alloc_spinning_mutex_cc} (81%)
 rename www/ungoogled-chromium/patches/{patch-base_allocator_partition_allocator_starscan_stack_stack_cc => patch-base_allocator_partition_allocator_src_partition_alloc_starscan_stack_stack_cc} (80%)
 create mode 100644 www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_thread_isolation_pkey_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-base_base_switches_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-base_base_switches_h
 create mode 100644 www/ungoogled-chromium/patches/patch-base_posix_sysctl_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-base_process_internal_linux_h
 create mode 100644 www/ungoogled-chromium/patches/patch-base_threading_hang_watcher_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-base_threading_platform_thread_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-base_trace_event_trace_log_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-build_config_clang_BUILD_gn
 delete mode 100644 www/ungoogled-chromium/patches/patch-build_config_compiler_pgo_BUILD_gn
 create mode 100644 www/ungoogled-chromium/patches/patch-build_config_rust_gni
 create mode 100644 www/ungoogled-chromium/patches/patch-build_linux_unbundle_libwebp_gn
 delete mode 100644 www/ungoogled-chromium/patches/patch-build_linux_unbundle_replace_gn_files_py
 create mode 100644 www/ungoogled-chromium/patches/patch-build_rust_std_BUILD_gn
 delete mode 100644 www/ungoogled-chromium/patches/patch-cc_paint_paint_op_writer_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_app_app_management_strings_grdp
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_app_chromium_strings_grd
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_app_generated_resources_grd
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_app_google_chrome_strings_grd
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_app_profiles_strings_grdp
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_app_settings_strings_grdp
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_app_theme_chrome_unscaled_resources_grd
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_app_theme_theme_resources_grd
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_accessibility_pdf_ocr_controller_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_extra_parts_ozone_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_linux_h
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_component_updater_widevine_cdm_component_installer_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_content_settings_one_time_permission_provider_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_download_bubble_download_bubble_update_service_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_browser_management_browser_management_service_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_browser_management_browser_management_service_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_content_analysis_delegate_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_connectors_manager_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_connectors_manager_h
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_watermark_watermark_view_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_management_chrome_management_api_delegate_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_desktop_media_picker_controller_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_password_manager_chrome_password_manager_client_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_resources_sandbox_internals_sandbox_internals_ts
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_browser_proxy_ts
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_html
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_ts
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_route_ts
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_resources_signin_sync_confirmation_sync_confirmation_app_html
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_screen_ai_screen_ai_install_state_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_screen_ai_screen_ai_service_router_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_search_engine_choice_search_engine_choice_client_side_trial_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_search_engine_choice_search_engine_choice_service_factory_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_supervised_user_supervised_user_extensions_delegate_impl_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_supervised_user_supervised_user_extensions_manager_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_supervised_user_supervised_user_extensions_manager_h
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_sync_sync_service_util_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_actions_chrome_action_id_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_autofill_chrome_autofill_client_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop_payments_window_manager_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop_payments_window_manager_h
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_ui_prefs_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_omnibox_chrome_omnibox_client_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_passwords_bubble_controllers_relaunch_chrome_bubble_controller_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_passwords_manage_passwords_ui_controller_cc
 rename www/ungoogled-chromium/patches/{patch-chrome_browser_ui_signin_view_controller_cc => patch-chrome_browser_ui_signin_signin_view_controller_cc} (50%)
 rename www/ungoogled-chromium/patches/{patch-chrome_browser_ui_signin_view_controller_delegate_h => patch-chrome_browser_ui_signin_signin_view_controller_delegate_h} (62%)
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_startup_tab_provider_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_compose_compose_dialog_view_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_eye_dropper_eye_dropper_view_aura_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_view_layout_linux_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_view_layout_linux_native_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_view_linux_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_passwords_password_bubble_view_base_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_hover_card_controller_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_user_education_browser_user_education_service_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_web_applications_web_app_dialogs_h
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_web_applications_web_app_ui_manager_impl_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_web_applications_web_app_ui_manager_impl_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_webauthn_sheet_models_cc
 rename www/ungoogled-chromium/patches/{patch-chrome_browser_ui_webui_about_ui_cc => patch-chrome_browser_ui_webui_about_about_ui_cc} (68%)
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_ntp_app_launcher_handler_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_password_manager_promo_cards_handler_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_password_manager_promo_cards_relaunch_chrome_promo_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_realbox_realbox_handler_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_settings_accessibility_main_handler_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_settings_accessibility_main_handler_h
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_policy_web_app_policy_manager_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_web_app_helpers_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_web_app_install_info_h
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_common_media_cdm_registration_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-chrome_common_media_component_widevine_cdm_hint_file_linux_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_common_url_constants_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_test_BUILD_gn
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_capabilities_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_chrome_client_hints_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_autofill_payments_strings_grdp
 create mode 100644 www/ungoogled-chromium/patches/patch-components_commerce_core_commerce_feature_list_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_components_chromium_strings_grd
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_components_google_chrome_strings_grd
 create mode 100644 www/ungoogled-chromium/patches/patch-components_constrained_window_constrained_window_views_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-components_crash_core_app_crashpad_handler_main_cc
 rename www/ungoogled-chromium/patches/{patch-chrome_browser_ui_views_eye_dropper_eye_dropper_view_cc => patch-components_eye_dropper_eye_dropper_view_cc} (56%)
 create mode 100644 www/ungoogled-chromium/patches/patch-components_gwp_asan_client_gwp_asan_features_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_management_strings_grdp
 create mode 100644 www/ungoogled-chromium/patches/patch-components_media_router_common_media_source_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_new_or_sad_tab_strings_grdp
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_omnibox_browser_omnibox_edit_model_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_optimization_guide_core_tflite_model_executor_h
 create mode 100644 www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_features_password_features_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_features_password_features_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_login_database_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_login_database_unittest_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_password_form_manager_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_password_manager_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_password_store_login_database_async_helper_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_password_store_login_database_unittest_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_ui_passwords_grouper_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_pref_names_h
 create mode 100644 www/ungoogled-chromium/patches/patch-components_policy_core_common_policy_paths_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-components_policy_core_common_policy_utils_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-components_search_engines_search_engine_choice_search_engine_choice_service_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-components_search_engines_template_url_service_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_services_screen_ai_screen_ai_library_wrapper_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-components_signin_public_base_signin_switches_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-components_signin_public_base_signin_switches_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_proto_fetcher_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_proto_fetcher_h
 create mode 100644 www/ungoogled-chromium/patches/patch-components_supervised_user_core_common_features_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-components_supervised_user_core_common_features_h
 create mode 100644 www/ungoogled-chromium/patches/patch-components_supervised_user_core_common_pref_names_h
 create mode 100644 www/ungoogled-chromium/patches/patch-components_sync_base_features_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-components_system_cpu_cpu_probe_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_variations_service_google_groups_updater_service_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_skia_output_surface_impl_on_gpu_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-components_webauthn_core_browser_passkey_sync_bridge_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-content_browser_browser_child_process_host_impl_h
 create mode 100644 www/ungoogled-chromium/patches/patch-content_browser_browser_child_process_host_impl_receiver_bindings_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-content_browser_child_process_launcher_helper_h
 create mode 100644 www/ungoogled-chromium/patches/patch-content_browser_child_thread_type_switcher_linux_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-content_browser_devtools_devtools_frontend_host_impl_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-content_browser_devtools_devtools_frontend_host_impl_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-content_browser_download_save_package_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-content_browser_file_system_access_file_system_access_local_path_watcher_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-content_browser_interest_group_header_direct_from_seller_signals_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_frame_host_impl_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-content_browser_service_worker_service_worker_context_wrapper_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-content_child_BUILD_gn
 create mode 100644 www/ungoogled-chromium/patches/patch-content_common_features_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-content_common_features_h
 rename www/ungoogled-chromium/patches/{patch-content_gpu_gpu_sandbox_hook_bsd_cc => patch-content_common_gpu_pre_sandbox_hook_bsd_cc} (83%)
 create mode 100644 www/ungoogled-chromium/patches/patch-content_common_gpu_pre_sandbox_hook_bsd_h
 create mode 100644 www/ungoogled-chromium/patches/patch-content_common_gpu_pre_sandbox_hook_linux_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-content_gpu_BUILD_gn
 create mode 100644 www/ungoogled-chromium/patches/patch-content_gpu_gpu_child_thread_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-content_gpu_gpu_sandbox_hook_bsd_h
 create mode 100644 www/ungoogled-chromium/patches/patch-content_public_browser_content_browser_client_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-content_public_browser_service_process_host_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-content_public_browser_web_ui_browser_interface_broker_registry_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-content_public_common_common_param_traits_macros_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-content_public_common_content_features_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-content_public_test_mock_render_thread_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-content_renderer_BUILD_gn
 delete mode 100644 www/ungoogled-chromium/patches/patch-content_test_BUILD_gn
 create mode 100644 www/ungoogled-chromium/patches/patch-content_utility_utility_thread_impl_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-extensions_browser_api_management_management_api_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-gpu_config_gpu_info_collector_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-gpu_vulkan_semaphore_handle_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-media_base_cdm_promise_adapter_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-media_base_libaom_thread_wrapper_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-media_base_libvpx_thread_wrapper_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-media_base_scopedfd_helper_h
 create mode 100644 www/ungoogled-chromium/patches/patch-media_cdm_library_cdm_cdm_paths_gni
 create mode 100644 www/ungoogled-chromium/patches/patch-media_gpu_chromeos_libyuv_image_processor_backend_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-media_gpu_chromeos_mailbox_video_frame_converter_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-media_gpu_chromeos_native_pixmap_frame_resource_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-media_gpu_chromeos_platform_video_frame_utils_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-net_cert_cert_verifier_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-net_cert_cert_verify_proc_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-net_cert_cert_verify_proc_unittest_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-net_cert_test_root_certs_unittest_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-net_dns_host_resolver_cache_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-net_filter_zstd_source_stream_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-net_http_http_auth_handler_negotiate_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-net_http_http_auth_preferences_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-net_http_http_auth_preferences_h
 create mode 100644 www/ungoogled-chromium/patches/patch-remoting_host_client_session_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-remoting_host_heartbeat_sender_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-remoting_resources_remoting_strings_grd
 create mode 100644 www/ungoogled-chromium/patches/patch-sandbox_policy_features_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-services_cert_verifier_cert_verifier_creation_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-services_device_compute_pressure_cpu_probe_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-services_device_public_cpp_generic_sensor_sensor_reading_h
 create mode 100644 www/ungoogled-chromium/patches/patch-services_network_network_context_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-services_network_network_context_h
 create mode 100644 www/ungoogled-chromium/patches/patch-services_network_network_service_h
 create mode 100644 www/ungoogled-chromium/patches/patch-services_on_device_model_on_device_model_service_h
 create mode 100644 www/ungoogled-chromium/patches/patch-services_on_device_model_pre_sandbox_init_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-services_screen_ai_public_cpp_utilities_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_h
 create mode 100644 www/ungoogled-chromium/patches/patch-skia_ext_font_utils_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_base_internal_raw_logging_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_time_internal_cctz_src_time_zone_format_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-third_party_angle_src_common_system_utils_cpp
 create mode 100644 www/ungoogled-chromium/patches/patch-third_party_angle_src_common_system_utils_linux_cpp
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_html_parser_html_document_parser_fastpath_cc
 rename www/ungoogled-chromium/patches/{patch-third_party_blink_renderer_core_layout_ng_layout_ng_view_cc => patch-third_party_blink_renderer_core_layout_layout_view_cc} (57%)
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_grid_ng_grid_layout_algorithm_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_physical_fragment_rare_data_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_paint_object_paint_properties_sparse_h
 create mode 100644 www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_xml_xslt_processor_h
 create mode 100644 www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_xml_xslt_processor_libxslt_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_canvas_canvas2d_canvas_style_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_palette_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_palette_interpolation_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_wtf_text_text_codec_icu_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_distributed_point_functions_BUILD_gn
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_ffmpeg_configure
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_ffmpeg_libavcodec_x86_fft_asm
 create mode 100644 www/ungoogled-chromium/patches/patch-third_party_libc++_src_src_chrono_cpp
 create mode 100644 www/ungoogled-chromium/patches/patch-third_party_libc++_src_src_filesystem_filesystem_clock_cpp
 create mode 100644 www/ungoogled-chromium/patches/patch-third_party_libc++abi_src_src_cxa_guard_impl_h
 create mode 100644 www/ungoogled-chromium/patches/patch-third_party_libusb_src_libusb_libusb_h
 create mode 100644 www/ungoogled-chromium/patches/patch-third_party_libvpx_source_libvpx_vpx_ports_aarch64_cpudetect_c
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_libxml_linux_config_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_libxml_src_dict_c
 create mode 100644 www/ungoogled-chromium/patches/patch-third_party_node_node_gni
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_pdfium_third_party_base_compiler_specific_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_perfetto_src_trace_processor_db_storage_numeric_storage_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-third_party_perfetto_src_tracing_core_clock_snapshots_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_perfetto_src_tracing_core_tracing_service_impl_cc
 rename www/ungoogled-chromium/patches/{patch-third_party_skia_src_base_SkContainers_cpp => patch-third_party_skia_src_ports_SkMemory_malloc_cpp} (63%)
 create mode 100644 www/ungoogled-chromium/patches/patch-third_party_speech-dispatcher_libspeechd_version_h
 create mode 100644 www/ungoogled-chromium/patches/patch-third_party_speech-dispatcher_speechd_types_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl_instance_device_cpp
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk_layer_utils_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk_extension_helper_h
 create mode 100644 www/ungoogled-chromium/patches/patch-third_party_widevine_cdm_widevine_gni
 create mode 100644 www/ungoogled-chromium/patches/patch-tools_gn_bootstrap_bootstrap_py
 create mode 100644 www/ungoogled-chromium/patches/patch-tools_grit_grit_node_base_py
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_base_clipboard_clipboard_non_backed_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_base_ime_init_input_method_initializer_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_base_test_ui_controls_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-ui_base_ui_base_features_h
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_base_ui_base_switches_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_base_ui_base_switches_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-ui_base_ui_base_types_h
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_base_x_x11_display_manager_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_base_x_x11_display_util_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_base_x_x11_util_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_base_x_x11_util_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-ui_events_gesture_detection_motion_event_generic_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-ui_gfx_linux_client_native_pixmap_dmabuf_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_gfx_linux_dmabuf_uapi_h
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_gfx_linux_gbm_wrapper_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-ui_gtk_gtk_ui_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_native_theme_native_theme_features_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_common_wayland_util_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_emulate_wayland_input_emulate_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_emulate_wayland_input_emulate_h
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_connection_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_input_method_context_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_ozone_platform_x11_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_window_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-ui_ozone_public_ozone_platform_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-ui_ozone_public_platform_screen_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-ui_ozone_public_platform_screen_h
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_qt_BUILD_gn
 delete mode 100644 www/ungoogled-chromium/patches/patch-ui_strings_app_locale_settings_grd
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_views_test_ui_controls_factory_desktop_aura_ozone_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_screen_ozone_cc
 create mode 100644 www/ungoogled-chromium/patches/patch-ui_views_widget_root_view_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-v8_src_baseline_x64_baseline-assembler-x64-inl_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-v8_src_builtins_x64_builtins-x64_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_assembler-x64_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_assembler-x64_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_macro-assembler-x64_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_macro-assembler-x64_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-v8_src_compiler_backend_x64_code-generator-x64_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-v8_src_deoptimizer_x64_deoptimizer-x64_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-v8_src_maglev_x64_maglev-assembler-x64-inl_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-v8_src_maglev_x64_maglev-assembler-x64_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-v8_src_regexp_x64_regexp-macro-assembler-x64_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-v8_src_regexp_x64_regexp-macro-assembler-x64_h
 rename www/ungoogled-chromium/patches/{patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32_h => patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl_h} (83%)
 delete mode 100644 www/ungoogled-chromium/patches/patch-v8_src_wasm_jump-table-assembler_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-v8_src_wasm_jump-table-assembler_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-weblayer_browser_browser_main_parts_impl_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-weblayer_browser_content_browser_client_impl_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-weblayer_browser_content_browser_client_impl_h
 delete mode 100644 www/ungoogled-chromium/patches/patch-weblayer_browser_system_network_context_manager_cc
 delete mode 100644 www/ungoogled-chromium/patches/patch-weblayer_common_weblayer_paths_cc

diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
index 9009e37d5..921522067 100644
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -4,10 +4,13 @@ BROKEN-riscv64 =	Unknown current CPU: riscv64
 USE_WXNEEDED=		Yes
 
 DPB_PROPERTIES=		parallel parallel2
+.if ${MACHINE_ARCH:Mi386}
+DPB_PROPERTIES+=	lonesome
+.endif
 
 COMMENT=		Chromium browser sans integration with Google
 
-V=			117.0.5938.149
+V=			124.0.6367.207
 UGV=			${V}-1
 
 DISTNAME=		ungoogled-chromium-${V}
@@ -15,8 +18,7 @@ DISTNAME=		ungoogled-chromium-${V}
 DISTFILES+=		${CHROMIUM_DISTFILES} \
 			${REGRESS_DISTFILES}
 
-DISTFILES.u=	 	libudev-openbsd-20221108-c3330efd.tar.gz \
-			${UGOOGLE_DISTFILES} \
+DISTFILES.u=		${UGOOGLE_DISTFILES} \
 			${REGRESS_DISTFILES.u}
 
 CHROMIUM_DISTFILES+=	chromium-${V}${EXTRACT_SUFX}
@@ -46,29 +48,31 @@ PERMIT_PACKAGE =	Yes
 SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/
 SITES.u=http://nerd.hu/distfiles/
 
-MODULES=	lang/python x11/qt5
-MODQT5_DEPS=	No
-
-COMPILER =	base-clang ports-clang ports-gcc
+MODULES=	lang/clang lang/python x11/qt5
 
+MODCLANG_VERSION=	17
+MODQT5_DEPS=		No
 MODPY_RUNDEP=		No
 
+COMPILER=		ports-clang
+
 # uses pledge()
 WANTLIB+=	GL X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xft Xi Xrandr
-WANTLIB+=	Xrender Xtst atk-1.0 atk-bridge-2.0 atspi c c++ c++abi cairo
+WANTLIB+=	Xrender Xtst aom atk-1.0 atk-bridge-2.0 atspi c cairo
 WANTLIB+=	cbor crypto cups dav1d dbus-1 drm event execinfo expat ffi fido2
 WANTLIB+=	fontconfig freetype fribidi gbm gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB+=	gobject-2.0 graphite2 gthread-2.0 harfbuzz harfbuzz-gobject
 WANTLIB+=	harfbuzz-subset iconv icudata icui18n icuuc intl jpeg kvm m
 WANTLIB+=	nspr4 nss3 nssutil3 openh264 opus pango-1.0 pangocairo-1.0
 WANTLIB+=	pangoft2-1.0 pcre2-8 pixman-1 plc4 plds4 png pthread pthread smime3
-WANTLIB+=	snappy sndio usbhid util xcb xcb-render xcb-shm xkbcommon xml2
+WANTLIB+=	sndio usbhid util vpx xcb xcb-render xcb-shm xkbcommon xml2
 WANTLIB+=	xshmfence xslt z
 
 RUN_DEPENDS=	devel/xdg-utils \
 		devel/desktop-file-utils \
 		fonts/noto/fonts \
 		graphics/libexif \
+		sysutils/libudev-openbsd \
 		x11/gtk+3,-main \
 		x11/gtk+4,-guic \
 		x11/gtk+3,-cups
@@ -77,6 +81,7 @@ BUILD_DEPENDS=	archivers/bzip2 \
 		devel/gperf \
 		devel/bison \
 		lang/node \
+		lang/rust \
 		shells/bash \
 		sysutils/flock \
 		sysutils/pciutils \
@@ -85,11 +90,12 @@ BUILD_DEPENDS=	archivers/bzip2 \
 		x11/qt5/qtbase,-main \
 		${MODGCC4_CPPDEP} \
 		${RUN_DEPENDS}
-LIB_DEPENDS=	archivers/snappy \
-		audio/opus \
+LIB_DEPENDS=	audio/opus \
 		devel/pango \
 		graphics/jpeg \
+		multimedia/aom \
 		multimedia/dav1d \
+		multimedia/libvpx \
 		multimedia/openh264 \
 		security/nss \
 		textproc/icu4c \
@@ -99,8 +105,6 @@ LIB_DEPENDS=	archivers/snappy \
 		print/cups,-libs \
 		${MODGCC4_CPPLIBDEP}
 
-BUILD_DEPENDS+=	sysutils/libudev-openbsd:build
-
 USE_GMAKE=	Yes
 
 .include <bsd.own.mk>
@@ -140,22 +144,23 @@ BUILDDIR=	${WRKSRC}/out/${BUILDTYPE}
 # removes them from the bundled third_party directory and replaces them
 # with hooks to use them from the system.
 GN_SYSTEM_LIBS=	dav1d \
+		fontconfig \
 		icu \
+		libaom \
 		libevent \
 		libjpeg \
 		libpng \
+		libvpx \
 		libxml \
 		libxslt \
 		openh264 \
-		opus \
-		snappy
+		opus
 
 GN_ARGS=	is_official_build=true \
 		is_debug=false \
 		is_cfi=false \
 		optimize_webui=true \
-		enable_rust=false \
-		use_bundled_fontconfig=false \
+		enable_log_error_not_reached=true \
 		use_kerberos=false \
 		use_sndio=true \
 		use_cups=true \
@@ -172,8 +177,17 @@ GN_ARGS=	is_official_build=true \
 		enable_backup_ref_ptr_support=false \
 		extra_cppflags=\"-idirafter ${LOCALBASE}/include -idirafter ${X11BASE}/include\" \
 		fatal_linker_warnings=false \
-		use_custom_libcxx=false \
-		use_udev=true
+		use_custom_libcxx=true \
+		use_custom_libunwind=true \
+		use_udev=true \
+		v8_enable_cet_ibt=true
+
+# rust
+RUSTC_VERSION!!=rustc -V
+MAKE_ENV+=	RUSTC_BOOTSTRAP=1
+GN_ARGS+=	enable_rust=true \
+		rust_sysroot_absolute=\"${LOCALBASE}\" \
+		rustc_version=\"${RUSTC_VERSION}\"
 
 # notyet
 GN_ARGS+=	use_vaapi=false
@@ -262,6 +276,7 @@ pre-patch:
 pre-configure:
 	@ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
 	@ln -sf ${MODQT5_MOC} ${WRKDIR}/bin/moc
+	@ln -sf ${LOCALBASE}/bin/llvm-ar-${MODCLANG_VERSION} ${WRKDIR}/bin/ar
 	cd ${WRKSRC}/third_party/ffmpeg && \
 		${MODPY_BIN} chromium/scripts/build_ffmpeg.py openbsd ${FFMPEG_TARGET} --config-only --branding=${FFMPEG_BRAND}
 	cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
@@ -326,6 +341,7 @@ do-install:
 .if ${MACHINE_ARCH} != "aarch64"
 	# SwiftShader
 	${INSTALL_DATA} ${BUILDDIR}/libvk_swiftshader.so ${PREFIX}/${DIST_TARGET_DIR}
+	${INSTALL_DATA} ${BUILDDIR}/vk_swiftshader_icd.json ${PREFIX}/${DIST_TARGET_DIR}
 .endif
 
 .if ${FLAVOR:Mcomponent}
@@ -346,8 +362,6 @@ do-install:
     unveil.gpu unveil.main unveil.utility_audio unveil.utility_network unveil.utility_video
 	${INSTALL_DATA} ${FILESDIR}/${f} ${PREFIX}/share/examples/ungoogled-chromium
 .endfor
-	${INSTALL_DATA} ${WRKDIR}/sysutils/libudev-openbsd/build-${MACHINE_ARCH}/libudev.so.0.0 \
-		${PREFIX}/${DIST_TARGET_DIR}/libudev.so.0
 
 pre-test:
 .for _d in ${REGRESS_DISTFILES:C/:[0-9]$//}
diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo
index 675667d5e..2e46df1b6 100644
--- a/www/ungoogled-chromium/distinfo
+++ b/www/ungoogled-chromium/distinfo
@@ -1,10 +1,8 @@
-SHA256 (chromium-117.0.5938.149-testdata.tar.xz) = OFrq6X5mpm7wrasDl1OKmdmsWcO7THFfY64UMc+4kkg=
-SHA256 (chromium-117.0.5938.149.tar.xz) = 3dfIUr0ZHAkXq4AGVdo0HnWDwjd8oiCuB3/F3n/H2d8=
-SHA256 (libudev-openbsd-20221108-c3330efd.tar.gz) = BBKUTWeCkarFwKZQ+eg9DfekIMr5xi2G4Lce0C43pnc=
+SHA256 (chromium-124.0.6367.207-testdata.tar.xz) = 0wOGpzcZpk/dGR97UXCRheTT/EmIiwSjkFBtQ3DmmwY=
+SHA256 (chromium-124.0.6367.207.tar.xz) = bW3IuUMBJXOiRN2wE7KB7LyX93/h/G9VpBGCQdEH66U=
 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = osopYtr0gqj5QxY1QeHHO6SyaU+rzSUQmB8ttO2kk8g=
-SHA256 (ungoogled-chromium-117.0.5938.149-1.tar.gz) = CvzB/vbhjGEueiXGXwi5jQ2z5iHID/hVy/1aeRtq0Do=
-SIZE (chromium-117.0.5938.149-testdata.tar.xz) = 264315044
-SIZE (chromium-117.0.5938.149.tar.xz) = 3141300340
-SIZE (libudev-openbsd-20221108-c3330efd.tar.gz) = 32757
+SHA256 (ungoogled-chromium-124.0.6367.207-1.tar.gz) = 4QljFlGv/ari3cIswegfVtjH61g/gWxu594h2Xl3MVs=
+SIZE (chromium-124.0.6367.207-testdata.tar.xz) = 277899644
+SIZE (chromium-124.0.6367.207.tar.xz) = 3450794132
 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
-SIZE (ungoogled-chromium-117.0.5938.149-1.tar.gz) = 651923
+SIZE (ungoogled-chromium-124.0.6367.207-1.tar.gz) = 667461
diff --git a/www/ungoogled-chromium/patches/patch-BUILD_gn b/www/ungoogled-chromium/patches/patch-BUILD_gn
index e71f2bcb0..965b2e9d8 100644
--- a/www/ungoogled-chromium/patches/patch-BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-BUILD_gn
@@ -1,7 +1,7 @@
 Index: BUILD.gn
 --- BUILD.gn.orig
 +++ BUILD.gn
-@@ -61,7 +61,7 @@ declare_args() {
+@@ -64,7 +64,7 @@ declare_args() {
    root_extra_deps = []
  }
  
@@ -10,7 +10,7 @@ Index: BUILD.gn
    # An official (maximally optimized!) component (optimized for build times)
    # build doesn't make sense and usually doesn't work.
    assert(!is_component_build)
-@@ -95,7 +95,6 @@ group("gn_all") {
+@@ -96,7 +96,6 @@ group("gn_all") {
        "//codelabs",
        "//components:components_unittests",
        "//components/gwp_asan:gwp_asan_unittests",
@@ -18,7 +18,7 @@ Index: BUILD.gn
        "//net:net_unittests",
        "//sandbox:sandbox_unittests",
        "//services:services_unittests",
-@@ -422,7 +421,7 @@ group("gn_all") {
+@@ -427,7 +426,7 @@ group("gn_all") {
        }
      }
  
@@ -27,7 +27,7 @@ Index: BUILD.gn
        deps += [
          "//third_party/breakpad:breakpad_unittests",
          "//third_party/breakpad:core-2-minidump",
-@@ -614,6 +613,15 @@ group("gn_all") {
+@@ -619,6 +618,15 @@ group("gn_all") {
        }
      }
  
@@ -43,7 +43,7 @@ Index: BUILD.gn
      if (is_mac) {
        deps += [
          "//third_party/breakpad:dump_syms",
-@@ -663,7 +671,7 @@ group("gn_all") {
+@@ -665,7 +673,7 @@ group("gn_all") {
            host_os == "win") {
          deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
        }
@@ -52,16 +52,16 @@ Index: BUILD.gn
        deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
      }
  
-@@ -1087,7 +1095,7 @@ if (!is_ios && !is_cronet_build) {
+@@ -1086,7 +1094,7 @@ if (use_blink && !is_cronet_build) {
      ]
    }
  
 -  if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos) {
 +  if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) {
-     script_test("webdriver_wpt_tests") {
+     script_test("chrome_wpt_tests") {
        script = "//third_party/blink/tools/run_wpt_tests.py"
        args = [
-@@ -1177,7 +1185,7 @@ if (!is_ios && !is_cronet_build) {
+@@ -1177,7 +1185,7 @@ if (use_blink && !is_cronet_build) {
        data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
      }
  
@@ -70,7 +70,7 @@ Index: BUILD.gn
        data_deps +=
            [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
      }
-@@ -1186,7 +1194,7 @@ if (!is_ios && !is_cronet_build) {
+@@ -1186,7 +1194,7 @@ if (use_blink && !is_cronet_build) {
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
diff --git a/www/ungoogled-chromium/patches/patch-apps_ui_views_app_window_frame_view_cc b/www/ungoogled-chromium/patches/patch-apps_ui_views_app_window_frame_view_cc
index 5b2364167..0ebaf97f8 100644
--- a/www/ungoogled-chromium/patches/patch-apps_ui_views_app_window_frame_view_cc
+++ b/www/ungoogled-chromium/patches/patch-apps_ui_views_app_window_frame_view_cc
@@ -1,7 +1,7 @@
 Index: apps/ui/views/app_window_frame_view.cc
 --- apps/ui/views/app_window_frame_view.cc.orig
 +++ apps/ui/views/app_window_frame_view.cc
-@@ -137,7 +137,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
+@@ -148,7 +148,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
    gfx::Rect window_bounds = client_bounds;
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.
diff --git a/www/ungoogled-chromium/patches/patch-base_BUILD_gn b/www/ungoogled-chromium/patches/patch-base_BUILD_gn
index 99779412b..4aeda00b5 100644
--- a/www/ungoogled-chromium/patches/patch-base_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-base_BUILD_gn
@@ -1,7 +1,7 @@
 Index: base/BUILD.gn
 --- base/BUILD.gn.orig
 +++ base/BUILD.gn
-@@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") {
+@@ -200,7 +200,7 @@ buildflag_header("ios_cronet_buildflags") {
    flags = [ "CRONET_BUILD=$is_cronet_build" ]
  }
  
@@ -10,7 +10,7 @@ Index: base/BUILD.gn
  buildflag_header("message_pump_buildflags") {
    header = "message_pump_buildflags.h"
    header_dir = "base/message_loop"
-@@ -1112,11 +1112,23 @@ component("base") {
+@@ -1131,11 +1131,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,8 +34,8 @@ Index: base/BUILD.gn
 +
    if (use_allocator_shim) {
      if (is_apple) {
-       sources += [ "allocator/early_zone_registration_mac.h" ]
-@@ -1133,7 +1145,7 @@ component("base") {
+       sources += [ "allocator/early_zone_registration_apple.h" ]
+@@ -1155,7 +1167,7 @@ component("base") {
  
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -44,7 +44,7 @@ Index: base/BUILD.gn
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
  
-@@ -2075,6 +2087,22 @@ component("base") {
+@@ -2113,6 +2125,22 @@ component("base") {
      ]
    }
  
@@ -67,7 +67,7 @@ Index: base/BUILD.gn
    # iOS
    if (is_ios) {
      sources += [
-@@ -2207,6 +2235,29 @@ component("base") {
+@@ -2249,6 +2277,33 @@ component("base") {
      }
    }
  
@@ -75,6 +75,8 @@ Index: base/BUILD.gn
 +    sources -= [
 +      "files/file_path_watcher_inotify.cc",
 +      "files/scoped_file_linux.cc",
++      "process/set_process_title_linux.cc",
++      "process/set_process_title_linux.h",
 +      "system/sys_info_linux.cc",
 +      "process/process_iterator_linux.cc",
 +      "process/process_linux.cc",
@@ -85,6 +87,8 @@ Index: base/BUILD.gn
 +      "profiler/thread_delegate_posix.cc",
 +      "profiler/thread_delegate_posix.h",
 +      "threading/platform_thread_linux.cc",
++      "stack_canary_linux.cc",
++      "stack_canary_linux.h",
 +    ]
 +    sources += [
 +      "files/file_path_watcher_kqueue.cc",
@@ -97,7 +101,7 @@ Index: base/BUILD.gn
    if (use_blink) {
      sources += [
        "files/file_path_watcher.cc",
-@@ -2217,7 +2268,7 @@ component("base") {
+@@ -2259,7 +2314,7 @@ component("base") {
    }
  
    if (dep_libevent) {
@@ -106,16 +110,25 @@ Index: base/BUILD.gn
    }
  
    if (use_libevent) {
-@@ -3587,7 +3638,7 @@ test("base_unittests") {
+@@ -3072,7 +3127,7 @@ if (is_apple) {
+   }
+ }
+ 
+-if (!is_nacl && (is_linux || is_chromeos)) {
++if (!is_nacl && !is_bsd && (is_linux || is_chromeos)) {
+   # This test must compile with -fstack-protector-all
+   source_set("stack_canary_linux_unittests") {
+     testonly = true
+@@ -3716,7 +3771,7 @@ test("base_unittests") {
      ]
    }
  
 -  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
++  if (!is_bsd && (is_linux || is_chromeos)) {
      sources += [
        "debug/proc_maps_linux_unittest.cc",
        "files/scoped_file_linux_unittest.cc",
-@@ -3608,7 +3659,7 @@ test("base_unittests") {
+@@ -3743,7 +3798,7 @@ test("base_unittests") {
        "posix/file_descriptor_shuffle_unittest.cc",
        "posix/unix_domain_socket_unittest.cc",
      ]
@@ -124,7 +137,7 @@ Index: base/BUILD.gn
        sources += [
          "profiler/stack_base_address_posix_unittest.cc",
          "profiler/stack_copier_signal_unittest.cc",
-@@ -3619,7 +3670,7 @@ test("base_unittests") {
+@@ -3754,7 +3809,7 @@ test("base_unittests") {
  
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -133,7 +146,7 @@ Index: base/BUILD.gn
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
  
-@@ -3871,7 +3922,7 @@ test("base_unittests") {
+@@ -4022,7 +4077,7 @@ test("base_unittests") {
      }
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_dispatcher_tls_h b/www/ungoogled-chromium/patches/patch-base_allocator_dispatcher_tls_h
index 9588185c9..245e37251 100644
--- a/www/ungoogled-chromium/patches/patch-base_allocator_dispatcher_tls_h
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_dispatcher_tls_h
@@ -1,9 +1,9 @@
 Index: base/allocator/dispatcher/tls.h
 --- base/allocator/dispatcher/tls.h.orig
 +++ base/allocator/dispatcher/tls.h
-@@ -50,7 +50,7 @@ struct BASE_EXPORT MMapAllocator {
-       partition_alloc::PartitionPageSize();
- #elif BUILDFLAG(IS_APPLE)
+@@ -76,7 +76,7 @@ struct BASE_EXPORT MMapAllocator {
+   constexpr static size_t AllocationChunkSize = 16384;
+ #elif BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)
    constexpr static size_t AllocationChunkSize = 16384;
 -#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
 +#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_BUILD_gn b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_BUILD_gn
deleted file mode 100644
index 24bcde0ac..000000000
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_BUILD_gn
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: base/allocator/partition_allocator/BUILD.gn
---- base/allocator/partition_allocator/BUILD.gn.orig
-+++ base/allocator/partition_allocator/BUILD.gn
-@@ -541,7 +541,7 @@ source_set("allocator_shim") {
-       ]
-       configs += [ ":mac_no_default_new_delete_symbols" ]
-     }
--    if (is_chromeos || is_linux) {
-+    if ((is_chromeos || is_linux) && !is_bsd) {
-       sources += [
-         "shim/allocator_shim_override_cpp_symbols.h",
-         "shim/allocator_shim_override_glibc_weak_symbols.h",
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_constants_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_constants_h
deleted file mode 100644
index adc62b546..000000000
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_constants_h
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: base/allocator/partition_allocator/page_allocator_constants.h
---- base/allocator/partition_allocator/page_allocator_constants.h.orig
-+++ base/allocator/partition_allocator/page_allocator_constants.h
-@@ -25,7 +25,7 @@
- // elimination.
- #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const))
- 
--#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
- // This should work for all POSIX (if needed), but currently all other
- // supported OS/architecture combinations use either hard-coded values
- // (such as x86) or have means to determine these values without needing
-@@ -92,7 +92,7 @@ PageAllocationGranularityShift() {
-   return 14;  // 16kB
- #elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)
-   return static_cast<size_t>(vm_page_shift);
--#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
-   // arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16)
-   // page sizes. Retrieve from or initialize cache.
-   size_t shift = page_characteristics.shift.load(std::memory_order_relaxed);
-@@ -113,7 +113,7 @@ PageAllocationGranularity() {
-   // This is literally equivalent to |1 << PageAllocationGranularityShift()|
-   // below, but was separated out for IS_APPLE to avoid << on a non-constexpr.
-   return vm_page_size;
--#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
-   // arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or
-   // initialize cache.
-   size_t size = page_characteristics.size.load(std::memory_order_relaxed);
-@@ -152,7 +152,7 @@ SystemPageShift() {
- PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
- SystemPageSize() {
- #if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
--    (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
-+    ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
-   // This is literally equivalent to |1 << SystemPageShift()| below, but was
-   // separated out for 64-bit IS_APPLE and arm64 on Linux to avoid << on a
-   // non-constexpr.
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_h
deleted file mode 100644
index 15777984e..000000000
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_h
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: base/allocator/partition_allocator/page_allocator.h
---- base/allocator/partition_allocator/page_allocator.h.orig
-+++ base/allocator/partition_allocator/page_allocator.h
-@@ -258,7 +258,7 @@ void DecommitAndZeroSystemPages(void* address,
- // recommitted. Do not assume that this will not change over time.
- constexpr PA_COMPONENT_EXPORT(
-     PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {
--#if BUILDFLAG(IS_APPLE)
-+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
-   return false;
- #else
-   return true;
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_address_space_cc b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_address_space_cc
deleted file mode 100644
index 1fb77ce3c..000000000
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_address_space_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: base/allocator/partition_allocator/partition_address_space.cc
---- base/allocator/partition_allocator/partition_address_space.cc.orig
-+++ base/allocator/partition_allocator/partition_address_space.cc
-@@ -420,7 +420,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo
- }
- #endif
- 
--#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
- 
- PageCharacteristics page_characteristics;
- 
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_compiler_specific_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_compiler_specific_h
deleted file mode 100644
index 416f6c20b..000000000
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_compiler_specific_h
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h
---- base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h.orig
-+++ base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h
-@@ -24,9 +24,9 @@
- // Annotate a function indicating it should not be inlined.
- // Use like:
- //   NOINLINE void DoStuff() { ... }
--#if defined(__clang__) && PA_HAS_ATTRIBUTE(noinline)
-+#if defined(__clang__) && (__clang_major__ >= 15) && PA_HAS_ATTRIBUTE(noinline)
- #define PA_NOINLINE [[clang::noinline]]
--#elif defined(COMPILER_GCC) && PA_HAS_ATTRIBUTE(noinline)
-+#elif (defined(COMPILER_GCC) || defined(__clang__)) && PA_HAS_ATTRIBUTE(noinline)
- #define PA_NOINLINE __attribute__((noinline))
- #elif defined(COMPILER_MSVC)
- #define PA_NOINLINE __declspec(noinline)
-@@ -34,7 +34,7 @@
- #define PA_NOINLINE
- #endif
- 
--#if defined(__clang__) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline)
-+#if defined(__clang__) && (__clang_major__ >= 15) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline)
- #define PA_ALWAYS_INLINE [[clang::always_inline]] inline
- #elif defined(COMPILER_GCC) && defined(NDEBUG) && \
-     PA_HAS_ATTRIBUTE(always_inline)
-@@ -53,7 +53,7 @@
- // prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
- // Use like:
- //   void NOT_TAIL_CALLED FooBar();
--#if defined(__clang__) && PA_HAS_ATTRIBUTE(not_tail_called)
-+#if defined(__clang__) && (__clang_major__ >= 15) && PA_HAS_ATTRIBUTE(not_tail_called)
- #define PA_NOT_TAIL_CALLED [[clang::not_tail_called]]
- #else
- #define PA_NOT_TAIL_CALLED
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_rand_util_posix_cc b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_rand_util_posix_cc
deleted file mode 100644
index d1e2bbcfe..000000000
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_rand_util_posix_cc
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc
---- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig
-+++ base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc
-@@ -90,6 +90,10 @@ void RandBytes(void* output, size_t output_length) {
-   if (getentropy(output, output_length) == 0) {
-     return;
-   }
-+#elif BUILDFLAG(IS_BSD)
-+  if (getentropy(output, output_length) == 0) {
-+    return;
-+  }
- #endif
-   // If getrandom(2) above returned with an error and the /dev/urandom fallback
-   // took place on Linux/ChromeOS bots, they would fail with a CHECK in
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_threading_platform_thread_posix_cc b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_threading_platform_thread_posix_cc
deleted file mode 100644
index 7052ad063..000000000
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_threading_platform_thread_posix_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc
---- base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc.orig
-+++ base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc
-@@ -17,7 +17,7 @@
- #include "base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h"
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include <sys/syscall.h>
- #include <atomic>
- #endif
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_config_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_config_h
deleted file mode 100644
index bec0b5e4f..000000000
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_config_h
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: base/allocator/partition_allocator/partition_alloc_config.h
---- base/allocator/partition_allocator/partition_alloc_config.h.orig
-+++ base/allocator/partition_allocator/partition_alloc_config.h
-@@ -94,7 +94,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).
- #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,
-@@ -236,7 +236,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.
- #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))
- 
- // PartitionAlloc uses PartitionRootEnumerator to acquire all
- // PartitionRoots at BeforeFork and to release at AfterFork.
-@@ -283,7 +283,7 @@ constexpr bool kUseLazyCommit = false;
- // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
- // larger slot spans.
- #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/patches/patch-base_allocator_partition_allocator_partition_alloc_constants_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_constants_h
deleted file mode 100644
index 1560b2b12..000000000
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_constants_h
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: base/allocator/partition_allocator/partition_alloc_constants.h
---- base/allocator/partition_allocator/partition_alloc_constants.h.orig
-+++ base/allocator/partition_allocator/partition_alloc_constants.h
-@@ -95,7 +95,7 @@ PartitionPageShift() {
-   return 18;  // 256 KiB
- }
- #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
--    (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
-+    ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
- PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
- PartitionPageShift() {
-   return PageAllocationGranularityShift() + 2;
-@@ -297,7 +297,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
- // 8GB for each of the glued pools).
- #if BUILDFLAG(HAS_64_BIT_POINTERS)
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \
--    BUILDFLAG(ENABLE_POINTER_COMPRESSION)
-+    BUILDFLAG(ENABLE_POINTER_COMPRESSION) || \
-+    BUILDFLAG(IS_BSD)
- constexpr size_t kPoolMaxSize = 8 * kGiB;
- #else
- constexpr size_t kPoolMaxSize = 16 * kGiB;
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_gni b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_gni
index fa3f1dfb3..59f91e688 100644
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_gni
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_gni
@@ -1,12 +1,21 @@
 Index: base/allocator/partition_allocator/partition_alloc.gni
 --- base/allocator/partition_allocator/partition_alloc.gni.orig
 +++ base/allocator/partition_allocator/partition_alloc.gni
-@@ -332,7 +332,7 @@ declare_args() {
-   # pkeys support is explicitly disabled in all Cronet builds, as some test
+@@ -33,7 +33,7 @@ if (is_nacl) {
+ use_large_empty_slot_span_ring = is_mac
+ 
+ has_memory_tagging =
+-    current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android)
++    current_cpu == "arm64" && is_clang && !is_asan && !is_bsd && (is_linux || is_android)
+ 
+ declare_args() {
+   # Causes all the allocations to be routed via allocator_shim.cc. Usually,
+@@ -351,7 +351,7 @@ declare_args() {
    # dependencies that use partition_allocator are compiled in AOSP against a
    # version of glibc that does not include pkeys syscall numbers.
--  enable_pkeys = is_linux && target_cpu == "x64" && !is_cronet_build
-+  enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" && !is_cronet_build
+   enable_pkeys =
+-      (is_linux || is_chromeos) && target_cpu == "x64" && !is_cronet_build
++      !is_bsd && (is_linux || is_chromeos) && target_cpu == "x64" && !is_cronet_build
  }
- assert(!enable_pkeys || (is_linux && target_cpu == "x64"),
-        "Pkeys are only supported on x64 linux")
+ assert(!enable_pkeys || ((is_linux || is_chromeos) && target_cpu == "x64"),
+        "Pkeys are only supported on x64 linux and ChromeOS")
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_page_constants_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_page_constants_h
deleted file mode 100644
index 8f401f21a..000000000
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_page_constants_h
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: base/allocator/partition_allocator/partition_page_constants.h
---- base/allocator/partition_allocator/partition_page_constants.h.orig
-+++ base/allocator/partition_allocator/partition_page_constants.h
-@@ -16,7 +16,7 @@ namespace partition_alloc::internal {
- // (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And
- // PartitionPageSize() is 4 times the OS page size.
- static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket;
--#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
- // System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
- // currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
- // so we use the 16 kiB maximum (64 kiB will crash).
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_BUILD_gn b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_BUILD_gn
new file mode 100644
index 000000000..bc29e89dd
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_BUILD_gn
@@ -0,0 +1,12 @@
+Index: base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
+--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig
++++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
+@@ -851,7 +851,7 @@ if (is_clang_or_gcc) {
+         configs -= [ "//build/config/compiler:enable_arc" ]
+       }
+     }
+-    if (is_chromeos || is_linux) {
++    if ((is_chromeos || is_linux) && !is_bsd) {
+       shim_headers += [
+         "shim/allocator_shim_override_cpp_symbols.h",
+         "shim/allocator_shim_override_glibc_weak_symbols.h",
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_address_space_randomization_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_address_space_randomization_h
similarity index 66%
rename from www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_address_space_randomization_h
rename to www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_address_space_randomization_h
index aace20ea8..d6c559f82 100644
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_address_space_randomization_h
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_address_space_randomization_h
@@ -1,6 +1,6 @@
-Index: base/allocator/partition_allocator/address_space_randomization.h
---- base/allocator/partition_allocator/address_space_randomization.h.orig
-+++ base/allocator/partition_allocator/address_space_randomization.h
+Index: base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h
+--- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig
++++ base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h
 @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
  
  #if defined(ARCH_CPU_64_BITS)
@@ -10,7 +10,7 @@ Index: base/allocator/partition_allocator/address_space_randomization.h
  
      // We shouldn't allocate system pages at all for sanitizer builds. However,
      // we do, and if random hint addresses interfere with address ranges
-@@ -124,7 +124,7 @@ AslrMask(uintptr_t bits) {
+@@ -128,7 +128,7 @@ AslrMask(uintptr_t bits) {
          return AslrAddress(0x20000000ULL);
        }
  
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_page_allocator_constants_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_page_allocator_constants_h
new file mode 100644
index 000000000..e45cc3112
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_page_allocator_constants_h
@@ -0,0 +1,12 @@
+Index: base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h
+--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig
++++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h
+@@ -26,7 +26,7 @@
+ #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const))
+ 
+ #elif (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)) || \
+-    (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
++    ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
+ // This should work for all POSIX (if needed), but currently all other
+ // supported OS/architecture combinations use either hard-coded values
+ // (such as x86) or have means to determine these values without needing
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_page_allocator_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_page_allocator_h
new file mode 100644
index 000000000..a3eba9b5c
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_page_allocator_h
@@ -0,0 +1,12 @@
+Index: base/allocator/partition_allocator/src/partition_alloc/page_allocator.h
+--- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig
++++ base/allocator/partition_allocator/src/partition_alloc/page_allocator.h
+@@ -259,7 +259,7 @@ bool DecommitAndZeroSystemPages(void* address,
+ // recommitted. Do not assume that this will not change over time.
+ constexpr PA_COMPONENT_EXPORT(
+     PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {
+-#if BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+   return false;
+ #else
+   return true;
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_internals_posix_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_page_allocator_internals_posix_h
similarity index 57%
rename from www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_internals_posix_h
rename to www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_page_allocator_internals_posix_h
index 27e451bbb..325d32fe1 100644
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_internals_posix_h
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_page_allocator_internals_posix_h
@@ -1,7 +1,7 @@
-Index: base/allocator/partition_allocator/page_allocator_internals_posix.h
---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig
-+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -403,8 +403,12 @@ bool TryRecommitSystemPagesInternal(
+Index: base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h
+--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig
++++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h
+@@ -411,8 +411,12 @@ bool TryRecommitSystemPagesInternal(
  
  void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
    void* ptr = reinterpret_cast<void*>(address);
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_debug_stack_trace_posix_cc b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_debug_stack_trace_posix_cc
new file mode 100644
index 000000000..8b9c2a297
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_debug_stack_trace_posix_cc
@@ -0,0 +1,35 @@
+Index: base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig
++++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc
+@@ -13,11 +13,11 @@
+ #include "partition_alloc/partition_alloc_base/posix/eintr_wrapper.h"
+ #include "partition_alloc/partition_alloc_base/strings/safe_sprintf.h"
+ 
+-#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE)
++#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
+ #include <link.h>  // For ElfW() macro.
+ #endif
+ 
+-#if BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+ #include <dlfcn.h>
+ #endif
+ 
+@@ -25,7 +25,7 @@ namespace partition_alloc::internal::base::debug {
+ 
+ namespace {
+ 
+-#if !BUILDFLAG(IS_APPLE)
++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
+ 
+ // On Android the 'open' function has two versions:
+ // int open(const char *pathname, int flags);
+@@ -369,7 +369,7 @@ void PrintStackTraceInternal(const void** trace, size_
+ }
+ #endif  // !BUILDFLAG(IS_APPLE)
+ 
+-#if BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+ // Since /proc/self/maps is not available, use dladdr() to obtain module
+ // names and offsets inside the modules from the given addresses.
+ void PrintStackTraceInternal(const void* const* trace, size_t size) {
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_rand_util_posix_cc b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_rand_util_posix_cc
new file mode 100644
index 000000000..9f2017a0b
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_rand_util_posix_cc
@@ -0,0 +1,14 @@
+Index: base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig
++++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc
+@@ -102,6 +102,10 @@ void RandBytes(void* output, size_t output_length) {
+   if (getentropy(output, output_length) == 0) {
+     return;
+   }
++#elif BUILDFLAG(IS_BSD)
++  if (getentropy(output, output_length) == 0) {
++    return;
++  }
+ #endif
+   // If getrandom(2) above returned with an error and the /dev/urandom fallback
+   // took place on Linux/ChromeOS bots, they would fail with a CHECK in
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_threading_platform_thread_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_threading_platform_thread_h
new file mode 100644
index 000000000..0477d918e
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_threading_platform_thread_h
@@ -0,0 +1,12 @@
+Index: base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h.orig
++++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h
+@@ -37,6 +37,8 @@ typedef DWORD PlatformThreadId;
+ typedef zx_handle_t PlatformThreadId;
+ #elif BUILDFLAG(IS_APPLE)
+ typedef mach_port_t PlatformThreadId;
++#elif BUILDFLAG(IS_BSD)
++typedef uint64_t PlatformThreadId;
+ #elif BUILDFLAG(IS_POSIX)
+ typedef pid_t PlatformThreadId;
+ #endif
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_threading_platform_thread_internal_posix_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_threading_platform_thread_internal_posix_h
similarity index 53%
rename from www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_threading_platform_thread_internal_posix_h
rename to www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_threading_platform_thread_internal_posix_h
index b14e410e6..edde67bdb 100644
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_threading_platform_thread_internal_posix_h
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_threading_platform_thread_internal_posix_h
@@ -1,6 +1,6 @@
-Index: base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h
---- base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h.orig
-+++ base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h
+Index: base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h.orig
++++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h
 @@ -10,7 +10,7 @@
  
  namespace partition_alloc::internal::base::internal {
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_threading_platform_thread_posix_cc b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_threading_platform_thread_posix_cc
new file mode 100644
index 000000000..f8b03463f
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_base_threading_platform_thread_posix_cc
@@ -0,0 +1,12 @@
+Index: base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig
++++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc
+@@ -18,7 +18,7 @@
+ #include "partition_alloc/partition_alloc_base/logging.h"
+ #include "partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h"
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include <sys/syscall.h>
+ #include <atomic>
+ #endif
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_config_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_config_h
new file mode 100644
index 000000000..dc90e7799
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_config_h
@@ -0,0 +1,21 @@
+Index: base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig
++++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
+@@ -251,7 +251,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.
+ #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))
+ 
+ // PartitionAlloc uses PartitionRootEnumerator to acquire all
+ // PartitionRoots at BeforeFork and to release at AfterFork.
+@@ -299,7 +299,7 @@ constexpr bool kUseLazyCommit = false;
+ //
+ // Also enabled on ARM64 macOS and iOS, as the 16kiB pages on this platform lead
+ // to larger slot spans.
+-#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64))
++#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD)
+ #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 1
+ #else
+ #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 0
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_constants_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_constants_h
new file mode 100644
index 000000000..0cd3e521b
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_constants_h
@@ -0,0 +1,12 @@
+Index: base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig
++++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
+@@ -313,7 +313,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
+ // 8GB for each of the glued pools).
+ #if BUILDFLAG(HAS_64_BIT_POINTERS)
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \
+-    BUILDFLAG(ENABLE_POINTER_COMPRESSION)
++    BUILDFLAG(ENABLE_POINTER_COMPRESSION) || BUILDFLAG(IS_BSD)
+ constexpr size_t kPoolMaxSize = 8 * kGiB;
+ #else
+ constexpr size_t kPoolMaxSize = 16 * kGiB;
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_forward_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_forward_h
similarity index 70%
rename from www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_forward_h
rename to www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_forward_h
index de691b5ec..bc830e607 100644
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_forward_h
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_alloc_forward_h
@@ -1,6 +1,6 @@
-Index: base/allocator/partition_allocator/partition_alloc_forward.h
---- base/allocator/partition_allocator/partition_alloc_forward.h.orig
-+++ base/allocator/partition_allocator/partition_alloc_forward.h
+Index: base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h.orig
++++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h
 @@ -28,9 +28,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
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_root_cc b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_root_cc
similarity index 52%
rename from www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_root_cc
rename to www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_root_cc
index 4fc16a244..57de87c8a 100644
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_root_cc
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_partition_root_cc
@@ -1,7 +1,7 @@
-Index: base/allocator/partition_allocator/partition_root.cc
---- base/allocator/partition_allocator/partition_root.cc.orig
-+++ base/allocator/partition_allocator/partition_root.cc
-@@ -46,7 +46,7 @@
+Index: base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
+--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig
++++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
+@@ -47,7 +47,7 @@
  #include "wow64apiset.h"
  #endif
  
@@ -10,7 +10,7 @@ Index: base/allocator/partition_allocator/partition_root.cc
  #include <pthread.h>
  #endif
  
-@@ -280,7 +280,7 @@ void PartitionAllocMallocInitOnce() {
+@@ -279,7 +279,7 @@ void PartitionAllocMallocInitOnce() {
      return;
    }
  
@@ -19,16 +19,7 @@ Index: base/allocator/partition_allocator/partition_root.cc
    // 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.
-@@ -372,7 +372,7 @@ static size_t PartitionPurgeSlotSpan(internal::SlotSpa
-   constexpr size_t kMaxSlotCount =
-       (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
-       MinPurgeableSlotSize();
--#elif BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
-+#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
-   // 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
-@@ -849,7 +849,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
+@@ -950,7 +950,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
      // apple OSes.
      PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
               (internal::SystemPageSize() == (size_t{1} << 14)));
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_spinning_mutex_cc b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_spinning_mutex_cc
similarity index 81%
rename from www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_spinning_mutex_cc
rename to www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_spinning_mutex_cc
index 7f3018757..931a77009 100644
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_spinning_mutex_cc
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_spinning_mutex_cc
@@ -1,10 +1,10 @@
-Index: base/allocator/partition_allocator/spinning_mutex.cc
---- base/allocator/partition_allocator/spinning_mutex.cc.orig
-+++ base/allocator/partition_allocator/spinning_mutex.cc
-@@ -18,7 +18,16 @@
+Index: base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc
+--- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig
++++ base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc
+@@ -17,7 +17,16 @@
+ #endif
  
  #if PA_CONFIG(HAS_LINUX_KERNEL)
- #include <errno.h>
 +#if defined(OS_OPENBSD)
 +#include <sys/time.h>
 +#include <sys/futex.h>
@@ -17,8 +17,8 @@ Index: base/allocator/partition_allocator/spinning_mutex.cc
 +#endif
  #include <sys/syscall.h>
  #include <unistd.h>
- #endif  // PA_CONFIG(HAS_LINUX_KERNEL)
-@@ -108,8 +117,16 @@ void SpinningMutex::FutexWait() {
+ 
+@@ -109,8 +118,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.
@@ -35,7 +35,7 @@ Index: base/allocator/partition_allocator/spinning_mutex.cc
  
    if (err) {
      // These are programming error, check them.
-@@ -121,8 +138,16 @@ void SpinningMutex::FutexWait() {
+@@ -122,8 +139,16 @@ void SpinningMutex::FutexWait() {
  
  void SpinningMutex::FutexWake() {
    int saved_errno = errno;
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_starscan_stack_stack_cc b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_starscan_stack_stack_cc
similarity index 80%
rename from www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_starscan_stack_stack_cc
rename to www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_starscan_stack_stack_cc
index 973811ebf..9d439526a 100644
--- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_starscan_stack_stack_cc
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_starscan_stack_stack_cc
@@ -1,6 +1,6 @@
-Index: base/allocator/partition_allocator/starscan/stack/stack.cc
---- base/allocator/partition_allocator/starscan/stack/stack.cc.orig
-+++ base/allocator/partition_allocator/starscan/stack/stack.cc
+Index: base/allocator/partition_allocator/src/partition_alloc/starscan/stack/stack.cc
+--- base/allocator/partition_allocator/src/partition_alloc/starscan/stack/stack.cc.orig
++++ base/allocator/partition_allocator/src/partition_alloc/starscan/stack/stack.cc
 @@ -18,6 +18,10 @@
  #include <pthread.h>
  #endif
diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_thread_isolation_pkey_cc b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_thread_isolation_pkey_cc
new file mode 100644
index 000000000..cfb186c45
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_thread_isolation_pkey_cc
@@ -0,0 +1,12 @@
+Index: base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc
+--- base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc.orig
++++ base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc
+@@ -16,7 +16,7 @@
+ #include "partition_alloc/partition_alloc_check.h"
+ #include "partition_alloc/thread_isolation/thread_isolation.h"
+ 
+-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
+ #error "This pkey code is currently only supported on Linux and ChromeOS"
+ #endif
+ 
diff --git a/www/ungoogled-chromium/patches/patch-base_base_paths_posix_cc b/www/ungoogled-chromium/patches/patch-base_base_paths_posix_cc
index a21088fdf..a7f940e3d 100644
--- a/www/ungoogled-chromium/patches/patch-base_base_paths_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-base_base_paths_posix_cc
@@ -9,7 +9,7 @@ Index: base/base_paths_posix.cc
  #include "base/environment.h"
  #include "base/files/file_path.h"
  #include "base/files/file_util.h"
-@@ -25,9 +26,13 @@
+@@ -26,9 +27,13 @@
  #include "base/process/process_metrics.h"
  #include "build/build_config.h"
  
@@ -24,7 +24,17 @@ Index: base/base_paths_posix.cc
  #elif BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_AIX)
  #include <stdlib.h>
  #endif
-@@ -68,13 +73,65 @@ bool PathProviderPosix(int key, FilePath* result) {
+@@ -48,8 +53,7 @@ bool PathProviderPosix(int key, FilePath* result) {
+       *result = bin_dir;
+       return true;
+ #elif BUILDFLAG(IS_FREEBSD)
+-      int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+-      std::optional<std::string> bin_dir = StringSysctl(name, std::size(name));
++      std::optional<std::string> bin_dir = StringSysctl({ CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 });
+       if (!bin_dir.has_value() || bin_dir.value().length() <= 1) {
+         NOTREACHED() << "Unable to resolve path.";
+         return false;
+@@ -65,13 +69,65 @@ bool PathProviderPosix(int key, FilePath* result) {
        *result = FilePath(bin_dir);
        return true;
  #elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX)
@@ -64,7 +74,7 @@ Index: base/base_paths_posix.cc
 +        goto out;
 +      }
 +
-+      if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf)) == NULL)
++      if ((kd = kvm_openfiles(NULL, NULL, NULL, (int)KVM_NO_FILES, errbuf)) == NULL)
 +        goto out;
 +
 +      if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, cpid,
diff --git a/www/ungoogled-chromium/patches/patch-base_base_switches_cc b/www/ungoogled-chromium/patches/patch-base_base_switches_cc
deleted file mode 100644
index 5a18b6de6..000000000
--- a/www/ungoogled-chromium/patches/patch-base_base_switches_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: base/base_switches.cc
---- base/base_switches.cc.orig
-+++ base/base_switches.cc
-@@ -162,7 +162,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria
- 
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when
- // Crashpad is fully enabled on Linux. Indicates that Crashpad should be
- // enabled.
diff --git a/www/ungoogled-chromium/patches/patch-base_base_switches_h b/www/ungoogled-chromium/patches/patch-base_base_switches_h
deleted file mode 100644
index fb69b363b..000000000
--- a/www/ungoogled-chromium/patches/patch-base_base_switches_h
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: base/base_switches.h
---- base/base_switches.h.orig
-+++ base/base_switches.h
-@@ -56,7 +56,7 @@ extern const char kEnableIdleTracing[];
- extern const char kForceFieldTrialParams[];
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when
- // Crashpad is fully enabled on Linux.
- extern const char kEnableCrashpad[];
diff --git a/www/ungoogled-chromium/patches/patch-base_compiler_specific_h b/www/ungoogled-chromium/patches/patch-base_compiler_specific_h
index 1503ccc72..d4ad1f386 100644
--- a/www/ungoogled-chromium/patches/patch-base_compiler_specific_h
+++ b/www/ungoogled-chromium/patches/patch-base_compiler_specific_h
@@ -1,36 +1,12 @@
 Index: base/compiler_specific.h
 --- base/compiler_specific.h.orig
 +++ base/compiler_specific.h
-@@ -41,9 +41,9 @@
- // Annotate a function indicating it should not be inlined.
- // Use like:
- //   NOINLINE void DoStuff() { ... }
--#if defined(__clang__) && HAS_ATTRIBUTE(noinline)
-+#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(noinline)
- #define NOINLINE [[clang::noinline]]
--#elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline)
-+#elif (defined(COMPILER_GCC) || defined(__clang__)) && HAS_ATTRIBUTE(noinline)
- #define NOINLINE __attribute__((noinline))
- #elif defined(COMPILER_MSVC)
- #define NOINLINE __declspec(noinline)
-@@ -51,9 +51,9 @@
- #define NOINLINE
- #endif
- 
--#if defined(__clang__) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
-+#if defined(__clang__) && (__clang_major__ >= 15) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
- #define ALWAYS_INLINE [[clang::always_inline]] inline
--#elif defined(COMPILER_GCC) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
-+#elif (defined(COMPILER_GCC) || defined(__clang__)) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
- #define ALWAYS_INLINE inline __attribute__((__always_inline__))
- #elif defined(COMPILER_MSVC) && defined(NDEBUG)
- #define ALWAYS_INLINE __forceinline
-@@ -69,7 +69,7 @@
- // prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
- // Use like:
- //   NOT_TAIL_CALLED void FooBar();
--#if defined(__clang__) && HAS_ATTRIBUTE(not_tail_called)
-+#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(not_tail_called)
- #define NOT_TAIL_CALLED [[clang::not_tail_called]]
+@@ -316,7 +316,7 @@
+ //
+ // In some cases it's desirable to remove this, e.g. on hot functions, or if
+ // we have purposely changed the reference canary.
+-#if defined(COMPILER_GCC) || defined(__clang__)
++#if (defined(COMPILER_GCC) || defined(__clang__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
+ #if HAS_ATTRIBUTE(__no_stack_protector__)
+ #define NO_STACK_PROTECTOR __attribute__((__no_stack_protector__))
  #else
- #define NOT_TAIL_CALLED
diff --git a/www/ungoogled-chromium/patches/patch-base_debug_debugger_posix_cc b/www/ungoogled-chromium/patches/patch-base_debug_debugger_posix_cc
index 933795005..30701288c 100644
--- a/www/ungoogled-chromium/patches/patch-base_debug_debugger_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-base_debug_debugger_posix_cc
@@ -1,7 +1,7 @@
 Index: base/debug/debugger_posix.cc
 --- base/debug/debugger_posix.cc.orig
 +++ base/debug/debugger_posix.cc
-@@ -35,6 +35,10 @@
+@@ -36,6 +36,10 @@
  #include <sys/sysctl.h>
  #endif
  
@@ -28,7 +28,8 @@ Index: base/debug/debugger_posix.cc
    if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0)
      return -1;
  
-   mib[5] = (info_size / sizeof(struct kinfo_proc));
+-  mib[5] = (info_size / sizeof(struct kinfo_proc));
++  mib[5] = static_cast<int>((info_size / sizeof(struct kinfo_proc)));
 +  if ((info = reinterpret_cast<kinfo_proc*>(malloc(info_size))) == NULL) {
 +    is_set = true;
 +    being_debugged = false;
diff --git a/www/ungoogled-chromium/patches/patch-base_debug_elf_reader_cc b/www/ungoogled-chromium/patches/patch-base_debug_elf_reader_cc
index 647620cd4..be7a7e654 100644
--- a/www/ungoogled-chromium/patches/patch-base_debug_elf_reader_cc
+++ b/www/ungoogled-chromium/patches/patch-base_debug_elf_reader_cc
@@ -1,19 +1,14 @@
 Index: base/debug/elf_reader.cc
 --- base/debug/elf_reader.cc.orig
 +++ base/debug/elf_reader.cc
-@@ -78,6 +78,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
-     bool found = false;
-     while (current_section < section_end) {
-       current_note = reinterpret_cast<const Nhdr*>(current_section);
-+#if !BUILDFLAG(IS_BSD)
-       if (current_note->n_type == NT_GNU_BUILD_ID) {
-         StringPiece note_name(current_section + sizeof(Nhdr),
-                               current_note->n_namesz);
-@@ -87,6 +88,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
-           break;
-         }
-       }
-+#endif
+@@ -45,6 +45,10 @@ using Xword = Elf64_Xword;
  
-       size_t section_size = bits::AlignUp(current_note->n_namesz, 4u) +
-                             bits::AlignUp(current_note->n_descsz, 4u) +
+ constexpr char kGnuNoteName[] = "GNU";
+ 
++#ifndef NT_GNU_BUILD_ID
++#define NT_GNU_BUILD_ID 3
++#endif
++
+ // Returns a pointer to the header of the ELF binary mapped into memory, or a
+ // null pointer if the header is invalid. Here and below |elf_mapped_base| is a
+ // pointer to the start of the ELF image.
diff --git a/www/ungoogled-chromium/patches/patch-base_debug_stack_trace_cc b/www/ungoogled-chromium/patches/patch-base_debug_stack_trace_cc
index a1b53f42b..46ef6e1f3 100644
--- a/www/ungoogled-chromium/patches/patch-base_debug_stack_trace_cc
+++ b/www/ungoogled-chromium/patches/patch-base_debug_stack_trace_cc
@@ -1,22 +1,30 @@
 Index: base/debug/stack_trace.cc
 --- base/debug/stack_trace.cc.orig
 +++ 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 {
+@@ -247,7 +247,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() {
+   // Symbols are not expected to be reliable when gn args specifies
+   // symbol_level=0.
+   return false;
+-#elif defined(__UCLIBC__) || defined(_AIX)
++#elif defined(__UCLIBC__) || defined(_AIX) || BUILDFLAG(IS_BSD)
+   // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX.
+   // See https://crbug.com/706728
+   return false;
+@@ -291,7 +291,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();
+   if (ShouldSuppressOutput()) {
+     return "Backtrace suppressed.";
+   }
+@@ -301,7 +301,7 @@ std::string StackTrace::ToStringWithPrefix(const char*
+ }
+ 
+ std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD)
+   s.OutputToStream(&os);
+ #else
+   os << "StackTrace::OutputToStream not implemented.";
diff --git a/www/ungoogled-chromium/patches/patch-base_debug_stack_trace_posix_cc b/www/ungoogled-chromium/patches/patch-base_debug_stack_trace_posix_cc
index 32befb562..a899c7a66 100644
--- a/www/ungoogled-chromium/patches/patch-base_debug_stack_trace_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-base_debug_stack_trace_posix_cc
@@ -10,16 +10,19 @@ Index: base/debug/stack_trace_posix.cc
  #define HAVE_BACKTRACE
  #include <execinfo.h>
  #endif
-@@ -59,7 +59,7 @@
+@@ -59,8 +59,10 @@
  #include <AvailabilityMacros.h>
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
++#if !BUILDFLAG(IS_BSD)
+ #include <sys/prctl.h>
++#endif
+ 
  #include "base/debug/proc_maps_linux.h"
  #endif
- 
-@@ -300,7 +300,7 @@ void PrintToStderr(const char* output) {
+@@ -301,7 +303,7 @@ void PrintToStderr(const char* output) {
    std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output)));
  }
  
@@ -28,7 +31,7 @@ Index: base/debug/stack_trace_posix.cc
  void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) {
    // We have seen rare cases on AMD linux where the default signal handler
    // either does not run or a thread (Probably an AMD driver thread) prevents
-@@ -317,7 +317,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v
+@@ -318,7 +320,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v
        "Warning: Default signal handler failed to terminate process.\n");
    PrintToStderr("Calling exit_group() directly to prevent timeout.\n");
    // See: https://man7.org/linux/man-pages/man2/exit_group.2.html
@@ -40,7 +43,7 @@ Index: base/debug/stack_trace_posix.cc
  }
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -534,7 +538,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
+@@ -535,7 +541,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
      _exit(EXIT_FAILURE);
    }
  
@@ -49,7 +52,7 @@ Index: base/debug/stack_trace_posix.cc
    // Set an alarm to trigger in case the default handler does not terminate
    // the process. See 'AlarmSignalHandler' for more details.
    struct sigaction action;
-@@ -559,6 +563,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
+@@ -560,6 +566,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
    // signals that do not re-raise autonomously), such as signals delivered via
    // kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would
    // otherwise be lost when re-raising the signal via raise().
@@ -57,7 +60,7 @@ Index: base/debug/stack_trace_posix.cc
    long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid),
                          info->si_signo, info);
    if (retval == 0) {
-@@ -573,6 +578,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
+@@ -574,6 +581,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
    if (errno != EPERM) {
      _exit(EXIT_FAILURE);
    }
@@ -65,7 +68,21 @@ Index: base/debug/stack_trace_posix.cc
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
          // BUILDFLAG(IS_CHROMEOS)
  
-@@ -821,6 +827,9 @@ class SandboxSymbolizeHelper {
+@@ -763,6 +771,7 @@ class SandboxSymbolizeHelper {
+     return -1;
+   }
+ 
++#if !BUILDFLAG(IS_BSD)
+   // This class is copied from
+   // third_party/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h.
+   // It aims at ensuring the process is dumpable before opening /proc/self/mem.
+@@ -855,11 +864,15 @@ class SandboxSymbolizeHelper {
+       r.base = cur_base;
+     }
+   }
++#endif
+ 
+   // Parses /proc/self/maps in order to compile a list of all object file names
    // for the modules that are loaded in the current process.
    // Returns true on success.
    bool CacheMemoryRegions() {
@@ -75,7 +92,7 @@ Index: base/debug/stack_trace_posix.cc
      // Reads /proc/self/maps.
      std::string contents;
      if (!ReadProcMaps(&contents)) {
-@@ -838,6 +847,7 @@ class SandboxSymbolizeHelper {
+@@ -877,6 +890,7 @@ class SandboxSymbolizeHelper {
  
      is_initialized_ = true;
      return true;
diff --git a/www/ungoogled-chromium/patches/patch-base_files_file_path_watcher_h b/www/ungoogled-chromium/patches/patch-base_files_file_path_watcher_h
index d47c147a0..8475aa550 100644
--- a/www/ungoogled-chromium/patches/patch-base_files_file_path_watcher_h
+++ b/www/ungoogled-chromium/patches/patch-base_files_file_path_watcher_h
@@ -1,7 +1,7 @@
 Index: base/files/file_path_watcher.h
 --- base/files/file_path_watcher.h.orig
 +++ base/files/file_path_watcher.h
-@@ -59,7 +59,7 @@ class BASE_EXPORT FilePathWatcher {
+@@ -105,7 +105,7 @@ class BASE_EXPORT FilePathWatcher {
      Type type = Type::kNonRecursive;
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/ungoogled-chromium/patches/patch-base_files_file_path_watcher_unittest_cc b/www/ungoogled-chromium/patches/patch-base_files_file_path_watcher_unittest_cc
index 10d78b417..a0390587c 100644
--- a/www/ungoogled-chromium/patches/patch-base_files_file_path_watcher_unittest_cc
+++ b/www/ungoogled-chromium/patches/patch-base_files_file_path_watcher_unittest_cc
@@ -1,7 +1,7 @@
 Index: base/files/file_path_watcher_unittest.cc
 --- base/files/file_path_watcher_unittest.cc.orig
 +++ base/files/file_path_watcher_unittest.cc
-@@ -586,7 +586,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
+@@ -847,7 +847,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
    }
    delegate.RunUntilEventsMatch(event_expecter);
  
@@ -10,7 +10,7 @@ Index: base/files/file_path_watcher_unittest.cc
    ASSERT_TRUE(WriteFile(file1, "content v2"));
    // Mac implementation does not detect files modified in a directory.
    // TODO(https://crbug.com/1432064): Expect that no events are fired on Mac.
-@@ -1525,7 +1525,7 @@ namespace {
+@@ -1783,7 +1783,7 @@ namespace {
  
  enum Permission { Read, Write, Execute };
  
@@ -19,7 +19,7 @@ Index: base/files/file_path_watcher_unittest.cc
  bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
    struct stat stat_buf;
  
-@@ -1559,7 +1559,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
+@@ -1817,7 +1817,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
  
  }  // namespace
  
diff --git a/www/ungoogled-chromium/patches/patch-base_files_file_util_posix_cc b/www/ungoogled-chromium/patches/patch-base_files_file_util_posix_cc
index 6aabcf4f9..f4c66cb8b 100644
--- a/www/ungoogled-chromium/patches/patch-base_files_file_util_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-base_files_file_util_posix_cc
@@ -1,7 +1,7 @@
 Index: base/files/file_util_posix.cc
 --- base/files/file_util_posix.cc.orig
 +++ base/files/file_util_posix.cc
-@@ -756,32 +756,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+@@ -816,33 +816,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
                                  File::Error* error) {
    ScopedBlockingCall scoped_blocking_call(
        FROM_HERE, BlockingType::MAY_BLOCK);  // For call to mkdir().
@@ -35,11 +35,12 @@ Index: base/files/file_util_posix.cc
 -    if (!DirectoryExists(subpath)) {
 -      if (error)
 -        *error = File::OSErrorToFileError(saved_errno);
+-      errno = saved_errno;
 -      return false;
 +    if (!PathExists(subpath)) {
 +      if ((mkdir(subpath.value().c_str(), 0700) == -1) &&
 +          ((full_path != subpath) ? (errno != ENOENT) : (-1))) {
-+        int saved_errno = errno;
++        int saved_errno = errno; 
 +        if (error)
 +          *error = File::OSErrorToFileError(saved_errno);
 +        return false;
diff --git a/www/ungoogled-chromium/patches/patch-base_files_file_util_unittest_cc b/www/ungoogled-chromium/patches/patch-base_files_file_util_unittest_cc
index f2f7557fb..d7192cf49 100644
--- a/www/ungoogled-chromium/patches/patch-base_files_file_util_unittest_cc
+++ b/www/ungoogled-chromium/patches/patch-base_files_file_util_unittest_cc
@@ -1,7 +1,7 @@
 Index: base/files/file_util_unittest.cc
 --- base/files/file_util_unittest.cc.orig
 +++ base/files/file_util_unittest.cc
-@@ -3871,7 +3871,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
+@@ -3870,7 +3870,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
  }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -10,7 +10,7 @@ Index: base/files/file_util_unittest.cc
  TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
    FilePath file_path("/proc/cpuinfo");
    std::string data = "temp";
-@@ -4594,7 +4594,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
+@@ -4651,7 +4651,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
                  NULL);
  #else
      size_t bytes_written =
diff --git a/www/ungoogled-chromium/patches/patch-base_functional_unretained_traits_h b/www/ungoogled-chromium/patches/patch-base_functional_unretained_traits_h
index 5f4f41eb4..0ec94b4cc 100644
--- a/www/ungoogled-chromium/patches/patch-base_functional_unretained_traits_h
+++ b/www/ungoogled-chromium/patches/patch-base_functional_unretained_traits_h
@@ -1,12 +1,12 @@
 Index: base/functional/unretained_traits.h
 --- base/functional/unretained_traits.h.orig
 +++ base/functional/unretained_traits.h
-@@ -130,7 +130,7 @@ struct TypeSupportsUnretained {
+@@ -93,7 +93,7 @@ struct SupportsUnretainedImpl {
  // official builds, and then in non-test code as well.
- #if !defined(UNIT_TEST) && !defined(OFFICIAL_BUILD)
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
--    defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS)
-+    || BUILDFLAGS(IS_BSD) || defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS)
-   static_assert(IsCompleteTypeV<T> ||
-                     IsIncompleteTypeSafeForUnretained<std::remove_cv_t<T>>,
-                 "T must be fully defined.");
+ #if defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) || \
+     (!defined(UNIT_TEST) && !defined(OFFICIAL_BUILD) &&        \
+-     (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)))
++     (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)))
+       static_assert(v,
+                     "Argument requires unretained storage, but type is not "
+                     "fully defined. This prevents determining whether "
diff --git a/www/ungoogled-chromium/patches/patch-base_i18n_icu_util_cc b/www/ungoogled-chromium/patches/patch-base_i18n_icu_util_cc
index 34d84ba5d..52c361dec 100644
--- a/www/ungoogled-chromium/patches/patch-base_i18n_icu_util_cc
+++ b/www/ungoogled-chromium/patches/patch-base_i18n_icu_util_cc
@@ -1,7 +1,7 @@
 Index: base/i18n/icu_util.cc
 --- base/i18n/icu_util.cc.orig
 +++ base/i18n/icu_util.cc
-@@ -51,7 +51,7 @@
+@@ -52,7 +52,7 @@
  #include "third_party/icu/source/common/unicode/unistr.h"
  #endif
  
@@ -10,7 +10,7 @@ Index: base/i18n/icu_util.cc
      BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
  #include "third_party/icu/source/i18n/unicode/timezone.h"
  #endif
-@@ -345,7 +345,7 @@ void InitializeIcuTimeZone() {
+@@ -328,7 +328,7 @@ void InitializeIcuTimeZone() {
        FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
    icu::TimeZone::adoptDefault(
        icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
diff --git a/www/ungoogled-chromium/patches/patch-base_linux_util_cc b/www/ungoogled-chromium/patches/patch-base_linux_util_cc
index cf21f61b2..2370ee463 100644
--- a/www/ungoogled-chromium/patches/patch-base_linux_util_cc
+++ b/www/ungoogled-chromium/patches/patch-base_linux_util_cc
@@ -9,7 +9,7 @@ Index: base/linux_util.cc
  
  #include "base/base_export.h"
  #include "base/files/dir_reader_posix.h"
-@@ -135,6 +136,9 @@ void SetLinuxDistro(const std::string& distro) {
+@@ -153,10 +154,14 @@ void SetLinuxDistro(const std::string& distro) {
  }
  
  bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) {
@@ -19,11 +19,8 @@ Index: base/linux_util.cc
    // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22
    char buf[25];
    strings::SafeSPrintf(buf, "/proc/%d/task", pid);
-@@ -152,6 +156,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t
-   }
- 
-   return true;
+   return GetThreadsFromProcessDir(buf, tids);
 +#endif
  }
  
- pid_t FindThreadIDWithSyscall(pid_t pid, const std::string& expected_data,
+ bool GetThreadsForCurrentProcess(std::vector<pid_t>* tids) {
diff --git a/www/ungoogled-chromium/patches/patch-base_logging_unittest_cc b/www/ungoogled-chromium/patches/patch-base_logging_unittest_cc
index a721713d9..64de509c9 100644
--- a/www/ungoogled-chromium/patches/patch-base_logging_unittest_cc
+++ b/www/ungoogled-chromium/patches/patch-base_logging_unittest_cc
@@ -10,7 +10,7 @@ Index: base/logging_unittest.cc
  #include <ucontext.h>
  #endif
  
-@@ -575,14 +575,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
+@@ -570,14 +570,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
    // need the arch-specific boilerplate below, which is inspired by breakpad.
    // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
    uintptr_t crash_addr = 0;
diff --git a/www/ungoogled-chromium/patches/patch-base_memory_platform_shared_memory_region_h b/www/ungoogled-chromium/patches/patch-base_memory_platform_shared_memory_region_h
index ef789c99b..bf7681680 100644
--- a/www/ungoogled-chromium/patches/patch-base_memory_platform_shared_memory_region_h
+++ b/www/ungoogled-chromium/patches/patch-base_memory_platform_shared_memory_region_h
@@ -1,16 +1,16 @@
 Index: base/memory/platform_shared_memory_region.h
 --- base/memory/platform_shared_memory_region.h.orig
 +++ base/memory/platform_shared_memory_region.h
-@@ -16,7 +16,7 @@
- 
- #include <stdint.h>
+@@ -17,7 +17,7 @@
+ #include "base/unguessable_token.h"
+ #include "build/build_config.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  namespace content {
  class SandboxIPCHandler;
  }
-@@ -83,7 +83,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
+@@ -84,7 +84,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
      kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
    };
  
@@ -19,7 +19,7 @@ Index: base/memory/platform_shared_memory_region.h
    // Structure to limit access to executable region creation.
    struct ExecutableRegion {
     private:
-@@ -215,7 +215,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
+@@ -216,7 +216,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
                             CheckPlatformHandlePermissionsCorrespondToMode);
    static PlatformSharedMemoryRegion Create(Mode mode,
                                             size_t size
diff --git a/www/ungoogled-chromium/patches/patch-base_native_library_unittest_cc b/www/ungoogled-chromium/patches/patch-base_native_library_unittest_cc
index f68f2356d..ecbd154d1 100644
--- a/www/ungoogled-chromium/patches/patch-base_native_library_unittest_cc
+++ b/www/ungoogled-chromium/patches/patch-base_native_library_unittest_cc
@@ -1,7 +1,7 @@
 Index: base/native_library_unittest.cc
 --- base/native_library_unittest.cc.orig
 +++ base/native_library_unittest.cc
-@@ -134,7 +134,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
+@@ -133,7 +133,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
  // versions with respect to symbol resolution scope.
  // TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255
  #if !BUILDFLAG(IS_ANDROID) && !defined(THREAD_SANITIZER) && \
diff --git a/www/ungoogled-chromium/patches/patch-base_posix_sysctl_cc b/www/ungoogled-chromium/patches/patch-base_posix_sysctl_cc
new file mode 100644
index 000000000..22b0ca134
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-base_posix_sysctl_cc
@@ -0,0 +1,11 @@
+Index: base/posix/sysctl.cc
+--- base/posix/sysctl.cc.orig
++++ base/posix/sysctl.cc
+@@ -4,6 +4,7 @@
+ 
+ #include "base/posix/sysctl.h"
+ 
++#include <sys/types.h>
+ #include <sys/sysctl.h>
+ 
+ #include <initializer_list>
diff --git a/www/ungoogled-chromium/patches/patch-base_posix_unix_domain_socket_cc b/www/ungoogled-chromium/patches/patch-base_posix_unix_domain_socket_cc
index 7f4278b25..565561fd0 100644
--- a/www/ungoogled-chromium/patches/patch-base_posix_unix_domain_socket_cc
+++ b/www/ungoogled-chromium/patches/patch-base_posix_unix_domain_socket_cc
@@ -10,6 +10,24 @@ Index: base/posix/unix_domain_socket.cc
    const int enable = 1;
    return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0;
  #else
+@@ -77,7 +77,7 @@ bool UnixDomainSocket::SendMsg(int fd,
+ 
+     struct cmsghdr* cmsg;
+     msg.msg_control = control_buffer;
+-#if BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+     msg.msg_controllen = checked_cast<socklen_t>(control_len);
+ #else
+     msg.msg_controllen = control_len;
+@@ -85,7 +85,7 @@ bool UnixDomainSocket::SendMsg(int fd,
+     cmsg = CMSG_FIRSTHDR(&msg);
+     cmsg->cmsg_level = SOL_SOCKET;
+     cmsg->cmsg_type = SCM_RIGHTS;
+-#if BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+     cmsg->cmsg_len = checked_cast<u_int>(CMSG_LEN(sizeof(int) * fds.size()));
+ #else
+     cmsg->cmsg_len = CMSG_LEN(sizeof(int) * fds.size());
 @@ -149,7 +149,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
  
    const size_t kControlBufferSize =
diff --git a/www/ungoogled-chromium/patches/patch-base_process_internal_linux_h b/www/ungoogled-chromium/patches/patch-base_process_internal_linux_h
new file mode 100644
index 000000000..db9530436
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-base_process_internal_linux_h
@@ -0,0 +1,21 @@
+Index: base/process/internal_linux.h
+--- base/process/internal_linux.h.orig
++++ base/process/internal_linux.h
+@@ -138,6 +138,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks);
+ // arguments to the lambda.
+ template <typename Lambda>
+ void ForEachProcessTask(base::ProcessHandle process, Lambda&& lambda) {
++#if BUILDFLAG(IS_BSD)
++  return;
++#else
+   // Iterate through the different threads tracked in /proc/<pid>/task.
+   FilePath fd_path = GetProcPidDir(process).Append("task");
+ 
+@@ -157,6 +160,7 @@ void ForEachProcessTask(base::ProcessHandle process, L
+     FilePath task_path = fd_path.Append(tid_str);
+     lambda(tid, task_path);
+   }
++#endif
+ }
+ 
+ }  // namespace internal
diff --git a/www/ungoogled-chromium/patches/patch-base_process_kill_h b/www/ungoogled-chromium/patches/patch-base_process_kill_h
index 126b77414..187a43342 100644
--- a/www/ungoogled-chromium/patches/patch-base_process_kill_h
+++ b/www/ungoogled-chromium/patches/patch-base_process_kill_h
@@ -1,7 +1,7 @@
 Index: base/process/kill.h
 --- base/process/kill.h.orig
 +++ base/process/kill.h
-@@ -113,7 +113,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
+@@ -121,7 +121,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
  BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus(
      ProcessHandle handle, int* exit_code);
  
diff --git a/www/ungoogled-chromium/patches/patch-base_process_launch_posix_cc b/www/ungoogled-chromium/patches/patch-base_process_launch_posix_cc
index a0f05ab96..b8b42dd26 100644
--- a/www/ungoogled-chromium/patches/patch-base_process_launch_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-base_process_launch_posix_cc
@@ -1,7 +1,7 @@
 Index: base/process/launch_posix.cc
 --- base/process/launch_posix.cc.orig
 +++ base/process/launch_posix.cc
-@@ -64,6 +64,9 @@
+@@ -61,6 +61,9 @@
  #error "macOS should use launch_mac.cc"
  #endif
  
diff --git a/www/ungoogled-chromium/patches/patch-base_process_memory_linux_cc b/www/ungoogled-chromium/patches/patch-base_process_memory_linux_cc
index b3d9effeb..82f5ee7a1 100644
--- a/www/ungoogled-chromium/patches/patch-base_process_memory_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-base_process_memory_linux_cc
@@ -1,7 +1,7 @@
 Index: base/process/memory_linux.cc
 --- base/process/memory_linux.cc.orig
 +++ base/process/memory_linux.cc
-@@ -20,6 +20,7 @@
+@@ -28,6 +28,7 @@ void __libc_free(void*);
  
  namespace base {
  
@@ -9,7 +9,7 @@ Index: base/process/memory_linux.cc
  namespace {
  
  void ReleaseReservationOrTerminate() {
-@@ -29,12 +30,14 @@ void ReleaseReservationOrTerminate() {
+@@ -37,12 +38,14 @@ void ReleaseReservationOrTerminate() {
  }
  
  }  // namespace
@@ -24,7 +24,7 @@ Index: base/process/memory_linux.cc
    // Set the new-out of memory handler.
    std::set_new_handler(&ReleaseReservationOrTerminate);
    // If we're using glibc's allocator, the above functions will override
-@@ -43,8 +46,10 @@ void EnableTerminationOnOutOfMemory() {
+@@ -51,8 +54,10 @@ void EnableTerminationOnOutOfMemory() {
  #if BUILDFLAG(USE_ALLOCATOR_SHIM)
    allocator_shim::SetCallNewHandlerOnMallocFailure(true);
  #endif
@@ -35,7 +35,7 @@ Index: base/process/memory_linux.cc
  // ScopedAllowBlocking() has private constructor and it can only be used in
  // friend classes/functions. Declaring a class is easier in this situation to
  // avoid adding more dependency to thread_restrictions.h because of the
-@@ -104,6 +109,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr
+@@ -112,6 +117,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr
  bool AdjustOOMScore(ProcessId process, int score) {
    return AdjustOOMScoreHelper::AdjustOOMScore(process, score);
  }
diff --git a/www/ungoogled-chromium/patches/patch-base_process_process_handle_freebsd_cc b/www/ungoogled-chromium/patches/patch-base_process_process_handle_freebsd_cc
index 9c2fd31e5..1c2d3832e 100644
--- a/www/ungoogled-chromium/patches/patch-base_process_process_handle_freebsd_cc
+++ b/www/ungoogled-chromium/patches/patch-base_process_process_handle_freebsd_cc
@@ -9,7 +9,7 @@ Index: base/process/process_handle_freebsd.cc
  
  #include <limits.h>
  #include <stddef.h>
-@@ -15,10 +16,13 @@ namespace base {
+@@ -20,10 +21,13 @@ namespace base {
  
  ProcessId GetParentProcessId(ProcessHandle process) {
    struct kinfo_proc info;
diff --git a/www/ungoogled-chromium/patches/patch-base_process_process_handle_h b/www/ungoogled-chromium/patches/patch-base_process_process_handle_h
index eb86f990b..01d1c92c0 100644
--- a/www/ungoogled-chromium/patches/patch-base_process_process_handle_h
+++ b/www/ungoogled-chromium/patches/patch-base_process_process_handle_h
@@ -1,7 +1,7 @@
 Index: base/process/process_handle.h
 --- base/process/process_handle.h.orig
 +++ base/process/process_handle.h
-@@ -106,7 +106,7 @@ BASE_EXPORT ProcessId GetCurrentProcId();
+@@ -86,7 +86,7 @@ BASE_EXPORT ProcessId GetCurrentProcId();
  // processes may be reused.
  BASE_EXPORT UniqueProcId GetUniqueIdForProcess();
  
diff --git a/www/ungoogled-chromium/patches/patch-base_process_process_handle_openbsd_cc b/www/ungoogled-chromium/patches/patch-base_process_process_handle_openbsd_cc
index d9092b41d..04589b157 100644
--- a/www/ungoogled-chromium/patches/patch-base_process_process_handle_openbsd_cc
+++ b/www/ungoogled-chromium/patches/patch-base_process_process_handle_openbsd_cc
@@ -1,19 +1,23 @@
 Index: base/process/process_handle_openbsd.cc
 --- base/process/process_handle_openbsd.cc.orig
 +++ base/process/process_handle_openbsd.cc
-@@ -3,8 +3,11 @@
+@@ -3,48 +3,112 @@
  // found in the LICENSE file.
  
  #include "base/process/process_handle.h"
 +#include "base/files/file_util.h"
  
  #include <stddef.h>
++#include <stdlib.h>
 +#include <sys/param.h>
 +#include <sys/proc.h>
++#include <sys/stat.h>
  #include <sys/sysctl.h>
  #include <sys/types.h>
  #include <unistd.h>
-@@ -12,39 +15,59 @@
+ 
++#include <kvm.h>
++
  namespace base {
  
  ProcessId GetParentProcessId(ProcessHandle process) {
@@ -27,18 +31,19 @@ Index: base/process/process_handle_openbsd.cc
    if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0)
      return -1;
  
+-  mib[5] = (length / sizeof(struct kinfo_proc));
 +  info = (struct kinfo_proc *)malloc(length);
-+
-   mib[5] = (length / sizeof(struct kinfo_proc));
  
 -  if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
 -    return -1;
++  mib[5] = static_cast<int>((length / sizeof(struct kinfo_proc)));
+ 
+-  return info.p_ppid;
 +  if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0) {
 +    ppid = -1;
 +    goto out;
 +  }
- 
--  return info.p_ppid;
++
 +  ppid = info->p_ppid;
 +
 +out:
@@ -48,16 +53,20 @@ Index: base/process/process_handle_openbsd.cc
  
  FilePath GetProcessExecutablePath(ProcessHandle process) {
 -  struct kinfo_proc kp;
--  size_t len;
-+  struct kinfo_proc *info;
-+  size_t length;
-+  char *path = NULL;
-   int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process,
-                 sizeof(struct kinfo_proc), 0 };
++  struct kinfo_file *files;
++  kvm_t *kd = NULL;
++  char errbuf[_POSIX2_LINE_MAX];
++  char **retvalargs, *cpath, retval[PATH_MAX];
++  int cnt;
+   size_t len;
+-  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process,
+-                sizeof(struct kinfo_proc), 0 };
++  char *tokens[2];
++  struct stat sb;
++  FilePath result;
  
 -  if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) == -1)
-+  if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) == -1)
-     return FilePath();
+-    return FilePath();
 -  mib[5] = (len / sizeof(struct kinfo_proc));
 -  if (sysctl(mib, std::size(mib), &kp, &len, NULL, 0) < 0)
 -    return FilePath();
@@ -65,26 +74,61 @@ Index: base/process/process_handle_openbsd.cc
 -    return FilePath();
 -  if (strcmp(kp.p_comm, "chrome") == 0)
 -    return FilePath(kp.p_comm);
++  int mib[] = { CTL_KERN, KERN_PROC_ARGS, process, KERN_PROC_ARGV };
  
 -  return FilePath();
-+  info = (struct kinfo_proc *)malloc(length);
++  if ((cpath = getenv("CHROME_EXE_PATH")) != NULL)
++    result = FilePath(cpath);
++  else
++    result = FilePath("/usr/local/chrome/chrome");
 +
-+  mib[5] = (length / sizeof(struct kinfo_proc));
++  if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) != -1) {
++    retvalargs = static_cast<char**>(malloc(len));
++    if (!retvalargs)
++      return result;
 +
-+  if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0)
-+    goto out;
++    if (sysctl(mib, std::size(mib), retvalargs, &len, NULL, 0) < 0) {
++      free(retvalargs);
++      return result;
++    }
 +
-+  if ((info->p_flag & P_SYSTEM) != 0)
-+    goto out;
++    if ((*tokens = strtok(retvalargs[0], ":")) == NULL) {
++      free(retvalargs);
++      return result;
++    }
 +
-+  if (strcmp(info->p_comm, "chrome") == 0) {
-+    path = info->p_comm;
-+    goto out;
++    free(retvalargs);
++
++    if (tokens[0] == NULL)
++      return result;
++
++    if (realpath(tokens[0], retval) == NULL)
++      return result;
++
++    if (stat(retval, &sb) < 0)
++      return result;
++
++    if ((kd = kvm_openfiles(NULL, NULL, NULL, (int)KVM_NO_FILES,
++         errbuf)) == NULL)
++      return result;
++
++    if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, process,
++        sizeof(struct kinfo_file), &cnt)) == NULL) {
++      kvm_close(kd);
++      return result;
++    }
++
++    for (int i = 0; i < cnt; i++) {
++      if (files[i].fd_fd == KERN_FILE_TEXT &&
++          files[i].va_fsid == static_cast<uint32_t>(sb.st_dev) &&
++          files[i].va_fileid == sb.st_ino) {
++            kvm_close(kd);
++            result = FilePath(retval);
++      }
++    }
 +  }
 +
-+out:
-+  free(info);
-+  return FilePath(path);
++  return result;
  }
  
  }  // namespace base
diff --git a/www/ungoogled-chromium/patches/patch-base_process_process_metrics_cc b/www/ungoogled-chromium/patches/patch-base_process_process_metrics_cc
index 9ad95a038..5e2e65424 100644
--- a/www/ungoogled-chromium/patches/patch-base_process_process_metrics_cc
+++ b/www/ungoogled-chromium/patches/patch-base_process_process_metrics_cc
@@ -36,17 +36,12 @@ Index: base/process/process_metrics.cc
  double ProcessMetrics::GetPlatformIndependentCPUUsage(
      TimeDelta cumulative_cpu) {
    TimeTicks time = TimeTicks::Now();
-@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
- double ProcessMetrics::GetPlatformIndependentCPUUsage() {
-   return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage());
+@@ -130,10 +129,9 @@ std::optional<double> ProcessMetrics::GetPlatformIndep
+   }
+   return GetPlatformIndependentCPUUsage(cpu_usage.value());
  }
 -#endif
  
- #if BUILDFLAG(IS_WIN)
- double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) {
-@@ -157,7 +155,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
- #endif  // BUILDFLAG(IS_WIN)
- 
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_AIX)
 +    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-base_process_process_metrics_freebsd_cc b/www/ungoogled-chromium/patches/patch-base_process_process_metrics_freebsd_cc
index 6aab8bbf4..ce1a02337 100644
--- a/www/ungoogled-chromium/patches/patch-base_process_process_metrics_freebsd_cc
+++ b/www/ungoogled-chromium/patches/patch-base_process_process_metrics_freebsd_cc
@@ -1,7 +1,7 @@
 Index: base/process/process_metrics_freebsd.cc
 --- base/process/process_metrics_freebsd.cc.orig
 +++ base/process/process_metrics_freebsd.cc
-@@ -3,20 +3,39 @@
+@@ -3,42 +3,57 @@
  // found in the LICENSE file.
  
  #include "base/process/process_metrics.h"
@@ -18,7 +18,6 @@ Index: base/process/process_metrics_freebsd.cc
 +#include <libutil.h>
 +
  #include "base/memory/ptr_util.h"
- #include "base/process/process_metrics_iocounters.h"
 +#include "base/values.h"
  
  namespace base {
@@ -27,28 +26,28 @@ Index: base/process/process_metrics_freebsd.cc
 +  int pagesize = getpagesize();
 +  int pageshift = 0;
  
+-ProcessMetrics::ProcessMetrics(ProcessHandle process)
+-    : process_(process),
+-      last_cpu_(0) {}
 +  while (pagesize > 1) {
 +    pageshift++;
 +    pagesize >>= 1;
 +  }
-+
+ 
 +  return pageshift;
 +}
 +}
 +
- ProcessMetrics::ProcessMetrics(ProcessHandle process)
--    : process_(process),
--      last_cpu_(0) {}
-+    : process_(process) {}
- 
++ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {}
++
  // static
  std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
-@@ -24,22 +43,19 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
+     ProcessHandle process) {
    return WrapUnique(new ProcessMetrics(process));
  }
  
--double ProcessMetrics::GetPlatformIndependentCPUUsage() {
-+TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
+-std::optional<double> ProcessMetrics::GetPlatformIndependentCPUUsage() {
++std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() {
    struct kinfo_proc info;
 -  int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_};
 -  size_t length = sizeof(info);
@@ -58,22 +57,22 @@ Index: base/process/process_metrics_freebsd.cc
 +  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ };
 +
    if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
--    return 0;
-+    return TimeDelta();
+-    return std::nullopt;
++    return std::optional(TimeDelta());
  
--  return (info.ki_pctcpu / FSCALE) * 100.0;
-+  return Microseconds(info.ki_runtime);
+-  return std::optional(double{info.ki_pctcpu} / FSCALE * 100.0);
++  return std::optional(Microseconds(info.ki_runtime));
  }
  
--TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
+-std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() {
 -  NOTREACHED();
--  return TimeDelta();
+-  return std::nullopt;
 -}
 -
- bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
-   return false;
- }
-@@ -65,6 +81,230 @@ size_t GetSystemCommitCharge() {
+ size_t GetSystemCommitCharge() {
+   int mib[2], pagesize;
+   unsigned long mem_total, mem_free, mem_inactive;
+@@ -60,6 +75,230 @@ size_t GetSystemCommitCharge() {
    pagesize = getpagesize();
  
    return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
@@ -172,7 +171,7 @@ Index: base/process/process_metrics_freebsd.cc
 +    kvm_close(kd);
 +    return 0;
 +  }
-+  
++
 +  size_t rss;
 +
 +  if (nproc > 0) {
@@ -198,7 +197,7 @@ Index: base/process/process_metrics_freebsd.cc
 +    kvm_close(kd);
 +    return 0;
 +  }
-+  
++
 +  size_t swrss;
 +
 +  if (nproc > 0) {
@@ -248,7 +247,7 @@ Index: base/process/process_metrics_freebsd.cc
 +
 +Value::Dict SystemDiskInfo::ToDict() const {
 +  Value::Dict res;
-+ 
++
 +  // Write out uint64_t variables as doubles.
 +  // Note: this may discard some precision, but for JS there's no other option.
 +  res.Set("reads", static_cast<double>(reads));
@@ -264,7 +263,7 @@ Index: base/process/process_metrics_freebsd.cc
 +  res.Set("weighted_io_time", static_cast<double>(weighted_io_time));
 +
 +  NOTIMPLEMENTED();
-+ 
++
 +  return res;
 +}
 +
diff --git a/www/ungoogled-chromium/patches/patch-base_process_process_metrics_h b/www/ungoogled-chromium/patches/patch-base_process_process_metrics_h
index bb6675552..4008164f1 100644
--- a/www/ungoogled-chromium/patches/patch-base_process_process_metrics_h
+++ b/www/ungoogled-chromium/patches/patch-base_process_process_metrics_h
@@ -1,7 +1,7 @@
 Index: base/process/process_metrics.h
 --- base/process/process_metrics.h.orig
 +++ base/process/process_metrics.h
-@@ -37,7 +37,7 @@
+@@ -38,7 +38,7 @@
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -10,16 +10,16 @@ Index: base/process/process_metrics.h
  #include <string>
  #include <utility>
  #include <vector>
-@@ -50,7 +50,7 @@ namespace base {
- // Full declaration is in process_metrics_iocounters.h.
- struct IoCounters;
+@@ -48,7 +48,7 @@
+ 
+ namespace base {
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
  // Minor and major page fault counts since the process creation.
  // Both counts are process-wide, and exclude child processes.
  //
-@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -103,7 +103,7 @@ class BASE_EXPORT ProcessMetrics {
    // convenience wrapper for CreateProcessMetrics().
    static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
  
@@ -28,8 +28,8 @@ Index: base/process/process_metrics.h
    // Resident Set Size is a Linux/Android specific memory concept. Do not
    // attempt to extend this to other platforms.
    BASE_EXPORT size_t GetResidentSetSize() const;
-@@ -163,7 +163,7 @@ class BASE_EXPORT ProcessMetrics {
- #endif  // BUILDFLAG(IS_WIN)
+@@ -137,7 +137,7 @@ class BASE_EXPORT ProcessMetrics {
+   [[nodiscard]] std::optional<TimeDelta> GetCumulativeCPUUsage();
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
 -    BUILDFLAG(IS_AIX)
@@ -37,7 +37,7 @@ Index: base/process/process_metrics.h
    // Emits the cumulative CPU usage for all currently active threads since they
    // were started into the output parameter (replacing its current contents).
    // Threads that have already terminated will not be reported. Thus, the sum of
-@@ -223,7 +223,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -182,7 +182,7 @@ class BASE_EXPORT ProcessMetrics {
    int GetOpenFdSoftLimit() const;
  #endif  // BUILDFLAG(IS_POSIX)
  
@@ -46,7 +46,7 @@ Index: base/process/process_metrics.h
    // Bytes of swap as reported by /proc/[pid]/status.
    uint64_t GetVmSwapBytes() const;
  
-@@ -244,7 +244,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -203,7 +203,7 @@ class BASE_EXPORT ProcessMetrics {
  #endif  // !BUILDFLAG(IS_MAC)
  
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -55,7 +55,7 @@ Index: base/process/process_metrics.h
    int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
  #endif
  #if BUILDFLAG(IS_APPLE)
-@@ -266,9 +266,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -225,12 +225,10 @@ class BASE_EXPORT ProcessMetrics {
    // Used to store the previous times and CPU usage counts so we can
    // compute the CPU usage between calls.
    TimeTicks last_cpu_time_;
@@ -63,18 +63,13 @@ Index: base/process/process_metrics.h
    TimeDelta last_cumulative_cpu_;
 -#endif
  
- #if BUILDFLAG(IS_WIN)
-   TimeTicks last_cpu_time_for_precise_cpu_usage_;
-@@ -276,7 +274,7 @@ class BASE_EXPORT ProcessMetrics {
- #endif
- 
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_AIX)
 +    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
    // Same thing for idle wakeups.
    TimeTicks last_idle_wakeups_time_;
    uint64_t last_absolute_idle_wakeups_;
-@@ -316,7 +314,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
+@@ -271,7 +269,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||      \
      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \
@@ -83,7 +78,7 @@ Index: base/process/process_metrics.h
  // Data about system-wide memory consumption. Values are in KB. Available on
  // Windows, Mac, Linux, Android and Chrome OS.
  //
-@@ -351,7 +349,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -306,7 +304,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -92,7 +87,7 @@ Index: base/process/process_metrics.h
    // This provides an estimate of available memory as described here:
    // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
    // NOTE: this is ONLY valid in kernels 3.14 and up.  Its value will always
-@@ -366,7 +364,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -321,7 +319,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
  #endif
  
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -101,7 +96,7 @@ Index: base/process/process_metrics.h
    int buffers = 0;
    int cached = 0;
    int active_anon = 0;
-@@ -403,7 +401,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
+@@ -358,7 +356,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
          // BUILDFLAG(IS_FUCHSIA)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -110,7 +105,7 @@ Index: base/process/process_metrics.h
  // Parse the data found in /proc/<pid>/stat and return the sum of the
  // CPU-related ticks.  Returns -1 on parse error.
  // Exposed for testing.
-@@ -591,7 +589,7 @@ class BASE_EXPORT SystemMetrics {
+@@ -552,7 +550,7 @@ class BASE_EXPORT SystemMetrics {
    FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
  
    size_t committed_memory_;
diff --git a/www/ungoogled-chromium/patches/patch-base_process_process_metrics_openbsd_cc b/www/ungoogled-chromium/patches/patch-base_process_process_metrics_openbsd_cc
index 7221b52ef..3b2be6e5d 100644
--- a/www/ungoogled-chromium/patches/patch-base_process_process_metrics_openbsd_cc
+++ b/www/ungoogled-chromium/patches/patch-base_process_process_metrics_openbsd_cc
@@ -1,7 +1,7 @@
 Index: base/process/process_metrics_openbsd.cc
 --- base/process/process_metrics_openbsd.cc.orig
 +++ base/process/process_metrics_openbsd.cc
-@@ -6,14 +6,23 @@
+@@ -6,73 +6,49 @@
  
  #include <stddef.h>
  #include <stdint.h>
@@ -9,28 +9,21 @@ Index: base/process/process_metrics_openbsd.cc
  #include <sys/param.h>
  #include <sys/sysctl.h>
 +#include <sys/vmmeter.h>
+ #include <optional>
  
 +#include <kvm.h>
 +
  #include "base/memory/ptr_util.h"
- #include "base/process/process_metrics_iocounters.h"
 +#include "base/values.h"
 +#include "base/notreached.h"
  
  namespace base {
  
-+ProcessMetrics::ProcessMetrics(ProcessHandle process)
-+    : process_(process) {}
-+
- // static
- std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
-     ProcessHandle process) {
-@@ -24,49 +33,23 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun
-   return false;
- }
+-namespace {
++ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {}
  
--static int GetProcessCPU(pid_t pid) {
-+TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
+-static std::optional<int> GetProcessCPU(pid_t pid) {
++std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() {
    struct kinfo_proc info;
 -  size_t length;
 -  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid,
@@ -38,43 +31,55 @@ Index: base/process/process_metrics_openbsd.cc
 +  size_t length = sizeof(struct kinfo_proc);
 +  struct timeval tv;
  
--  if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0)
--    return -1;
+-  if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) {
+-    return std::nullopt;
+-  }
 +  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_,
 +                sizeof(struct kinfo_proc), 1 };
  
 -  mib[5] = (length / sizeof(struct kinfo_proc));
 -
-   if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
--    return 0;
-+    return TimeDelta();
+   if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
+-    return std::nullopt;
++    return std::optional(TimeDelta());
+   }
  
--  return info.p_pctcpu;
--}
+-  return std::optional(info.p_pctcpu);
 +  tv.tv_sec = info.p_rtime_sec;
 +  tv.tv_usec = info.p_rtime_usec;
++
++  return std::optional(Microseconds(TimeValToMicroseconds(tv)));
+ }
  
--double ProcessMetrics::GetPlatformIndependentCPUUsage() {
+-}  // namespace
+-
+ // static
+ std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
+     ProcessHandle process) {
+   return WrapUnique(new ProcessMetrics(process));
+ }
+ 
+-std::optional<double> ProcessMetrics::GetPlatformIndependentCPUUsage() {
 -  TimeTicks time = TimeTicks::Now();
 -
 -  if (last_cpu_time_.is_zero()) {
 -    // First call, just set the last values.
 -    last_cpu_time_ = time;
--    return 0;
+-    return std::optional(0.0);
 -  }
 -
--  int cpu = GetProcessCPU(process_);
+-  const std::optional<int> cpu = GetProcessCPU(process_);
+-  if (!cpu.has_value()) {
+-    return std::nullopt;
+-  }
 -
 -  last_cpu_time_ = time;
--  double percentage = static_cast<double>((cpu * 100.0) / FSCALE);
+-  return std::optional(double{cpu.value()} / FSCALE * 100.0);
+-}
 -
--  return percentage;
-+  return Microseconds(TimeValToMicroseconds(tv));
- }
- 
--TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
+-std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() {
 -  NOTREACHED();
--  return TimeDelta();
+-  return std::nullopt;
 -}
 -
 -ProcessMetrics::ProcessMetrics(ProcessHandle process)
@@ -83,9 +88,17 @@ Index: base/process/process_metrics_openbsd.cc
 -
  size_t GetSystemCommitCharge() {
    int mib[] = { CTL_VM, VM_METER };
-   int pagesize;
-@@ -84,6 +67,133 @@ size_t GetSystemCommitCharge() {
-   pagesize = getpagesize();
+-  int pagesize;
++  size_t pagesize;
+   struct vmtotal vmtotal;
+   unsigned long mem_total, mem_free, mem_inactive;
+   size_t len = sizeof(vmtotal);
+@@ -84,9 +60,136 @@ size_t GetSystemCommitCharge() {
+   mem_free = vmtotal.t_free;
+   mem_inactive = vmtotal.t_vm - vmtotal.t_avm;
+ 
+-  pagesize = getpagesize();
++  pagesize = checked_cast<size_t>(getpagesize());
  
    return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
 +}
diff --git a/www/ungoogled-chromium/patches/patch-base_process_process_metrics_unittest_cc b/www/ungoogled-chromium/patches/patch-base_process_process_metrics_unittest_cc
index 9e0c0a94b..d11dfdacb 100644
--- a/www/ungoogled-chromium/patches/patch-base_process_process_metrics_unittest_cc
+++ b/www/ungoogled-chromium/patches/patch-base_process_process_metrics_unittest_cc
@@ -1,21 +1,13 @@
 Index: base/process/process_metrics_unittest.cc
 --- base/process/process_metrics_unittest.cc.orig
 +++ base/process/process_metrics_unittest.cc
-@@ -44,7 +44,7 @@ namespace debug {
+@@ -56,7 +56,8 @@
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||      \
      BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- 
- namespace {
- 
-@@ -347,7 +347,7 @@ TEST_F(SystemMetricsTest, ParseVmstat) {
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||      \
-     BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- 
- // Test that ProcessMetrics::GetPlatformIndependentCPUUsage() doesn't return
- // negative values when the number of threads running on the process decreases
+-    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || \
++    BUILDFLAG(IS_BSD)
+ #define ENABLE_CPU_TESTS 1
+ #else
+ #define ENABLE_CPU_TESTS 0
diff --git a/www/ungoogled-chromium/patches/patch-base_process_process_unittest_cc b/www/ungoogled-chromium/patches/patch-base_process_process_unittest_cc
index 602f74bf1..612f99597 100644
--- a/www/ungoogled-chromium/patches/patch-base_process_process_unittest_cc
+++ b/www/ungoogled-chromium/patches/patch-base_process_process_unittest_cc
@@ -1,7 +1,7 @@
 Index: base/process/process_unittest.cc
 --- base/process/process_unittest.cc.orig
 +++ base/process/process_unittest.cc
-@@ -195,7 +195,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
+@@ -199,7 +199,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
    // was spawned and a time recorded after it was spawned. However, since the
    // base::Time and process creation clocks don't match, tolerate some error.
    constexpr base::TimeDelta kTolerance =
diff --git a/www/ungoogled-chromium/patches/patch-base_profiler_module_cache_cc b/www/ungoogled-chromium/patches/patch-base_profiler_module_cache_cc
index 50ab0d511..48492fea5 100644
--- a/www/ungoogled-chromium/patches/patch-base_profiler_module_cache_cc
+++ b/www/ungoogled-chromium/patches/patch-base_profiler_module_cache_cc
@@ -1,7 +1,7 @@
 Index: base/profiler/module_cache.cc
 --- base/profiler/module_cache.cc.orig
 +++ base/profiler/module_cache.cc
-@@ -52,7 +52,7 @@ std::string TransformModuleIDToSymbolServerFormat(Stri
+@@ -38,7 +38,7 @@ std::string TransformModuleIDToSymbolServerFormat(std:
    // Android and Linux Chrome builds use the "breakpad" format to index their
    // build id, so we transform the build id for these platforms. All other
    // platforms keep their symbols indexed by the original build ID.
diff --git a/www/ungoogled-chromium/patches/patch-base_profiler_sampling_profiler_thread_token_cc b/www/ungoogled-chromium/patches/patch-base_profiler_sampling_profiler_thread_token_cc
index e5fa3dbf3..c4503107c 100644
--- a/www/ungoogled-chromium/patches/patch-base_profiler_sampling_profiler_thread_token_cc
+++ b/www/ungoogled-chromium/patches/patch-base_profiler_sampling_profiler_thread_token_cc
@@ -16,6 +16,6 @@ Index: base/profiler/sampling_profiler_thread_token.cc
    return {id, pthread_self()};
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   absl::optional<uintptr_t> maybe_stack_base =
+   std::optional<uintptr_t> maybe_stack_base =
        GetThreadStackBaseAddress(id, pthread_self());
    return {id, maybe_stack_base};
diff --git a/www/ungoogled-chromium/patches/patch-base_profiler_sampling_profiler_thread_token_h b/www/ungoogled-chromium/patches/patch-base_profiler_sampling_profiler_thread_token_h
index 78b1f8c32..b0775f3c0 100644
--- a/www/ungoogled-chromium/patches/patch-base_profiler_sampling_profiler_thread_token_h
+++ b/www/ungoogled-chromium/patches/patch-base_profiler_sampling_profiler_thread_token_h
@@ -1,7 +1,7 @@
 Index: base/profiler/sampling_profiler_thread_token.h
 --- base/profiler/sampling_profiler_thread_token.h.orig
 +++ base/profiler/sampling_profiler_thread_token.h
-@@ -12,7 +12,7 @@
+@@ -13,7 +13,7 @@
  
  #if BUILDFLAG(IS_ANDROID)
  #include <pthread.h>
@@ -10,7 +10,7 @@ Index: base/profiler/sampling_profiler_thread_token.h
  #include <stdint.h>
  #endif
  
-@@ -26,7 +26,7 @@ struct SamplingProfilerThreadToken {
+@@ -27,7 +27,7 @@ struct SamplingProfilerThreadToken {
    PlatformThreadId id;
  #if BUILDFLAG(IS_ANDROID)
    pthread_t pthread_id;
diff --git a/www/ungoogled-chromium/patches/patch-base_profiler_stack_base_address_posix_cc b/www/ungoogled-chromium/patches/patch-base_profiler_stack_base_address_posix_cc
index 722bccd39..12f9aaee8 100644
--- a/www/ungoogled-chromium/patches/patch-base_profiler_stack_base_address_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-base_profiler_stack_base_address_posix_cc
@@ -12,7 +12,7 @@ Index: base/profiler/stack_base_address_posix.cc
  #if BUILDFLAG(IS_CHROMEOS)
  extern "C" void* __libc_stack_end;
  #endif
-@@ -45,7 +49,21 @@ absl::optional<uintptr_t> GetAndroidMainThreadStackBas
+@@ -45,7 +49,21 @@ std::optional<uintptr_t> GetAndroidMainThreadStackBase
  
  #if !BUILDFLAG(IS_LINUX)
  uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) {
@@ -49,3 +49,12 @@ Index: base/profiler/stack_base_address_posix.cc
    const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size;
    return base_address;
  }
+@@ -80,7 +100,7 @@ std::optional<uintptr_t> GetThreadStackBaseAddress(Pla
+   // trying to work around the problem.
+   return std::nullopt;
+ #else
+-  const bool is_main_thread = id == GetCurrentProcId();
++  const bool is_main_thread = id == checked_cast<PlatformThreadId>(GetCurrentProcId());
+   if (is_main_thread) {
+ #if BUILDFLAG(IS_ANDROID)
+     // The implementation of pthread_getattr_np() in Bionic reads proc/self/maps
diff --git a/www/ungoogled-chromium/patches/patch-base_profiler_stack_sampling_profiler_test_util_cc b/www/ungoogled-chromium/patches/patch-base_profiler_stack_sampling_profiler_test_util_cc
index c52e6fd61..bf38763ad 100644
--- a/www/ungoogled-chromium/patches/patch-base_profiler_stack_sampling_profiler_test_util_cc
+++ b/www/ungoogled-chromium/patches/patch-base_profiler_stack_sampling_profiler_test_util_cc
@@ -1,7 +1,7 @@
 Index: base/profiler/stack_sampling_profiler_test_util.cc
 --- base/profiler/stack_sampling_profiler_test_util.cc.orig
 +++ base/profiler/stack_sampling_profiler_test_util.cc
-@@ -36,7 +36,7 @@
+@@ -37,7 +37,7 @@
  // Fortunately, it provides _alloca, which functions identically.
  #include <malloc.h>
  #define alloca _alloca
diff --git a/www/ungoogled-chromium/patches/patch-base_profiler_stack_sampling_profiler_unittest_cc b/www/ungoogled-chromium/patches/patch-base_profiler_stack_sampling_profiler_unittest_cc
index 060167453..ee430b3a9 100644
--- a/www/ungoogled-chromium/patches/patch-base_profiler_stack_sampling_profiler_unittest_cc
+++ b/www/ungoogled-chromium/patches/patch-base_profiler_stack_sampling_profiler_unittest_cc
@@ -1,7 +1,7 @@
 Index: base/profiler/stack_sampling_profiler_unittest.cc
 --- base/profiler/stack_sampling_profiler_unittest.cc.orig
 +++ base/profiler/stack_sampling_profiler_unittest.cc
-@@ -41,7 +41,7 @@
+@@ -42,7 +42,7 @@
  #include <intrin.h>
  #include <malloc.h>
  #include <windows.h>
diff --git a/www/ungoogled-chromium/patches/patch-base_profiler_thread_delegate_posix_cc b/www/ungoogled-chromium/patches/patch-base_profiler_thread_delegate_posix_cc
index 8907fb664..366580d87 100644
--- a/www/ungoogled-chromium/patches/patch-base_profiler_thread_delegate_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-base_profiler_thread_delegate_posix_cc
@@ -1,19 +1,19 @@
 Index: base/profiler/thread_delegate_posix.cc
 --- base/profiler/thread_delegate_posix.cc.orig
 +++ base/profiler/thread_delegate_posix.cc
-@@ -13,7 +13,7 @@
+@@ -14,7 +14,7 @@
+ #include "base/process/process_handle.h"
  #include "build/build_config.h"
- #include "third_party/abseil-cpp/absl/types/optional.h"
  
 -#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
 +#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
  #include "base/profiler/stack_base_address_posix.h"
  #endif
  
-@@ -22,7 +22,7 @@ namespace base {
+@@ -23,7 +23,7 @@ namespace base {
  std::unique_ptr<ThreadDelegatePosix> ThreadDelegatePosix::Create(
      SamplingProfilerThreadToken thread_token) {
-   absl::optional<uintptr_t> base_address;
+   std::optional<uintptr_t> base_address;
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    base_address = thread_token.stack_base_address;
diff --git a/www/ungoogled-chromium/patches/patch-base_rand_util_h b/www/ungoogled-chromium/patches/patch-base_rand_util_h
index 0b12a20f6..d32fe7107 100644
--- a/www/ungoogled-chromium/patches/patch-base_rand_util_h
+++ b/www/ungoogled-chromium/patches/patch-base_rand_util_h
@@ -1,7 +1,7 @@
 Index: base/rand_util.h
 --- base/rand_util.h.orig
 +++ base/rand_util.h
-@@ -121,7 +121,7 @@ void RandomShuffle(Itr first, Itr last) {
+@@ -149,7 +149,7 @@ void RandomShuffle(Itr first, Itr last) {
    std::shuffle(first, last, RandomBitGenerator());
  }
  
diff --git a/www/ungoogled-chromium/patches/patch-base_rand_util_posix_cc b/www/ungoogled-chromium/patches/patch-base_rand_util_posix_cc
index 0e4136be4..17158db9a 100644
--- a/www/ungoogled-chromium/patches/patch-base_rand_util_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-base_rand_util_posix_cc
@@ -1,7 +1,7 @@
 Index: base/rand_util_posix.cc
 --- base/rand_util_posix.cc.orig
 +++ base/rand_util_posix.cc
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
  #include "base/time/time.h"
  #include "build/build_config.h"
  
@@ -10,15 +10,15 @@ Index: base/rand_util_posix.cc
  #include "third_party/lss/linux_syscall_support.h"
  #elif BUILDFLAG(IS_MAC)
  // TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK.
-@@ -46,6 +46,7 @@ static constexpr int kOpenFlags = O_RDONLY;
- static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC;
- #endif
+@@ -40,6 +40,7 @@ namespace base {
+ 
+ namespace {
  
 +#if !BUILDFLAG(IS_BSD)
- // We keep the file descriptor for /dev/urandom around so we don't need to
- // reopen it (which is expensive), and since we may not even be able to reopen
- // it if we are later put in a sandbox. This class wraps the file descriptor so
-@@ -63,10 +64,11 @@ class URandomFd {
+ #if BUILDFLAG(IS_AIX)
+ // AIX has no 64-bit support for O_CLOEXEC.
+ static constexpr int kOpenFlags = O_RDONLY;
+@@ -64,10 +65,11 @@ class URandomFd {
   private:
    const int fd_;
  };
@@ -31,26 +31,26 @@ Index: base/rand_util_posix.cc
  // TODO(pasko): Unify reading kernel version numbers in:
  // mojo/core/channel_linux.cc
  // chrome/browser/android/seccomp_support_detector.cc
-@@ -176,6 +178,7 @@ bool UseBoringSSLForRandBytes() {
+@@ -177,6 +179,7 @@ bool UseBoringSSLForRandBytes() {
  namespace {
  
- void RandBytes(void* output, size_t output_length, bool avoid_allocation) {
+ void RandBytes(span<uint8_t> output, bool avoid_allocation) {
 +#if !BUILDFLAG(IS_BSD)
  #if !BUILDFLAG(IS_NACL)
    // The BoringSSL experiment takes priority over everything else.
    if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) {
-@@ -214,6 +217,9 @@ void RandBytes(void* output, size_t output_length, boo
-   const bool success =
-       ReadFromFD(urandom_fd, static_cast<char*>(output), output_length);
+@@ -215,6 +218,9 @@ void RandBytes(span<uint8_t> output, bool avoid_alloca
+   const int urandom_fd = GetUrandomFD();
+   const bool success = ReadFromFD(urandom_fd, as_writable_chars(output));
    CHECK(success);
 +#else
-+  arc4random_buf(static_cast<char*>(output), output_length);
++  arc4random_buf(output.data(), output.size());
 +#endif
  }
  
  }  // namespace
-@@ -233,9 +239,11 @@ void RandBytes(void* output, size_t output_length) {
-   RandBytes(output, output_length, /*avoid_allocation=*/false);
+@@ -239,9 +245,11 @@ void RandBytes(void* output, size_t output_length) {
+   RandBytes(make_span(static_cast<uint8_t*>(output), output_length));
  }
  
 +#if !BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-base_synchronization_lock_impl_h b/www/ungoogled-chromium/patches/patch-base_synchronization_lock_impl_h
index 369b21001..1a7eb5808 100644
--- a/www/ungoogled-chromium/patches/patch-base_synchronization_lock_impl_h
+++ b/www/ungoogled-chromium/patches/patch-base_synchronization_lock_impl_h
@@ -1,7 +1,7 @@
 Index: base/synchronization/lock_impl.h
 --- base/synchronization/lock_impl.h.orig
 +++ base/synchronization/lock_impl.h
-@@ -104,6 +104,10 @@ void LockImpl::Unlock() {
+@@ -107,6 +107,10 @@ void LockImpl::Unlock() {
  }
  
  #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
@@ -12,7 +12,7 @@ Index: base/synchronization/lock_impl.h
  
  #if DCHECK_IS_ON()
  BASE_EXPORT void dcheck_trylock_result(int rv);
-@@ -124,6 +128,9 @@ void LockImpl::Unlock() {
+@@ -127,6 +131,9 @@ void LockImpl::Unlock() {
    dcheck_unlock_result(rv);
  #endif
  }
diff --git a/www/ungoogled-chromium/patches/patch-base_syslog_logging_cc b/www/ungoogled-chromium/patches/patch-base_syslog_logging_cc
index 81ba76f57..30d1e5728 100644
--- a/www/ungoogled-chromium/patches/patch-base_syslog_logging_cc
+++ b/www/ungoogled-chromium/patches/patch-base_syslog_logging_cc
@@ -1,7 +1,7 @@
 Index: base/syslog_logging.cc
 --- base/syslog_logging.cc.orig
 +++ base/syslog_logging.cc
-@@ -15,7 +15,7 @@
+@@ -17,7 +17,7 @@
  #include "base/strings/string_util.h"
  #include "base/win/scoped_handle.h"
  #include "base/win/win_util.h"
@@ -10,7 +10,7 @@ Index: base/syslog_logging.cc
  // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with
  // base::LOG_INFO, base::LOG_WARNING.
  #include <syslog.h>
-@@ -147,7 +147,7 @@ EventLogMessage::~EventLogMessage() {
+@@ -149,7 +149,7 @@ EventLogMessage::~EventLogMessage() {
  
    if (user_sid != nullptr)
      ::LocalFree(user_sid);
diff --git a/www/ungoogled-chromium/patches/patch-base_system_sys_info_cc b/www/ungoogled-chromium/patches/patch-base_system_sys_info_cc
index 42cf5bda4..585fa28b6 100644
--- a/www/ungoogled-chromium/patches/patch-base_system_sys_info_cc
+++ b/www/ungoogled-chromium/patches/patch-base_system_sys_info_cc
@@ -1,7 +1,7 @@
 Index: base/system/sys_info.cc
 --- base/system/sys_info.cc.orig
 +++ base/system/sys_info.cc
-@@ -166,7 +166,7 @@ std::string SysInfo::HardwareModelName() {
+@@ -225,7 +225,7 @@ std::string SysInfo::HardwareModelName() {
  #endif
  
  void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) {
diff --git a/www/ungoogled-chromium/patches/patch-base_system_sys_info_h b/www/ungoogled-chromium/patches/patch-base_system_sys_info_h
index 71685d16b..ec62ce5f4 100644
--- a/www/ungoogled-chromium/patches/patch-base_system_sys_info_h
+++ b/www/ungoogled-chromium/patches/patch-base_system_sys_info_h
@@ -1,7 +1,7 @@
 Index: base/system/sys_info.h
 --- base/system/sys_info.h.orig
 +++ base/system/sys_info.h
-@@ -264,6 +264,8 @@ class BASE_EXPORT SysInfo {
+@@ -322,6 +322,8 @@ class BASE_EXPORT SysInfo {
    static void ResetCpuSecurityMitigationsEnabledForTesting();
  #endif
  
@@ -10,7 +10,7 @@ Index: base/system/sys_info.h
   private:
    friend class test::ScopedAmountOfPhysicalMemoryOverride;
    FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
-@@ -276,7 +278,7 @@ class BASE_EXPORT SysInfo {
+@@ -334,7 +336,7 @@ class BASE_EXPORT SysInfo {
    static HardwareInfo GetHardwareInfoSync();
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/ungoogled-chromium/patches/patch-base_system_sys_info_openbsd_cc b/www/ungoogled-chromium/patches/patch-base_system_sys_info_openbsd_cc
index d1f38ac51..f76dc17d6 100644
--- a/www/ungoogled-chromium/patches/patch-base_system_sys_info_openbsd_cc
+++ b/www/ungoogled-chromium/patches/patch-base_system_sys_info_openbsd_cc
@@ -1,22 +1,29 @@
 Index: base/system/sys_info_openbsd.cc
 --- base/system/sys_info_openbsd.cc.orig
 +++ base/system/sys_info_openbsd.cc
-@@ -11,6 +11,7 @@
- #include <sys/sysctl.h>
+@@ -3,7 +3,6 @@
+ // found in the LICENSE file.
+ 
+ #include "base/system/sys_info.h"
+-
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <sys/param.h>
+@@ -12,6 +11,7 @@
  
  #include "base/notreached.h"
+ #include "base/posix/sysctl.h"
 +#include "base/strings/string_util.h"
  
  namespace {
  
-@@ -26,9 +27,15 @@ uint64_t AmountOfMemory(int pages_name) {
+@@ -27,9 +27,14 @@ uint64_t AmountOfMemory(int pages_name) {
  
  namespace base {
  
 +// pledge(2)
-+int64_t aofpmem = 0;
-+int64_t aofapmem = 0;
-+int64_t shmmax = 0;
++uint64_t aofpmem = 0;
++uint64_t shmmax = 0;
 +char cpumodel[256];
 +
  // static
@@ -26,7 +33,7 @@ Index: base/system/sys_info_openbsd.cc
    int ncpu;
    size_t size = sizeof(ncpu);
    if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) {
-@@ -40,10 +47,26 @@ int SysInfo::NumberOfProcessors() {
+@@ -41,10 +46,26 @@ int SysInfo::NumberOfProcessors() {
  
  // static
  uint64_t SysInfo::AmountOfPhysicalMemoryImpl() {
@@ -54,7 +61,7 @@ Index: base/system/sys_info_openbsd.cc
  uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
    // We should add inactive file-backed memory also but there is no such
    // information from OpenBSD unfortunately.
-@@ -55,23 +78,28 @@ uint64_t SysInfo::MaxSharedMemorySize() {
+@@ -56,16 +77,28 @@ uint64_t SysInfo::MaxSharedMemorySize() {
    int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX};
    size_t limit;
    size_t size = sizeof(limit);
@@ -73,14 +80,7 @@ Index: base/system/sys_info_openbsd.cc
  
  // static
 -std::string SysInfo::CPUModelName() {
--  int mib[] = {CTL_HW, HW_MODEL};
--  char name[256];
--  size_t len = std::size(name);
--  if (sysctl(mib, std::size(mib), name, &len, NULL, 0) < 0) {
--    NOTREACHED();
--    return std::string();
--  }
--  return name;
+-  return StringSysctl({CTL_HW, HW_MODEL}).value();
 +SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() {
 +  HardwareInfo info;
 +  // Set the manufacturer to "OpenBSD" and the model to
diff --git a/www/ungoogled-chromium/patches/patch-base_system_sys_info_posix_cc b/www/ungoogled-chromium/patches/patch-base_system_sys_info_posix_cc
index 75b102a93..709049f06 100644
--- a/www/ungoogled-chromium/patches/patch-base_system_sys_info_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-base_system_sys_info_posix_cc
@@ -1,25 +1,25 @@
 Index: base/system/sys_info_posix.cc
 --- base/system/sys_info_posix.cc.orig
 +++ base/system/sys_info_posix.cc
-@@ -117,7 +117,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
+@@ -118,7 +118,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
  
  namespace base {
  
 -#if !BUILDFLAG(IS_OPENBSD)
 +#if !BUILDFLAG(IS_BSD)
+ // static
  int SysInfo::NumberOfProcessors() {
  #if BUILDFLAG(IS_MAC)
-   absl::optional<int> number_of_physical_cores =
-@@ -161,7 +161,7 @@ int SysInfo::NumberOfProcessors() {
+@@ -175,7 +175,7 @@ int SysInfo::NumberOfProcessors() {
  
-   return num_cpus;
+   return cached_num_cpus;
  }
 -#endif  // !BUILDFLAG(IS_OPENBSD)
 +#endif  // !BUILDFLAG(IS_BSD)
  
  // static
  uint64_t SysInfo::AmountOfVirtualMemory() {
-@@ -251,6 +251,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
+@@ -265,6 +265,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
      arch = "x86";
    } else if (arch == "amd64") {
      arch = "x86_64";
diff --git a/www/ungoogled-chromium/patches/patch-base_system_sys_info_unittest_cc b/www/ungoogled-chromium/patches/patch-base_system_sys_info_unittest_cc
index 0689ade53..e35ef1d7e 100644
--- a/www/ungoogled-chromium/patches/patch-base_system_sys_info_unittest_cc
+++ b/www/ungoogled-chromium/patches/patch-base_system_sys_info_unittest_cc
@@ -1,7 +1,7 @@
 Index: base/system/sys_info_unittest.cc
 --- base/system/sys_info_unittest.cc.orig
 +++ base/system/sys_info_unittest.cc
-@@ -263,12 +263,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
+@@ -264,12 +264,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
    EXPECT_TRUE(IsStringUTF8(hardware_info->model));
    bool empty_result_expected =
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \
diff --git a/www/ungoogled-chromium/patches/patch-base_test_launcher_test_launcher_cc b/www/ungoogled-chromium/patches/patch-base_test_launcher_test_launcher_cc
index dae61a591..f9ba6de05 100644
--- a/www/ungoogled-chromium/patches/patch-base_test_launcher_test_launcher_cc
+++ b/www/ungoogled-chromium/patches/patch-base_test_launcher_test_launcher_cc
@@ -2,7 +2,7 @@ Index: base/test/launcher/test_launcher.cc
 --- base/test/launcher/test_launcher.cc.orig
 +++ base/test/launcher/test_launcher.cc
 @@ -69,6 +69,7 @@
- #include "third_party/libxml/chromium/libxml_utils.h"
+ #include "testing/gtest/include/gtest/gtest.h"
  
  #if BUILDFLAG(IS_POSIX)
 +#include <signal.h>
diff --git a/www/ungoogled-chromium/patches/patch-base_test_test_file_util_posix_cc b/www/ungoogled-chromium/patches/patch-base_test_test_file_util_posix_cc
index 4b4d06ca6..5dfeb50e3 100644
--- a/www/ungoogled-chromium/patches/patch-base_test_test_file_util_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-base_test_test_file_util_posix_cc
@@ -1,7 +1,7 @@
 Index: base/test/test_file_util_posix.cc
 --- base/test/test_file_util_posix.cc.orig
 +++ base/test/test_file_util_posix.cc
-@@ -88,7 +88,7 @@ void SyncPageCacheToDisk() {
+@@ -89,7 +89,7 @@ void SyncPageCacheToDisk() {
  }
  
  #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \
diff --git a/www/ungoogled-chromium/patches/patch-base_threading_hang_watcher_cc b/www/ungoogled-chromium/patches/patch-base_threading_hang_watcher_cc
new file mode 100644
index 000000000..ce58127d5
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-base_threading_hang_watcher_cc
@@ -0,0 +1,12 @@
+Index: base/threading/hang_watcher.cc
+--- base/threading/hang_watcher.cc.orig
++++ base/threading/hang_watcher.cc
+@@ -332,7 +332,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p
+ 
+   bool enable_hang_watcher = base::FeatureList::IsEnabled(kEnableHangWatcher);
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
+   if (is_zygote_child) {
+     enable_hang_watcher =
+         enable_hang_watcher &&
diff --git a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_bsd_cc b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_bsd_cc
index 07d576387..03cdd7056 100644
--- a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_bsd_cc
+++ b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_bsd_cc
@@ -21,9 +21,9 @@ Index: base/threading/platform_thread_bsd.cc
 +  return false;
 +}
 +
-+absl::optional<ThreadPriorityForTest>
++std::optional<ThreadPriorityForTest>
 +GetCurrentThreadPriorityForPlatformForTest() {
-+  return absl::nullopt;
++  return std::nullopt;
 +}
 +}  // namespace internal
 +
diff --git a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_h b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_h
new file mode 100644
index 000000000..2657fe7f4
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_h
@@ -0,0 +1,12 @@
+Index: base/threading/platform_thread.h
+--- base/threading/platform_thread.h.orig
++++ base/threading/platform_thread.h
+@@ -46,6 +46,8 @@ typedef DWORD PlatformThreadId;
+ typedef zx_koid_t PlatformThreadId;
+ #elif BUILDFLAG(IS_APPLE)
+ typedef mach_port_t PlatformThreadId;
++#elif BUILDFLAG(IS_BSD)
++typedef uint64_t PlatformThreadId;
+ #elif BUILDFLAG(IS_POSIX)
+ typedef pid_t PlatformThreadId;
+ #endif
diff --git a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_internal_posix_cc b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_internal_posix_cc
index fbd7bf218..dfd30e914 100644
--- a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_internal_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_internal_posix_cc
@@ -1,7 +1,7 @@
 Index: base/threading/platform_thread_internal_posix.cc
 --- base/threading/platform_thread_internal_posix.cc.orig
 +++ base/threading/platform_thread_internal_posix.cc
-@@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest
+@@ -42,7 +42,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest
  }
  
  int GetCurrentThreadNiceValue() {
diff --git a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_posix_cc b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_posix_cc
index 4c3dcaa54..f1c1b436a 100644
--- a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_posix_cc
@@ -1,7 +1,7 @@
 Index: base/threading/platform_thread_posix.cc
 --- base/threading/platform_thread_posix.cc.orig
 +++ base/threading/platform_thread_posix.cc
-@@ -76,12 +76,12 @@ void* ThreadFunc(void* params) {
+@@ -78,12 +78,12 @@ void* ThreadFunc(void* params) {
      if (!thread_params->joinable)
        base::DisallowSingleton();
  
@@ -16,7 +16,16 @@ Index: base/threading/platform_thread_posix.cc
  #if BUILDFLAG(IS_APPLE)
      PlatformThread::SetCurrentThreadRealtimePeriodValue(
          delegate->GetRealtimePeriod());
-@@ -353,7 +353,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t
+@@ -267,6 +267,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() {
+   return reinterpret_cast<int32_t>(pthread_self());
+ #elif BUILDFLAG(IS_POSIX) && BUILDFLAG(IS_AIX)
+   return pthread_self();
++#elif BUILDFLAG(IS_BSD)
++  return reinterpret_cast<uint64_t>(pthread_self());
+ #elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_AIX)
+   return reinterpret_cast<int64_t>(pthread_self());
+ #endif
+@@ -357,7 +359,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t
  
  // static
  bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) {
@@ -25,7 +34,7 @@ Index: base/threading/platform_thread_posix.cc
    return false;
  #else
    if (from >= to) {
-@@ -374,6 +374,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
+@@ -378,6 +380,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
                                MessagePumpType pump_type_hint) {
  #if BUILDFLAG(IS_NACL)
    NOTIMPLEMENTED();
@@ -35,7 +44,7 @@ Index: base/threading/platform_thread_posix.cc
  #else
    if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint))
      return;
-@@ -396,7 +399,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
+@@ -400,7 +405,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
  
  // static
  ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() {
diff --git a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_unittest_cc b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_unittest_cc
index 2752cd985..41593f760 100644
--- a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_unittest_cc
+++ b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_unittest_cc
@@ -17,9 +17,9 @@ Index: base/threading/platform_thread_unittest.cc
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be
-   // able to increase priority to any level.
-   constexpr bool kCanIncreasePriority = false;
-@@ -695,12 +695,16 @@ INSTANTIATE_TEST_SUITE_P(
+   // able to increase priority to any level unless we are root (euid == 0).
+   bool kCanIncreasePriority = false;
+@@ -706,12 +706,16 @@ INSTANTIATE_TEST_SUITE_P(
  
  #endif  // BUILDFLAG(IS_APPLE)
  
diff --git a/www/ungoogled-chromium/patches/patch-base_trace_event_malloc_dump_provider_cc b/www/ungoogled-chromium/patches/patch-base_trace_event_malloc_dump_provider_cc
index d58acef3f..21b5e49e2 100644
--- a/www/ungoogled-chromium/patches/patch-base_trace_event_malloc_dump_provider_cc
+++ b/www/ungoogled-chromium/patches/patch-base_trace_event_malloc_dump_provider_cc
@@ -1,7 +1,7 @@
 Index: base/trace_event/malloc_dump_provider.cc
 --- base/trace_event/malloc_dump_provider.cc.orig
 +++ base/trace_event/malloc_dump_provider.cc
-@@ -25,6 +25,8 @@
+@@ -24,6 +24,8 @@
  
  #if BUILDFLAG(IS_APPLE)
  #include <malloc/malloc.h>
@@ -10,7 +10,7 @@ Index: base/trace_event/malloc_dump_provider.cc
  #else
  #include <malloc.h>
  #endif
-@@ -188,7 +190,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
+@@ -181,7 +183,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
  
  #if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
      (!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) &&    \
@@ -19,7 +19,7 @@ Index: base/trace_event/malloc_dump_provider.cc
  void ReportMallinfoStats(ProcessMemoryDump* pmd,
                           size_t* total_virtual_size,
                           size_t* resident_size,
-@@ -359,6 +361,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
+@@ -366,6 +368,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
                       &allocated_objects_count);
  #elif BUILDFLAG(IS_FUCHSIA)
  // TODO(fuchsia): Port, see https://crbug.com/706592.
diff --git a/www/ungoogled-chromium/patches/patch-base_trace_event_process_memory_dump_cc b/www/ungoogled-chromium/patches/patch-base_trace_event_process_memory_dump_cc
index 67a43a490..23df00d16 100644
--- a/www/ungoogled-chromium/patches/patch-base_trace_event_process_memory_dump_cc
+++ b/www/ungoogled-chromium/patches/patch-base_trace_event_process_memory_dump_cc
@@ -1,7 +1,7 @@
 Index: base/trace_event/process_memory_dump.cc
 --- base/trace_event/process_memory_dump.cc.orig
 +++ base/trace_event/process_memory_dump.cc
-@@ -112,7 +112,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
+@@ -113,7 +113,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident
  #if BUILDFLAG(IS_WIN)
    std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec(
        new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]);
@@ -10,7 +10,7 @@ Index: base/trace_event/process_memory_dump.cc
    std::unique_ptr<char[]> vec(new char[max_vec_size]);
  #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
    std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]);
-@@ -134,7 +134,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
+@@ -135,7 +135,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident
  
      for (size_t i = 0; i < page_count; i++)
        resident_page_count += vec[i].VirtualAttributes.Valid;
diff --git a/www/ungoogled-chromium/patches/patch-base_trace_event_trace_log_cc b/www/ungoogled-chromium/patches/patch-base_trace_event_trace_log_cc
deleted file mode 100644
index 57a237add..000000000
--- a/www/ungoogled-chromium/patches/patch-base_trace_event_trace_log_cc
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: base/trace_event/trace_log.cc
---- base/trace_event/trace_log.cc.orig
-+++ base/trace_event/trace_log.cc
-@@ -2187,8 +2187,13 @@ void TraceLog::SetTraceBufferForTesting(
- #if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY)
- void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) {
-   AutoLock lock(track_event_lock_);
-+#if defined(__clang__) && (__clang_major__ >= 16)
-   track_event_sessions_.emplace_back(args.internal_instance_index, *args.config,
-                                      args.backend_type);
-+#else
-+  track_event_sessions_.emplace_back(TrackEventSession{args.internal_instance_index, *args.config,
-+                                     args.backend_type});
-+#endif
- }
- 
- void TraceLog::OnStart(const perfetto::DataSourceBase::StartArgs&) {
diff --git a/www/ungoogled-chromium/patches/patch-build_config_clang_BUILD_gn b/www/ungoogled-chromium/patches/patch-build_config_clang_BUILD_gn
new file mode 100644
index 000000000..7f99bf09a
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-build_config_clang_BUILD_gn
@@ -0,0 +1,12 @@
+Index: build/config/clang/BUILD.gn
+--- build/config/clang/BUILD.gn.orig
++++ build/config/clang/BUILD.gn
+@@ -203,7 +203,7 @@ template("clang_lib") {
+ 
+ # Adds a dependency on the Clang runtime library clang_rt.builtins.
+ clang_lib("compiler_builtins") {
+-  if (!toolchain_has_rust) {
++  if (!toolchain_has_rust || is_bsd) {
+     # Since there's no Rust in the toolchain, there's no concern that we'll use
+     # the Rust stdlib's intrinsics here.
+     #
diff --git a/www/ungoogled-chromium/patches/patch-build_config_compiler_BUILD_gn b/www/ungoogled-chromium/patches/patch-build_config_compiler_BUILD_gn
index 95110bf8d..05849bf3c 100644
--- a/www/ungoogled-chromium/patches/patch-build_config_compiler_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-build_config_compiler_BUILD_gn
@@ -1,7 +1,16 @@
 Index: build/config/compiler/BUILD.gn
 --- build/config/compiler/BUILD.gn.orig
 +++ build/config/compiler/BUILD.gn
-@@ -248,13 +248,16 @@ config("default_include_dirs") {
+@@ -204,7 +204,7 @@ declare_args() {
+   # This greatly reduces the size of debug builds, at the cost of
+   # debugging information which is required by some specialized
+   # debugging tools.
+-  simple_template_names = is_clang && !is_nacl && !is_win && !is_apple
++  simple_template_names = is_clang && !is_nacl && !is_win && !is_apple && !is_bsd
+ }
+ 
+ declare_args() {
+@@ -268,13 +268,16 @@ config("default_include_dirs") {
  # Compiler instrumentation can introduce dependencies in DSOs to symbols in
  # the executable they are loaded into, so they are unresolved at link-time.
  config("no_unresolved_symbols") {
@@ -14,12 +23,12 @@ Index: build/config/compiler/BUILD.gn
      ]
    }
 +  if (current_cpu == "x86" && is_openbsd) {
-+    ldflags = [ "-Wl,-z,notext" ]
++    ldflags = [ "-Wl,-z,notext", "-Wl,--strip-all" ]
 +  }
  }
  
  # compiler ---------------------------------------------------------------------
-@@ -499,6 +502,10 @@ config("compiler") {
+@@ -515,6 +518,10 @@ config("compiler") {
      }
    }
  
@@ -30,7 +39,7 @@ Index: build/config/compiler/BUILD.gn
    # Linux-specific compiler flags setup.
    # ------------------------------------
    if (use_gold) {
-@@ -574,7 +581,7 @@ config("compiler") {
+@@ -590,7 +597,7 @@ config("compiler") {
      ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
    }
  
@@ -39,25 +48,7 @@ Index: build/config/compiler/BUILD.gn
      cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
      if (save_reproducers_on_lld_crash && use_lld) {
        ldflags += [
-@@ -759,7 +766,7 @@ config("compiler") {
- 
-       ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ]
- 
--      if (!is_chromeos) {
-+      if (!is_chromeos && !is_bsd) {
-         # TODO(https://crbug.com/972449): turn on for ChromeOS when that
-         # toolchain has this flag.
-         # We only use one version of LLVM within a build so there's no need to
-@@ -866,7 +873,7 @@ config("compiler") {
-   # * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode
-   #   lldb doesn't have the needed changes yet.
-   # TODO(crbug.com/1379070): Remove if the upstream default ever changes.
--  if (is_clang && !is_nacl && !is_win && !is_apple) {
-+  if (is_clang && !is_nacl && !is_win && !is_apple && !is_bsd) {
-     cflags_cc += [ "-gsimple-template-names" ]
-   }
- 
-@@ -1108,7 +1115,7 @@ config("compiler_cpu_abi") {
+@@ -1180,7 +1187,7 @@ config("compiler_cpu_abi") {
          ]
        }
      } else if (current_cpu == "arm") {
@@ -66,7 +57,7 @@ Index: build/config/compiler/BUILD.gn
            !(is_chromeos_lacros && is_chromeos_device)) {
          cflags += [ "--target=arm-linux-gnueabihf" ]
          ldflags += [ "--target=arm-linux-gnueabihf" ]
-@@ -1123,7 +1130,7 @@ config("compiler_cpu_abi") {
+@@ -1195,7 +1202,7 @@ config("compiler_cpu_abi") {
          cflags += [ "-mtune=$arm_tune" ]
        }
      } else if (current_cpu == "arm64") {
@@ -75,7 +66,7 @@ Index: build/config/compiler/BUILD.gn
            !(is_chromeos_lacros && is_chromeos_device)) {
          cflags += [ "--target=aarch64-linux-gnu" ]
          ldflags += [ "--target=aarch64-linux-gnu" ]
-@@ -1458,7 +1465,7 @@ config("compiler_deterministic") {
+@@ -1530,7 +1537,7 @@ config("compiler_deterministic") {
      # different build directory like "out/feature_a" and "out/feature_b" if
      # we build same files with same compile flag.
      # Other paths are already given in relative, no need to normalize them.
@@ -84,7 +75,7 @@ Index: build/config/compiler/BUILD.gn
        # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
        cflags += [
          "-Xclang",
-@@ -1510,7 +1517,7 @@ config("compiler_deterministic") {
+@@ -1582,7 +1589,7 @@ config("compiler_deterministic") {
  }
  
  config("clang_revision") {
@@ -93,16 +84,26 @@ Index: build/config/compiler/BUILD.gn
      update_args = [
        "--print-revision",
        "--verify-version=$clang_version",
-@@ -1764,7 +1771,7 @@ config("default_warnings") {
-         "-Wno-ignored-pragma-optimize",
+@@ -1890,9 +1897,6 @@ config("default_warnings") {
+ 
+         # TODO(crbug.com/1494809): Evaluate and possibly enable.
+         "-Wno-vla-extension",
+-
+-        # TODO(https://crbug.com/1490607): Fix and re-enable.
+-        "-Wno-thread-safety-reference-return",
+       ]
+ 
+       cflags_cc += [
+@@ -1900,7 +1904,7 @@ config("default_warnings") {
+         "-Wenum-compare-conditional",
        ]
  
 -      if (!is_nacl) {
 +      if (!is_nacl && !is_bsd) {
-         cflags += [
-           # TODO(crbug.com/1343975) Evaluate and possibly enable.
-           "-Wno-deprecated-builtins",
-@@ -1973,7 +1980,7 @@ config("no_chromium_code") {
+         cflags_cc += [
+           # TODO(https://crbug.com/1513724): Fix and re-enable.
+           "-Wno-c++11-narrowing-const-reference",
+@@ -2089,7 +2093,7 @@ config("no_chromium_code") {
        # third-party libraries.
        "-Wno-c++11-narrowing",
      ]
@@ -111,7 +112,7 @@ Index: build/config/compiler/BUILD.gn
        cflags += [
          # Disabled for similar reasons as -Wunused-variable.
          "-Wno-unused-but-set-variable",
-@@ -2483,7 +2490,7 @@ config("afdo_optimize_size") {
+@@ -2597,7 +2601,7 @@ config("afdo_optimize_size") {
  # There are some targeted places that AFDO regresses, so we provide a separate
  # config to allow AFDO to be disabled per-target.
  config("afdo") {
@@ -120,7 +121,7 @@ Index: build/config/compiler/BUILD.gn
      cflags = []
      if (clang_emit_debug_info_for_profiling) {
        # Add the following flags to generate debug info for profiling.
-@@ -2510,7 +2517,7 @@ config("afdo") {
+@@ -2624,7 +2628,7 @@ config("afdo") {
        cflags += [ "-Wno-backend-plugin" ]
        inputs = [ _clang_sample_profile ]
      }
@@ -129,7 +130,7 @@ Index: build/config/compiler/BUILD.gn
      cflags = [ "-fauto-profile=${auto_profile_path}" ]
      inputs = [ auto_profile_path ]
    }
-@@ -2674,7 +2681,8 @@ config("symbols") {
+@@ -2788,7 +2792,8 @@ config("symbols") {
      configs += [ "//build/config:compress_debug_sections" ]
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-build_config_compiler_pgo_BUILD_gn b/www/ungoogled-chromium/patches/patch-build_config_compiler_pgo_BUILD_gn
deleted file mode 100644
index 59a7b0f45..000000000
--- a/www/ungoogled-chromium/patches/patch-build_config_compiler_pgo_BUILD_gn
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: build/config/compiler/pgo/BUILD.gn
---- build/config/compiler/pgo/BUILD.gn.orig
-+++ build/config/compiler/pgo/BUILD.gn
-@@ -138,13 +138,14 @@ config("pgo_optimization_flags") {
- 
-     # Enable basic block layout based on the extended TSP problem. This aims to
-     # improve icache utilization and reduce the binary size.
--    if (use_thin_lto) {
-+    # __clang_major__ >= 15
-+    if (use_thin_lto && !is_bsd) {
-       if (is_win) {
-         ldflags = [ "-mllvm:-enable-ext-tsp-block-placement=1" ]
-       } else {
-         ldflags = [ "-Wl,-mllvm,-enable-ext-tsp-block-placement=1" ]
-       }
--    } else {
-+    } else if (!is_bsd) {
-       cflags += [
-         "-mllvm",
-         "-enable-ext-tsp-block-placement=1",
diff --git a/www/ungoogled-chromium/patches/patch-build_config_ozone_gni b/www/ungoogled-chromium/patches/patch-build_config_ozone_gni
index 48361447d..6c495c9d3 100644
--- a/www/ungoogled-chromium/patches/patch-build_config_ozone_gni
+++ b/www/ungoogled-chromium/patches/patch-build_config_ozone_gni
@@ -1,7 +1,7 @@
 Index: build/config/ozone.gni
 --- build/config/ozone.gni.orig
 +++ build/config/ozone.gni
-@@ -87,7 +87,15 @@ declare_args() {
+@@ -84,7 +84,15 @@ declare_args() {
      } else if (is_chromeos_lacros) {
        ozone_platform = "wayland"
        ozone_platform_wayland = true
diff --git a/www/ungoogled-chromium/patches/patch-build_config_rust_gni b/www/ungoogled-chromium/patches/patch-build_config_rust_gni
new file mode 100644
index 000000000..87b828c5d
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-build_config_rust_gni
@@ -0,0 +1,14 @@
+Index: build/config/rust.gni
+--- build/config/rust.gni.orig
++++ build/config/rust.gni
+@@ -277,6 +277,10 @@ if (is_linux || is_chromeos) {
+   }
+ }
+ 
++if (is_bsd) {
++  rust_abi_target = string_replace(rust_abi_target, "linux-gnu", current_os)
++}
++
+ assert(!toolchain_has_rust || rust_abi_target != "")
+ 
+ # This variable is passed to the Rust libstd build.
diff --git a/www/ungoogled-chromium/patches/patch-build_linux_unbundle_libusb_gn b/www/ungoogled-chromium/patches/patch-build_linux_unbundle_libusb_gn
index 9c0d71934..c77cfd2f9 100644
--- a/www/ungoogled-chromium/patches/patch-build_linux_unbundle_libusb_gn
+++ b/www/ungoogled-chromium/patches/patch-build_linux_unbundle_libusb_gn
@@ -1,7 +1,7 @@
 Index: build/linux/unbundle/libusb.gn
 --- build/linux/unbundle/libusb.gn.orig
 +++ build/linux/unbundle/libusb.gn
-@@ -0,0 +1,24 @@
+@@ -1,3 +1,27 @@
 +# Copyright 2016 The Chromium Authors. All rights reserved.
 +# Use of this source code is governed by a BSD-style license that can be
 +# found in the LICENSE file.
@@ -26,3 +26,6 @@ Index: build/linux/unbundle/libusb.gn
 +  ]
 +  public_configs = [ ":system_libusb" ]
 +}
+ import("//build/config/linux/pkg_config.gni")
+ import("//build/shim_headers.gni")
+ 
diff --git a/www/ungoogled-chromium/patches/patch-build_linux_unbundle_libwebp_gn b/www/ungoogled-chromium/patches/patch-build_linux_unbundle_libwebp_gn
new file mode 100644
index 000000000..52f7f8a32
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-build_linux_unbundle_libwebp_gn
@@ -0,0 +1,28 @@
+Index: build/linux/unbundle/libwebp.gn
+--- build/linux/unbundle/libwebp.gn.orig
++++ build/linux/unbundle/libwebp.gn
+@@ -22,6 +22,8 @@ shim_headers("libwebp_shim") {
+     "webp/mux.h",
+     "webp/mux_types.h",
+     "webp/types.h",
++    "webp/sharpyuv/sharpyuv.h",
++    "webp/sharpyuv/sharpyuv_csp.h",
+   ]
+ }
+ 
+@@ -30,6 +32,14 @@ source_set("libwebp_webp") {
+   public_configs = [ ":system_libwebp" ]
+ }
+ 
++source_set("libwebp_sharpyuv") {
++  deps = [ ":libwebp_shim" ]
++  public_configs = [ ":system_libwebp" ]
++}
++
+ group("libwebp") {
+-  deps = [ ":libwebp_webp" ]
++  deps = [
++    ":libwebp_webp",
++    ":libwebp_sharpyuv",
++  ]
+ }
diff --git a/www/ungoogled-chromium/patches/patch-build_linux_unbundle_replace_gn_files_py b/www/ungoogled-chromium/patches/patch-build_linux_unbundle_replace_gn_files_py
deleted file mode 100644
index eae0929c7..000000000
--- a/www/ungoogled-chromium/patches/patch-build_linux_unbundle_replace_gn_files_py
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: build/linux/unbundle/replace_gn_files.py
---- build/linux/unbundle/replace_gn_files.py.orig
-+++ build/linux/unbundle/replace_gn_files.py
-@@ -54,6 +54,7 @@ REPLACEMENTS = {
-   'libevent': 'third_party/libevent/BUILD.gn',
-   'libjpeg': 'third_party/libjpeg.gni',
-   'libpng': 'third_party/libpng/BUILD.gn',
-+  'libusb': 'third_party/libusb/BUILD.gn',
-   'libvpx': 'third_party/libvpx/BUILD.gn',
-   'libwebp': 'third_party/libwebp/BUILD.gn',
-   'libxml': 'third_party/libxml/BUILD.gn',
diff --git a/www/ungoogled-chromium/patches/patch-build_rust_std_BUILD_gn b/www/ungoogled-chromium/patches/patch-build_rust_std_BUILD_gn
new file mode 100644
index 000000000..318414e54
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-build_rust_std_BUILD_gn
@@ -0,0 +1,11 @@
+Index: build/rust/std/BUILD.gn
+--- build/rust/std/BUILD.gn.orig
++++ build/rust/std/BUILD.gn
+@@ -90,7 +90,6 @@ if (toolchain_has_rust) {
+   # don't need to pass to the C++ linker because they're used for specialized
+   # purposes.
+   skip_stdlib_files = [
+-    "profiler_builtins",
+     "rustc_std_workspace_alloc",
+     "rustc_std_workspace_core",
+     "rustc_std_workspace_std",
diff --git a/www/ungoogled-chromium/patches/patch-build_toolchain_gcc_toolchain_gni b/www/ungoogled-chromium/patches/patch-build_toolchain_gcc_toolchain_gni
index c768aae9e..d519c7e59 100644
--- a/www/ungoogled-chromium/patches/patch-build_toolchain_gcc_toolchain_gni
+++ b/www/ungoogled-chromium/patches/patch-build_toolchain_gcc_toolchain_gni
@@ -1,7 +1,7 @@
 Index: build/toolchain/gcc_toolchain.gni
 --- build/toolchain/gcc_toolchain.gni.orig
 +++ build/toolchain/gcc_toolchain.gni
-@@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) {
+@@ -57,6 +57,13 @@ if (enable_resource_allowlist_generation) {
        "enable_resource_allowlist_generation=true does not work for target_os=$target_os")
  }
  
@@ -15,7 +15,7 @@ Index: build/toolchain/gcc_toolchain.gni
  # This template defines a toolchain for something that works like gcc
  # (including clang).
  #
-@@ -874,22 +881,12 @@ template("gcc_toolchain") {
+@@ -890,22 +897,12 @@ template("gcc_toolchain") {
  # use_gold too.
  template("clang_toolchain") {
    gcc_toolchain(target_name) {
@@ -41,5 +41,5 @@ Index: build/toolchain/gcc_toolchain.gni
 +    ar = "ar"
 +    nm = "nm"
  
-     forward_variables_from(invoker,
-                            [
+     forward_variables_from(invoker, "*", [ "toolchain_args" ])
+ 
diff --git a/www/ungoogled-chromium/patches/patch-build_toolchain_toolchain_gni b/www/ungoogled-chromium/patches/patch-build_toolchain_toolchain_gni
index 33e3ae438..643d6f43c 100644
--- a/www/ungoogled-chromium/patches/patch-build_toolchain_toolchain_gni
+++ b/www/ungoogled-chromium/patches/patch-build_toolchain_toolchain_gni
@@ -1,7 +1,7 @@
 Index: build/toolchain/toolchain.gni
 --- build/toolchain/toolchain.gni.orig
 +++ build/toolchain/toolchain.gni
-@@ -62,7 +62,7 @@ if (host_os == "mac") {
+@@ -68,7 +68,7 @@ if (host_os == "mac") {
    host_shlib_extension = ".dylib"
  } else if (host_os == "win") {
    host_shlib_extension = ".dll"
diff --git a/www/ungoogled-chromium/patches/patch-cc_BUILD_gn b/www/ungoogled-chromium/patches/patch-cc_BUILD_gn
index 9593bfe61..9c673d9ed 100644
--- a/www/ungoogled-chromium/patches/patch-cc_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-cc_BUILD_gn
@@ -1,7 +1,7 @@
 Index: cc/BUILD.gn
 --- cc/BUILD.gn.orig
 +++ cc/BUILD.gn
-@@ -671,7 +671,7 @@ cc_test_static_library("test_support") {
+@@ -681,7 +681,7 @@ cc_test_static_library("test_support") {
    if (enable_vulkan) {
      deps += [ "//gpu/vulkan/init" ]
    }
@@ -9,8 +9,8 @@ Index: cc/BUILD.gn
 +  if (!is_android && !is_bsd) {
      data_deps = [ "//third_party/mesa_headers" ]
    }
- }
-@@ -919,7 +919,6 @@ cc_test("cc_unittests") {
+   if (skia_use_dawn) {
+@@ -940,7 +940,6 @@ cc_test("cc_unittests") {
    data = [ "//components/test/data/viz/" ]
    data_deps = [
      "//testing/buildbot/filters:cc_unittests_filters",
diff --git a/www/ungoogled-chromium/patches/patch-cc_base_features_cc b/www/ungoogled-chromium/patches/patch-cc_base_features_cc
index 7cb8566f8..12452db5c 100644
--- a/www/ungoogled-chromium/patches/patch-cc_base_features_cc
+++ b/www/ungoogled-chromium/patches/patch-cc_base_features_cc
@@ -1,12 +1,12 @@
 Index: cc/base/features.cc
 --- cc/base/features.cc.orig
 +++ cc/base/features.cc
-@@ -71,7 +71,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding,
- 
+@@ -88,7 +88,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding,
+ // be using a separate flag to control the launch on GL.
  BASE_FEATURE(kUseDMSAAForTiles,
               "UseDMSAAForTiles",
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/ungoogled-chromium/patches/patch-cc_paint_paint_op_writer_h b/www/ungoogled-chromium/patches/patch-cc_paint_paint_op_writer_h
deleted file mode 100644
index 31d53487c..000000000
--- a/www/ungoogled-chromium/patches/patch-cc_paint_paint_op_writer_h
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: cc/paint/paint_op_writer.h
---- cc/paint/paint_op_writer.h.orig
-+++ cc/paint/paint_op_writer.h
-@@ -114,10 +114,17 @@ class CC_PAINT_EXPORT PaintOpWriter {
-   // easier to keep serialized size calculation in sync with serialization and
-   // deserialization, and make it possible to allow dynamic sizing for some
-   // data types (see the specialized/overloaded functions).
-+#if defined(__clang__) && (__clang_major__ >= 15)
-   template <typename T>
-   static constexpr size_t SerializedSize();
-   template <typename T>
-   static constexpr size_t SerializedSize(const T& data);
-+#else
-+  template <typename T>
-+  static size_t SerializedSize();
-+  template <typename T>
-+  static size_t SerializedSize(const T& data);
-+#endif
-   static size_t SerializedSize(const PaintImage& image);
-   static size_t SerializedSize(const PaintRecord& record);
-   static size_t SerializedSize(const SkHighContrastConfig& config);
-@@ -386,12 +393,20 @@ constexpr size_t PaintOpWriter::SerializedSize<SkGainm
- }
- 
- template <typename T>
-+#if defined(__clang__) && (__clang_major__ >= 15)
- constexpr size_t PaintOpWriter::SerializedSize() {
-+#else
-+size_t PaintOpWriter::SerializedSize() {
-+#endif
-   static_assert(std::is_arithmetic_v<T> || std::is_enum_v<T>);
-   return SerializedSizeSimple<T>();
- }
- template <typename T>
-+#if defined(__clang__) && (__clang_major__ >= 15)
- constexpr size_t PaintOpWriter::SerializedSize(const T& data) {
-+#else
-+size_t PaintOpWriter::SerializedSize(const T& data) {
-+#endif
-   return SerializedSizeSimple<T>();
- }
- 
diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_app_management_strings_grdp b/www/ungoogled-chromium/patches/patch-chrome_app_app_management_strings_grdp
deleted file mode 100644
index d9a138f9b..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_app_app_management_strings_grdp
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: chrome/app/app_management_strings.grdp
---- chrome/app/app_management_strings.grdp.orig
-+++ chrome/app/app_management_strings.grdp
-@@ -188,7 +188,7 @@
-       You can open and edit supported files with this app from Finder or other apps. To control which files open this app by default, <ph name="BEGIN_LINK">&lt;a href="#"&gt;</ph>learn how to set default apps on your device<ph name="END_LINK">&lt;/a&gt;</ph>.
-     </message>
-   </if>
--  <if expr="is_fuchsia or is_linux">
-+  <if expr="is_fuchsia or is_posix">
-     <message name="IDS_APP_MANAGEMENT_FILE_HANDLING_SET_DEFAULTS_LINK" desc="Further explanation of the File Handling API, including text describing the purpose of the toggle (referencing a generic Linux file browser app) and a link to a learn more link for default filetype associations.">
-       You can open and edit supported files with this app from your file browser or other apps. To control which files open this app by default, <ph name="BEGIN_LINK">&lt;a href="#"&gt;</ph>learn how to set default apps on your device<ph name="END_LINK">&lt;/a&gt;</ph>.
-     </message>
diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_chrome_main_cc b/www/ungoogled-chromium/patches/patch-chrome_app_chrome_main_cc
index 805addae1..21ba05597 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_app_chrome_main_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_app_chrome_main_cc
@@ -1,8 +1,8 @@
 Index: chrome/app/chrome_main.cc
 --- chrome/app/chrome_main.cc.orig
 +++ chrome/app/chrome_main.cc
-@@ -27,11 +27,11 @@
- #include "chrome/app/notification_metrics.h"
+@@ -28,11 +28,11 @@
+ #include "chrome/app/chrome_main_mac.h"
  #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -15,7 +15,16 @@ Index: chrome/app/chrome_main.cc
  #include "chrome/app/chrome_main_linux.h"
  #endif
  
-@@ -136,7 +136,7 @@ int ChromeMain(int argc, const char** argv) {
+@@ -80,7 +80,7 @@ int ChromeMain(int argc, const char** argv) {
+ #error Unknown platform.
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   PossiblyDetermineFallbackChromeChannel(argv[0]);
+ #endif
+ 
+@@ -141,7 +141,7 @@ int ChromeMain(int argc, const char** argv) {
    SetUpBundleOverrides();
  #endif
  
@@ -24,8 +33,8 @@ Index: chrome/app/chrome_main.cc
    AppendExtraArgumentsToCommandLine(command_line);
  #endif
  
-@@ -164,7 +164,7 @@ int ChromeMain(int argc, const char** argv) {
-     headless::SetUpCommandLine(command_line);
+@@ -170,7 +170,7 @@ int ChromeMain(int argc, const char** argv) {
+     headless_mode_handle = headless::InitHeadlessMode();
    } else {
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_chrome_main_delegate_cc b/www/ungoogled-chromium/patches/patch-chrome_app_chrome_main_delegate_cc
index 411660561..1f06739ec 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_app_chrome_main_delegate_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_app_chrome_main_delegate_cc
@@ -1,7 +1,7 @@
 Index: chrome/app/chrome_main_delegate.cc
 --- chrome/app/chrome_main_delegate.cc.orig
 +++ chrome/app/chrome_main_delegate.cc
-@@ -139,7 +139,7 @@
+@@ -146,7 +146,7 @@
  #include "components/about_ui/credit_utils.h"
  #endif
  
@@ -10,7 +10,7 @@ Index: chrome/app/chrome_main_delegate.cc
  #include "components/nacl/common/nacl_paths.h"
  #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
  #endif
-@@ -182,16 +182,16 @@
+@@ -189,20 +189,20 @@
  #include "v8/include/v8.h"
  #endif
  
@@ -19,6 +19,11 @@ Index: chrome/app/chrome_main_delegate.cc
  #include "base/environment.h"
  #endif
  
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/nix/scoped_xdg_activation_token_injector.h"
+ #endif
+ 
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
  #include "base/message_loop/message_pump_libevent.h"
@@ -30,7 +35,7 @@ Index: chrome/app/chrome_main_delegate.cc
  #include "chrome/browser/policy/policy_path_parser.h"
  #include "components/crash/core/app/crashpad.h"
  #endif
-@@ -330,7 +330,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -349,7 +349,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
  // and resources loaded.
  bool SubprocessNeedsResourceBundle(const std::string& process_type) {
    return
@@ -39,7 +44,7 @@ Index: chrome/app/chrome_main_delegate.cc
        // The zygote process opens the resources for the renderers.
        process_type == switches::kZygoteProcess ||
  #endif
-@@ -415,7 +415,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -434,7 +434,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -48,7 +53,25 @@ Index: chrome/app/chrome_main_delegate.cc
  // Show the man page if --help or -h is on the command line.
  void HandleHelpSwitches(const base::CommandLine& command_line) {
    if (command_line.HasSwitch(switches::kHelp) ||
-@@ -542,7 +542,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -480,7 +480,7 @@ void SetCrashpadUploadConsentPostLogin() {
+ }
+ #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
+ 
+-#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID)
++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD)
+ void SIGTERMProfilingShutdown(int signal) {
+   content::Profiling::Stop();
+   struct sigaction sigact;
+@@ -562,7 +562,7 @@ std::optional<int> AcquireProcessSingleton(
+   // process can be exited.
+   ChromeProcessSingleton::CreateInstance(user_data_dir);
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Read the xdg-activation token and set it in the command line for the
+   // duration of the notification in order to ensure this is propagated to an
+   // already running browser process if it exists.
+@@ -646,7 +646,7 @@ void InitializeUserDataDir(base::CommandLine* command_
    std::string process_type =
        command_line->GetSwitchValueASCII(switches::kProcessType);
  
@@ -57,7 +80,7 @@ Index: chrome/app/chrome_main_delegate.cc
    // On Linux, Chrome does not support running multiple copies under different
    // DISPLAYs, so the profile directory can be specified in the environment to
    // support the virtual desktop use-case.
-@@ -632,7 +632,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
+@@ -773,7 +773,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
  #endif
  
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -66,16 +89,25 @@ Index: chrome/app/chrome_main_delegate.cc
    // Record the startup process creation time on supported platforms. On Android
    // this is recorded in ChromeMainDelegateAndroid.
    startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
-@@ -959,7 +959,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
-   base::InitializeCpuReductionExperiment();
-   base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
-   base::sequence_manager::internal::ThreadController::InitializeFeatures();
+@@ -1162,7 +1162,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
+       chrome::GetChannel() == version_info::Channel::DEV;
+   const bool emit_crashes =
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+       is_canary_dev;
+ #else
+       false;
+@@ -1181,7 +1181,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
+   // for more context.
+   base::sequence_manager::internal::ThreadController::InitializeFeatures(
+       /*record_sample_metadata=*/is_canary_dev);
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
    base::MessagePumpLibevent::InitializeFeatures();
  #elif BUILDFLAG(IS_MAC)
    base::PlatformThread::InitFeaturesPostFieldTrial();
-@@ -1106,7 +1106,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
+@@ -1330,7 +1330,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
  
    // TODO(crbug.com/1052397): Revisit the macro expression once build flag
    // switch of lacros-chrome is complete.
@@ -84,7 +116,7 @@ Index: chrome/app/chrome_main_delegate.cc
    // This will directly exit if the user asked for help.
    HandleHelpSwitches(command_line);
  #endif
-@@ -1136,7 +1136,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
+@@ -1360,7 +1360,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
  #if BUILDFLAG(IS_CHROMEOS)
    chromeos::dbus_paths::RegisterPathProvider();
  #endif
@@ -93,7 +125,7 @@ Index: chrome/app/chrome_main_delegate.cc
    nacl::RegisterPathProvider();
  #endif
  
-@@ -1526,7 +1526,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1757,7 +1757,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
      CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
    }
  
@@ -102,7 +134,7 @@ Index: chrome/app/chrome_main_delegate.cc
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess) {
      if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
-@@ -1628,7 +1628,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
+@@ -1858,7 +1858,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
  
    // This entry is not needed on Linux, where the NaCl loader
    // process is launched via nacl_helper instead.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_chromium_strings_grd b/www/ungoogled-chromium/patches/patch-chrome_app_chromium_strings_grd
deleted file mode 100644
index 36f004a6a..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_app_chromium_strings_grd
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: chrome/app/chromium_strings.grd
---- chrome/app/chromium_strings.grd.orig
-+++ chrome/app/chromium_strings.grd
-@@ -315,7 +315,7 @@ If you update this file, be sure also to update google
-           Welcome to Chromium; new browser window opened
-         </message>
-       </if>
--      <if expr="is_macosx or is_linux">
-+      <if expr="is_macosx or is_posix">
-         <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar">
-           Welcome to Chromium
-         </message>
-@@ -465,7 +465,7 @@ If you update this file, be sure also to update google
-                     To get future Chromium updates, you'll need Windows 10 or later. This computer is using Windows 8.1.
-         </message>
-       </if>
--      <if expr="is_linux">
-+      <if expr="is_posix">
-         <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported.">
-           Chromium may not function correctly because it is no longer supported on this Linux distribution
-         </message>
-@@ -870,7 +870,7 @@ Permissions you've already given to websites and apps 
-         </message>
-       </if>
- 
--      <if expr="is_win or is_macosx or is_linux">
-+      <if expr="is_win or is_macosx or is_posix">
-         <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item" translateable="false">
-         Not used in Chromium. Placeholder to keep resource maps in sync.
-         </message>
-@@ -1255,7 +1255,7 @@ Permissions you've already given to websites and apps 
-         </message>
-       </if>
- 
--      <if expr="is_win or is_macosx or is_linux">
-+      <if expr="is_win or is_macosx or is_posix">
-         <message name="IDS_UPDATE_RECOMMENDED_DIALOG_TITLE_ALT" desc="Alternate window title for the Update Recommended dialog." translateable="false">
-           Not used in Chromium. Placeholder to keep resource maps in sync.
-         </message>
diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_generated_resources_grd b/www/ungoogled-chromium/patches/patch-chrome_app_generated_resources_grd
deleted file mode 100644
index af4353bc6..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_app_generated_resources_grd
+++ /dev/null
@@ -1,93 +0,0 @@
-Index: chrome/app/generated_resources.grd
---- chrome/app/generated_resources.grd.orig
-+++ chrome/app/generated_resources.grd
-@@ -2,7 +2,7 @@
- 
- <!--
- This file contains definitions of resources that will be translated for each
--locale.  The variables is_win, is_macosx, is_linux, and is_posix are available
-+locale.  The variables is_win, is_macosx, is_posix, and is_posix are available
- for making strings OS specific.  Other platform defines such as use_titlecase
- are declared in tools/grit/grit_rule.gni.
- -->
-@@ -3575,7 +3575,7 @@ are declared in tools/grit/grit_rule.gni.
-       </if>
- 
-       <!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog -->
--      <if expr="is_win or is_linux">
-+      <if expr="is_win or is_posix">
-         <message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
-           Device Credentials
-         </message>
-@@ -5406,7 +5406,7 @@ are declared in tools/grit/grit_rule.gni.
-             Read information about your browser, OS, device, installed software, registry values and files
-           </message>
-         </if>
--        <if expr="is_macosx or is_linux">
-+        <if expr="is_macosx or is_posix">
-           <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS.">
-             Read information about your browser, OS, device, installed software and files
-           </message>
-@@ -6095,7 +6095,7 @@ Keep your key file in a safe place. You will need it t
-           Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app.
-         </message>
-       </if>
--      <if expr="is_linux">
-+      <if expr="is_posix">
-         <message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog">
-           Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app.
-         </message>
-@@ -6141,7 +6141,7 @@ Keep your key file in a safe place. You will need it t
-           Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available.
-         </message>
-       </if>
--      <if expr="is_linux">
-+      <if expr="is_posix">
-         <message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch.">
-           Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available.
-         </message>
-@@ -10364,7 +10364,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
-       <message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available.">
-         Update
-       </message>
--      <if expr="is_win or is_macosx or is_linux">
-+      <if expr="is_win or is_macosx or is_posix">
-         <message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available.">
-           Finish update
-         </message>
-@@ -10703,7 +10703,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
-         Google Pay
-       </message>
- 
--      <if expr="is_linux">
-+      <if expr="is_posix">
-         <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
-           Use system title bar and borders
-         </message>
-@@ -11688,7 +11688,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
-       </message>
- 
-       <!-- Device Trust Consent dialog -->
--      <if expr="is_win or is_macosx or is_linux or is_chromeos">
-+      <if expr="is_win or is_macosx or is_posix or is_chromeos">
-         <message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals.">
-           Share information about your device?
-         </message>
-@@ -12087,7 +12087,7 @@ Please help our engineers fix this problem. Tell us wh
-         Set as default
-       </message>
- 
--      <if expr="is_linux">
-+      <if expr="is_posix">
-         <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
-           Minimize
-         </message>
-@@ -14309,7 +14309,7 @@ Please help our engineers fix this problem. Tell us wh
-       Open Anyway
-     </message>
- 
--    <if expr="is_win or is_macosx or is_linux">
-+    <if expr="is_win or is_macosx or is_posix">
-       <message name="IDS_UTILITY_PROCESS_SYSTEM_SIGNALS_NAME" desc="The name of the utility process used to collect system signals. Only spawned on Windows, Mac or Linux.">
-         System Signals Utilities
-       </message>
diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_google_chrome_strings_grd b/www/ungoogled-chromium/patches/patch-chrome_app_google_chrome_strings_grd
deleted file mode 100644
index 806ccaaf7..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_app_google_chrome_strings_grd
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: chrome/app/google_chrome_strings.grd
---- chrome/app/google_chrome_strings.grd.orig
-+++ chrome/app/google_chrome_strings.grd
-@@ -301,7 +301,7 @@ chromium_strings.grd. -->
-           Welcome to Chrome; new browser window opened
-         </message>
-       </if>
--      <if expr="is_macosx or is_linux">
-+      <if expr="is_macosx or is_posix">
-         <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar">
-           Welcome to Google Chrome
-         </message>
-@@ -453,7 +453,7 @@ chromium_strings.grd. -->
-                     To get future Google Chrome updates, you'll need Windows 10 or later. This computer is using Windows 8.1.
-         </message>
-       </if>
--      <if expr="is_linux">
-+      <if expr="is_posix">
-         <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported.">
-           Google Chrome may not function correctly because it is no longer supported on this Linux distribution
-         </message>
-@@ -855,7 +855,7 @@ Permissions you've already given to websites and apps 
-         </if>
-       </if>
- 
--      <if expr="is_win or is_macosx or is_linux">
-+      <if expr="is_win or is_macosx or is_posix">
-         <if expr="use_titlecase">
-           <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item">
-             Relaunch to Update - Your tabs will reopen
-@@ -1278,7 +1278,7 @@ Permissions you've already given to websites and apps 
-         </message>
-       </if>
- 
--      <if expr="is_win or is_macosx or is_linux">
-+      <if expr="is_win or is_macosx or is_posix">
-         <message name="IDS_UPDATE_RECOMMENDED_DIALOG_TITLE_ALT" desc="Alternate window title for the Update Recommended dialog.">
-           Relaunch to finish Chrome update
-         </message>
diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_profiles_strings_grdp b/www/ungoogled-chromium/patches/patch-chrome_app_profiles_strings_grdp
deleted file mode 100644
index 54dd7720b..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_app_profiles_strings_grdp
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: chrome/app/profiles_strings.grdp
---- chrome/app/profiles_strings.grdp.orig
-+++ chrome/app/profiles_strings.grdp
-@@ -54,7 +54,7 @@
-       Add Profile...
-     </message>
-   </if>
--  <if expr="is_linux">
-+  <if expr="is_posix">
-     <message name="IDS_PROFILES_ADD_PROFILE_LABEL" desc="Menu item for adding a new profile.">
-       Add profile...
-     </message>
diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_settings_strings_grdp b/www/ungoogled-chromium/patches/patch-chrome_app_settings_strings_grdp
deleted file mode 100644
index 5a65e2517..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_app_settings_strings_grdp
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: chrome/app/settings_strings.grdp
---- chrome/app/settings_strings.grdp.orig
-+++ chrome/app/settings_strings.grdp
-@@ -207,7 +207,7 @@
-       Theme
-     </message>
-   </if>
--  <if expr="is_linux">
-+  <if expr="is_posix">
-     <message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux">
-       GTK
-     </message>
-@@ -227,7 +227,7 @@
-       Use Classic
-     </message>
-   </if>
--  <if expr="not is_linux or is_chromeos or is_fuchsia">
-+  <if expr="not is_posix or is_chromeos or is_fuchsia">
-     <message name="IDS_SETTINGS_RESET_TO_DEFAULT_THEME" desc="Name of the control which resets the browser theme back to the default theme.">
-       Reset to default
-     </message>
diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_theme_chrome_unscaled_resources_grd b/www/ungoogled-chromium/patches/patch-chrome_app_theme_chrome_unscaled_resources_grd
deleted file mode 100644
index ca088fad8..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_app_theme_chrome_unscaled_resources_grd
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: chrome/app/theme/chrome_unscaled_resources.grd
---- chrome/app/theme/chrome_unscaled_resources.grd.orig
-+++ chrome/app/theme/chrome_unscaled_resources.grd
-@@ -16,7 +16,7 @@
-     <includes>
-       <if expr="_google_chrome">
-         <then>
--          <if expr="is_linux">
-+          <if expr="is_posix">
-             <then>
-               <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" />
-               <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" />
-@@ -61,7 +61,7 @@
-         <else> <!-- not _google_chrome -->
-           <if expr="_is_chrome_for_testing_branded">
-             <then>
--              <if expr="is_linux">
-+              <if expr="is_posix">
-                 <then>
-                   <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/google_chrome_for_testing/linux/product_logo_64.png" type="BINDATA" />
-                   <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/google_chrome_for_testing/linux/product_logo_128.png" type="BINDATA" />
-@@ -75,7 +75,7 @@
-               </if>
-             </then>
-             <else>  <!-- not _is_chrome_for_testing_branded -->
--              <if expr="is_linux">
-+              <if expr="is_posix">
-                 <then>
-                   <include name="IDR_PRODUCT_LOGO_64" file="chromium/linux/product_logo_64.png" type="BINDATA" />
-                   <include name="IDR_PRODUCT_LOGO_128" file="chromium/linux/product_logo_128.png" type="BINDATA" />
diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_theme_theme_resources_grd b/www/ungoogled-chromium/patches/patch-chrome_app_theme_theme_resources_grd
deleted file mode 100644
index 211ca94d6..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_app_theme_theme_resources_grd
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: chrome/app/theme/theme_resources.grd
---- chrome/app/theme/theme_resources.grd.orig
-+++ chrome/app/theme/theme_resources.grd
-@@ -143,14 +143,14 @@
-       </if>
-       <if expr="_google_chrome">
-         <then>
--          <if expr="is_linux">
-+          <if expr="is_posix">
-             <then>
-               <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/linux/product_logo_16.png" />
-               <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/linux/product_logo_32.png" />
-               <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/linux/product_logo_32_beta.png" />
-               <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/linux/product_logo_32_dev.png" />
-             </then>
--            <else> <!-- not is_linux -->
-+            <else> <!-- not is_posix -->
-               <if expr="not is_android">
-                 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" />
-                 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" />
-@@ -158,7 +158,7 @@
-               <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/product_logo_32_beta.png" />
-               <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" />
-             </else>
--          </if> <!-- is_linux -->
-+          </if> <!-- is_posix -->
-           <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_CANARY" file="google_chrome/product_logo_32_canary.png" />
-           <if expr="not is_android">
-             <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" />
-@@ -170,7 +170,7 @@
-         <else> <!-- not _google_chrome -->
-           <if expr="_is_chrome_for_testing_branded">
-             <then>
--              <if expr="is_linux">
-+              <if expr="is_posix">
-                 <then>
-                   <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/linux/product_logo_16.png" />
-                   <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/linux/product_logo_32.png" />
-@@ -179,10 +179,10 @@
-                   <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/product_logo_16.png" />
-                   <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/product_logo_32.png" />
-                 </else>
--              </if> <!-- is_linux -->
-+              </if> <!-- is_posix -->
-             </then>
-             <else> <!-- not _is_chrome_for_testing_branded -->
--              <if expr="is_linux">
-+              <if expr="is_posix">
-                 <then>
-                   <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" />
-                   <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" />
-@@ -191,7 +191,7 @@
-                   <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" />
-                   <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" />
-                 </else>
--              </if> <!-- is_linux -->
-+              </if> <!-- is_posix -->
-             </else>
-           </if> <!-- _is_chrome_for_testing_branded -->
-           <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="chromium/product_logo_name_22.png" />
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_BUILD_gn b/www/ungoogled-chromium/patches/patch-chrome_browser_BUILD_gn
index b2f55d6b6..f2b0ef446 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_BUILD_gn
@@ -1,7 +1,7 @@
 Index: chrome/browser/BUILD.gn
 --- chrome/browser/BUILD.gn.orig
 +++ chrome/browser/BUILD.gn
-@@ -6347,6 +6347,13 @@ static_library("browser") {
+@@ -6531,6 +6531,13 @@ static_library("browser") {
      }
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_about_flags_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_about_flags_cc
index fa6cfa424..5261c4ef8 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_about_flags_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_about_flags_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/about_flags.cc
 --- chrome/browser/about_flags.cc.orig
 +++ chrome/browser/about_flags.cc
-@@ -222,7 +222,7 @@
+@@ -235,7 +235,7 @@
  #include "ui/ui_features.h"
  #include "url/url_features.h"
  
@@ -10,25 +10,25 @@ Index: chrome/browser/about_flags.cc
  #include "base/allocator/buildflags.h"
  #endif
  
-@@ -321,7 +321,7 @@
+@@ -323,7 +323,7 @@
  #include "device/vr/public/cpp/features.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- #include "ui/ozone/buildflags.h"
  #include "ui/ozone/public/ozone_switches.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -335,7 +335,7 @@
+ 
+@@ -332,7 +332,7 @@
  #include "chrome/browser/win/titlebar_config.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/enterprise/profile_management/profile_management_features.h"
+ #include "components/supervised_user/core/common/features.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
- 
-@@ -435,7 +435,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
+@@ -490,7 +490,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
      {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
  #endif
  
@@ -37,23 +37,52 @@ Index: chrome/browser/about_flags.cc
  const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
      {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
      {flag_descriptions::kOzonePlatformHintChoiceAuto,
-@@ -1475,7 +1475,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
-      std::size(kChromeRefresh2023Level1), nullptr}};
+@@ -1385,7 +1385,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
+      nullptr}};
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- const FeatureEntry::FeatureParam kShortcutBoostSearchAndUrl1414[] = {
-     {"ShortcutBoostSearchScore", "1414"},
-     {"ShortcutBoostUrlScore", "1414"}};
-@@ -5031,13 +5031,13 @@ const FeatureEntry kFeatureEntries[] = {
+ const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = {
+     {"ShortcutBoostSearchScore", "0"},
+     {"ShortcutBoostNonTopHitThreshold", "0"},
+@@ -3705,7 +3705,7 @@ const flags_ui::FeatureEntry::FeatureVariation
+          std::size(kParcelTrackingTestDataOutForDelivery), nullptr},
+ };
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ const flags_ui::FeatureEntry::FeatureParam
+     kDesktopPWAsLinkCapturingDefaultOn[] = {{"on_by_default", "true"}};
+ const flags_ui::FeatureEntry::FeatureParam
+@@ -4504,7 +4504,7 @@ const FeatureEntry kFeatureEntries[] = {
+     },
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     {
+         "fluent-overlay-scrollbars",
+         flag_descriptions::kFluentOverlayScrollbarsName,
+@@ -4945,7 +4945,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)},
+ #endif  // !BUILDFLAG(IS_ANDROID)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+     {"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName,
+      flag_descriptions::kShortcutsNotAppsDescription,
+      kOsMac | kOsWin | kOsLinux | kOsFuchsia,
+@@ -5070,7 +5070,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kWebShare)},
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName,
-      flag_descriptions::kOzonePlatformHintDescription, kOsLinux,
+     {"pulseaudio-loopback-for-cast",
+      flag_descriptions::kPulseaudioLoopbackForCastName,
+      flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
+@@ -5086,7 +5086,7 @@ const FeatureEntry kFeatureEntries[] = {
       MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
  #endif  // BUILDFLAG(IS_LINUX)
  
@@ -62,17 +91,8 @@ Index: chrome/browser/about_flags.cc
      {"skip-undecryptable-passwords",
       flag_descriptions::kSkipUndecryptablePasswordsName,
       flag_descriptions::kSkipUndecryptablePasswordsDescription,
-@@ -5326,7 +5326,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(feed::kFeedDynamicColors)},
- #endif  // BUILDFLAG(IS_ANDROID)
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
-      flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
-@@ -6016,7 +6016,7 @@ const FeatureEntry kFeatureEntries[] = {
-      kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)},
+@@ -5990,7 +5990,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)},
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
@@ -80,7 +100,7 @@ Index: chrome/browser/about_flags.cc
      {"omnibox-domain-suggestions",
       flag_descriptions::kOmniboxDomainSuggestionsName,
       flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
-@@ -6814,7 +6814,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6861,7 +6861,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kParallelDownloadingDescription, kOsAll,
       FEATURE_VALUE_TYPE(download::features::kParallelDownloading)},
  
@@ -88,26 +108,26 @@ Index: chrome/browser/about_flags.cc
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      {"enable-async-dns", flag_descriptions::kAsyncDnsName,
       flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
-      FEATURE_VALUE_TYPE(features::kAsyncDns)},
-@@ -7797,7 +7797,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(supervised_user::kEnableProtoApiForClassifyUrl)},
- #endif  // BUILDFLAG(ENABLE_SUPERVISED_USERS)
+      FEATURE_VALUE_TYPE(net::features::kAsyncDns)},
+@@ -7866,7 +7866,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(ash::features::kPrivacyIndicators)},
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
      {"enable-network-service-sandbox",
       flag_descriptions::kEnableNetworkServiceSandboxName,
       flag_descriptions::kEnableNetworkServiceSandboxDescription,
-@@ -8528,7 +8528,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7890,7 +7890,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)},
  #endif
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     {"quick-commands", flag_descriptions::kQuickCommandsName,
-      flag_descriptions::kQuickCommandsDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(features::kQuickCommands)},
-@@ -8808,7 +8808,7 @@ const FeatureEntry kFeatureEntries[] = {
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+     {"enable-family-link-extensions-permissions",
+      flag_descriptions::
+          kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName,
+@@ -8742,7 +8742,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -116,7 +136,7 @@ Index: chrome/browser/about_flags.cc
      {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
       flag_descriptions::kGetAllScreensMediaDescription,
       kOsCrOS | kOsLacros | kOsLinux,
-@@ -8868,7 +8868,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8784,7 +8784,7 @@ const FeatureEntry kFeatureEntries[] = {
  
  #if BUILDFLAG(IS_WIN) ||                                      \
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -125,48 +145,66 @@ Index: chrome/browser/about_flags.cc
      {
          "ui-debug-tools",
          flag_descriptions::kUIDebugToolsName,
-@@ -9386,7 +9386,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9053,7 +9053,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS_ASH)
++    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+     {"policy-indication-for-managed-default-search",
+      flag_descriptions::kPolicyIndicationForManagedDefaultSearchName,
+      flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription,
+@@ -9349,7 +9349,7 @@ const FeatureEntry kFeatureEntries[] = {
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
-     {"document-picture-in-picture-api",
-      flag_descriptions::kDocumentPictureInPictureApiName,
-      flag_descriptions::kDocumentPictureInPictureApiDescription,
-@@ -10046,7 +10046,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)},
- 
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-     {"webui-system-font", flag_descriptions::kWebUiSystemFontName,
-      flag_descriptions::kWebUiSystemFontDescription, kOsAll,
-      FEATURE_VALUE_TYPE(features::kWebUiSystemFont)},
-@@ -10232,7 +10232,7 @@ const FeatureEntry kFeatureEntries[] = {
- #endif
- 
- #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
--    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-     {"data-retention-policies-disable-sync-types-needed",
-      flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName,
-      flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription,
-@@ -10625,7 +10625,7 @@ const FeatureEntry kFeatureEntries[] = {
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     {"media-session-enter-picture-in-picture",
+      flag_descriptions::kMediaSessionEnterPictureInPictureName,
+      flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
+@@ -10289,7 +10289,7 @@ const FeatureEntry kFeatureEntries[] = {
+      kOsDesktop | kOsAndroid,
       FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
  
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     {"camera-mic-preview", flag_descriptions::kCameraMicPreviewName,
-      flag_descriptions::kCameraMicPreviewDescription,
-      static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux | kOsFuchsia),
-@@ -10802,7 +10802,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kDigestAuthEnableSecureAlgorithmsDescription, kOsAll,
-      FEATURE_VALUE_TYPE(net::features::kDigestAuthEnableSecureAlgorithms)},
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
+      flag_descriptions::kCameraMicEffectsDescription,
+      static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
+@@ -10327,7 +10327,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)},
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     {"site-search-settings-policy",
+      flag_descriptions::kSiteSearchSettingsPolicyName,
+      flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll,
+@@ -10461,7 +10461,7 @@ const FeatureEntry kFeatureEntries[] = {
+          password_manager::features::kFillingAcrossAffiliatedWebsitesAndroid)},
+ #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
      {"third-party-profile-management",
       flag_descriptions::kThirdPartyProfileManagementName,
       flag_descriptions::kThirdPartyProfileManagementDescription,
+@@ -10813,7 +10813,7 @@ const FeatureEntry kFeatureEntries[] = {
+          trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)},
+ #endif
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     {"restart-to-gain-access-to-keychain",
+      flag_descriptions::kRestartToGainAccessToKeychainName,
+      flag_descriptions::kRestartToGainAccessToKeychainDescription,
+@@ -11087,7 +11087,7 @@ const FeatureEntry kFeatureEntries[] = {
+ 
+ // Controls the view mode for (history) sync screen.
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+     {"minor-mode-restrictions-for-history-sync-opt-in",
+      flag_descriptions::kMinorModeRestrictionsForHistorySyncOptInName,
+      flag_descriptions::kMinorModeRestrictionsForHistorySyncOptInDescription,
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_accessibility_pdf_ocr_controller_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_accessibility_pdf_ocr_controller_cc
new file mode 100644
index 000000000..bd318073d
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_accessibility_pdf_ocr_controller_cc
@@ -0,0 +1,12 @@
+Index: chrome/browser/accessibility/pdf_ocr_controller.cc
+--- chrome/browser/accessibility/pdf_ocr_controller.cc.orig
++++ chrome/browser/accessibility/pdf_ocr_controller.cc
+@@ -111,7 +111,7 @@ void AnnounceToScreenReader(const int message_id) {
+ // TODO(crbug.com/1442928): Sending announcements results in a failure in
+ // `AuraLinuxAccessibilityInProcessBrowserTest::IndexInParentWithModal` and
+ // flaky fail when running Chrome.
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+   const Browser* browser = BrowserList::GetInstance()->GetLastActive();
+   if (!browser) {
+     VLOG(2) << "Browser is not ready to announce";
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_after_startup_task_utils_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_after_startup_task_utils_cc
index 3d1651384..9c1c09007 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_after_startup_task_utils_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_after_startup_task_utils_cc
@@ -1,9 +1,9 @@
 Index: chrome/browser/after_startup_task_utils.cc
 --- chrome/browser/after_startup_task_utils.cc.orig
 +++ chrome/browser/after_startup_task_utils.cc
-@@ -107,7 +107,7 @@ void SetBrowserStartupIsComplete() {
-   TRACE_EVENT0("startup", "SetBrowserStartupIsComplete");
-   g_startup_complete_flag.Get().Set();
+@@ -115,7 +115,7 @@ void SetBrowserStartupIsComplete() {
+                        TRACE_EVENT_SCOPE_GLOBAL, "BrowserCount", browser_count);
+   GetStartupCompleteFlag().Set();
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_apps_app_service_publishers_extension_apps_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_apps_app_service_publishers_extension_apps_cc
index f6c358c1a..21b480ab4 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_apps_app_service_publishers_extension_apps_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_apps_app_service_publishers_extension_apps_cc
@@ -1,12 +1,12 @@
 Index: chrome/browser/apps/app_service/publishers/extension_apps.cc
 --- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig
 +++ chrome/browser/apps/app_service/publishers/extension_apps.cc
-@@ -25,7 +25,7 @@ ExtensionApps::~ExtensionApps() = default;
+@@ -23,7 +23,7 @@ ExtensionApps::ExtensionApps(AppServiceProxy* proxy)
+ ExtensionApps::~ExtensionApps() = default;
  
  bool ExtensionApps::Accepts(const extensions::Extension* extension) {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (extensions::IsExtensionUnsupportedDeprecatedApp(profile(),
                                                        extension->id())) {
      return false;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_apps_platform_apps_platform_app_launch_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_apps_platform_apps_platform_app_launch_cc
index 71481fcb9..6d978fc42 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_apps_platform_apps_platform_app_launch_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_apps_platform_apps_platform_app_launch_cc
@@ -1,21 +1,66 @@
 Index: chrome/browser/apps/platform_apps/platform_app_launch.cc
 --- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig
 +++ chrome/browser/apps/platform_apps/platform_app_launch.cc
-@@ -20,7 +20,7 @@
+@@ -19,7 +19,7 @@
+ #include "extensions/common/constants.h"
  #include "extensions/common/extension.h"
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/browser.h"
  #include "chrome/browser/ui/browser_navigator.h"
  #include "chrome/browser/ui/browser_window.h"
-@@ -138,7 +138,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con
+@@ -86,7 +86,7 @@ bool OpenExtensionApplicationWindow(Profile* profile,
+   if (launch_container == LaunchContainer::kLaunchContainerTab)
+     return false;
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (OpenDeprecatedApplicationPrompt(profile, app_id)) {
+     return false;
+   }
+@@ -118,7 +118,7 @@ content::WebContents* OpenExtensionApplicationTab(Prof
+   if (launch_container != apps::LaunchContainer::kLaunchContainerTab)
+     return nullptr;
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (OpenDeprecatedApplicationPrompt(profile, app_id)) {
+     return nullptr;
+   }
+@@ -134,7 +134,7 @@ content::WebContents* OpenExtensionApplicationTab(Prof
+   return app_tab;
  }
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  bool OpenDeprecatedApplicationPrompt(Profile* profile,
                                       const std::string& app_id) {
    if (!extensions::IsExtensionUnsupportedDeprecatedApp(profile, app_id))
+@@ -170,7 +170,7 @@ bool OpenExtensionApplicationWithReenablePrompt(
+   if (!GetPlatformApp(profile, app_id))
+     return false;
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (OpenDeprecatedApplicationPrompt(profile, app_id)) {
+     return false;
+   }
+@@ -192,7 +192,7 @@ content::WebContents* OpenExtensionAppShortcutWindow(P
+                                          ->enabled_extensions()
+                                          .GetAppByURL(url);
+   if (app) {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     if (OpenDeprecatedApplicationPrompt(profile, app->id())) {
+       return nullptr;
+     }
+@@ -215,7 +215,7 @@ void RecordExtensionAppLaunchOnTabRestored(Profile* pr
+   if (!extension)
+     return;
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (OpenDeprecatedApplicationPrompt(profile, extension->id())) {
+     return;
+   }
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_apps_platform_apps_platform_app_launch_h b/www/ungoogled-chromium/patches/patch-chrome_browser_apps_platform_apps_platform_app_launch_h
index 326467677..35644714b 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_apps_platform_apps_platform_app_launch_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_apps_platform_apps_platform_app_launch_h
@@ -1,8 +1,8 @@
 Index: chrome/browser/apps/platform_apps/platform_app_launch.h
 --- chrome/browser/apps/platform_apps/platform_app_launch.h.orig
 +++ chrome/browser/apps/platform_apps/platform_app_launch.h
-@@ -37,7 +37,7 @@ bool OpenExtensionApplicationWindow(Profile* profile,
- bool OpenExtensionApplicationTab(Profile* profile, const std::string& app_id);
+@@ -39,7 +39,7 @@ content::WebContents* OpenExtensionApplicationTab(Prof
+                                                   const std::string& app_id);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_FUCHSIA)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_background_background_mode_manager_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_background_background_mode_manager_cc
index 717ff3112..944f8bc72 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_background_background_mode_manager_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_background_background_mode_manager_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/background/background_mode_manager.cc
 --- chrome/browser/background/background_mode_manager.cc.orig
 +++ chrome/browser/background/background_mode_manager.cc
-@@ -870,7 +870,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
+@@ -872,7 +872,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
      return gfx::ImageSkia();
  
    return family->CreateExact(size).AsImageSkia();
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_background_background_mode_optimizer_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_background_background_mode_optimizer_cc
index feb221312..c63fe044f 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_background_background_mode_optimizer_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_background_background_mode_optimizer_cc
@@ -8,5 +8,5 @@ Index: chrome/browser/background/background_mode_optimizer.cc
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    if (base::FeatureList::IsEnabled(features::kBackgroundModeAllowRestart)) {
+     // Private ctor.
      return base::WrapUnique(new BackgroundModeOptimizer());
-   }
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_browser_features_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_browser_features_cc
index 073fcd851..02201c726 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_browser_features_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_browser_features_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/browser_features.cc
 --- chrome/browser/browser_features.cc.orig
 +++ chrome/browser/browser_features.cc
-@@ -28,7 +28,7 @@ BASE_FEATURE(kClosedTabCache,
+@@ -76,7 +76,7 @@ const base::FeatureParam<bool> kSpareRendererWarmupDel
  BASE_FEATURE(kDestroyProfileOnBrowserClose,
               "DestroyProfileOnBrowserClose",
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -10,3 +10,12 @@ Index: chrome/browser/browser_features.cc
               base::FEATURE_ENABLED_BY_DEFAULT);
  #else
               base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -337,7 +337,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
+ BASE_FEATURE(kSupportSearchSuggestionForPrerender2,
+              "SupportSearchSuggestionForPrerender2",
+ #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
+-    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_cc
index dbb205080..658243d74 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_cc
@@ -1,8 +1,8 @@
 Index: chrome/browser/browser_process_impl.cc
 --- chrome/browser/browser_process_impl.cc.orig
 +++ chrome/browser/browser_process_impl.cc
-@@ -219,7 +219,7 @@
- #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
+@@ -223,7 +223,7 @@
+ #include "chrome/browser/ui/profiles/profile_picker.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -10,7 +10,7 @@ Index: chrome/browser/browser_process_impl.cc
  #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h"  // nogncheck
  #endif
  
-@@ -1212,7 +1212,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
+@@ -1258,7 +1258,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
  
    ApplyMetricsReportingPolicy();
  
@@ -19,7 +19,7 @@ Index: chrome/browser/browser_process_impl.cc
    ChromeJsErrorReportProcessor::Create();
  #endif
  
-@@ -1448,7 +1448,7 @@ void BrowserProcessImpl::Unpin() {
+@@ -1518,7 +1518,7 @@ void BrowserProcessImpl::Unpin() {
  // Mac is currently not supported.
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_h b/www/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_h
index 51fd81bf7..62e98d420 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_h
@@ -1,7 +1,7 @@
 Index: chrome/browser/browser_process_impl.h
 --- chrome/browser/browser_process_impl.h.orig
 +++ chrome/browser/browser_process_impl.h
-@@ -378,7 +378,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -385,7 +385,7 @@ class BrowserProcessImpl : public BrowserProcess,
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_interface_binders_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_interface_binders_cc
index c8b77764c..4bec56a4e 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_interface_binders_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_interface_binders_cc
@@ -17,16 +17,25 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
  #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
  #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
  #endif
-@@ -217,7 +217,7 @@
+@@ -224,7 +224,7 @@
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h"
+ #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
  #include "chrome/browser/ui/webui/discards/discards.mojom.h"
- #include "chrome/browser/ui/webui/discards/discards_ui.h"
- #include "chrome/browser/ui/webui/discards/site_data.mojom.h"
-@@ -949,7 +949,7 @@ void PopulateChromeFrameBinders(
+@@ -834,7 +834,7 @@ void BindScreen2xMainContentExtractor(
+ #endif
+ 
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ void BindVisualSuggestionsModelProvider(
+     content::RenderFrameHost* frame_host,
+     mojo::PendingReceiver<
+@@ -1030,7 +1030,7 @@ void PopulateChromeFrameBinders(
  #endif  // BUILDFLAG(ENABLE_SPEECH_SERVICE)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -35,16 +44,16 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
    if (!render_frame_host->GetParent()) {
      map->Add<chrome::mojom::DraggableRegions>(
          base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
-@@ -957,7 +957,7 @@ void PopulateChromeFrameBinders(
+@@ -1038,7 +1038,7 @@ void PopulateChromeFrameBinders(
  #endif
  
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
        !render_frame_host->GetParentOrOuterDocument()) {
      // The service binder will reject non-primary main frames, but we still need
-@@ -1031,7 +1031,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1125,7 +1125,7 @@ void PopulateChromeWebUIFrameBinders(
        commerce::CommerceInternalsUI>(map);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -53,7 +62,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
    RegisterWebUIControllerInterfaceBinder<
        connectors_internals::mojom::PageHandler,
        enterprise_connectors::ConnectorsInternalsUI>(map);
-@@ -1046,7 +1046,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1137,7 +1137,7 @@ void PopulateChromeWebUIFrameBinders(
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -62,7 +71,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
    RegisterWebUIControllerInterfaceBinder<
        app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
  #endif
-@@ -1535,7 +1535,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1704,7 +1704,7 @@ void PopulateChromeWebUIFrameBinders(
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_cc
index 2bcb37000..16e881a0b 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/chrome_browser_main.cc
 --- chrome/browser/chrome_browser_main.cc.orig
 +++ chrome/browser/chrome_browser_main.cc
-@@ -245,11 +245,11 @@
+@@ -246,15 +246,15 @@
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -15,7 +15,12 @@ Index: chrome/browser/chrome_browser_main.cc
  #include "components/crash/core/app/crashpad.h"
  #endif
  
-@@ -284,14 +284,14 @@
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/nix/xdg_util.h"
+ #endif
+ 
+@@ -287,14 +287,14 @@
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -32,7 +37,33 @@ Index: chrome/browser/chrome_browser_main.cc
  #include "chrome/browser/headless/headless_mode_metrics.h"  // nogncheck
  #include "chrome/browser/headless/headless_mode_util.h"     // nogncheck
  #include "components/headless/select_file_dialog/headless_select_file_dialog.h"
-@@ -1030,7 +1030,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -361,14 +361,14 @@
+ #endif  // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
+ 
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+-    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ #include "sql/database.h"
+ #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
+         // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
+ 
+ namespace {
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+-    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] =
+     FILE_PATH_LITERAL("Media History");
+ 
+@@ -523,7 +523,7 @@ void ProcessSingletonNotificationCallbackImpl(
+   }
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Set the global activation token sent as a command line switch by another
+   // browser process. This also removes the switch after use to prevent any side
+   // effects of leaving it in the command line after this point.
+@@ -1090,7 +1090,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
        browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
      }
  
@@ -41,7 +72,7 @@ Index: chrome/browser/chrome_browser_main.cc
      // Create directory for user-level Native Messaging manifest files. This
      // makes it less likely that the directory will be created by third-party
      // software with incorrect owner or permission. See crbug.com/725513 .
-@@ -1086,7 +1086,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1138,7 +1138,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -50,7 +81,16 @@ Index: chrome/browser/chrome_browser_main.cc
    metrics::DesktopSessionDurationTracker::Initialize();
    ProfileActivityMetricsRecorder::Initialize();
    TouchModeStatsTracker::Initialize(
-@@ -1322,7 +1322,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* 
+@@ -1329,7 +1329,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* 
+ #endif  // BUILDFLAG(IS_WIN)
+ 
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+-    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+   // Delete the media history database if it still exists.
+   // TODO(crbug.com/1198344): Remove this.
+   base::ThreadPool::PostTask(
+@@ -1378,7 +1378,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* 
        *UrlLanguageHistogramFactory::GetForBrowserContext(profile));
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -59,7 +99,7 @@ Index: chrome/browser/chrome_browser_main.cc
    if (headless::IsHeadlessMode()) {
      headless::ReportHeadlessActionMetrics();
    }
-@@ -1428,7 +1428,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
+@@ -1486,7 +1486,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
    // In headless mode provide alternate SelectFileDialog factory overriding
    // any platform specific SelectFileDialog implementation that may have been
    // set.
@@ -68,3 +108,12 @@ Index: chrome/browser/chrome_browser_main.cc
    if (headless::IsHeadlessMode()) {
      headless::HeadlessSelectFileDialogFactory::SetUp();
    }
+@@ -2026,7 +2026,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
+ 
+   // Drop the request if headless mode is in effect or the request is from
+   // a headless Chrome process.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   if (headless::IsHeadlessMode() ||
+       command_line.HasSwitch(switches::kHeadless)) {
+     return false;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_extra_parts_linux_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_extra_parts_linux_cc
index 10e432c7d..372a867e1 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_extra_parts_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_extra_parts_linux_cc
@@ -1,10 +1,10 @@
 Index: chrome/browser/chrome_browser_main_extra_parts_linux.cc
 --- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig
 +++ chrome/browser/chrome_browser_main_extra_parts_linux.cc
-@@ -120,7 +120,7 @@ ChromeBrowserMainExtraPartsLinux::ChromeBrowserMainExt
- ChromeBrowserMainExtraPartsLinux::~ChromeBrowserMainExtraPartsLinux() = default;
+@@ -175,7 +175,7 @@ void ChromeBrowserMainExtraPartsLinux::PostBrowserStar
  
- void ChromeBrowserMainExtraPartsLinux::PreEarlyInitialization() {
+ // static
+ void ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint() {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // On the desktop, we fix the platform name if necessary.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_extra_parts_ozone_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_extra_parts_ozone_cc
new file mode 100644
index 000000000..56fa87584
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_extra_parts_ozone_cc
@@ -0,0 +1,12 @@
+Index: chrome/browser/chrome_browser_main_extra_parts_ozone.cc
+--- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig
++++ chrome/browser/chrome_browser_main_extra_parts_ozone.cc
+@@ -27,7 +27,7 @@ void ChromeBrowserMainExtraPartsOzone::PostCreateMainM
+ }
+ 
+ void ChromeBrowserMainExtraPartsOzone::PostMainMessageLoopRun() {
+-#if !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+   // Lacros's `PostMainMessageLoopRun` must be called at the very end of
+   // `PostMainMessageLoopRun` in
+   // `ChromeBrowserMainPartsLacros::PostMainMessageLoopRun`.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_linux_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_linux_cc
index 9a2493b33..ef9136633 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_linux_cc
@@ -1,14 +1,16 @@
 Index: chrome/browser/chrome_browser_main_linux.cc
 --- chrome/browser/chrome_browser_main_linux.cc.orig
 +++ chrome/browser/chrome_browser_main_linux.cc
-@@ -53,13 +53,15 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi
- }
+@@ -24,7 +24,7 @@
+ #include "device/bluetooth/dbus/bluez_dbus_thread_manager.h"
+ #include "ui/base/l10n/l10n_util.h"
  
- void ChromeBrowserMainPartsLinux::PostCreateMainMessageLoop() {
--#if BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // No-op: Ash and Lacros Bluetooth DBusManager initialization depend on
-   // FeatureList, and is done elsewhere.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/ozone/public/ozone_platform.h"
+ #endif
+ 
+@@ -71,7 +71,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if !BUILDFLAG(IS_CHROMEOS)
@@ -18,7 +20,16 @@ Index: chrome/browser/chrome_browser_main_linux.cc
  
    // Set up crypt config. This needs to be done before anything starts the
    // network service, as the raw encryption key needs to be shared with the
-@@ -117,7 +119,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
+@@ -96,7 +98,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
+   ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop();
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
+   ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
+   ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
+@@ -135,7 +137,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
  #endif  // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS)
  
  void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_linux_h b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_linux_h
new file mode 100644
index 000000000..ce707fc8d
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_linux_h
@@ -0,0 +1,12 @@
+Index: chrome/browser/chrome_browser_main_linux.h
+--- chrome/browser/chrome_browser_main_linux.h.orig
++++ chrome/browser/chrome_browser_main_linux.h
+@@ -30,7 +30,7 @@ class ChromeBrowserMainPartsLinux : public ChromeBrows
+ 
+   // ChromeBrowserMainPartsPosix overrides.
+   void PostCreateMainMessageLoop() override;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   void PostMainMessageLoopRun() override;
+ #endif
+   void PreProfileInit() override;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_posix_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_posix_cc
index a70f15074..c5a7eceab 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_posix_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/chrome_browser_main_posix.cc
 --- chrome/browser/chrome_browser_main_posix.cc.orig
 +++ chrome/browser/chrome_browser_main_posix.cc
-@@ -73,7 +73,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
+@@ -79,7 +79,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
    } else {
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc
index e161d36e3..66ad975c7 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc
@@ -1,16 +1,16 @@
 Index: chrome/browser/chrome_content_browser_client.cc
 --- chrome/browser/chrome_content_browser_client.cc.orig
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -432,7 +432,7 @@
- #include "components/user_manager/user_manager.h"
- #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
+@@ -459,7 +459,7 @@
  #include "storage/browser/file_system/external_mount_points.h"
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/chrome_browser_main_linux.h"
+ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
  #elif BUILDFLAG(IS_ANDROID)
- #include "base/android/application_status_listener.h"
-@@ -523,12 +523,12 @@
+@@ -568,12 +568,12 @@
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -25,15 +25,16 @@ Index: chrome/browser/chrome_content_browser_client.cc
  #include "components/crash/core/app/crash_switches.h"
  #include "components/crash/core/app/crashpad.h"
  #endif
-@@ -537,14 +537,14 @@
- #include "components/crash/content/browser/crash_handler_host_linux.h"
+@@ -584,7 +584,7 @@
+ #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h"
+ #include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h"
  #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h"
- #include "chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.h"
+@@ -592,7 +592,7 @@
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -42,13 +43,8 @@ Index: chrome/browser/chrome_content_browser_client.cc
  #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
          // BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -571,11 +571,11 @@
- 
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
+@@ -608,7 +608,7 @@
+ #include "components/lens/lens_features.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
@@ -56,16 +52,16 @@ Index: chrome/browser/chrome_content_browser_client.cc
  #include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
  #elif BUILDFLAG(IS_OZONE)
  #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -1564,7 +1564,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
-   registry->RegisterBooleanPref(prefs::kNewBaseUrlInheritanceBehaviorAllowed,
-                                 true);
+@@ -1477,7 +1477,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
+ #if BUILDFLAG(IS_CHROMEOS)
    registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false);
+ #endif  // BUILDFLAG(IS_CHROMEOS)
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
    registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
                                  true);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-@@ -1688,7 +1688,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1601,7 +1601,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
  #elif BUILDFLAG(IS_CHROMEOS_LACROS)
    main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
        is_integration_test, &startup_data_);
@@ -74,7 +70,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
    main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
        is_integration_test, &startup_data_);
  #elif BUILDFLAG(IS_ANDROID)
-@@ -1727,7 +1727,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1638,7 +1638,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
        std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -83,7 +79,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
    main_parts->AddParts(
        std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
  #else
-@@ -1748,7 +1748,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1659,7 +1659,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
  #endif
  
@@ -92,7 +88,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
  #elif BUILDFLAG(IS_OZONE)
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -1767,7 +1767,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1678,7 +1678,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
  
    chrome::AddMetricsExtraParts(main_parts.get());
  
@@ -101,25 +97,16 @@ Index: chrome/browser/chrome_content_browser_client.cc
    main_parts->AddParts(
        std::make_unique<
            chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
-@@ -2591,6 +2591,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
- #if(0)
- #if BUILDFLAG(IS_ANDROID)
-   bool enable_crash_reporter = true;
-+#elif BUILDFLAG(IS_BSD)
-+  bool enable_crash_reporter = false;
- #elif BUILDFLAG(IS_CHROMEOS)
-   bool enable_crash_reporter = false;
-   if (crash_reporter::IsCrashpadEnabled()) {
-@@ -2998,7 +3000,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2832,7 +2832,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
    ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
        command_line);
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && !BUILDFLAG(IS_BSD)
    // Opt into a hardened stack canary mitigation if it hasn't already been
    // force-disabled.
    if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
-@@ -4564,7 +4566,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -4536,7 +4536,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
    }
  }
  
@@ -128,7 +115,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -5086,7 +5088,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5090,7 +5090,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
          &throttles);
    }
  
@@ -137,7 +124,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
    MaybeAddThrottle(
        WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
        &throttles);
-@@ -5096,7 +5098,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5104,7 +5104,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -146,7 +133,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
    MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
                         MaybeCreateThrottleFor(handle),
                     &throttles);
-@@ -5127,7 +5129,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5135,7 +5135,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
    }
  #endif
  
@@ -155,10 +142,10 @@ Index: chrome/browser/chrome_content_browser_client.cc
    MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
                         MaybeCreateThrottleFor(handle),
                     &throttles);
-@@ -6920,7 +6922,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
- }
- 
+@@ -7059,7 +7059,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
  bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
+ // This enterprise policy is supported on Android, but the feature will not be
+ // launched there.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
    // This is possibly called before `g_browser_process` is initialized.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_h b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_h
index 934e37c74..75f3252a5 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_h
@@ -1,10 +1,10 @@
 Index: chrome/browser/chrome_content_browser_client.h
 --- chrome/browser/chrome_content_browser_client.h.orig
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -471,7 +471,7 @@ class ChromeContentBrowserClient : public content::Con
-   void OverridePageVisibilityState(
-       content::RenderFrameHost* render_frame_host,
-       content::PageVisibilityState* visibility_state) override;
+@@ -500,7 +500,7 @@ class ChromeContentBrowserClient : public content::Con
+   bool IsPluginAllowedToUseDevChannelAPIs(
+       content::BrowserContext* browser_context,
+       const GURL& url) override;
 -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
    void GetAdditionalMappedFilesForChildProcess(
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_component_updater_widevine_cdm_component_installer_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_component_updater_widevine_cdm_component_installer_cc
new file mode 100644
index 000000000..98c23d447
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_component_updater_widevine_cdm_component_installer_cc
@@ -0,0 +1,30 @@
+Index: chrome/browser/component_updater/widevine_cdm_component_installer.cc
+--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig
++++ chrome/browser/component_updater/widevine_cdm_component_installer.cc
+@@ -40,7 +40,7 @@
+ #include "third_party/widevine/cdm/buildflags.h"
+ #include "third_party/widevine/cdm/widevine_cdm_common.h"
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h"
+ #endif
+ 
+@@ -78,7 +78,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto::
+ const char ImageLoaderComponentName[] = "WidevineCdm";
+ #endif
+ 
+-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
+ // On Linux and ChromeOS the Widevine CDM is loaded at startup before the
+ // zygote is locked down. As a result there is no need to register the CDM
+ // with Chrome as it can't be used until Chrome is restarted.
+@@ -364,7 +364,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat
+     return;
+   }
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+   VLOG(1) << "Updating hint file with Widevine CDM " << cdm_version;
+ 
+   // This is running on a thread that allows IO, so simply update the hint file.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_content_settings_one_time_permission_provider_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_content_settings_one_time_permission_provider_cc
deleted file mode 100644
index 9ff1d6dd2..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_content_settings_one_time_permission_provider_cc
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: chrome/browser/content_settings/one_time_permission_provider.cc
---- chrome/browser/content_settings/one_time_permission_provider.cc.orig
-+++ chrome/browser/content_settings/one_time_permission_provider.cc
-@@ -225,8 +225,13 @@ void OneTimePermissionProvider::OnSuspend() {
- 
-       while (rule_iterator && rule_iterator->HasNext()) {
-         auto rule = rule_iterator->Next();
-+#if defined(__clang__) && (__clang_major__ >= 16)
-         patterns_to_delete.emplace_back(setting_type, rule->primary_pattern,
-                                         rule->secondary_pattern);
-+#else
-+        patterns_to_delete.emplace_back(ContentSettingEntry{setting_type, rule->primary_pattern,
-+                                        rule->secondary_pattern});
-+#endif
-         permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
-             setting_type,
-             permissions::OneTimePermissionEvent::EXPIRED_ON_SUSPEND);
-@@ -320,8 +325,13 @@ void OneTimePermissionProvider::DeleteEntriesMatchingG
-     auto rule = rule_iterator->Next();
-     if (rule->primary_pattern.Matches(origin_gurl) &&
-         rule->secondary_pattern.Matches(origin_gurl)) {
-+#if defined(__clang__) && (__clang_major__ >= 16)
-       patterns_to_delete.emplace_back(
-           content_setting_type, rule->primary_pattern, rule->secondary_pattern);
-+#else
-+      patterns_to_delete.emplace_back(
-+          ContentSettingEntry{content_setting_type, rule->primary_pattern, rule->secondary_pattern});
-+#endif
-       permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
-           content_setting_type, trigger_event);
-     }
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_defaults_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_defaults_cc
index 88d709bb3..63d3966c6 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_defaults_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_defaults_cc
@@ -1,9 +1,9 @@
 Index: chrome/browser/defaults.cc
 --- chrome/browser/defaults.cc.orig
 +++ chrome/browser/defaults.cc
-@@ -46,7 +46,7 @@ const bool kShowHelpMenuItemIcon = false;
- 
- const bool kDownloadPageHasShowInFolder = true;
+@@ -44,7 +44,7 @@ const bool kShowHelpMenuItemIcon = true;
+ const bool kShowHelpMenuItemIcon = false;
+ #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_download_bubble_download_bubble_update_service_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_download_bubble_download_bubble_update_service_cc
deleted file mode 100644
index 93c68f464..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_download_bubble_download_bubble_update_service_cc
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: chrome/browser/download/bubble/download_bubble_update_service.cc
---- chrome/browser/download/bubble/download_bubble_update_service.cc.orig
-+++ chrome/browser/download/bubble/download_bubble_update_service.cc
-@@ -91,7 +91,11 @@ ItemSortKey GetSortKey(const Item& item) {
- // Helper to get an iterator to the last element in the cache. The cache
- // must not be empty.
- template <typename Item>
-+#if defined(__clang__) && (__clang_major__ >= 16)
- SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
-+#else
-+typename SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
-+#endif
-   CHECK(!cache.empty());
-   auto it = cache.end();
-   return std::prev(it);
-@@ -967,9 +971,17 @@ bool DownloadBubbleUpdateService::CacheManager::Remove
- }
- 
- template <typename Id, typename Item>
-+#if defined(__clang__) && (__clang_major__ >= 16)
- SortedItems<Item>::iterator
-+#else
-+typename SortedItems<Item>::iterator
-+#endif
- DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter(
-+#if defined(__clang__) && (__clang_major__ >= 16)
-     SortedItems<Item>::iterator iter,
-+#else
-+    typename SortedItems<Item>::iterator iter,
-+#endif
-     SortedItems<Item>& cache,
-     IterMap<Id, Item>& iter_map) {
-   CHECK(iter != cache.end());
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc
index 026714846..4cae7d150 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc
@@ -1,8 +1,8 @@
 Index: chrome/browser/download/chrome_download_manager_delegate.cc
 --- chrome/browser/download/chrome_download_manager_delegate.cc.orig
 +++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -1565,7 +1565,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
- bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
+@@ -1671,7 +1671,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+ bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile(
      const base::FilePath& path) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_MAC)
@@ -10,7 +10,7 @@ Index: chrome/browser/download/chrome_download_manager_delegate.cc
    if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
      return !download_prefs_->ShouldOpenPdfInSystemReader();
    }
-@@ -1631,7 +1631,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
+@@ -1737,7 +1737,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
      content::CheckDownloadAllowedCallback check_download_allowed_cb) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_commands_h b/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_commands_h
index 37043d96d..a0ef59099 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_commands_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_commands_h
@@ -1,7 +1,7 @@
 Index: chrome/browser/download/download_commands.h
 --- chrome/browser/download/download_commands.h.orig
 +++ chrome/browser/download/download_commands.h
-@@ -60,7 +60,7 @@ class DownloadCommands {
+@@ -63,7 +63,7 @@ class DownloadCommands {
    void ExecuteCommand(Command command);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_file_picker_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_file_picker_cc
index ff93edd4a..7cb2edd16 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_file_picker_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_file_picker_cc
@@ -1,16 +1,16 @@
 Index: chrome/browser/download/download_file_picker.cc
 --- chrome/browser/download/download_file_picker.cc.orig
 +++ chrome/browser/download/download_file_picker.cc
-@@ -17,7 +17,7 @@
- #include "content/public/browser/download_manager.h"
+@@ -18,7 +18,7 @@
  #include "content/public/browser/web_contents.h"
+ #include "ui/shell_dialogs/selected_file_info.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/browser_list.h"
  #include "chrome/browser/ui/browser_window.h"
  #include "ui/aura/window.h"
-@@ -82,7 +82,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl
+@@ -83,7 +83,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl
    // dialog in Linux (See SelectFileImpl() in select_file_dialog_linux_gtk.cc).
    // and windows.Here we make owning_window host to browser current active
    // window if it is null. https://crbug.com/1301898
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_item_model_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_item_model_cc
index 84671503b..9a8c70bb9 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_item_model_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_item_model_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/download/download_item_model.cc
 --- chrome/browser/download/download_item_model.cc.orig
 +++ chrome/browser/download/download_item_model.cc
-@@ -765,7 +765,7 @@ bool DownloadItemModel::IsCommandChecked(
+@@ -749,7 +749,7 @@ bool DownloadItemModel::IsCommandChecked(
               download_crx_util::IsExtensionDownload(*download_);
      case DownloadCommands::ALWAYS_OPEN_TYPE:
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -10,8 +10,8 @@ Index: chrome/browser/download/download_item_model.cc
        if (download_commands->CanOpenPdfInSystemViewer()) {
          DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
          return prefs->ShouldOpenPdfInSystemReader();
-@@ -811,7 +811,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
-       base::UmaHistogramBoolean("Download.SetAlwaysOpenTo", !is_checked);
+@@ -795,7 +795,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
+                                          DownloadCommands::ALWAYS_OPEN_TYPE);
        DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_MAC)
@@ -19,7 +19,7 @@ Index: chrome/browser/download/download_item_model.cc
        if (download_commands->CanOpenPdfInSystemViewer()) {
          prefs->SetShouldOpenPdfInSystemReader(!is_checked);
          SetShouldPreferOpeningInBrowser(is_checked);
-@@ -1163,7 +1163,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
+@@ -1145,7 +1145,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
      return;
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_prefs_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_prefs_cc
index 2ec0157eb..8efd7dc2a 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_prefs_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_prefs_cc
@@ -9,8 +9,8 @@ Index: chrome/browser/download/download_prefs.cc
  #include "base/feature_list.h"
  #include "base/files/file_util.h"
  #include "base/functional/bind.h"
-@@ -63,6 +64,10 @@
- #include "chrome/browser/download/bubble/download_bubble_prefs.h"
+@@ -64,6 +65,10 @@
+ #include "chrome/browser/flags/android/chrome_feature_list.h"
  #endif
  
 +#if BUILDFLAG(IS_BSD)
@@ -20,7 +20,7 @@ Index: chrome/browser/download/download_prefs.cc
  using content::BrowserContext;
  using content::BrowserThread;
  using content::DownloadManager;
-@@ -73,7 +78,7 @@ namespace {
+@@ -74,7 +79,7 @@ namespace {
  // Consider downloads 'dangerous' if they go to the home directory on Linux and
  // to the desktop on any platform.
  bool DownloadPathIsDangerous(const base::FilePath& download_path) {
@@ -29,7 +29,7 @@ Index: chrome/browser/download/download_prefs.cc
    base::FilePath home_dir = base::GetHomeDir();
    if (download_path == home_dir) {
      return true;
-@@ -181,7 +186,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
+@@ -180,7 +185,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -38,16 +38,16 @@ Index: chrome/browser/download/download_prefs.cc
    should_open_pdf_in_system_reader_ =
        prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
  #endif
-@@ -307,7 +312,7 @@ void DownloadPrefs::RegisterProfilePrefs(
-   registry->RegisterTimePref(prefs::kDownloadLastCompleteTime,
-                              /*default_value=*/base::Time());
+@@ -299,7 +304,7 @@ void DownloadPrefs::RegisterProfilePrefs(
+   registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
+                                  default_download_path);
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_MAC)
 +    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
    registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
  #endif
  #if BUILDFLAG(IS_ANDROID)
-@@ -476,7 +481,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
+@@ -462,7 +467,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -56,7 +56,7 @@ Index: chrome/browser/download/download_prefs.cc
  void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
    if (should_open_pdf_in_system_reader_ == should_open)
      return;
-@@ -508,7 +513,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
+@@ -494,7 +499,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
  
  void DownloadPrefs::ResetAutoOpenByUser() {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -65,7 +65,7 @@ Index: chrome/browser/download/download_prefs.cc
    SetShouldOpenPdfInSystemReader(false);
  #endif
    auto_open_by_user_.clear();
-@@ -539,7 +544,7 @@ void DownloadPrefs::SaveAutoOpenState() {
+@@ -534,7 +539,7 @@ void DownloadPrefs::SaveAutoOpenState() {
  bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
  #if BUILDFLAG(IS_CHROMEOS)
    return false;  // There is no UI for auto-open on ChromeOS.
@@ -74,7 +74,7 @@ Index: chrome/browser/download/download_prefs.cc
    return ShouldOpenPdfInSystemReader();
  #else
    return false;
-@@ -663,7 +668,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
+@@ -686,7 +691,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
  #else
    // If the stored download directory is an absolute path, we presume it's
    // correct; there's not really much more validation we can do here.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_prefs_h b/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_prefs_h
index cbb75002a..4ef7365ed 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_prefs_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_prefs_h
@@ -1,7 +1,7 @@
 Index: chrome/browser/download/download_prefs.h
 --- chrome/browser/download/download_prefs.h.orig
 +++ chrome/browser/download/download_prefs.h
-@@ -118,7 +118,7 @@ class DownloadPrefs {
+@@ -115,7 +115,7 @@ class DownloadPrefs {
    void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -10,7 +10,7 @@ Index: chrome/browser/download/download_prefs.h
    // Store the user preference to disk. If |should_open| is true, also disable
    // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
    void SetShouldOpenPdfInSystemReader(bool should_open);
-@@ -183,7 +183,7 @@ class DownloadPrefs {
+@@ -179,7 +179,7 @@ class DownloadPrefs {
    std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_browser_management_browser_management_service_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_browser_management_browser_management_service_cc
new file mode 100644
index 000000000..52e995cec
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_browser_management_browser_management_service_cc
@@ -0,0 +1,30 @@
+Index: chrome/browser/enterprise/browser_management/browser_management_service.cc
+--- chrome/browser/enterprise/browser_management/browser_management_service.cc.orig
++++ chrome/browser/enterprise/browser_management/browser_management_service.cc
+@@ -21,7 +21,7 @@ namespace policy {
+ 
+ namespace {
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void UpdateEnterpriseLogo(
+     Profile* profile,
+     base::OnceCallback<void(const gfx::Image&,
+@@ -98,7 +98,7 @@ GetManagementStatusProviders(Profile* profile) {
+ }  // namespace
+ 
+ BrowserManagementMetadata::BrowserManagementMetadata(Profile* profile) {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   UpdateManagementLogo(profile);
+   pref_change_registrar_.Init(profile->GetPrefs());
+   pref_change_registrar_.Add(
+@@ -114,7 +114,7 @@ const gfx::Image& BrowserManagementMetadata::GetManage
+   return management_logo_;
+ }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void BrowserManagementMetadata::UpdateManagementLogo(Profile* profile) {
+   UpdateEnterpriseLogo(
+       profile, base::BindOnce(&BrowserManagementMetadata::SetManagementLogo,
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_browser_management_browser_management_service_h b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_browser_management_browser_management_service_h
new file mode 100644
index 000000000..1b0c0eeee
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_browser_management_browser_management_service_h
@@ -0,0 +1,12 @@
+Index: chrome/browser/enterprise/browser_management/browser_management_service.h
+--- chrome/browser/enterprise/browser_management/browser_management_service.h.orig
++++ chrome/browser/enterprise/browser_management/browser_management_service.h
+@@ -28,7 +28,7 @@ class BrowserManagementMetadata {
+ 
+   const gfx::Image& GetManagementLogo() const;
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+  private:
+   void UpdateManagementLogo(Profile* profile);
+   void SetManagementLogo(
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_analysis_service_settings_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_analysis_service_settings_cc
index de2c0dcd0..6db0ae37c 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_analysis_service_settings_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_analysis_service_settings_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc
 --- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig
 +++ chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc
-@@ -142,11 +142,11 @@ AnalysisServiceSettings::AnalysisServiceSettings(
+@@ -150,7 +150,7 @@ AnalysisServiceSettings::AnalysisServiceSettings(
    const char* verification_key = kKeyWindowsVerification;
  #elif BUILDFLAG(IS_MAC)
    const char* verification_key = kKeyMacVerification;
@@ -10,8 +10,3 @@ Index: chrome/browser/enterprise/connectors/analysis/analysis_service_settings.c
    const char* verification_key = kKeyLinuxVerification;
  #endif
  
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const base::Value::Dict& dict = settings_value.GetDict();
-   const base::Value::List* signatures =
-       dict.FindListByDottedPath(verification_key);
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_content_analysis_delegate_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_content_analysis_delegate_cc
deleted file mode 100644
index 2f444056f..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_content_analysis_delegate_cc
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
---- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig
-+++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
-@@ -50,7 +50,7 @@
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/ui_base_types.h"
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/connectors/analysis/content_analysis_sdk_manager.h"  // nogncheck
- #endif
- 
-@@ -557,7 +557,7 @@ void ContentAnalysisDelegate::PageRequestCallback(
- bool ContentAnalysisDelegate::UploadData() {
-   upload_start_time_ = base::TimeTicks::Now();
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // If this is a local content analysis, check if the local agent is ready.
-   // If not, abort early.  This is to prevent doing a lot of work, like reading
-   // files into memory or calcuating SHA256 hashes and prevent a flash of the
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_connectors_manager_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_connectors_manager_cc
deleted file mode 100644
index 2e2764606..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_connectors_manager_cc
+++ /dev/null
@@ -1,83 +0,0 @@
-Index: chrome/browser/enterprise/connectors/connectors_manager.cc
---- chrome/browser/enterprise/connectors/connectors_manager.cc.orig
-+++ chrome/browser/enterprise/connectors/connectors_manager.cc
-@@ -16,7 +16,7 @@
- #include "components/prefs/pref_service.h"
- #include "url/gurl.h"
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/connectors/analysis/content_analysis_sdk_manager.h"  // nogncheck
- #include "chrome/browser/ui/browser.h"
- #include "chrome/browser/ui/browser_list.h"
-@@ -25,7 +25,7 @@
- 
- namespace enterprise_connectors {
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- namespace {
- 
- static constexpr enterprise_connectors::AnalysisConnector
-@@ -51,7 +51,7 @@ ConnectorsManager::ConnectorsManager(
-   DCHECK(browser_crash_event_router_) << "Crash event router is null";
-   DCHECK(extension_install_event_router_) << "Extension event router is null";
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Start observing tab strip models for all browsers.
-   BrowserList* browser_list = BrowserList::GetInstance();
-   for (Browser* browser : *browser_list) {
-@@ -62,14 +62,14 @@ ConnectorsManager::ConnectorsManager(
- 
-   if (observe_prefs) {
-     StartObservingPrefs(pref_service);
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     MaybeCloseLocalContentAnalysisAgentConnection();
- #endif
-   }
-   extension_install_event_router_->StartObserving();
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- ConnectorsManager::~ConnectorsManager() {
-   BrowserList* browser_list = BrowserList::GetInstance();
-   browser_list->RemoveObserver(this);
-@@ -99,7 +99,7 @@ bool ConnectorsManager::IsConnectorEnabled(AnalysisCon
-          base::FeatureList::IsEnabled(kLocalContentAnalysisEnabled);
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool ConnectorsManager::IsConnectorEnabledForLocalAgent(
-     AnalysisConnector connector) const {
-   if (!IsConnectorEnabled(connector)) {
-@@ -178,7 +178,7 @@ absl::optional<AnalysisSettings> ConnectorsManager::Ge
- }
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void ConnectorsManager::OnBrowserAdded(Browser* browser) {
-   browser->tab_strip_model()->AddObserver(this);
- }
-@@ -241,7 +241,7 @@ void ConnectorsManager::CacheAnalysisConnectorPolicy(
-         service_settings, *service_provider_config_);
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void ConnectorsManager::MaybeCloseLocalContentAnalysisAgentConnection() {
-   for (auto connector : kLocalAnalysisConnectors) {
-     if (IsConnectorEnabledForLocalAgent(connector)) {
-@@ -257,7 +257,7 @@ void ConnectorsManager::MaybeCloseLocalContentAnalysis
- 
- void ConnectorsManager::OnPrefChanged(AnalysisConnector connector) {
-   CacheAnalysisConnectorPolicy(connector);
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   MaybeCloseLocalContentAnalysisAgentConnection();
- #endif
- }
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_connectors_manager_h b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_connectors_manager_h
deleted file mode 100644
index c9783f5ce..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_connectors_manager_h
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: chrome/browser/enterprise/connectors/connectors_manager.h
---- chrome/browser/enterprise/connectors/connectors_manager.h.orig
-+++ chrome/browser/enterprise/connectors/connectors_manager.h
-@@ -16,7 +16,7 @@
- #include "third_party/abseil-cpp/absl/types/optional.h"
- #include "url/gurl.h"
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/browser_list_observer.h"
- #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -31,7 +31,7 @@ class BrowserCrashEventRouter;
- // Manages access to Connector policies for a given profile. This class is
- // responsible for caching the Connector policies, validate them against
- // approved service providers and provide a simple interface to them.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- class ConnectorsManager : public BrowserListObserver,
-                           public TabStripModelObserver {
- #else
-@@ -51,7 +51,7 @@ class ConnectorsManager {
-       PrefService* pref_service,
-       const ServiceProviderConfig* config,
-       bool observe_prefs = true);
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   ~ConnectorsManager() override;
- #else
-   ~ConnectorsManager();
-@@ -81,7 +81,7 @@ class ConnectorsManager {
-   bool IsConnectorEnabled(AnalysisConnector connector) const;
-   bool IsConnectorEnabled(ReportingConnector connector) const;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Check if the corresponding connector is enabled for any local agent.
-   bool IsConnectorEnabledForLocalAgent(AnalysisConnector connector) const;
- #endif
-@@ -109,7 +109,7 @@ class ConnectorsManager {
-       const;
- 
-  private:
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // BrowserListObserver overrides:
-   void OnBrowserAdded(Browser* browser) override;
-   void OnBrowserRemoved(Browser* browser) override;
-@@ -132,7 +132,7 @@ class ConnectorsManager {
-   void CacheAnalysisConnectorPolicy(AnalysisConnector connector) const;
-   void CacheReportingConnectorPolicy(ReportingConnector connector);
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Close connection with local agent if all the relevant connectors are turned
-   // off for it.
-   void MaybeCloseLocalContentAnalysisAgentConnection();
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_connectors_service_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_connectors_service_cc
index 0ee2ef7c3..718d8b69f 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_connectors_service_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_connectors_service_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/enterprise/connectors/connectors_service.cc
 --- chrome/browser/enterprise/connectors/connectors_service.cc.orig
 +++ chrome/browser/enterprise/connectors/connectors_service.cc
-@@ -514,7 +514,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
+@@ -519,7 +519,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
  
    Profile* profile = Profile::FromBrowserContext(context_);
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_device_trust_connector_service_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_device_trust_connector_service_factory_cc
index e1d5743ef..14856f23c 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_device_trust_connector_service_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_device_trust_connector_service_factory_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc
 --- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig
 +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc
-@@ -11,7 +11,7 @@
+@@ -10,7 +10,7 @@
  #include "chrome/browser/profiles/profile.h"
  #include "components/keyed_service/core/keyed_service.h"
  
@@ -10,21 +10,21 @@ Index: chrome/browser/enterprise/connectors/device_trust/device_trust_connector_
  #include "chrome/browser/browser_process.h"
  #include "chrome/browser/enterprise/connectors/device_trust/browser/signing_key_policy_observer.h"
  #include "chrome/browser/policy/chrome_browser_policy_connector.h"
-@@ -42,7 +42,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi
+@@ -40,7 +40,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi
  
  bool DeviceTrustConnectorServiceFactory::ServiceIsCreatedWithBrowserContext()
      const {
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   return IsDeviceTrustConnectorFeatureEnabled();
+   return true;
  #else
    return false;
-@@ -78,7 +78,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil
- 
-   auto* service = new DeviceTrustConnectorService(profile->GetPrefs());
+@@ -79,7 +79,7 @@ DeviceTrustConnectorServiceFactory::BuildServiceInstan
+   std::unique_ptr<DeviceTrustConnectorService> service =
+       std::make_unique<DeviceTrustConnectorService>(profile->GetPrefs());
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   if (IsDeviceTrustConnectorFeatureEnabled()) {
-     auto* key_manager = g_browser_process->browser_policy_connector()
-                             ->chrome_browser_cloud_management_controller()
+   auto* key_manager = g_browser_process->browser_policy_connector()
+                           ->chrome_browser_cloud_management_controller()
+                           ->GetDeviceTrustKeyManager();
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_device_trust_service_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_device_trust_service_factory_cc
index 89c977c48..88b9d7e3a 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_device_trust_service_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_device_trust_service_factory_cc
@@ -10,7 +10,7 @@ Index: chrome/browser/enterprise/connectors/device_trust/device_trust_service_fa
  #include "chrome/browser/browser_process.h"
  #include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/browser_attestation_service.h"
  #include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/device_attester.h"
-@@ -56,7 +56,7 @@ bool IsProfileManaged(Profile* profile) {
+@@ -54,7 +54,7 @@ bool IsProfileManaged(Profile* profile) {
    return management_service && management_service->IsManaged();
  }
  
@@ -19,7 +19,7 @@ Index: chrome/browser/enterprise/connectors/device_trust/device_trust_service_fa
  policy::CloudPolicyStore* GetUserCloudPolicyStore(Profile* profile) {
    policy::CloudPolicyManager* user_policy_manager =
        profile->GetUserCloudPolicyManager();
-@@ -106,7 +106,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory()
+@@ -104,7 +104,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory()
    DependsOn(DeviceTrustConnectorServiceFactory::GetInstance());
    DependsOn(policy::ManagementServiceFactory::GetInstance());
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_key_management_browser_commands_key_rotation_command_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_key_management_browser_commands_key_rotation_command_factory_cc
index 8ba670e14..9c8de2dd9 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_key_management_browser_commands_key_rotation_command_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_key_management_browser_commands_key_rotation_command_factory_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc
 --- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig
 +++ chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc
-@@ -13,7 +13,7 @@
+@@ -14,7 +14,7 @@
  
  #if BUILDFLAG(IS_WIN)
  #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.h"
@@ -10,7 +10,7 @@ Index: chrome/browser/enterprise/connectors/device_trust/key_management/browser/
  #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.h"
  #elif BUILDFLAG(IS_MAC)
  #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.h"
-@@ -46,7 +46,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand
+@@ -47,7 +47,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand
      scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) {
  #if BUILDFLAG(IS_WIN)
    return std::make_unique<WinKeyRotationCommand>();
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_browser_crash_event_router_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_browser_crash_event_router_cc
index 92f5ddebc..058652429 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_browser_crash_event_router_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_browser_crash_event_router_cc
@@ -5,8 +5,8 @@ Index: chrome/browser/enterprise/connectors/reporting/browser_crash_event_router
  
  BrowserCrashEventRouter::BrowserCrashEventRouter(
      content::BrowserContext* context) {
--#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
-+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
+-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS)
++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
    CrashReportingContext* crash_reporting_context =
        CrashReportingContext::GetInstance();
    Profile* profile = Profile::FromBrowserContext(context);
@@ -14,8 +14,8 @@ Index: chrome/browser/enterprise/connectors/reporting/browser_crash_event_router
  }
  
  BrowserCrashEventRouter::~BrowserCrashEventRouter() {
--#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
-+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
+-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS)
++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
    CrashReportingContext* crash_reporting_context =
        CrashReportingContext::GetInstance();
    crash_reporting_context->RemoveProfile(this);
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_crash_reporting_context_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_crash_reporting_context_cc
index e5555998f..84ab52eb9 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_crash_reporting_context_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_crash_reporting_context_cc
@@ -5,8 +5,8 @@ Index: chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc
  
  namespace enterprise_connectors {
  
--#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
-+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
+-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS)
++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
  
  namespace {
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime_reporting_client_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime_reporting_client_cc
index 27c8e0c65..0d028cf33 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime_reporting_client_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime_reporting_client_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
 --- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig
 +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
-@@ -54,7 +54,7 @@
+@@ -58,7 +58,7 @@
  #include "base/strings/utf_string_conversions.h"
  #endif
  
@@ -10,7 +10,7 @@ Index: chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.
  #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
  #include "components/device_signals/core/browser/signals_aggregator.h"
  #include "components/device_signals/core/common/signals_constants.h"
-@@ -139,7 +139,7 @@ void UploadSecurityEventReport(base::Value::Dict event
+@@ -132,7 +132,7 @@ void UploadSecurityEventReport(base::Value::Dict event
        std::move(upload_callback));
  }
  
@@ -19,7 +19,7 @@ Index: chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.
  void PopulateSignals(base::Value::Dict event,
                       policy::CloudPolicyClient* client,
                       std::string name,
-@@ -427,7 +427,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
+@@ -420,7 +420,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
                             /*include_profile_user_name=*/false);
  }
  
@@ -28,7 +28,7 @@ Index: chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.
  
  void AddCrowdstrikeSignalsToEvent(
      base::Value::Dict& event,
-@@ -486,7 +486,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp
+@@ -479,7 +479,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp
    if (include_profile_user_name) {
      event.Set(kKeyProfileUserName, GetProfileUserName());
    }
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime_reporting_client_h b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime_reporting_client_h
index bffa6df17..fb26fa666 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime_reporting_client_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime_reporting_client_h
@@ -1,7 +1,7 @@
 Index: chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h
 --- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig
 +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h
-@@ -17,7 +17,7 @@
+@@ -16,7 +16,7 @@
  #include "components/keyed_service/core/keyed_service.h"
  #include "components/policy/core/common/cloud/cloud_policy_client.h"
  
@@ -10,7 +10,7 @@ Index: chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.
  #include "components/device_signals/core/browser/signals_types.h"
  #endif
  
-@@ -194,7 +194,7 @@ class RealtimeReportingClient : public KeyedService,
+@@ -184,7 +184,7 @@ class RealtimeReportingClient : public KeyedService,
    base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this};
  };
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_remote_commands_cbcm_remote_commands_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_remote_commands_cbcm_remote_commands_factory_cc
index 170f42c29..6faed0ed6 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_remote_commands_cbcm_remote_commands_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_remote_commands_cbcm_remote_commands_factory_cc
@@ -7,15 +7,15 @@ Index: chrome/browser/enterprise/remote_commands/cbcm_remote_commands_factory.cc
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.h"  // nogncheck
  #include "chrome/browser/enterprise/remote_commands/rotate_attestation_credential_job.h"
  #include "chrome/browser/policy/chrome_browser_policy_connector.h"
-@@ -31,7 +31,7 @@ CBCMRemoteCommandsFactory::BuildJobForType(
+ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
+@@ -30,7 +30,7 @@ CBCMRemoteCommandsFactory::BuildJobForType(
          g_browser_process->profile_manager());
    }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   if (enterprise_connectors::IsDeviceTrustConnectorFeatureEnabled() &&
-       type == enterprise_management::
+   if (type == enterprise_management::
                    RemoteCommand_Type_BROWSER_ROTATE_ATTESTATION_CREDENTIAL) {
+     return std::make_unique<RotateAttestationCredentialJob>(
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_signals_device_info_fetcher_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_signals_device_info_fetcher_cc
index caad1d915..fdc713f43 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_signals_device_info_fetcher_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_signals_device_info_fetcher_cc
@@ -10,12 +10,12 @@ Index: chrome/browser/enterprise/signals/device_info_fetcher.cc
  #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h"
  #endif
  
-@@ -71,7 +71,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::
-   return std::make_unique<DeviceInfoFetcherMac>();
- #elif BUILDFLAG(IS_WIN)
-   return std::make_unique<DeviceInfoFetcherWin>();
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return std::make_unique<DeviceInfoFetcherLinux>();
- #else
-   return std::make_unique<StubDeviceFetcher>();
+@@ -67,7 +67,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::
+   return CreateInstanceInternal();
+ }
+ 
+-#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) && \
++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) && \
+     !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
+ // static
+ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::CreateInstanceInternal() {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_watermark_watermark_view_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_watermark_watermark_view_cc
new file mode 100644
index 000000000..fe891a993
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_watermark_watermark_view_cc
@@ -0,0 +1,21 @@
+Index: chrome/browser/enterprise/watermark/watermark_view.cc
+--- chrome/browser/enterprise/watermark/watermark_view.cc.orig
++++ chrome/browser/enterprise/watermark/watermark_view.cc
+@@ -33,7 +33,7 @@ const gfx::Font& WatermarkFont() {
+       "Segoe UI",
+ #elif BUILDFLAG(IS_MAC)
+       "SF Pro Text",
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       "Ubuntu",
+ #elif BUILDFLAG(IS_CHROMEOS)
+       "Google Sans",
+@@ -45,7 +45,7 @@ const gfx::Font& WatermarkFont() {
+ }
+ 
+ gfx::Font::Weight WatermarkFontWeight() {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return gfx::Font::Weight::SEMIBOLD;
+ #else
+   return gfx::Font::Weight::MEDIUM;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_BUILD_gn b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_BUILD_gn
index 78294986d..ab9702832 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_BUILD_gn
@@ -1,7 +1,7 @@
 Index: chrome/browser/extensions/BUILD.gn
 --- chrome/browser/extensions/BUILD.gn.orig
 +++ chrome/browser/extensions/BUILD.gn
-@@ -1351,6 +1351,10 @@ static_library("extensions") {
+@@ -1378,6 +1378,10 @@ static_library("extensions") {
      deps += [ "//chrome/services/printing/public/mojom" ]
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_api_browser_context_keyed_service_factories_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_api_browser_context_keyed_service_factories_cc
index 6e0279df4..9b1b20243 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_api_browser_context_keyed_service_factories_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_api_browser_context_keyed_service_factories_cc
@@ -1,16 +1,16 @@
 Index: chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
 --- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig
 +++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
-@@ -42,7 +42,7 @@
- #include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h"
- #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
+@@ -45,7 +45,7 @@
+ #include "printing/buildflags/buildflags.h"
+ #include "services/screen_ai/buildflags/buildflags.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
  #endif
  
-@@ -105,7 +105,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
+@@ -127,7 +127,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
    extensions::SettingsPrivateEventRouterFactory::GetInstance();
    extensions::SettingsOverridesAPI::GetFactoryInstance();
    extensions::SidePanelService::GetFactoryInstance();
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_enterprise_reporting_private_chrome_desktop_report_request_helper_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_enterprise_reporting_private_chrome_desktop_report_request_helper_cc
index 70f2ddba9..9b5b5dfd1 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_enterprise_reporting_private_chrome_desktop_report_request_helper_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_enterprise_reporting_private_chrome_desktop_report_request_helper_cc
@@ -10,7 +10,7 @@ Index: chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop
  #include "base/environment.h"
  #include "base/nix/xdg_util.h"
  #endif
-@@ -256,7 +256,7 @@ base::FilePath GetEndpointVerificationDir() {
+@@ -255,7 +255,7 @@ base::FilePath GetEndpointVerificationDir() {
    bool got_path = false;
  #if BUILDFLAG(IS_WIN)
    got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path);
@@ -19,7 +19,7 @@ Index: chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop
    std::unique_ptr<base::Environment> env(base::Environment::Create());
    path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar,
                                      base::nix::kDotConfigDir);
-@@ -267,7 +267,7 @@ base::FilePath GetEndpointVerificationDir() {
+@@ -266,7 +266,7 @@ base::FilePath GetEndpointVerificationDir() {
    if (!got_path)
      return path;
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_enterprise_reporting_private_conversion_utils_h b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_enterprise_reporting_private_conversion_utils_h
index fc6d6937c..a2eb18ecb 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_enterprise_reporting_private_conversion_utils_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_enterprise_reporting_private_conversion_utils_h
@@ -8,5 +8,5 @@ Index: chrome/browser/extensions/api/enterprise_reporting_private/conversion_uti
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  
+ #include <optional>
  #include <vector>
- 
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_enterprise_reporting_private_enterprise_reporting_private_api_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_enterprise_reporting_private_enterprise_reporting_private_api_cc
index 4217e4c75..bdcd6d68a 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_enterprise_reporting_private_enterprise_reporting_private_api_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_enterprise_reporting_private_enterprise_reporting_private_api_cc
@@ -7,10 +7,10 @@ Index: chrome/browser/extensions/api/enterprise_reporting_private/enterprise_rep
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include <optional>
+ 
  #include "base/strings/string_util.h"
- #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
- #include "chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h"
-@@ -105,7 +105,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
+@@ -106,7 +106,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
    return info;
  }
  
@@ -19,7 +19,7 @@ Index: chrome/browser/extensions/api/enterprise_reporting_private/enterprise_rep
  
  device_signals::SignalsAggregationRequest CreateAggregationRequest(
      device_signals::SignalName signal_name) {
-@@ -166,7 +166,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
+@@ -167,7 +167,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
  
  // getPersistentSecret
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_management_chrome_management_api_delegate_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_management_chrome_management_api_delegate_cc
new file mode 100644
index 000000000..6bb9e6f41
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_management_chrome_management_api_delegate_cc
@@ -0,0 +1,12 @@
+Index: chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
+--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig
++++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
+@@ -408,7 +408,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel
+   apps::LaunchContainer launch_container =
+       GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension);
+   Profile* profile = Profile::FromBrowserContext(context);
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (extensions::IsExtensionUnsupportedDeprecatedApp(profile,
+                                                       extension->id())) {
+     return false;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_messaging_native_process_launcher_posix_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_messaging_native_process_launcher_posix_cc
index 0a6210957..c08390e70 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_messaging_native_process_launcher_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_messaging_native_process_launcher_posix_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc
 --- chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc.orig
 +++ chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc
-@@ -82,7 +82,7 @@ bool NativeProcessLauncher::LaunchNativeProcess(
+@@ -84,7 +84,7 @@ bool NativeProcessLauncher::LaunchNativeProcess(
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_passwords_private_passwords_private_delegate_impl_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_passwords_private_passwords_private_delegate_impl_cc
index 057118a80..8707f713a 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_passwords_private_passwords_private_delegate_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_passwords_private_passwords_private_delegate_impl_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
 --- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig
 +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
-@@ -593,7 +593,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
+@@ -605,7 +605,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
  }
  
  void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_runtime_chrome_runtime_api_delegate_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_runtime_chrome_runtime_api_delegate_cc
index bafeca58d..6d1cfa7a3 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_runtime_chrome_runtime_api_delegate_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_runtime_chrome_runtime_api_delegate_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
 --- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig
 +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
-@@ -280,7 +280,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
+@@ -284,7 +284,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
    } else if (strcmp(os, "linux") == 0) {
      info->os = extensions::api::runtime::PlatformOs::kLinux;
    } else if (strcmp(os, "openbsd") == 0) {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_settings_private_prefs_util_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_settings_private_prefs_util_cc
index f026017d6..c56bae764 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_settings_private_prefs_util_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_settings_private_prefs_util_cc
@@ -1,21 +1,21 @@
 Index: chrome/browser/extensions/api/settings_private/prefs_util.cc
 --- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig
 +++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -202,7 +202,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
    (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] =
-       settings_api::PrefType::PREF_TYPE_BOOLEAN;
+       settings_api::PrefType::kBoolean;
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    (*s_allowlist)[::prefs::kUseCustomChromeFrame] =
-       settings_api::PrefType::PREF_TYPE_BOOLEAN;
+       settings_api::PrefType::kBoolean;
  #endif
-@@ -208,7 +208,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
-       settings_api::PrefType::PREF_TYPE_STRING;
-   (*s_allowlist)[::prefs::kPolicyThemeColor] =
-       settings_api::PrefType::PREF_TYPE_NUMBER;
+@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+   // Appearance settings.
+   (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
+   (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber;
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   (*s_allowlist)[::prefs::kUsesSystemThemeDeprecated] =
-       settings_api::PrefType::PREF_TYPE_BOOLEAN;
-   (*s_allowlist)[::prefs::kSystemTheme] =
+   (*s_allowlist)[::prefs::kSystemTheme] = settings_api::PrefType::kNumber;
+ #endif
+   (*s_allowlist)[::prefs::kHomePage] = settings_api::PrefType::kUrl;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_tabs_tabs_api_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_tabs_tabs_api_cc
index f30ee14d5..06cdcb641 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_tabs_tabs_api_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_tabs_tabs_api_cc
@@ -1,12 +1,12 @@
 Index: chrome/browser/extensions/api/tabs/tabs_api.cc
 --- chrome/browser/extensions/api/tabs/tabs_api.cc.orig
 +++ chrome/browser/extensions/api/tabs/tabs_api.cc
-@@ -833,7 +833,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
- // ui::SHOW_STATE_MINIMIZED above, on Linux the window is not created as
+@@ -867,7 +867,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
  // minimized.
  // TODO(crbug.com/1410400): Remove this workaround when linux is fixed.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // TODO(crbug.com/1410400): Find a fix for wayland as well.
- 
- // Must be defined inside IS_LINUX to compile on windows/mac.
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
+   if (new_window->initial_show_state() == ui::SHOW_STATE_MINIMIZED) {
+     new_window->window()->Minimize();
+   }
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_webrtc_logging_private_webrtc_logging_private_api_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_webrtc_logging_private_webrtc_logging_private_api_cc
index 76e55739f..dc0643702 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_webrtc_logging_private_webrtc_logging_private_api_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_webrtc_logging_private_webrtc_logging_private_api_cc
@@ -19,7 +19,7 @@ Index: chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_priva
    if (extension) {
      enabled_by_permissions =
          extension->permissions_data()->active_permissions().HasAPIPermission(
-@@ -580,7 +580,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
+@@ -576,7 +576,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
  
  ExtensionFunction::ResponseAction
  WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_webstore_private_webstore_private_api_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_webstore_private_webstore_private_api_cc
index 09e9cabd4..83f76c1fa 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_webstore_private_webstore_private_api_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_webstore_private_webstore_private_api_cc
@@ -1,10 +1,10 @@
 Index: chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 --- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig
 +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-@@ -901,7 +901,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
-         RequestExtensionApproval(contents);
-         return;
-       }
+@@ -922,7 +922,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
+ #if BUILDFLAG(IS_CHROMEOS)
+       RequestExtensionApproval(contents);
+       return;
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
        // Shows a parental permission dialog directly bypassing the extension
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_external_provider_impl_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_external_provider_impl_cc
index 1df1de808..3d7bde6e7 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_external_provider_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_external_provider_impl_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/extensions/external_provider_impl.cc
 --- chrome/browser/extensions/external_provider_impl.cc.orig
 +++ chrome/browser/extensions/external_provider_impl.cc
-@@ -829,7 +829,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -830,7 +830,7 @@ void ExternalProviderImpl::CreateExternalProviders(
    if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -10,7 +10,7 @@ Index: chrome/browser/extensions/external_provider_impl.cc
      provider_list->push_back(std::make_unique<ExternalProviderImpl>(
          service,
          base::MakeRefCounted<ExternalPrefLoader>(
-@@ -857,7 +857,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -858,7 +858,7 @@ void ExternalProviderImpl::CreateExternalProviders(
          bundled_extension_creation_flags));
  
      // Define a per-user source of external extensions.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_file_system_access_chrome_file_system_access_permission_context_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_file_system_access_chrome_file_system_access_permission_context_cc
index 37f94d03c..40a203db8 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_file_system_access_chrome_file_system_access_permission_context_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_file_system_access_chrome_file_system_access_permission_context_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
 --- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig
 +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
-@@ -313,7 +313,7 @@ const struct {
+@@ -316,7 +316,7 @@ const struct {
       FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
       kDontBlockChildren},
  #endif
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_cc
index 5ea42198a..bd4b9b210 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_cc
@@ -1,16 +1,25 @@
 Index: chrome/browser/flag_descriptions.cc
 --- chrome/browser/flag_descriptions.cc.orig
 +++ chrome/browser/flag_descriptions.cc
-@@ -2560,7 +2560,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P
- const char kWebUIOmniboxPopupDescription[] =
-     "If enabled, shows the omnibox suggestions popup in WebUI.";
+@@ -2950,7 +2950,7 @@ const char kCbdTimeframeRequiredDescription[] =
+     "value to the list.";
  
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- const char kWebUiSystemFontName[] = "WebUI System font";
- const char kWebUiSystemFontDescription[] =
-     "If enabled, all WebUI surfaces will use the default UI font of the "
-@@ -7044,7 +7044,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS_ASH)
++    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ const char kPolicyIndicationForManagedDefaultSearchName[] =
+     "Enable policy indication for managed Default Search provider";
+ const char kPolicyIndicationForManagedDefaultSearchDescription[] =
+@@ -3263,7 +3263,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
+     "but in the same SiteInstanceGroup, and thus the same process.";
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy";
+ const char kSiteSearchSettingsPolicyDescription[] =
+     "Allow site search engines to be defined by the SiteSearchSettings policy.";
+@@ -7500,7 +7500,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
      "Enables sharing common areas of icudtl.dat between Ash and Lacros.";
  #endif  // #if BUILDFLAG(IS_CHROMEOS_LACROS)
  
@@ -19,17 +28,17 @@ Index: chrome/browser/flag_descriptions.cc
  const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
  const char kGetAllScreensMediaDescription[] =
      "When enabled, the getAllScreensMedia API for capturing multiple screens "
-@@ -7258,7 +7258,7 @@ const char kSearchWebInSidePanelDescription[] =
- // Random platform combinations -----------------------------------------------
+@@ -7760,7 +7760,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] 
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- const char kQuickCommandsName[] = "Quick Commands";
- const char kQuickCommandsDescription[] =
-     "Enable a text interface to browser features. Invoke with Ctrl-Space.";
-@@ -7267,7 +7267,7 @@ const char kQuickCommandsDescription[] =
-         // BUILDFLAG(IS_FUCHSIA)
+ // Linux -----------------------------------------------------------------------
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char kOzonePlatformHintChoiceDefault[] = "Default";
+ const char kOzonePlatformHintChoiceAuto[] = "Auto";
+ const char kOzonePlatformHintChoiceX11[] = "X11";
+@@ -7808,7 +7808,7 @@ const char kZeroCopyVideoCaptureDescription[] =
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS)
@@ -37,7 +46,7 @@ Index: chrome/browser/flag_descriptions.cc
  const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
  const char kFollowingFeedSidepanelDescription[] =
      "Enables the following feed in the sidepanel.";
-@@ -7282,7 +7282,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] 
+@@ -7823,7 +7823,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] 
      "instead of JSON.";
  #endif
  
@@ -46,16 +55,7 @@ Index: chrome/browser/flag_descriptions.cc
  const char kEnableNetworkServiceSandboxName[] =
      "Enable the network service sandbox.";
  const char kEnableNetworkServiceSandboxDescription[] =
-@@ -7306,7 +7306,7 @@ const char kWebShareDescription[] =
-     "platforms.";
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
- const char kOzonePlatformHintChoiceDefault[] = "Default";
- const char kOzonePlatformHintChoiceAuto[] = "Auto";
- const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -7326,7 +7326,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
+@@ -7855,7 +7855,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
      "Bluetooth";
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
  
@@ -64,8 +64,8 @@ Index: chrome/browser/flag_descriptions.cc
  const char kSkipUndecryptablePasswordsName[] =
      "Skip undecryptable passwords to use the available decryptable "
      "passwords.";
-@@ -7340,7 +7340,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
-     "storage and requests initial sync.";
+@@ -7875,7 +7875,7 @@ const char kRestartToGainAccessToKeychainDescription[]
+     "to restart Chrome to gain access to computer's password manager.";
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -73,7 +73,7 @@ Index: chrome/browser/flag_descriptions.cc
  const char kAsyncDnsName[] = "Async DNS resolver";
  const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-@@ -7447,7 +7447,7 @@ const char kElasticOverscrollDescription[] =
+@@ -7976,7 +7976,7 @@ const char kElementCaptureDescription[] =
  
  #if BUILDFLAG(IS_WIN) ||                                      \
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -82,18 +82,9 @@ Index: chrome/browser/flag_descriptions.cc
  const char kUIDebugToolsName[] = "Debugging tools for UI";
  const char kUIDebugToolsDescription[] =
      "Enables additional keyboard shortcuts to help debugging.";
-@@ -7459,7 +7459,7 @@ const char kSyncPollImmediatelyOnEveryStartupDescripti
- #endif
- 
- #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
--    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- const char kDataRetentionPoliciesDisableSyncTypesNeededName[] =
-     "Data Retention Policies Disable Sync Types";
- const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[] =
-@@ -7504,7 +7504,7 @@ const char kEnableAudioFocusEnforcementDescription[] =
-     "any one time. Requires #enable-media-session-service to be enabled too.";
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -8025,7 +8025,7 @@ const char kComposeTextSelectionDescription[] =
+     "Enables feature for different heuristics for selecting text for Compose";
+ #endif  // BUILDFLAG(ENABLE_COMPOSE)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_h b/www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_h
index 355b16dab..e45053239 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_h
@@ -1,16 +1,25 @@
 Index: chrome/browser/flag_descriptions.h
 --- chrome/browser/flag_descriptions.h.orig
 +++ chrome/browser/flag_descriptions.h
-@@ -1455,7 +1455,7 @@ extern const char kOmnibox2023RefreshConnectionSecurit
- extern const char kWebUIOmniboxPopupName[];
- extern const char kWebUIOmniboxPopupDescription[];
+@@ -1712,7 +1712,7 @@ extern const char kCbdTimeframeRequiredName[];
+ extern const char kCbdTimeframeRequiredDescription[];
  
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- extern const char kWebUiSystemFontName[];
- extern const char kWebUiSystemFontDescription[];
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS_ASH)
++    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ extern const char kPolicyIndicationForManagedDefaultSearchName[];
+ extern const char kPolicyIndicationForManagedDefaultSearchDescription[];
  #endif
-@@ -4039,7 +4039,7 @@ extern const char kLacrosMergeIcuDataFileName[];
+@@ -1893,7 +1893,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
+ extern const char kSiteInstanceGroupsForDataUrlsDescription[];
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ extern const char kSiteSearchSettingsPolicyName[];
+ extern const char kSiteSearchSettingsPolicyDescription[];
+ #endif
+@@ -4326,7 +4326,7 @@ extern const char kLacrosMergeIcuDataFileName[];
  extern const char kLacrosMergeIcuDataFileDescription[];
  #endif  // #if BUILDFLAG(IS_CHROMEOS_LACROS)
  
@@ -19,43 +28,26 @@ Index: chrome/browser/flag_descriptions.h
  extern const char kGetAllScreensMediaName[];
  extern const char kGetAllScreensMediaDescription[];
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -4169,14 +4169,14 @@ extern const char kSearchWebInSidePanelDescription[];
- // Random platform combinations -----------------------------------------------
+@@ -4474,7 +4474,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- extern const char kQuickCommandsName[];
- extern const char kQuickCommandsDescription[];
- 
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // defined (OS_FUCHSIA)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- extern const char kWebShareName[];
- extern const char kWebShareDescription[];
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-@@ -4186,7 +4186,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
- extern const char kWebBluetoothConfirmPairingSupportDescription[];
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+ // Linux ---------------------------------------------------------------------
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  extern const char kOzonePlatformHintChoiceDefault[];
  extern const char kOzonePlatformHintChoiceAuto[];
  extern const char kOzonePlatformHintChoiceX11[];
-@@ -4196,7 +4196,7 @@ extern const char kOzonePlatformHintName[];
- extern const char kOzonePlatformHintDescription[];
- #endif  // BUILDFLAG(IS_LINUX)
+@@ -4516,7 +4516,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
+ extern const char kWebBluetoothConfirmPairingSupportDescription[];
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
  extern const char kSkipUndecryptablePasswordsName[];
  extern const char kSkipUndecryptablePasswordsDescription[];
  
-@@ -4204,13 +4204,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
- extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
+@@ -4527,13 +4527,13 @@ extern const char kRestartToGainAccessToKeychainName[]
+ extern const char kRestartToGainAccessToKeychainDescription[];
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -70,7 +62,7 @@ Index: chrome/browser/flag_descriptions.h
  extern const char kFollowingFeedSidepanelName[];
  extern const char kFollowingFeedSidepanelDescription[];
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -4221,7 +4221,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
+@@ -4544,7 +4544,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
  extern const char kEnableProtoApiForClassifyUrlDescription[];
  #endif  // BUILDFLAG(ENABLE_SUPERVISED_USERS)
  
@@ -79,7 +71,7 @@ Index: chrome/browser/flag_descriptions.h
  extern const char kEnableNetworkServiceSandboxName[];
  extern const char kEnableNetworkServiceSandboxDescription[];
  
-@@ -4303,7 +4303,7 @@ extern const char kElasticOverscrollDescription[];
+@@ -4621,7 +4621,7 @@ extern const char kElementCaptureDescription[];
  
  #if BUILDFLAG(IS_WIN) ||                                      \
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -88,21 +80,12 @@ Index: chrome/browser/flag_descriptions.h
  extern const char kUIDebugToolsName[];
  extern const char kUIDebugToolsDescription[];
  
-@@ -4312,7 +4312,7 @@ extern const char kSyncPollImmediatelyOnEveryStartupDe
- #endif
- 
- #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
--    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- extern const char kDataRetentionPoliciesDisableSyncTypesNeededName[];
- extern const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[];
- #endif
-@@ -4339,7 +4339,7 @@ extern const char kEnableAudioFocusEnforcementName[];
- extern const char kEnableAudioFocusEnforcementDescription[];
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -4655,7 +4655,7 @@ extern const char kComposeTextSelectionName[];
+ extern const char kComposeTextSelectionDescription[];
+ #endif  // BUILDFLAG(ENABLE_COMPOSE)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  extern const char kThirdPartyProfileManagementName[];
  extern const char kThirdPartyProfileManagementDescription[];
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+ 
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_headless_headless_mode_util_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_headless_headless_mode_util_cc
index 06c976207..9ac18d5d8 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_headless_headless_mode_util_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_headless_headless_mode_util_cc
@@ -1,27 +1,21 @@
 Index: chrome/browser/headless/headless_mode_util.cc
 --- chrome/browser/headless/headless_mode_util.cc.orig
 +++ chrome/browser/headless/headless_mode_util.cc
-@@ -10,12 +10,12 @@
- // New headless mode is available on Linux, Windows and Mac platforms.
- // More platforms will be added later, so avoid function level clutter
- // by providing stub implementations at the end of the file.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- 
- #include "base/base_switches.h"
+@@ -19,7 +19,7 @@
  #include "chrome/common/chrome_switches.h"
+ #include "content/public/common/content_switches.h"
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "ui/gl/gl_switches.h"               // nogncheck
  #include "ui/ozone/public/ozone_switches.h"  // nogncheck
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -73,7 +73,7 @@ void SetUpCommandLine(const base::CommandLine* command
-         ::switches::kNoErrorDialogs);
-   }
+@@ -87,7 +87,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand
+       command_line->AppendSwitchPath(switches::kUserDataDir, GetUserDataDir());
+     }
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Headless mode on Linux relies on ozone/headless platform.
-   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-       ::switches::kOzonePlatform, switches::kHeadless);
+   command_line->AppendSwitchASCII(::switches::kOzonePlatform,
+                                   switches::kHeadless);
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_intranet_redirect_detector_h b/www/ungoogled-chromium/patches/patch-chrome_browser_intranet_redirect_detector_h
index e563825d4..9b0402bb7 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_intranet_redirect_detector_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_intranet_redirect_detector_h
@@ -1,7 +1,7 @@
 Index: chrome/browser/intranet_redirect_detector.h
 --- chrome/browser/intranet_redirect_detector.h.orig
 +++ chrome/browser/intranet_redirect_detector.h
-@@ -27,7 +27,7 @@ class SimpleURLLoader;
+@@ -25,7 +25,7 @@ class SimpleURLLoader;
  class PrefRegistrySimple;
  
  #if !(BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_media_galleries_media_file_system_registry_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_media_galleries_media_file_system_registry_cc
index 7d07c8cfe..5bf05534b 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_media_galleries_media_file_system_registry_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_media_galleries_media_file_system_registry_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/media_galleries/media_file_system_registry.cc
 --- chrome/browser/media_galleries/media_file_system_registry.cc.orig
 +++ chrome/browser/media_galleries/media_file_system_registry.cc
-@@ -586,7 +586,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
+@@ -584,7 +584,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
  // Constructor in 'private' section because depends on private class definition.
  MediaFileSystemRegistry::MediaFileSystemRegistry()
      : file_system_context_(new MediaFileSystemContextImpl) {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_media_router_discovery_BUILD_gn b/www/ungoogled-chromium/patches/patch-chrome_browser_media_router_discovery_BUILD_gn
index d0d310804..f2652bbcb 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_media_router_discovery_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_media_router_discovery_BUILD_gn
@@ -1,9 +1,9 @@
 Index: chrome/browser/media/router/discovery/BUILD.gn
 --- chrome/browser/media/router/discovery/BUILD.gn.orig
 +++ chrome/browser/media/router/discovery/BUILD.gn
-@@ -80,7 +80,7 @@ static_library("discovery") {
-     "media_sink_discovery_metrics.h",
+@@ -81,7 +81,7 @@ static_library("discovery") {
    ]
+   configs += [ "//build/config/compiler:wexit_time_destructors" ]
  
 -  if (is_linux || is_chromeos) {
 +  if ((is_linux || is_chromeos) && !is_bsd) {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_chrome_screen_enumerator_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_chrome_screen_enumerator_cc
index 61db893b7..c81981efd 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_chrome_screen_enumerator_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_chrome_screen_enumerator_cc
@@ -10,8 +10,8 @@ Index: chrome/browser/media/webrtc/chrome_screen_enumerator.cc
  #include "base/functional/callback.h"
  #include "content/public/browser/desktop_capture.h"
  #endif
-@@ -32,7 +32,7 @@ base::LazyInstance<std::vector<aura::Window*>>::Destru
-     root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER;
+@@ -32,7 +32,7 @@ base::LazyInstance<std::vector<raw_ptr<aura::Window, V
+     DestructorAtExit root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER;
  }  // namespace
  
 -#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
@@ -19,7 +19,7 @@ Index: chrome/browser/media/webrtc/chrome_screen_enumerator.cc
  namespace {
  base::LazyInstance<std::unique_ptr<webrtc::DesktopCapturer>>::DestructorAtExit
      g_desktop_capturer_for_testing = LAZY_INSTANCE_INITIALIZER;
-@@ -78,7 +78,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens(
+@@ -79,7 +79,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens(
    return stream_devices_set;
  }
  
@@ -28,7 +28,7 @@ Index: chrome/browser/media/webrtc/chrome_screen_enumerator.cc
  blink::mojom::StreamDevicesSetPtr EnumerateScreens(
      blink::mojom::MediaStreamType stream_type) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-@@ -129,7 +129,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting(
+@@ -130,7 +130,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting(
    root_windows_for_testing_.Get() = std::move(root_windows);
  }
  
@@ -38,8 +38,8 @@ Index: chrome/browser/media/webrtc/chrome_screen_enumerator.cc
      std::unique_ptr<webrtc::DesktopCapturer> capturer) {
    g_desktop_capturer_for_testing.Get() = std::move(capturer);
 @@ -143,7 +143,7 @@ void ChromeScreenEnumerator::EnumerateScreens(
+     ScreensCallback screens_callback) const {
    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-   DCHECK(base::FeatureList::IsEnabled(blink::features::kGetAllScreensMedia));
  
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_chrome_screen_enumerator_h b/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_chrome_screen_enumerator_h
index fe3d4f034..569c17d2f 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_chrome_screen_enumerator_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_chrome_screen_enumerator_h
@@ -1,7 +1,7 @@
 Index: chrome/browser/media/webrtc/chrome_screen_enumerator.h
 --- chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig
 +++ chrome/browser/media/webrtc/chrome_screen_enumerator.h
-@@ -21,7 +21,7 @@ namespace aura {
+@@ -20,7 +20,7 @@ namespace aura {
  class Window;
  }
  
@@ -11,9 +11,9 @@ Index: chrome/browser/media/webrtc/chrome_screen_enumerator.h
  class DesktopCapturer;
  }
 @@ -42,7 +42,7 @@ class ChromeScreenEnumerator : public media::ScreenEnu
- 
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-   static void SetRootWindowsForTesting(std::vector<aura::Window*> root_windows);
+   static void SetRootWindowsForTesting(
+       std::vector<raw_ptr<aura::Window, VectorExperimental>> root_windows);
 -#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    static void SetDesktopCapturerForTesting(
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_desktop_media_picker_controller_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_desktop_media_picker_controller_cc
new file mode 100644
index 000000000..f05b7bcf6
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_desktop_media_picker_controller_cc
@@ -0,0 +1,12 @@
+Index: chrome/browser/media/webrtc/desktop_media_picker_controller.cc
+--- chrome/browser/media/webrtc/desktop_media_picker_controller.cc.orig
++++ chrome/browser/media/webrtc/desktop_media_picker_controller.cc
+@@ -92,7 +92,7 @@ bool DesktopMediaPickerController::IsSystemAudioCaptur
+   } else {
+     return base::FeatureList::IsEnabled(media::kMacLoopbackAudioForScreenShare);
+   }
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (request_source == Params::RequestSource::kCast) {
+     return base::FeatureList::IsEnabled(media::kPulseaudioLoopbackForCast);
+   } else {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader_cc
deleted file mode 100644
index 287d02670..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig
-+++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
-@@ -42,7 +42,7 @@ const char kProduct[] = "Chrome";
- const char kProduct[] = "Chrome_Mac";
- #elif BUILDFLAG(IS_CHROMEOS_ASH)
- const char kProduct[] = "Chrome_ChromeOS";
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- const char kProduct[] = "Chrome_Linux";
- #elif BUILDFLAG(IS_ANDROID)
- const char kProduct[] = "Chrome_Android";
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_log_uploader_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_log_uploader_cc
index 32827f4da..175d0e726 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_log_uploader_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_log_uploader_cc
@@ -1,14 +1,12 @@
 Index: chrome/browser/media/webrtc/webrtc_log_uploader.cc
 --- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig
 +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -291,6 +291,10 @@ void WebRtcLogUploader::SetupMultipart(
-   const char product[] = "Chrome_ChromeOS";
- #elif BUILDFLAG(IS_FUCHSIA)
-   const char product[] = "Chrome_Fuchsia";
-+#elif defined(OS_OPENBSD)
-+  const char product[] = "Chrome_OpenBSD";
-+#elif defined(OS_FREEBSD)
-+  const char product[] = "Chrome_FreeBSD";
+@@ -100,7 +100,7 @@ std::string GetLogUploadProduct() {
+   const char product[] = "Chrome_Mac";
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+ #if !defined(ADDRESS_SANITIZER)
+   const char product[] = "Chrome_Linux";
  #else
- #error Platform not supported.
- #endif
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_logging_controller_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_logging_controller_cc
index 6d9af0f75..c95c5819d 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_logging_controller_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_logging_controller_cc
@@ -14,7 +14,7 @@ Index: chrome/browser/media/webrtc/webrtc_logging_controller.cc
  
  using webrtc_event_logging::WebRtcEventLogManager;
  
-@@ -284,7 +284,7 @@ void WebRtcLoggingController::StartEventLogging(
+@@ -288,7 +288,7 @@ void WebRtcLoggingController::StartEventLogging(
        web_app_id, callback);
  }
  
@@ -23,7 +23,7 @@ Index: chrome/browser/media/webrtc/webrtc_logging_controller.cc
  void WebRtcLoggingController::GetLogsDirectory(
      LogsDirectoryCallback callback,
      LogsDirectoryErrorCallback error_callback) {
-@@ -329,7 +329,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess
+@@ -334,7 +334,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess
        FROM_HERE,
        base::BindOnce(std::move(callback), file_system.id(), registered_name));
  }
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_logging_controller_h b/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_logging_controller_h
index e61aa6b8f..f0f351114 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_logging_controller_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_logging_controller_h
@@ -1,7 +1,7 @@
 Index: chrome/browser/media/webrtc/webrtc_logging_controller.h
 --- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig
 +++ chrome/browser/media/webrtc/webrtc_logging_controller.h
-@@ -134,7 +134,7 @@ class WebRtcLoggingController
+@@ -133,7 +133,7 @@ class WebRtcLoggingController
                           size_t web_app_id,
                           const StartEventLoggingCallback& callback);
  
@@ -10,7 +10,7 @@ Index: chrome/browser/media/webrtc/webrtc_logging_controller.h
    // Ensures that the WebRTC Logs directory exists and then grants render
    // process access to the 'WebRTC Logs' directory, and invokes |callback| with
    // the ids necessary to create a DirectoryEntry object.
-@@ -199,7 +199,7 @@ class WebRtcLoggingController
+@@ -197,7 +197,7 @@ class WebRtcLoggingController
  
    content::BrowserContext* GetBrowserContext() const;
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_memory_details_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_memory_details_cc
index e4a52adae..1b8a6d17c 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_memory_details_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_memory_details_cc
@@ -11,7 +11,7 @@ Index: chrome/browser/memory_details.cc
  #endif
  
 @@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
-           std::ref(process)));
+           });
      }
  
 -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc
index 6a54ec6b1..c17c49673 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
 --- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig
 +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -79,8 +79,10 @@
+@@ -80,8 +80,10 @@
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -13,7 +13,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
  
  #include "base/linux_util.h"
  #include "base/strings/string_split.h"
-@@ -109,7 +111,7 @@
+@@ -106,7 +108,7 @@
  #include "chromeos/crosapi/cpp/crosapi_constants.h"
  #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
  
@@ -22,7 +22,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
  #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -118,7 +120,7 @@
+@@ -115,7 +117,7 @@
  #include "components/user_manager/user_manager.h"
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -31,7 +31,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
  #include "components/power_metrics/system_power_monitor.h"
  #endif
  
-@@ -931,7 +933,7 @@ void RecordStartupMetrics() {
+@@ -860,7 +862,7 @@ void RecordStartupMetrics() {
  
    // Record whether Chrome is the default browser or not.
    // Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@@ -40,7 +40,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
    shell_integration::DefaultWebClientState default_state =
        shell_integration::GetDefaultBrowser();
    base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
-@@ -1260,11 +1262,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
+@@ -1164,11 +1166,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
    }
  #endif  // !BUILDFLAG(IS_ANDROID)
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_h b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_h
index 243942706..1fd53ce6d 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_h
@@ -1,7 +1,7 @@
 Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
 --- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig
 +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
-@@ -33,7 +33,7 @@ class PowerMetricsReporter;
+@@ -28,7 +28,7 @@ class PowerMetricsReporter;
  class ProcessMonitor;
  #endif
  
@@ -10,7 +10,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
  class PressureMetricsReporter;
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -139,7 +139,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro
+@@ -115,7 +115,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro
    std::unique_ptr<BatteryDischargeReporter> battery_discharge_reporter_;
  #endif  // !BUILDFLAG(IS_ANDROID)
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_metrics_service_client_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_metrics_service_client_cc
index d26a08e3f..d8d2b25b3 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_metrics_service_client_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_metrics_service_client_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/metrics/chrome_metrics_service_client.cc
 --- chrome/browser/metrics/chrome_metrics_service_client.cc.orig
 +++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -183,7 +183,7 @@
+@@ -194,7 +194,7 @@
  #include "chrome/notification_helper/notification_helper_constants.h"
  #endif
  
@@ -10,16 +10,34 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
  #include "components/metrics/motherboard_metrics_provider.h"
  #endif
  
-@@ -209,7 +209,7 @@
+@@ -211,7 +211,7 @@
+ #include "chrome/browser/metrics/power/power_metrics_provider_mac.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/metrics/bluetooth_metrics_provider.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/metrics/family_link_user_metrics_provider.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS_LACROS))||BUILDFLAG(IS_ANDROID))
-@@ -809,7 +809,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -577,7 +577,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   metrics::structured::StructuredMetricsService::RegisterPrefs(registry);
+ 
+ #if !BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -749,7 +749,7 @@ void ChromeMetricsServiceClient::Initialize() {
+     RegisterUKMProviders();
+   }
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_CHROMEOS_ASH)
++    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+   metrics::structured::Recorder::GetInstance()->SetUiTaskRunner(
+       base::SequencedTaskRunner::GetCurrentDefault());
+ #endif
+@@ -796,7 +796,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<metrics::CPUMetricsProvider>());
  
@@ -28,16 +46,16 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<metrics::MotherboardMetricsProvider>());
  #endif
-@@ -891,7 +891,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
- 
+@@ -881,7 +881,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+-    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
-@@ -1007,7 +1007,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
+@@ -991,7 +991,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
        std::make_unique<PowerMetricsProvider>());
  #endif
  
@@ -46,12 +64,21 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
    metrics_service_->RegisterMetricsProvider(
        metrics::CreateDesktopSessionMetricsProvider());
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
-@@ -1206,7 +1206,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
- #endif
+@@ -1170,7 +1170,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+-    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
    // This creates the DesktopProfileSessionDurationsServices if it didn't exist
    // already.
+   metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(
+@@ -1513,7 +1513,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
+   recorder =
+       std::make_unique<metrics::structured::AshStructuredMetricsRecorder>(
+           cros_system_profile_provider_.get());
+-#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ 
+   // Make sure that Structured Metrics recording delegates have been created
+   // before the service is created. This is handled in other places for ChromeOS
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_metrics_recorder_util_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_metrics_recorder_util_cc
index 1e7308ee8..a560b14ee 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_metrics_recorder_util_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_metrics_recorder_util_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/metrics/power/process_metrics_recorder_util.cc
 --- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig
 +++ chrome/browser/metrics/power/process_metrics_recorder_util.cc
-@@ -59,7 +59,7 @@ void RecordProcessHistograms(const char* histogram_suf
+@@ -65,7 +65,7 @@ void RecordProcessHistograms(const char* histogram_suf
                               const ProcessMonitor::Metrics& metrics) {
    RecordAverageCPUUsage(histogram_suffix, metrics.cpu_usage);
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_monitor_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_monitor_cc
index 130758aab..f72e30249 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_monitor_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_monitor_cc
@@ -1,8 +1,8 @@
 Index: chrome/browser/metrics/power/process_monitor.cc
 --- chrome/browser/metrics/power/process_monitor.cc.orig
 +++ chrome/browser/metrics/power/process_monitor.cc
-@@ -65,7 +65,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
- #endif
+@@ -61,7 +61,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
+   metrics.cpu_usage = process_metrics.GetPlatformIndependentCPUUsage();
  
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_AIX)
@@ -10,8 +10,8 @@ Index: chrome/browser/metrics/power/process_monitor.cc
    metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond();
  #endif
  #if BUILDFLAG(IS_MAC)
-@@ -82,7 +82,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do
-   metrics->cpu_usage *= factor;
+@@ -79,7 +79,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do
+   }
  
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_AIX)
@@ -19,8 +19,8 @@ Index: chrome/browser/metrics/power/process_monitor.cc
    metrics->idle_wakeups *= factor;
  #endif
  
-@@ -174,7 +174,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
-   lhs.cpu_usage += rhs.cpu_usage;
+@@ -167,7 +167,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
+   }
  
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_AIX)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_monitor_h b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_monitor_h
index fc3017314..f678cc5e5 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_monitor_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_monitor_h
@@ -1,8 +1,8 @@
 Index: chrome/browser/metrics/power/process_monitor.h
 --- chrome/browser/metrics/power/process_monitor.h.orig
 +++ chrome/browser/metrics/power/process_monitor.h
-@@ -75,7 +75,7 @@ class ProcessMonitor : public content::BrowserChildPro
-     double cpu_usage = 0.0;
+@@ -76,7 +76,7 @@ class ProcessMonitor : public content::BrowserChildPro
+     std::optional<double> cpu_usage;
  
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_AIX)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_net_system_network_context_manager_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_net_system_network_context_manager_cc
index 9f92440b7..0c8b0b9a4 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_net_system_network_context_manager_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_net_system_network_context_manager_cc
@@ -1,16 +1,34 @@
 Index: chrome/browser/net/system_network_context_manager.cc
 --- chrome/browser/net/system_network_context_manager.cc.orig
 +++ chrome/browser/net/system_network_context_manager.cc
-@@ -93,7 +93,7 @@
+@@ -94,7 +94,7 @@
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
  #include "chrome/common/chrome_paths_internal.h"
- #include "chrome/grit/chromium_strings.h"
+ #include "chrome/grit/branded_strings.h"
  #include "ui/base/l10n/l10n_util.h"
-@@ -184,7 +184,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -139,7 +139,7 @@ SystemNetworkContextManager* g_system_network_context_
+ // received a failed launch for a sandboxed network service.
+ bool g_previously_failed_to_launch_sandboxed_service = false;
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Whether kerberos library loading will work in the network service due to the
+ // sandbox.
+ bool g_network_service_will_allow_gssapi_library_load = false;
+@@ -147,7 +147,7 @@ bool g_network_service_will_allow_gssapi_library_load 
+ const char* kGssapiDesiredPref =
+ #if BUILDFLAG(IS_CHROMEOS)
+     prefs::kKerberosEnabled;
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     prefs::kReceivedHttpAuthNegotiateHeader;
+ #endif
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+@@ -193,7 +193,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
    auth_dynamic_params->basic_over_http_enabled =
        local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
  
@@ -19,7 +37,25 @@ Index: chrome/browser/net/system_network_context_manager.cc
    auth_dynamic_params->delegate_by_kdc_policy =
        local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -242,7 +242,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
+@@ -208,7 +208,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+       local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   auth_dynamic_params->allow_gssapi_library_load =
+       local_state->GetBoolean(kGssapiDesiredPref);
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+@@ -218,7 +218,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+ 
+ void OnNewHttpAuthDynamicParams(
+     network::mojom::HttpAuthDynamicParamsPtr& params) {
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // The kerberos library is incompatible with the network service sandbox, so
+   // if library loading is now enabled, the network service needs to be
+   // restarted. It will be restarted unsandboxed because is
+@@ -260,11 +260,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
    if (g_previously_failed_to_launch_sandboxed_service) {
      return NetworkSandboxState::kDisabledBecauseOfFailedLaunch;
    }
@@ -28,7 +64,12 @@ Index: chrome/browser/net/system_network_context_manager.cc
    auto* local_state = g_browser_process->local_state();
  #endif
  
-@@ -263,7 +263,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // The network service sandbox and the kerberos library are incompatible.
+   // If kerberos is enabled by policy, disable the network service sandbox.
+   if (g_network_service_will_allow_gssapi_library_load ||
+@@ -280,7 +280,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
    }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -37,7 +78,16 @@ Index: chrome/browser/net/system_network_context_manager.cc
    if (local_state &&
        local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) {
      return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled)
-@@ -494,7 +494,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -510,7 +510,7 @@ void SystemNetworkContextManager::DeleteInstance() {
+   g_system_network_context_manager = nullptr;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ SystemNetworkContextManager::GssapiLibraryLoadObserver::
+     GssapiLibraryLoadObserver(SystemNetworkContextManager* owner)
+     : owner_(owner) {}
+@@ -568,7 +568,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
    pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
                               auth_pref_callback);
  
@@ -46,8 +96,17 @@ Index: chrome/browser/net/system_network_context_manager.cc
    pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
                               auth_pref_callback);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -541,7 +541,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
- #endif  // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
+@@ -582,7 +582,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+                              auth_pref_callback);
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback);
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+ 
+@@ -608,7 +608,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+ #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
@@ -55,7 +114,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
    pref_change_registrar_.Add(
        prefs::kEnforceLocalAnchorConstraintsEnabled,
        base::BindRepeating(&SystemNetworkContextManager::
-@@ -590,7 +590,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -663,7 +663,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
    registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
  #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
  
@@ -64,16 +123,16 @@ Index: chrome/browser/net/system_network_context_manager.cc
    registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
                                  false);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -619,7 +619,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
-   registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false);
- #endif  // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
+@@ -687,7 +687,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+   registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, -1);
+ 
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
    // Note that the default value is not relevant because the pref is only
    // evaluated when it is managed.
    registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled,
-@@ -628,7 +628,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -696,11 +696,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
  
    registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
  
@@ -81,9 +140,32 @@ Index: chrome/browser/net/system_network_context_manager.cc
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    registry->RegisterBooleanPref(prefs::kNetworkServiceSandboxEnabled, true);
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
+@@ -753,7 +753,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
+   OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
+   network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   gssapi_library_loader_observer_.Install(network_service);
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
+@@ -970,7 +970,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
+       break;
+   }
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (!enabled) {
+     g_network_service_will_allow_gssapi_library_load = true;
+   }
+@@ -1055,7 +1055,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
  }
-@@ -980,7 +980,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor
- #endif  // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_net_system_network_context_manager_h b/www/ungoogled-chromium/patches/patch-chrome_browser_net_system_network_context_manager_h
index 6576ae427..8701e16b7 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_net_system_network_context_manager_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_net_system_network_context_manager_h
@@ -1,8 +1,17 @@
 Index: chrome/browser/net/system_network_context_manager.h
 --- chrome/browser/net/system_network_context_manager.h.orig
 +++ chrome/browser/net/system_network_context_manager.h
-@@ -207,7 +207,7 @@ class SystemNetworkContextManager {
- #endif  // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
+@@ -200,7 +200,7 @@ class SystemNetworkContextManager {
+   class URLLoaderFactoryForSystem;
+   class NetworkProcessLaunchWatcher;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   class GssapiLibraryLoadObserver
+       : public network::mojom::GssapiLibraryLoadObserver {
+    public:
+@@ -236,7 +236,7 @@ class SystemNetworkContextManager {
+   void UpdateExplicitlyAllowedNetworkPorts();
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
@@ -10,3 +19,12 @@ Index: chrome/browser/net/system_network_context_manager.h
    // Applies the current value of the kEnforceLocalAnchorConstraintsEnabled
    // pref to the enforcement state.
    void UpdateEnforceLocalAnchorConstraintsEnabled();
+@@ -286,7 +286,7 @@ class SystemNetworkContextManager {
+ 
+   std::unique_ptr<NetworkAnnotationMonitor> network_annotation_monitor_;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   GssapiLibraryLoadObserver gssapi_library_loader_observer_{this};
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_new_tab_page_new_tab_page_util_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_new_tab_page_new_tab_page_util_cc
index bd42d5e72..620c65473 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_new_tab_page_new_tab_page_util_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_new_tab_page_new_tab_page_util_cc
@@ -1,16 +1,7 @@
 Index: chrome/browser/new_tab_page/new_tab_page_util.cc
 --- chrome/browser/new_tab_page/new_tab_page_util.cc.orig
 +++ chrome/browser/new_tab_page/new_tab_page_util.cc
-@@ -11,7 +11,7 @@
- 
- namespace {
- bool IsOsSupportedForRecipe() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return true;
- #else
-   return false;
-@@ -27,7 +27,7 @@ bool IsOsSupportedForCart() {
+@@ -20,7 +20,7 @@ bool IsOsSupportedForCart() {
  }
  
  bool IsOsSupportedForDrive() {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_password_manager_chrome_password_manager_client_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_password_manager_chrome_password_manager_client_cc
new file mode 100644
index 000000000..18f19f029
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_password_manager_chrome_password_manager_client_cc
@@ -0,0 +1,21 @@
+Index: chrome/browser/password_manager/chrome_password_manager_client.cc
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig
++++ chrome/browser/password_manager/chrome_password_manager_client.cc
+@@ -467,7 +467,7 @@ bool ChromePasswordManagerClient::ShowKeyboardReplacin
+ 
+ bool ChromePasswordManagerClient::CanUseBiometricAuthForFilling(
+     device_reauth::DeviceAuthenticator* authenticator) {
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) {
+     return false;
+   }
+@@ -690,7 +690,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
+ }
+ 
+ void ChromePasswordManagerClient::NotifyKeychainError() {
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   PasswordsClientUIDelegate* manage_passwords_ui_controller =
+       PasswordsClientUIDelegateFromWebContents(web_contents());
+   manage_passwords_ui_controller->OnKeychainError();
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_password_manager_password_reuse_manager_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_password_manager_password_reuse_manager_factory_cc
index da38e7cfc..b296e5741 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_password_manager_password_reuse_manager_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_password_manager_password_reuse_manager_factory_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/password_manager/password_reuse_manager_factory.cc
 --- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig
 +++ chrome/browser/password_manager/password_reuse_manager_factory.cc
-@@ -115,7 +115,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr
+@@ -137,7 +137,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_platform_util_linux_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_platform_util_linux_cc
index c2c8abd2a..d7162d5b5 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_platform_util_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_platform_util_linux_cc
@@ -1,9 +1,9 @@
 Index: chrome/browser/platform_util_linux.cc
 --- chrome/browser/platform_util_linux.cc.orig
 +++ chrome/browser/platform_util_linux.cc
-@@ -299,7 +299,9 @@ void RunCommand(const std::string& command,
- 
-   base::LaunchOptions options;
+@@ -300,7 +300,9 @@ void OnLaunchOptionsCreated(const std::string& command
+   argv.push_back(command);
+   argv.push_back(arg);
    options.current_directory = working_directory;
 +#if !BUILDFLAG(IS_BSD)
    options.allow_new_privs = true;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_policy_chrome_browser_cloud_management_controller_desktop_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_policy_chrome_browser_cloud_management_controller_desktop_cc
index 16e9e6246..47c14ee9c 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_policy_chrome_browser_cloud_management_controller_desktop_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_policy_chrome_browser_cloud_management_controller_desktop_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc
 --- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig
 +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc
-@@ -48,7 +48,7 @@
+@@ -50,7 +50,7 @@
  #include "chrome/browser/policy/browser_dm_token_storage_mac.h"
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -10,16 +10,16 @@ Index: chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.
  #include "chrome/browser/policy/browser_dm_token_storage_linux.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -57,7 +57,7 @@
+@@ -59,7 +59,7 @@
  #include "chrome/install_static/install_util.h"
  #endif  // BUILDFLAG(IS_WIN)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.h"  // nogncheck
  #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h"
  #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher.h"
-@@ -90,7 +90,7 @@ void ChromeBrowserCloudManagementControllerDesktop::
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+@@ -91,7 +91,7 @@ void ChromeBrowserCloudManagementControllerDesktop::
  
  #if BUILDFLAG(IS_MAC)
    storage_delegate = std::make_unique<BrowserDMTokenStorageMac>();
@@ -28,12 +28,12 @@ Index: chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.
    storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>();
  #elif BUILDFLAG(IS_WIN)
    storage_delegate = std::make_unique<BrowserDMTokenStorageWin>();
-@@ -245,7 +245,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC
+@@ -261,7 +261,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC
  
  std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager>
  ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() {
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   if (enterprise_connectors::IsDeviceTrustConnectorFeatureEnabled()) {
-     auto key_rotation_launcher =
-         enterprise_connectors::KeyRotationLauncher::Create(
+   auto* browser_dm_token_storage = BrowserDMTokenStorage::Get();
+   auto* device_management_service = GetDeviceManagementService();
+   auto shared_url_loader_factory = GetSharedURLLoaderFactory();
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc
index 177ca9c66..a0e85cdf1 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc
@@ -1,22 +1,47 @@
 Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
 --- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig
 +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -212,12 +212,12 @@
+@@ -231,19 +231,20 @@
  #include "components/spellcheck/browser/pref_names.h"
  #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/enterprise/idle/action.h"
+ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #include "components/device_signals/core/browser/pref_names.h"  // nogncheck due to crbug.com/1125897
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ #include "components/enterprise/idle/idle_timeout_policy_handler.h"
+ #endif
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) || \
++    BUILDFLAG(IS_BSD)
  #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -771,14 +771,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+         // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ||
+@@ -258,13 +259,13 @@
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS_ASH)
++    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/policy/battery_saver_policy_handler.h"
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+         // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "components/search_engines/site_search_policy_handler.h"
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+         // BUILDFLAG(IS_CHROMEOS)
+@@ -839,14 +840,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kManagedDefaultGeolocationSetting,
      base::Value::Type::INTEGER },
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@@ -33,8 +58,8 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
    { key::kFullscreenAllowed,
      prefs::kFullscreenAllowed,
      base::Value::Type::BOOLEAN },
-@@ -1466,7 +1466,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
-     base::Value::Type::BOOLEAN },
+@@ -1625,7 +1626,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+   },
  #endif // BUILDFLAG(IS_CHROMEOS_ASH)
  
 -#if BUILDFLAG(IS_LINUX)
@@ -42,7 +67,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
    { key::kGSSAPILibraryName,
      prefs::kGSSAPILibraryName,
      base::Value::Type::STRING },
-@@ -1514,7 +1514,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1673,7 +1674,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -51,7 +76,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
    { key::kNetworkServiceSandboxEnabled,
      prefs::kNetworkServiceSandboxEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1540,18 +1540,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1699,12 +1700,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kTotalMemoryLimitMb,
      base::Value::Type::INTEGER },
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -66,6 +91,8 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
    { key::kUnmanagedDeviceSignalsConsentFlowEnabled,
      device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
      base::Value::Type::BOOLEAN },
+@@ -1713,7 +1714,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+     base::Value::Type::STRING },
  #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
 -    || BUILDFLAG(IS_FUCHSIA)
@@ -73,7 +100,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
    { key::kDefaultBrowserSettingEnabled,
      prefs::kDefaultBrowserSettingEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1564,7 +1564,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1726,7 +1727,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
          // || BUILDFLAG(IS_FUCHSIA)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
@@ -82,7 +109,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
    { key::kAutoplayAllowed,
      prefs::kAutoplayAllowed,
      base::Value::Type::BOOLEAN },
-@@ -1665,7 +1665,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1824,7 +1825,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
  
@@ -91,26 +118,17 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
    { key::kAlternativeBrowserPath,
      browser_switcher::prefs::kAlternativeBrowserPath,
      base::Value::Type::STRING },
-@@ -1752,7 +1752,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
-     base::Value::Type::BOOLEAN },
- #endif // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // TODO(crbug.com/1454054): replace the
-   // kGetDisplayMediaSetSelectAllScreensAllowedForUrls policy by a policy that
-   // matches the name of the new `getAllScreensMedia` API.
-@@ -1761,7 +1761,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1931,7 +1932,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::LIST },
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    { key::kAuthNegotiateDelegateByKdcPolicy,
      prefs::kAuthNegotiateDelegateByKdcPolicy,
      base::Value::Type::BOOLEAN },
-@@ -1792,7 +1792,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
- #endif  // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
+@@ -1956,7 +1957,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+ #endif // BUILDFLAG(ENABLE_EXTENSIONS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
@@ -118,16 +136,16 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
    { key::kEnforceLocalAnchorConstraintsEnabled,
      prefs::kEnforceLocalAnchorConstraintsEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1871,7 +1871,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2014,7 +2015,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      ash::prefs::kUrlParameterToAutofillSAMLUsername,
      base::Value::Type::STRING },
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
-   { key::kBatterySaverModeAvailability,
-     performance_manager::user_tuning::prefs::kBatterySaverModeState,
-     base::Value::Type::INTEGER },
-@@ -1902,7 +1902,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+   { key::kTabDiscardingExceptions,
+     performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions,
+     base::Value::Type::LIST },
+@@ -2042,7 +2043,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kCloudApAuthEnabled,
      base::Value::Type::INTEGER },
  #endif  // BUILDFLAG(IS_WIN)
@@ -136,16 +154,43 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
    { key::kOutOfProcessSystemDnsResolutionEnabled,
      prefs::kOutOfProcessSystemDnsResolutionEnabled,
      base::Value::Type::BOOLEAN },
-@@ -2016,7 +2016,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2068,7 +2069,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+     prefs::kManagedPrivateNetworkAccessRestrictionsEnabled,
+     base::Value::Type::BOOLEAN },
+ #if BUILDFLAG(ENABLE_EXTENSIONS)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   { key::kExtensionInstallTypeBlocklist,
+     extensions::pref_names::kExtensionInstallTypeBlocklist,
+     base::Value::Type::LIST},
+@@ -2089,7 +2090,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+     optimization_guide::model_execution::prefs::kWallpaperSearchEnterprisePolicyAllowed,
+     base::Value::Type::INTEGER},
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   { key::kChromeForTestingAllowed,
+     prefs::kChromeForTestingAllowed,
+     base::Value::Type::BOOLEAN },
+@@ -2208,7 +2209,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
    // Policies for all platforms - End
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS_ASH)
 +    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
    handlers->AddHandler(
-       std::make_unique<performance_manager::HighEfficiencyPolicyHandler>());
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -2207,7 +2207,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+       std::make_unique<performance_manager::MemorySaverPolicyHandler>());
+   // Note: This needs to be created after `DefaultSearchPolicyHandler`.
+@@ -2216,7 +2217,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+         // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   handlers->AddHandler(
+       std::make_unique<SiteSearchPolicyHandler>(chrome_schema));
+ 
+@@ -2405,7 +2406,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -154,7 +199,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
    handlers->AddHandler(
        std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
    handlers->AddHandler(
-@@ -2265,7 +2265,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2463,7 +2464,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
        key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
        chrome_schema));
  
@@ -163,7 +208,16 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
    handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
    handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
    handlers->AddHandler(
-@@ -2649,7 +2649,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2498,7 +2499,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+           SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED,
+           SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)));
+ 
+-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   handlers->AddHandler(
+       std::make_unique<ManagedAccountRestrictionsPolicyHandler>(chrome_schema));
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+@@ -2875,7 +2876,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif
  
  #if BUILDFLAG(ENABLE_SPELLCHECK)
@@ -172,7 +226,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
    handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
    handlers->AddHandler(
        std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
-@@ -2657,7 +2657,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2883,7 +2884,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
  #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
  
@@ -181,12 +235,21 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
    handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
        key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
        base::Value::Type::BOOLEAN));
-@@ -2670,7 +2670,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
-   handlers->AddHandler(
-       std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>(
-           chrome_schema));
+@@ -2900,7 +2901,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+       /*new_policy_handler=*/std::make_unique<
+           first_party_sets::FirstPartySetsOverridesPolicyHandler>(
+           key::kRelatedWebsiteSetsOverrides, chrome_schema)));
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
    handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+@@ -2927,7 +2928,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+           base::Value::Type::BOOLEAN)));
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS_ASH)
++    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+   handlers->AddHandler(std::make_unique<BatterySaverPolicyHandler>());
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+         // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_policy_device_management_service_configuration_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_policy_device_management_service_configuration_cc
index 8662000c5..e18184f93 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_policy_device_management_service_configuration_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_policy_device_management_service_configuration_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/policy/device_management_service_configuration.cc
 --- chrome/browser/policy/device_management_service_configuration.cc.orig
 +++ chrome/browser/policy/device_management_service_configuration.cc
-@@ -22,7 +22,7 @@
+@@ -24,7 +24,7 @@
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ||           \
      ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
@@ -10,7 +10,7 @@ Index: chrome/browser/policy/device_management_service_configuration.cc
  #include "chrome/browser/enterprise/connectors/common.h"
  #include "chrome/browser/enterprise/connectors/connectors_service.h"
  #endif
-@@ -100,7 +100,7 @@ DeviceManagementServiceConfiguration::GetReportingConn
+@@ -102,7 +102,7 @@ DeviceManagementServiceConfiguration::GetReportingConn
      content::BrowserContext* context) const {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ||           \
      ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_policy_policy_value_and_status_aggregator_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_policy_policy_value_and_status_aggregator_cc
index 42a81620a..c449dc358 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_policy_policy_value_and_status_aggregator_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_policy_policy_value_and_status_aggregator_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/policy/policy_value_and_status_aggregator.cc
 --- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig
 +++ chrome/browser/policy/policy_value_and_status_aggregator.cc
-@@ -52,7 +52,7 @@
+@@ -53,7 +53,7 @@
  #include "chrome/browser/policy/value_provider/extension_policies_value_provider.h"
  #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
  
@@ -10,7 +10,7 @@ Index: chrome/browser/policy/policy_value_and_status_aggregator.cc
  #include "components/policy/core/common/cloud/profile_cloud_policy_manager.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
-@@ -98,7 +98,7 @@ std::unique_ptr<policy::PolicyStatusProvider> GetUserP
+@@ -99,7 +99,7 @@ std::unique_ptr<policy::PolicyStatusProvider> GetUserP
  #else  // BUILDFLAG(IS_CHROMEOS_ASH)
    policy::CloudPolicyManager* cloud_policy_manager =
        profile->GetUserCloudPolicyManager();
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_prefs_browser_prefs_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_prefs_browser_prefs_cc
index c2637138c..e1ccbcecb 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_prefs_browser_prefs_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_prefs_browser_prefs_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/prefs/browser_prefs.cc
 --- chrome/browser/prefs/browser_prefs.cc.orig
 +++ chrome/browser/prefs/browser_prefs.cc
-@@ -469,13 +469,13 @@
+@@ -485,18 +485,18 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -17,7 +17,13 @@ Index: chrome/browser/prefs/browser_prefs.cc
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
  #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
  #endif
-@@ -508,7 +508,7 @@
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
+ #endif
+ 
+@@ -531,7 +531,7 @@
  #include "chrome/browser/sessions/session_service_log.h"
  #endif
  
@@ -26,34 +32,16 @@ Index: chrome/browser/prefs/browser_prefs.cc
  #include "ui/color/system_theme.h"
  #endif
  
-@@ -713,7 +713,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
- const char kPluginsShowDetails[] = "plugins.show_details";
- 
- // Deprecated 02/2023.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
-@@ -1004,7 +1004,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
- 
-   // Deprecated 02/2023.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo);
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
-@@ -1160,7 +1160,7 @@ void RegisterProfilePrefsForMigration(
-   registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0);
+@@ -1718,7 +1718,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
+   registry->RegisterBooleanPref(prefs::kOopPrintDriversAllowedByPolicy, true);
  #endif
  
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Deprecated 08/2022.
-   registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false);
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true);
  #endif
-@@ -1957,12 +1957,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+ 
+@@ -2060,12 +2060,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -66,23 +54,5 @@ Index: chrome/browser/prefs/browser_prefs.cc
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
+   enterprise_signin::RegisterProfilePrefs(registry);
  #endif
- 
-@@ -2120,7 +2120,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
- 
-   // Added 02/2023
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   local_state->ClearPref(kWebAppsUrlHandlerInfo);
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
-@@ -2290,7 +2290,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
-   profile_prefs->ClearPref(kProfileAvatarTutorialShown);
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Added 08/2022.
-   if (profile_prefs->HasPrefPath(prefs::kUsesSystemThemeDeprecated)) {
-     auto migrated_theme =
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_prefs_pref_service_incognito_allowlist_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_prefs_pref_service_incognito_allowlist_cc
index 6172ff504..e3ba08591 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_prefs_pref_service_incognito_allowlist_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_prefs_pref_service_incognito_allowlist_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/prefs/pref_service_incognito_allowlist.cc
 --- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig
 +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
-@@ -168,7 +168,7 @@ const char* const kPersistentPrefNames[] = {
+@@ -184,7 +184,7 @@ const char* const kPersistentPrefNames[] = {
      prefs::kShowFullscreenToolbar,
  #endif
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_printing_print_backend_service_manager_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_printing_print_backend_service_manager_cc
index 18662a41f..e1b72e5bc 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_printing_print_backend_service_manager_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_printing_print_backend_service_manager_cc
@@ -1,8 +1,8 @@
 Index: chrome/browser/printing/print_backend_service_manager.cc
 --- chrome/browser/printing/print_backend_service_manager.cc.orig
 +++ chrome/browser/printing/print_backend_service_manager.cc
-@@ -33,7 +33,7 @@
- #include "printing/buildflags/buildflags.h"
+@@ -34,7 +34,7 @@
+ #include "printing/printing_context.h"
  #include "printing/printing_features.h"
  
 -#if BUILDFLAG(IS_LINUX)
@@ -10,7 +10,7 @@ Index: chrome/browser/printing/print_backend_service_manager.cc
  #include "content/public/common/content_switches.h"
  #endif
  
-@@ -851,7 +851,7 @@ PrintBackendServiceManager::GetServiceFromBundle(
+@@ -861,7 +861,7 @@ PrintBackendServiceManager::GetServiceFromBundle(
          host.BindNewPipeAndPassReceiver(),
          content::ServiceProcessHost::Options()
              .WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME)
@@ -19,7 +19,7 @@ Index: chrome/browser/printing/print_backend_service_manager.cc
              .WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi})
  #endif
              .Pass());
-@@ -1024,7 +1024,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
+@@ -1038,7 +1038,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
        return kNoClientsRegisteredResetOnIdleTimeout;
  
      case ClientType::kQueryWithUi:
@@ -27,4 +27,4 @@ Index: chrome/browser/printing/print_backend_service_manager.cc
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
        // No need to update if there were other query with UI clients.
        if (HasQueryWithUiClientForRemoteId(remote_id)) {
-         return absl::nullopt;
+         return std::nullopt;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_printing_printer_query_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_printing_printer_query_cc
index 0d286b40f..5f388536c 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_printing_printer_query_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_printing_printer_query_cc
@@ -3,7 +3,7 @@ Index: chrome/browser/printing/printer_query.cc
 +++ chrome/browser/printing/printer_query.cc
 @@ -341,7 +341,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
      crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
-         print_backend->GetPrinterDriverInfo(printer_name));
+         printer_name, print_backend->GetPrinterDriverInfo(printer_name));
  
 -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS)
 +#if (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && BUILDFLAG(USE_CUPS)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc
index 7c9ea0af5..8bd7594bf 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc
@@ -1,9 +1,18 @@
 Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 --- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig
 +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -379,18 +379,18 @@
+@@ -320,7 +320,7 @@
+ #include "chromeos/constants/chromeos_features.h"
  #endif
  
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h"
+ #endif
+ 
+@@ -411,18 +411,18 @@
+ 
+ 
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS_ASH)
 +    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
@@ -21,20 +30,20 @@ Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
- #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
- #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
-@@ -589,7 +589,7 @@ void ChromeBrowserMainExtraPartsProfiles::
-   if (breadcrumbs::IsEnabled()) {
-     BreadcrumbManagerKeyedServiceFactory::GetInstance();
-   }
+ #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
+ #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h"
+@@ -657,7 +657,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+   DiceBoundSessionCookieServiceFactory::GetInstance();
+ #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT)
+ #endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
  #endif
    browser_sync::UserEventServiceFactory::GetInstance();
-@@ -675,23 +675,23 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -780,26 +780,26 @@ void ChromeBrowserMainExtraPartsProfiles::
+   enterprise_commands::UserRemoteCommandsServiceFactory::GetInstance();
  #endif
-   enterprise::ProfileIdServiceFactory::GetInstance();
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS_ASH)
 +    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
@@ -59,8 +68,12 @@ Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
    enterprise_signals::UserPermissionServiceFactory::GetInstance();
  #endif
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
+ #endif
  #if BUILDFLAG(ENABLE_SESSION_SERVICE)
-@@ -794,7 +794,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -923,7 +923,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #endif
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -69,21 +82,30 @@ Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
    metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
  #endif
-@@ -888,7 +888,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1026,7 +1026,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #if BUILDFLAG(IS_CHROMEOS)
    policy::PolicyCertServiceFactory::GetInstance();
  #endif
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
+   policy::UserPolicyOidcSigninServiceFactory::GetInstance();
  #endif
-   policy::UserCloudPolicyInvalidatorFactory::GetInstance();
-@@ -929,7 +929,7 @@ void ChromeBrowserMainExtraPartsProfiles::
- #if !BUILDFLAG(IS_ANDROID)
-   ProfileThemeUpdateServiceFactory::GetInstance();
+@@ -1068,7 +1068,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+ #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)
+   ProfileStatisticsFactory::GetInstance();
  #endif
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    ProfileTokenWebSigninInterceptorFactory::GetInstance();
+   OidcAuthenticationSigninInterceptorFactory::GetInstance();
  #endif
- #if !BUILDFLAG(IS_ANDROID)
+@@ -1087,7 +1087,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+ #endif
+   ReduceAcceptLanguageFactory::GetInstance();
+   RendererUpdaterFactory::GetInstance();
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   reporting::ManualTestHeartbeatEventFactory::GetInstance();
+ #endif
+ #if BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_profile_impl_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_profile_impl_cc
index cfc05e10d..4022a1e05 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_profile_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_profile_impl_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/profiles/profile_impl.cc
 --- chrome/browser/profiles/profile_impl.cc.orig
 +++ chrome/browser/profiles/profile_impl.cc
-@@ -256,6 +256,10 @@
+@@ -265,6 +265,10 @@
  #include "chrome/browser/spellchecker/spellcheck_service.h"
  #endif
  
@@ -21,7 +21,7 @@ Index: chrome/browser/profiles/profile_impl.cc
      ProfileManager* profile_manager = g_browser_process->profile_manager();
      ProfileAttributesEntry* entry =
          profile_manager->GetProfileAttributesStorage()
-@@ -860,7 +864,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) 
+@@ -880,7 +884,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) 
  }
  
  base::FilePath ProfileImpl::last_selected_directory() {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_profiles_state_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_profiles_state_cc
index ad16faaba..c9cf88f12 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_profiles_state_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_profiles_state_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/profiles/profiles_state.cc
 --- chrome/browser/profiles/profiles_state.cc.orig
 +++ chrome/browser/profiles/profiles_state.cc
-@@ -181,7 +181,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
+@@ -194,7 +194,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
                            PrefService* local_state,
                            bool show_warning) {
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_renderer_preferences_util_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_renderer_preferences_util_cc
index 67391a870..0c968e9bf 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_renderer_preferences_util_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_renderer_preferences_util_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/renderer_preferences_util.cc
 --- chrome/browser/renderer_preferences_util.cc.orig
 +++ chrome/browser/renderer_preferences_util.cc
-@@ -36,7 +36,7 @@
+@@ -39,7 +39,7 @@
  #include "ui/views/controls/textfield/textfield.h"
  #endif
  
@@ -10,7 +10,7 @@ Index: chrome/browser/renderer_preferences_util.cc
  #include "chrome/browser/themes/theme_service.h"
  #include "chrome/browser/themes/theme_service_factory.h"
  #include "ui/linux/linux_ui.h"
-@@ -149,7 +149,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
+@@ -154,7 +154,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
    prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval();
  #endif
  
@@ -19,7 +19,7 @@ Index: chrome/browser/renderer_preferences_util.cc
    auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
    if (linux_ui_theme) {
      if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
-@@ -172,7 +172,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
+@@ -177,7 +177,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_sandbox_internals_sandbox_internals_ts b/www/ungoogled-chromium/patches/patch-chrome_browser_resources_sandbox_internals_sandbox_internals_ts
deleted file mode 100644
index 73a480dd8..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_sandbox_internals_sandbox_internals_ts
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: chrome/browser/resources/sandbox_internals/sandbox_internals.ts
---- chrome/browser/resources/sandbox_internals/sandbox_internals.ts.orig
-+++ chrome/browser/resources/sandbox_internals/sandbox_internals.ts
-@@ -2,7 +2,7 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
--// <if expr="is_linux or is_chromeos">
-+// <if expr="is_posix or is_chromeos">
- import './strings.m.js';
- 
- import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
-@@ -121,7 +121,7 @@ function androidHandler() {
- }
- // </if>
- 
--// <if expr="is_linux or is_chromeos">
-+// <if expr="is_posix or is_chromeos">
- 
- /**
-  * Adds a status row that reports either Yes or No.
-@@ -182,7 +182,7 @@ document.addEventListener('DOMContentLoaded', () => {
-   // <if expr="is_android">
-   androidHandler();
-   // </if>
--  // <if expr="is_linux or is_chromeos">
-+  // <if expr="is_posix or is_chromeos">
-   linuxHandler();
-   // </if>
- });
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_browser_proxy_ts b/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_browser_proxy_ts
deleted file mode 100644
index 619e05087..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_browser_proxy_ts
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts
---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig
-+++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts
-@@ -18,7 +18,7 @@ export interface AppearanceBrowserProxy {
- 
-   useDefaultTheme(): void;
- 
--  // <if expr="is_linux">
-+  // <if expr="is_posix">
-   useGtkTheme(): void;
-   useQtTheme(): void;
-   // </if>
-@@ -48,7 +48,7 @@ export class AppearanceBrowserProxyImpl implements App
-     chrome.send('useDefaultTheme');
-   }
- 
--  // <if expr="is_linux">
-+  // <if expr="is_posix">
-   useGtkTheme() {
-     chrome.send('useGtkTheme');
-   }
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_html b/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_html
deleted file mode 100644
index 1ca92c7e1..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_html
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: chrome/browser/resources/settings/appearance_page/appearance_page.html
---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig
-+++ chrome/browser/resources/settings/appearance_page/appearance_page.html
-@@ -27,7 +27,7 @@
-           <div class="flex cr-padded-text">
-             <div>$i18n{themes}</div><div class="secondary">[[themeSublabel_]]</div>
-           </div>
--<if expr="not is_linux">
-+<if expr="not is_posix">
-           <template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
-             <div class="separator"></div>
-             <cr-button id="useDefault" on-click="onUseDefaultClick_">
-@@ -35,7 +35,7 @@
-             </cr-button>
-           </template>
- </if>
--<if expr="is_linux">
-+<if expr="is_posix">
-           <div class="settings-row continuation"
-               hidden="[[!showThemesSecondary_(
-                   prefs.extensions.theme.id.value, systemTheme_)]]"
-@@ -172,7 +172,7 @@
-           </div>
-         </template>
- 
--<if expr="is_linux">
-+<if expr="is_posix">
-         <div class="hr" hidden="[[!pageVisibility.bookmarksBar]]"></div>
-         <settings-toggle-button
-             hidden="[[!showCustomChromeFrame_]]"
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_ts b/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_ts
deleted file mode 100644
index 917731675..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_ts
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: chrome/browser/resources/settings/appearance_page/appearance_page.ts
---- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig
-+++ chrome/browser/resources/settings/appearance_page/appearance_page.ts
-@@ -72,7 +72,7 @@ export interface SettingsAppearancePageElement {
- export enum SystemTheme {
-   // Either classic or web theme.
-   DEFAULT = 0,
--  // <if expr="is_linux">
-+  // <if expr="is_posix">
-   GTK = 1,
-   QT = 2,
-   // </if>
-@@ -193,7 +193,7 @@ export class SettingsAppearancePageElement extends
-             'prefs.autogenerated.theme.policy.color.controlledBy)',
-       },
- 
--      // <if expr="is_linux">
-+      // <if expr="is_posix">
-       /**
-        * Whether to show the "Custom Chrome Frame" setting.
-        */
-@@ -229,7 +229,7 @@ export class SettingsAppearancePageElement extends
-       'themeChanged_(' +
-           'prefs.extensions.theme.id.value, systemTheme_, isForcedTheme_)',
- 
--      // <if expr="is_linux">
-+      // <if expr="is_posix">
-       'systemThemePrefChanged_(prefs.extensions.theme.system_theme.value)',
-       // </if>
-     ];
-@@ -253,7 +253,7 @@ export class SettingsAppearancePageElement extends
-   private isForcedTheme_: boolean;
-   private showHoverCardImagesOption_: boolean;
- 
--  // <if expr="is_linux">
-+  // <if expr="is_posix">
-   private showCustomChromeFrame_: boolean;
-   // </if>
- 
-@@ -354,7 +354,7 @@ export class SettingsAppearancePageElement extends
-     this.appearanceBrowserProxy_.useDefaultTheme();
-   }
- 
--  // <if expr="is_linux">
-+  // <if expr="is_posix">
-   private systemThemePrefChanged_(systemTheme: SystemTheme) {
-     this.systemTheme_ = systemTheme;
-   }
-@@ -426,7 +426,7 @@ export class SettingsAppearancePageElement extends
-       return;
-     }
- 
--    // <if expr="is_linux">
-+    // <if expr="is_posix">
-     let i18nId;
-     switch (this.systemTheme_) {
-       case SystemTheme.GTK:
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_route_ts b/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_route_ts
deleted file mode 100644
index 15eb839d2..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_route_ts
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: chrome/browser/resources/settings/route.ts
---- chrome/browser/resources/settings/route.ts.orig
-+++ chrome/browser/resources/settings/route.ts
-@@ -231,7 +231,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
-     r.ACCESSIBILITY = r.ADVANCED.createSection(
-         '/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle'));
- 
--    // <if expr="is_linux">
-+    // <if expr="is_posix">
-     r.CAPTIONS = r.ACCESSIBILITY.createChild('/captions');
-     // </if>
- 
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_signin_sync_confirmation_sync_confirmation_app_html b/www/ungoogled-chromium/patches/patch-chrome_browser_resources_signin_sync_confirmation_sync_confirmation_app_html
deleted file mode 100644
index 11a9f1ca4..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_signin_sync_confirmation_sync_confirmation_app_html
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html
---- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig
-+++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html
-@@ -290,7 +290,7 @@
-         autofocus="[[isModalDialog_]]">
-       $i18n{syncConfirmationConfirmLabel}
-     </cr-button>
--    <if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros">
-+    <if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros">
-       <cr-button id="settingsButton" on-click="onGoToSettings_"
-           disabled="[[anyButtonClicked_]]" consent-confirmation>
-         $i18n{syncConfirmationSettingsLabel}
-@@ -300,7 +300,7 @@
-         disabled="[[anyButtonClicked_]]">
-       $i18n{syncConfirmationUndoLabel}
-     </cr-button>
--    <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)">
-+    <if expr="not (is_macosx or is_posix or chromeos_ash or chromeos_lacros)">
-       <cr-button id="settingsButton" on-click="onGoToSettings_"
-           disabled="[[anyButtonClicked_]]" consent-confirmation>
-         $i18n{syncConfirmationSettingsLabel}
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_cloud_content_scanning_binary_upload_service_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_cloud_content_scanning_binary_upload_service_cc
index cba879833..2b8143311 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_cloud_content_scanning_binary_upload_service_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_cloud_content_scanning_binary_upload_service_cc
@@ -10,7 +10,7 @@ Index: chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service
  #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
  #endif
  
-@@ -398,7 +398,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
+@@ -417,7 +417,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
      Profile* profile,
      const enterprise_connectors::AnalysisSettings& settings) {
    // Local content analysis is supported only on desktop platforms.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_download_protection_file_analyzer_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_download_protection_file_analyzer_cc
index 2d3aa3716..bbadd6cb9 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_download_protection_file_analyzer_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_download_protection_file_analyzer_cc
@@ -10,16 +10,16 @@ Index: chrome/browser/safe_browsing/download_protection/file_analyzer.cc
  #include "chrome/browser/safe_browsing/download_protection/document_analysis_service.h"
  #endif
  
-@@ -83,7 +83,7 @@ void FileAnalyzer::Start(const base::FilePath& target_
+@@ -85,7 +85,7 @@ void FileAnalyzer::Start(const base::FilePath& target_
    } else if (inspection_type == DownloadFileType::DMG) {
      StartExtractDmgFeatures();
  #endif
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   } else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) {
+   } else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT &&
+              !base::FeatureList::IsEnabled(kMaldocaSkipCheck)) {
      StartExtractDocumentFeatures();
- #endif
-@@ -310,7 +310,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
+@@ -326,7 +326,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
  }
  #endif  // BUILDFLAG(IS_MAC)
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_download_protection_file_analyzer_h b/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_download_protection_file_analyzer_h
index 9faef184f..0522ac1f3 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_download_protection_file_analyzer_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_download_protection_file_analyzer_h
@@ -10,7 +10,7 @@ Index: chrome/browser/safe_browsing/download_protection/file_analyzer.h
  #include "chrome/services/file_util/public/cpp/sandboxed_document_analyzer.h"
  #endif
  
-@@ -106,7 +106,7 @@ class FileAnalyzer {
+@@ -110,7 +110,7 @@ class FileAnalyzer {
        const safe_browsing::ArchiveAnalyzerResults& archive_results);
  #endif
  
@@ -19,7 +19,7 @@ Index: chrome/browser/safe_browsing/download_protection/file_analyzer.h
    void StartExtractDocumentFeatures();
    void OnDocumentAnalysisFinished(
        const DocumentAnalyzerResults& document_results);
-@@ -136,7 +136,7 @@ class FileAnalyzer {
+@@ -141,7 +141,7 @@ class FileAnalyzer {
        dmg_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)};
  #endif
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc
index a7c49d0e8..ad0d2ac68 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
 --- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig
 +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
-@@ -707,7 +707,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
+@@ -696,7 +696,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
  
  // Process::Current().CreationTime() is missing on some platforms.
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_screen_ai_screen_ai_install_state_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_screen_ai_screen_ai_install_state_cc
new file mode 100644
index 000000000..dd65ec33d
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_screen_ai_screen_ai_install_state_cc
@@ -0,0 +1,21 @@
+Index: chrome/browser/screen_ai/screen_ai_install_state.cc
+--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig
++++ chrome/browser/screen_ai/screen_ai_install_state.cc
+@@ -23,7 +23,7 @@
+ #include "services/screen_ai/public/cpp/utilities.h"
+ #include "ui/accessibility/accessibility_features.h"
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/cpu.h"
+ #include "base/files/file_util.h"
+ #endif
+@@ -35,7 +35,7 @@ const char kMinExpectedVersion[] = "123.1";
+ bool IsDeviceCompatible() {
+   // Check if the CPU has the required instruction set to run the Screen AI
+   // library.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (!base::CPU().has_sse41()) {
+     return false;
+   }
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_screen_ai_screen_ai_service_router_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_screen_ai_screen_ai_service_router_cc
new file mode 100644
index 000000000..f92c4dd6f
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_screen_ai_screen_ai_service_router_cc
@@ -0,0 +1,21 @@
+Index: chrome/browser/screen_ai/screen_ai_service_router.cc
+--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig
++++ chrome/browser/screen_ai/screen_ai_service_router.cc
+@@ -281,7 +281,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
+   base::FilePath binary_path = state_instance->get_component_binary_path();
+ #if BUILDFLAG(IS_WIN)
+   std::vector<base::FilePath> preload_libraries = {binary_path};
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   std::vector<std::string> extra_switches = {
+       base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(),
+                          binary_path.MaybeAsASCII().c_str())};
+@@ -295,7 +295,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
+           .WithPreloadedLibraries(
+               preload_libraries,
+               content::ServiceProcessHostPreloadLibraries::GetPassKey())
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+           .WithExtraCommandLineSwitches(extra_switches)
+ #endif  // BUILDFLAG(IS_WIN)
+           .Pass());
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_search_engine_choice_search_engine_choice_client_side_trial_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_search_engine_choice_search_engine_choice_client_side_trial_cc
new file mode 100644
index 000000000..4321150d0
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_search_engine_choice_search_engine_choice_client_side_trial_cc
@@ -0,0 +1,12 @@
+Index: chrome/browser/search_engine_choice/search_engine_choice_client_side_trial.cc
+--- chrome/browser/search_engine_choice/search_engine_choice_client_side_trial.cc.orig
++++ chrome/browser/search_engine_choice/search_engine_choice_client_side_trial.cc
+@@ -132,7 +132,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* regis
+ void SetUpIfNeeded(const base::FieldTrial::EntropyProvider& entropy_provider,
+                    base::FeatureList* feature_list,
+                    PrefService* local_state) {
+-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
+   // Platform not in scope for this client-side trial.
+   return;
+ #else
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_search_engine_choice_search_engine_choice_service_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_search_engine_choice_search_engine_choice_service_factory_cc
new file mode 100644
index 000000000..a52a37a78
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_search_engine_choice_search_engine_choice_service_factory_cc
@@ -0,0 +1,21 @@
+Index: chrome/browser/search_engine_choice/search_engine_choice_service_factory.cc
+--- chrome/browser/search_engine_choice/search_engine_choice_service_factory.cc.orig
++++ chrome/browser/search_engine_choice/search_engine_choice_service_factory.cc
+@@ -11,7 +11,7 @@
+ #include "components/country_codes/country_codes.h"
+ #include "components/search_engines/search_engine_choice/search_engine_choice_service.h"
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/browser_process.h"
+ #include "components/variations/service/variations_service.h"
+ #endif
+@@ -21,7 +21,7 @@ namespace {
+ std::unique_ptr<KeyedService> BuildSearchEngineChoiceService(
+     content::BrowserContext* context) {
+   int variations_country_id = country_codes::kCountryIDUnknown;
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (g_browser_process->variations_service()) {
+     variations_country_id =
+         country_codes::CountryStringToCountryID(base::ToUpperASCII(
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_send_tab_to_self_receiving_ui_handler_registry_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_send_tab_to_self_receiving_ui_handler_registry_cc
index 465df1bf6..4e84d4720 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_send_tab_to_self_receiving_ui_handler_registry_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_send_tab_to_self_receiving_ui_handler_registry_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
 --- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig
 +++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
-@@ -16,7 +16,7 @@
+@@ -15,7 +15,7 @@
  #include "components/send_tab_to_self/features.h"
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -10,7 +10,7 @@ Index: chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
  #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
  #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
  #endif
-@@ -48,7 +48,7 @@ SendTabToSelfToolbarIconController*
+@@ -47,7 +47,7 @@ SendTabToSelfToolbarIconController*
  ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile(
      Profile* profile) {
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_send_tab_to_self_send_tab_to_self_client_service_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_send_tab_to_self_send_tab_to_self_client_service_cc
index c78074150..4cf2095f5 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_send_tab_to_self_send_tab_to_self_client_service_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_send_tab_to_self_send_tab_to_self_client_service_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc
 --- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig
 +++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc
-@@ -17,7 +17,7 @@
+@@ -16,7 +16,7 @@
  #include "components/send_tab_to_self/send_tab_to_self_model.h"
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -10,7 +10,7 @@ Index: chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc
  #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
  #endif
  
-@@ -51,7 +51,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely(
+@@ -50,7 +50,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely(
      const std::vector<const SendTabToSelfEntry*>& new_entries) {
    for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) {
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_sharing_sharing_device_registration_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_sharing_sharing_device_registration_cc
index 56a02a805..a67a5562d 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_sharing_sharing_device_registration_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_sharing_sharing_device_registration_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/sharing/sharing_device_registration.cc
 --- chrome/browser/sharing/sharing_device_registration.cc.orig
 +++ chrome/browser/sharing/sharing_device_registration.cc
-@@ -326,7 +326,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
+@@ -328,7 +328,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
  
  bool SharingDeviceRegistration::IsRemoteCopySupported() const {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_sharing_sharing_handler_registry_impl_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_sharing_sharing_handler_registry_impl_cc
index a9d689b57..500a1bd80 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_sharing_sharing_handler_registry_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_sharing_sharing_handler_registry_impl_cc
@@ -10,7 +10,7 @@ Index: chrome/browser/sharing/sharing_handler_registry_impl.cc
  #include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS_LACROS)) BUILDFLAG(IS_CHROMEOS)
-@@ -77,7 +77,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl
+@@ -78,7 +78,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl
    }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_supervised_user_supervised_user_extensions_delegate_impl_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_supervised_user_supervised_user_extensions_delegate_impl_cc
new file mode 100644
index 000000000..94c22b931
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_supervised_user_supervised_user_extensions_delegate_impl_cc
@@ -0,0 +1,12 @@
+Index: chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc
+--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig
++++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc
+@@ -180,7 +180,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte
+       return;
+     }
+   }
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   CHECK(contents.value());
+   content::WebContents* web_contents = contents.value().get();
+   if (CanInstallExtensions()) {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_supervised_user_supervised_user_extensions_manager_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_supervised_user_supervised_user_extensions_manager_cc
new file mode 100644
index 000000000..3f19ac98f
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_supervised_user_supervised_user_extensions_manager_cc
@@ -0,0 +1,21 @@
+Index: chrome/browser/supervised_user/supervised_user_extensions_manager.cc
+--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig
++++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc
+@@ -305,7 +305,7 @@ void SupervisedUserExtensionsManager::
+     ActivateManagementPolicyAndUpdateRegistration() {
+   SetActiveForSupervisedUsers();
+   UpdateManagementPolicyRegistration();
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   MaybeMarkExtensionsLocallyParentApproved();
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ }
+@@ -417,7 +417,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten
+   return false;
+ }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void SupervisedUserExtensionsManager::
+     MaybeMarkExtensionsLocallyParentApproved() {
+   if (!is_active_policy_for_supervised_users_) {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_supervised_user_supervised_user_extensions_manager_h b/www/ungoogled-chromium/patches/patch-chrome_browser_supervised_user_supervised_user_extensions_manager_h
new file mode 100644
index 000000000..bfa174b91
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_supervised_user_supervised_user_extensions_manager_h
@@ -0,0 +1,12 @@
+Index: chrome/browser/supervised_user/supervised_user_extensions_manager.h
+--- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig
++++ chrome/browser/supervised_user/supervised_user_extensions_manager.h
+@@ -143,7 +143,7 @@ class SupervisedUserExtensionsManager : public Extensi
+   // launched.
+   bool ShouldBlockExtension(const std::string& extension_id) const;
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Triggers an one-time migration of the present extensions as parent-approved
+   // when the feature
+   // `kEnableSupervisedUserSkipParentApprovalToInstallExtensions` becomes
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_supervised_user_supervised_user_navigation_observer_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_supervised_user_supervised_user_navigation_observer_cc
index bdd86b706..d985118ae 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_supervised_user_supervised_user_navigation_observer_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_supervised_user_supervised_user_navigation_observer_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/supervised_user/supervised_user_navigation_observer.cc
 --- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig
 +++ chrome/browser/supervised_user/supervised_user_navigation_observer.cc
-@@ -44,7 +44,7 @@
+@@ -47,7 +47,7 @@
  #include "chrome/browser/supervised_user/android/supervised_user_web_content_handler_impl.h"
  #elif BUILDFLAG(IS_CHROMEOS)
  #include "chrome/browser/supervised_user/chromeos/supervised_user_web_content_handler_impl.h"
@@ -10,7 +10,7 @@ Index: chrome/browser/supervised_user/supervised_user_navigation_observer.cc
  #include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.h"
  #endif
  
-@@ -64,7 +64,7 @@ std::unique_ptr<supervised_user::WebContentHandler> Cr
+@@ -67,7 +67,7 @@ std::unique_ptr<supervised_user::WebContentHandler> Cr
  #elif BUILDFLAG(IS_ANDROID)
    return std::make_unique<SupervisedUserWebContentHandlerImpl>(
        web_contents, frame_id, navigation_id);
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_sync_chrome_sync_client_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_sync_chrome_sync_client_cc
index b2b508fb8..dfc270e9e 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_sync_chrome_sync_client_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_sync_chrome_sync_client_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/sync/chrome_sync_client.cc
 --- chrome/browser/sync/chrome_sync_client.cc.orig
 +++ chrome/browser/sync/chrome_sync_client.cc
-@@ -110,7 +110,7 @@
+@@ -112,7 +112,7 @@
  #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
  
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -10,7 +10,7 @@ Index: chrome/browser/sync/chrome_sync_client.cc
  #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h"
  #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
-@@ -440,7 +440,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -460,7 +460,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
  #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -19,7 +19,7 @@ Index: chrome/browser/sync/chrome_sync_client.cc
      if (base::FeatureList::IsEnabled(features::kTabGroupsSave)) {
        controllers.push_back(std::make_unique<syncer::ModelTypeController>(
            syncer::SAVED_TAB_GROUP,
-@@ -453,7 +453,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -473,7 +473,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
  
  // Chrome prefers OS provided spell checkers where they exist. So only sync the
  // custom dictionary on platforms that typically don't provide one.
@@ -28,7 +28,7 @@ Index: chrome/browser/sync/chrome_sync_client.cc
      // Dictionary sync is enabled by default.
      if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) {
        controllers.push_back(
-@@ -609,7 +609,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate>
+@@ -629,7 +629,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate>
  ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) {
    switch (type) {
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -36,4 +36,4 @@ Index: chrome/browser/sync/chrome_sync_client.cc
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
      case syncer::SAVED_TAB_GROUP: {
        DCHECK(base::FeatureList::IsEnabled(features::kTabGroupsSave));
-       return SavedTabGroupServiceFactory::GetForProfile(profile_)
+       return tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile_)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_sync_sync_service_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_sync_sync_service_factory_cc
index cab1f76c3..100f7d8d8 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_sync_sync_service_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_sync_sync_service_factory_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/sync/sync_service_factory.cc
 --- chrome/browser/sync/sync_service_factory.cc.orig
 +++ chrome/browser/sync/sync_service_factory.cc
-@@ -80,7 +80,7 @@
+@@ -84,7 +84,7 @@
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -10,7 +10,7 @@ Index: chrome/browser/sync/sync_service_factory.cc
  #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
          // BUILDFLAG(IS_WIN)
-@@ -129,7 +129,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
+@@ -130,7 +130,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
  // TODO(crbug.com/1052397): Reassess whether the following block needs to be
  // included in lacros-chrome once build flag switch of lacros-chrome is
  // complete.
@@ -19,12 +19,12 @@ Index: chrome/browser/sync/sync_service_factory.cc
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
    syncer::SyncPrefs prefs(profile->GetPrefs());
    local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
-@@ -251,7 +251,7 @@ SyncServiceFactory::SyncServiceFactory()
-   DependsOn(PasswordStoreFactory::GetInstance());
+@@ -264,7 +264,7 @@ SyncServiceFactory::SyncServiceFactory()
+   DependsOn(ProfilePasswordStoreFactory::GetInstance());
    DependsOn(PowerBookmarkServiceFactory::GetInstance());
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   DependsOn(SavedTabGroupServiceFactory::GetInstance());
+   DependsOn(tab_groups::SavedTabGroupServiceFactory::GetInstance());
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
          // BUILDFLAG(IS_WIN)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_sync_sync_service_util_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_sync_sync_service_util_cc
new file mode 100644
index 000000000..05fc3b30c
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_sync_sync_service_util_cc
@@ -0,0 +1,21 @@
+Index: chrome/browser/sync/sync_service_util.cc
+--- chrome/browser/sync/sync_service_util.cc.orig
++++ chrome/browser/sync/sync_service_util.cc
+@@ -9,7 +9,7 @@
+ #include "components/sync/base/features.h"
+ 
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "components/variations/service/variations_service.h"
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
+         // BUILDFLAG(IS_WIN)
+@@ -22,7 +22,7 @@ bool IsDesktopEnUSLocaleOnlySyncPollFeatureEnabled() {
+   }
+ 
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   std::string country_code;
+   auto* variations_service = g_browser_process->variations_service();
+   if (variations_service) {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_group_h b/www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_group_h
index 9c9ce9b07..228d0362f 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_group_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_group_h
@@ -10,7 +10,7 @@ Index: chrome/browser/task_manager/sampling/task_group.h
      REFRESH_TYPE_FD_COUNT |
  #endif
      REFRESH_TYPE_HARD_FAULTS;
-@@ -150,7 +150,7 @@ class TaskGroup {
+@@ -152,7 +152,7 @@ class TaskGroup {
    }
  #endif  // BUILDFLAG(ENABLE_NACL)
  
@@ -19,7 +19,7 @@ Index: chrome/browser/task_manager/sampling/task_group.h
    int open_fd_count() const { return open_fd_count_; }
    void set_open_fd_count(int open_fd_count) { open_fd_count_ = open_fd_count; }
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-@@ -170,7 +170,7 @@ class TaskGroup {
+@@ -172,7 +172,7 @@ class TaskGroup {
    void RefreshNaClDebugStubPort(int child_process_unique_id);
    void OnRefreshNaClDebugStubPortDone(int port);
  #endif
@@ -28,7 +28,7 @@ Index: chrome/browser/task_manager/sampling/task_group.h
    void OnOpenFdCountRefreshDone(int open_fd_count);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
  
-@@ -243,7 +243,7 @@ class TaskGroup {
+@@ -244,7 +244,7 @@ class TaskGroup {
  #if BUILDFLAG(ENABLE_NACL)
    int nacl_debug_stub_port_;
  #endif  // BUILDFLAG(ENABLE_NACL)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_group_sampler_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_group_sampler_cc
index a823555cb..8960d0299 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_group_sampler_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_group_sampler_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/task_manager/sampling/task_group_sampler.cc
 --- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig
 +++ chrome/browser/task_manager/sampling/task_group_sampler.cc
-@@ -45,7 +45,7 @@ TaskGroupSampler::TaskGroupSampler(
+@@ -46,7 +46,7 @@ TaskGroupSampler::TaskGroupSampler(
      const OnCpuRefreshCallback& on_cpu_refresh,
      const OnSwappedMemRefreshCallback& on_swapped_mem_refresh,
      const OnIdleWakeupsCallback& on_idle_wakeups,
@@ -10,7 +10,7 @@ Index: chrome/browser/task_manager/sampling/task_group_sampler.cc
      const OnOpenFdCountCallback& on_open_fd_count,
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
      const OnProcessPriorityCallback& on_process_priority)
-@@ -55,7 +55,7 @@ TaskGroupSampler::TaskGroupSampler(
+@@ -56,7 +56,7 @@ TaskGroupSampler::TaskGroupSampler(
        on_cpu_refresh_callback_(on_cpu_refresh),
        on_swapped_mem_refresh_callback_(on_swapped_mem_refresh),
        on_idle_wakeups_callback_(on_idle_wakeups),
@@ -19,7 +19,7 @@ Index: chrome/browser/task_manager/sampling/task_group_sampler.cc
        on_open_fd_count_callback_(on_open_fd_count),
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
        on_process_priority_callback_(on_process_priority) {
-@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
+@@ -86,7 +86,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
          base::BindOnce(on_swapped_mem_refresh_callback_));
    }
  
@@ -28,7 +28,7 @@ Index: chrome/browser/task_manager/sampling/task_group_sampler.cc
    if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS,
                                                      refresh_flags)) {
      blocking_pool_runner_->PostTaskAndReplyWithResult(
-@@ -95,7 +95,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
+@@ -96,7 +96,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
    }
  #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
@@ -37,7 +37,7 @@ Index: chrome/browser/task_manager/sampling/task_group_sampler.cc
    if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT,
                                                      refresh_flags)) {
      blocking_pool_runner_->PostTaskAndReplyWithResult(
-@@ -144,7 +144,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() {
+@@ -150,7 +150,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() {
    return process_metrics_->GetIdleWakeupsPerSecond();
  }
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_manager_impl_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_manager_impl_cc
index 58c9c44ba..46d98284f 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_manager_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_manager_impl_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/task_manager/sampling/task_manager_impl.cc
 --- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig
 +++ chrome/browser/task_manager/sampling/task_manager_impl.cc
-@@ -217,7 +217,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
+@@ -218,7 +218,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
  }
  
  int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_themes_theme_service_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_themes_theme_service_cc
index 53a9f6788..6a696ee0d 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_themes_theme_service_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_themes_theme_service_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/themes/theme_service.cc
 --- chrome/browser/themes/theme_service.cc.orig
 +++ chrome/browser/themes/theme_service.cc
-@@ -75,7 +75,7 @@
+@@ -74,7 +74,7 @@
  #include "extensions/browser/extension_registry_observer.h"
  #endif
  
@@ -10,7 +10,7 @@ Index: chrome/browser/themes/theme_service.cc
  #include "ui/linux/linux_ui.h"
  #include "ui/ozone/public/ozone_platform.h"
  #endif
-@@ -333,7 +333,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() 
+@@ -330,7 +330,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() 
  }
  
  bool ThemeService::ShouldUseCustomFrame() const {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_actions_chrome_action_id_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_actions_chrome_action_id_h
new file mode 100644
index 000000000..bf7900a32
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_actions_chrome_action_id_h
@@ -0,0 +1,12 @@
+Index: chrome/browser/ui/actions/chrome_action_id.h
+--- chrome/browser/ui/actions/chrome_action_id.h.orig
++++ chrome/browser/ui/actions/chrome_action_id.h
+@@ -510,7 +510,7 @@
+     IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \
+   E(kActionContentContextQuickAnswersInlineQuery, \
+     IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \
+   E(kUseSystemTitleBar, IDC_USE_SYSTEM_TITLE_BAR) \
+   E(kRestoreWindow, IDC_RESTORE_WINDOW)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_autofill_chrome_autofill_client_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_autofill_chrome_autofill_client_cc
deleted file mode 100644
index 25fdc05b7..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_autofill_chrome_autofill_client_cc
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: chrome/browser/ui/autofill/chrome_autofill_client.cc
---- chrome/browser/ui/autofill/chrome_autofill_client.cc.orig
-+++ chrome/browser/ui/autofill/chrome_autofill_client.cc
-@@ -1100,7 +1100,14 @@ void ChromeAutofillClient::PropagateAutofillPrediction
-           &renderer_form);
-     }
- 
-+#if defined(__clang__) && (__clang_major__ >= 16)
-     for (const auto& [frame_token, frame_forms] : renderer_forms_by_frame) {
-+#else
-+    for (const auto& r_f : renderer_forms_by_frame) {
-+      const auto& [f_t, f_f] = r_f;
-+      const auto& frame_token = f_t;
-+      const auto& frame_forms = f_f;
-+#endif
-       // Attempt to find the RFH with this `frame_token`.
-       content::RenderFrameHost* rfh = nullptr;
-       GetWebContents().ForEachRenderFrameHost(
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop_payments_window_manager_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop_payments_window_manager_cc
new file mode 100644
index 000000000..aa58e5ea9
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop_payments_window_manager_cc
@@ -0,0 +1,21 @@
+Index: chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc
+--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig
++++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc
+@@ -25,7 +25,7 @@ namespace autofill::payments {
+ DesktopPaymentsWindowManager::DesktopPaymentsWindowManager(
+     ContentAutofillClient* client)
+     : client_(CHECK_DEREF(client)) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+   scoped_observation_.Observe(BrowserList::GetInstance());
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+ }
+@@ -48,7 +48,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye
+   }
+ }
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+ void DesktopPaymentsWindowManager::OnBrowserSetLastActive(Browser* browser) {
+   // If there is an ongoing payments window manager pop-up flow, and the
+   // original tab's WebContents become active, activate the pop-up's
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop_payments_window_manager_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop_payments_window_manager_h
new file mode 100644
index 000000000..a3c2396f3
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop_payments_window_manager_h
@@ -0,0 +1,39 @@
+Index: chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h
+--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig
++++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h
+@@ -11,7 +11,7 @@
+ #include "components/autofill/core/browser/payments/payments_window_manager.h"
+ #include "content/public/browser/web_contents_observer.h"
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+ #include "base/scoped_observation.h"
+ #include "chrome/browser/ui/browser_list.h"
+ #include "chrome/browser/ui/browser_list_observer.h"
+@@ -30,7 +30,7 @@ namespace payments {
+ // WebContents of the original tab that the pop-up is created in. If there is a
+ // pop-up currently present, `this` will observe the WebContents of that pop-up.
+ class DesktopPaymentsWindowManager : public PaymentsWindowManager,
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+                                      public BrowserListObserver,
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+                                      public content::WebContentsObserver {
+@@ -47,7 +47,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi
+   // content::WebContentsObserver:
+   void WebContentsDestroyed() override;
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+   // BrowserListObserver:
+   void OnBrowserSetLastActive(Browser* browser) override;
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -99,7 +99,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi
+   // ContentAutofillClient that owns `this`.
+   const raw_ref<ContentAutofillClient> client_;
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+   base::ScopedObservation<BrowserList, BrowserListObserver> scoped_observation_{
+       this};
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_command_controller_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_command_controller_cc
index e6df9e8e7..5ee249fbb 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_command_controller_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_command_controller_cc
@@ -1,16 +1,16 @@
 Index: chrome/browser/ui/browser_command_controller.cc
 --- chrome/browser/ui/browser_command_controller.cc.orig
 +++ chrome/browser/ui/browser_command_controller.cc
-@@ -123,7 +123,7 @@
+@@ -120,7 +120,7 @@
  #include "components/user_manager/user_manager.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/base/ime/text_input_flags.h"
  #include "ui/linux/linux_ui.h"
  #endif
- 
-@@ -304,7 +304,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -302,7 +302,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
  #endif
    }
  
@@ -19,7 +19,7 @@ Index: chrome/browser/ui/browser_command_controller.cc
    // If this key was registered by the user as a content editing hotkey, then
    // it is not reserved.
    auto* linux_ui = ui::LinuxUi::instance();
-@@ -555,7 +555,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -554,7 +554,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -28,7 +28,7 @@ Index: chrome/browser/ui/browser_command_controller.cc
      case IDC_MINIMIZE_WINDOW:
        browser_->window()->Minimize();
        break;
-@@ -567,7 +567,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -566,7 +566,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
        break;
  #endif
  
@@ -37,7 +37,7 @@ Index: chrome/browser/ui/browser_command_controller.cc
      case IDC_USE_SYSTEM_TITLE_BAR: {
        PrefService* prefs = profile()->GetPrefs();
        prefs->SetBoolean(prefs::kUseCustomChromeFrame,
-@@ -1210,12 +1210,12 @@ void BrowserCommandController::InitCommandState() {
+@@ -1230,12 +1230,12 @@ void BrowserCommandController::InitCommandState() {
  #endif
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_h
index 68eb8518a..490af674e 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_h
@@ -1,8 +1,8 @@
 Index: chrome/browser/ui/browser.h
 --- chrome/browser/ui/browser.h.orig
 +++ chrome/browser/ui/browser.h
-@@ -289,7 +289,7 @@ class Browser : public TabStripModelObserver,
-     int32_t restore_id = kDefaultRestoreId;
+@@ -310,7 +310,7 @@ class Browser : public TabStripModelObserver,
+     std::optional<int64_t> display_id;
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_ui_prefs_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_ui_prefs_cc
new file mode 100644
index 000000000..a38e815fb
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_ui_prefs_cc
@@ -0,0 +1,12 @@
+Index: chrome/browser/ui/browser_ui_prefs.cc
+--- chrome/browser/ui/browser_ui_prefs.cc.orig
++++ chrome/browser/ui/browser_ui_prefs.cc
+@@ -168,7 +168,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry
+   registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks);
+   registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations);
+   registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false);
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   registry->RegisterStringPref(prefs::kEnterpriseLogoUrl, std::string());
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+ }
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_cc
index 2249ab1d3..b1e75e563 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/chrome_pages.cc
 --- chrome/browser/ui/chrome_pages.cc.orig
 +++ chrome/browser/ui/chrome_pages.cc
-@@ -70,7 +70,7 @@
+@@ -81,7 +81,7 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -10,12 +10,12 @@ Index: chrome/browser/ui/chrome_pages.cc
  #include "chrome/browser/web_applications/web_app_utils.h"
  #endif
  
-@@ -616,7 +616,7 @@ void ShowShortcutCustomizationApp(Profile* profile) {
+@@ -715,7 +715,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- void ShowWebAppSettings(Browser* browser,
-                         const std::string& app_id,
-                         web_app::AppSettingsPageEntryPoint entry_point) {
+ void ShowWebAppSettingsImpl(Browser* browser,
+                             Profile* profile,
+                             const std::string& app_id,
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_h
index 02a215210..512f66bed 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_h
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/chrome_pages.h
 --- chrome/browser/ui/chrome_pages.h.orig
 +++ chrome/browser/ui/chrome_pages.h
-@@ -34,7 +34,7 @@ enum class ConsentLevel;
+@@ -38,7 +38,7 @@ enum class ConsentLevel;
  }  // namespace signin
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -10,7 +10,7 @@ Index: chrome/browser/ui/chrome_pages.h
  namespace web_app {
  enum class AppSettingsPageEntryPoint;
  }  // namespace web_app
-@@ -237,7 +237,7 @@ void ShowShortcutCustomizationApp(Profile* profile);
+@@ -262,7 +262,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_exclusive_access_exclusive_access_bubble_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_exclusive_access_exclusive_access_bubble_cc
index 61373f919..a84870044 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_exclusive_access_exclusive_access_bubble_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_exclusive_access_exclusive_access_bubble_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc
 --- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig
 +++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc
-@@ -16,7 +16,7 @@
+@@ -19,7 +19,7 @@
  
  // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding
  // here.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_omnibox_chrome_omnibox_client_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_omnibox_chrome_omnibox_client_cc
deleted file mode 100644
index 0e8ee04ae..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_omnibox_chrome_omnibox_client_cc
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: chrome/browser/ui/omnibox/chrome_omnibox_client.cc
---- chrome/browser/ui/omnibox/chrome_omnibox_client.cc.orig
-+++ chrome/browser/ui/omnibox/chrome_omnibox_client.cc
-@@ -474,10 +474,18 @@ void ChromeOmniboxClient::OnAutocompleteAccept(
-               alternative_nav_match);
- 
-   // Store the details necessary to open the omnibox match via browser commands.
-+#if defined(__clang__) && (__clang_major__ >= 16)
-   location_bar_->set_navigation_params(LocationBar::NavigationParams(
-       destination_url, disposition, transition, match_selection_timestamp,
-       destination_url_entered_without_scheme,
-       destination_url_entered_with_http_scheme));
-+#else
-+  LocationBar::NavigationParams np = {
-+      destination_url, disposition, transition, match_selection_timestamp,
-+      destination_url_entered_without_scheme,
-+      destination_url_entered_with_http_scheme };
-+  location_bar_->set_navigation_params(np);
-+#endif
- 
-   if (browser_) {
-     auto navigation = chrome::OpenCurrentURL(browser_);
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_omnibox_omnibox_pedal_implementations_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_omnibox_omnibox_pedal_implementations_cc
index 33e59262f..b2b2c194d 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_omnibox_omnibox_pedal_implementations_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_omnibox_omnibox_pedal_implementations_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
 --- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig
 +++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
-@@ -1961,7 +1961,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() {
+@@ -1989,7 +1989,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() {
                   OmniboxFieldTrial::IsChromeRefreshActionChipIconsEnabled()
               ? omnibox::kShareWinChromeRefreshIcon
               : omnibox::kShareWinIcon;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_passwords_bubble_controllers_relaunch_chrome_bubble_controller_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_passwords_bubble_controllers_relaunch_chrome_bubble_controller_cc
new file mode 100644
index 000000000..5f80affff
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_passwords_bubble_controllers_relaunch_chrome_bubble_controller_cc
@@ -0,0 +1,21 @@
+Index: chrome/browser/ui/passwords/bubble_controllers/relaunch_chrome_bubble_controller.cc
+--- chrome/browser/ui/passwords/bubble_controllers/relaunch_chrome_bubble_controller.cc.orig
++++ chrome/browser/ui/passwords/bubble_controllers/relaunch_chrome_bubble_controller.cc
+@@ -44,7 +44,7 @@ std::u16string RelaunchChromeBubbleController::GetTitl
+ #if BUILDFLAG(IS_MAC)
+           ? IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_TITLE_BRANDED
+           : IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_TITLE_NON_BRANDED
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+           ? IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_TITLE_LINUX_BRANDED
+           : IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_TITLE_LINUX_NON_BRANDED
+ #endif
+@@ -57,7 +57,7 @@ std::u16string RelaunchChromeBubbleController::GetBody
+ #if BUILDFLAG(IS_MAC)
+           ? IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_DESCRIPTION_BRANDED
+           : IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_DESCRIPTION_NON_BRANDED
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+           ? IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_DESCRIPTION_LINUX_BRANDED
+           : IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_DESCRIPTION_LINUX_NON_BRANDED
+ #endif
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_passwords_manage_passwords_ui_controller_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_passwords_manage_passwords_ui_controller_cc
new file mode 100644
index 000000000..6108306da
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_passwords_manage_passwords_ui_controller_cc
@@ -0,0 +1,21 @@
+Index: chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
+--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig
++++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
+@@ -88,7 +88,7 @@ int ManagePasswordsUIController::save_fallback_timeout
+ 
+ namespace {
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Should be kept in sync with constant declared in
+ // bubble_controllers/relaunch_chrome_bubble_controller.cc.
+ constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3;
+@@ -477,7 +477,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor
+ }
+ 
+ void ManagePasswordsUIController::OnKeychainError() {
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   CHECK(!dialog_controller_);
+   PrefService* prefs =
+       Profile::FromBrowserContext(web_contents()->GetBrowserContext())
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_view_controller_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_signin_view_controller_cc
similarity index 50%
rename from www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_view_controller_cc
rename to www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_signin_view_controller_cc
index 7b82cb099..f087a1f92 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_view_controller_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_signin_view_controller_cc
@@ -1,7 +1,7 @@
-Index: chrome/browser/ui/signin_view_controller.cc
---- chrome/browser/ui/signin_view_controller.cc.orig
-+++ chrome/browser/ui/signin_view_controller.cc
-@@ -275,7 +275,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
+Index: chrome/browser/ui/signin/signin_view_controller.cc
+--- chrome/browser/ui/signin/signin_view_controller.cc.orig
++++ chrome/browser/ui/signin/signin_view_controller.cc
+@@ -255,7 +255,7 @@ void SigninViewController::ShowModalManagedUserNoticeD
      bool show_link_data_option,
      signin::SigninChoiceCallback callback) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,4 +9,4 @@ Index: chrome/browser/ui/signin_view_controller.cc
 +    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
    CloseModalSignin();
    dialog_ = std::make_unique<SigninModalDialogImpl>(
-       SigninViewControllerDelegate::CreateEnterpriseConfirmationDelegate(
+       SigninViewControllerDelegate::CreateManagedUserNoticeDelegate(
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_view_controller_delegate_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_signin_view_controller_delegate_h
similarity index 62%
rename from www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_view_controller_delegate_h
rename to www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_signin_view_controller_delegate_h
index e36d286eb..52a847799 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_view_controller_delegate_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_signin_view_controller_delegate_h
@@ -1,6 +1,6 @@
-Index: chrome/browser/ui/signin_view_controller_delegate.h
---- chrome/browser/ui/signin_view_controller_delegate.h.orig
-+++ chrome/browser/ui/signin_view_controller_delegate.h
+Index: chrome/browser/ui/signin/signin_view_controller_delegate.h
+--- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig
++++ chrome/browser/ui/signin/signin_view_controller_delegate.h
 @@ -81,7 +81,7 @@ class SigninViewControllerDelegate {
  #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
  
@@ -8,5 +8,5 @@ Index: chrome/browser/ui/signin_view_controller_delegate.h
 -    BUILDFLAG(IS_CHROMEOS_LACROS)
 +    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
    // Returns a platform-specific SigninViewContolllerDelegate instance that
-   // displays the enterprise confirmation modal dialog. The returned object
+   // displays the managed user notice modal dialog. The returned object
    // should delete itself when the window it's managing is closed.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_bad_flags_prompt_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_bad_flags_prompt_cc
index 81027588a..ab418c102 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_bad_flags_prompt_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_bad_flags_prompt_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/startup/bad_flags_prompt.cc
 --- chrome/browser/ui/startup/bad_flags_prompt.cc.orig
 +++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -95,7 +95,7 @@ static const char* kBadFlags[] = {
+@@ -104,7 +104,7 @@ const char* const kBadFlags[] = {
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_cc
index 0a5f8d9cd..13aa7631b 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/startup/startup_browser_creator.cc
 --- chrome/browser/ui/startup/startup_browser_creator.cc.orig
 +++ chrome/browser/ui/startup/startup_browser_creator.cc
-@@ -132,7 +132,7 @@
+@@ -135,7 +135,7 @@
  #include "chrome/credential_provider/common/gcp_strings.h"
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -10,7 +10,7 @@ Index: chrome/browser/ui/startup/startup_browser_creator.cc
  #include "chrome/browser/headless/headless_mode_util.h"
  #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
  #include "components/headless/policy/headless_mode_policy.h"
-@@ -917,7 +917,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -962,7 +962,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
    TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
    ComputeAndRecordLaunchMode(command_line);
  
@@ -19,7 +19,7 @@ Index: chrome/browser/ui/startup/startup_browser_creator.cc
    if (headless::IsHeadlessMode() &&
        headless::HeadlessModePolicy::IsHeadlessModeDisabled(
            g_browser_process->local_state())) {
-@@ -1021,7 +1021,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1060,7 +1060,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
      silent_launch = true;
    }
  
@@ -28,7 +28,7 @@ Index: chrome/browser/ui/startup/startup_browser_creator.cc
    // Writes open and installed web apps to the specified file without
    // launching a new browser window or tab.
    if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
-@@ -1232,7 +1232,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1270,7 +1270,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
      CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow)
          << "Failed launch with app: couldn't pick a profile";
      std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId);
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_impl_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_impl_cc
index 705764490..99372c5d1 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_impl_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc
 --- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig
 +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -260,7 +260,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
+@@ -261,7 +261,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
      // at the state of the MessageLoop.
      Browser::CreateParams params = Browser::CreateParams(profile_, false);
      params.creation_source = Browser::CreationSource::kStartupCreator;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_startup_tab_provider_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_startup_tab_provider_cc
new file mode 100644
index 000000000..22257b67f
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_startup_tab_provider_cc
@@ -0,0 +1,21 @@
+Index: chrome/browser/ui/startup/startup_tab_provider.cc
+--- chrome/browser/ui/startup/startup_tab_provider.cc.orig
++++ chrome/browser/ui/startup/startup_tab_provider.cc
+@@ -61,7 +61,7 @@
+ #include "extensions/browser/extension_registry.h"
+ #endif  // !BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/headless/headless_mode_util.h"
+ #endif
+ 
+@@ -105,7 +105,7 @@ bool ValidateUrl(const GURL& url) {
+ #if BUILDFLAG(IS_CHROMEOS_LACROS)
+   // In ChromeOS, allow any URL pattern that matches chrome:// scheme.
+   url_scheme_is_chrome = url.SchemeIs(content::kChromeUIScheme);
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   // In Headless mode, allow any URL pattern that matches chrome:// scheme if
+   // the user explicitly allowed it.
+   if (headless::IsHeadlessMode() && url.SchemeIs(content::kChromeUIScheme)) {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_tab_helpers_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_tab_helpers_cc
index 88ed507a4..0d4c027c7 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_tab_helpers_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_tab_helpers_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/tab_helpers.cc
 --- chrome/browser/ui/tab_helpers.cc.orig
 +++ chrome/browser/ui/tab_helpers.cc
-@@ -223,7 +223,7 @@
+@@ -233,7 +233,7 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -10,7 +10,7 @@ Index: chrome/browser/ui/tab_helpers.cc
  #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
  #include "chrome/browser/ui/browser_finder.h"
  #include "chrome/browser/ui/hats/hats_helper.h"
-@@ -597,12 +597,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -656,12 +656,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_task_manager_task_manager_table_model_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_task_manager_task_manager_table_model_cc
index db362e749..3878fd852 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_task_manager_task_manager_table_model_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_task_manager_task_manager_table_model_cc
@@ -19,7 +19,7 @@ Index: chrome/browser/ui/task_manager/task_manager_table_model.cc
      case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
        const int proc1_fd_count =
            observed_task_manager()->GetOpenFdCount(tasks_[row1]);
-@@ -795,7 +795,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
+@@ -799,7 +799,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
        type = REFRESH_TYPE_KEEPALIVE_COUNT;
        break;
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_ui_features_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_ui_features_cc
index 3c7c241b3..d192a0501 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_ui_features_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_ui_features_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/ui_features.cc
 --- chrome/browser/ui/ui_features.cc.orig
 +++ chrome/browser/ui/ui_features.cc
-@@ -288,7 +288,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
+@@ -410,7 +410,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
               "TopChromeWebUIUsesSpareRenderer",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_ui_features_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_ui_features_h
index 5ff4db1c2..b6d426c3c 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_ui_features_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_ui_features_h
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/ui_features.h
 --- chrome/browser/ui/ui_features.h.orig
 +++ chrome/browser/ui/ui_features.h
-@@ -191,7 +191,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
+@@ -264,7 +264,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
  
  BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer);
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_accelerator_table_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_accelerator_table_cc
index 77e59be8b..600d1a458 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_accelerator_table_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_accelerator_table_cc
@@ -24,7 +24,7 @@ Index: chrome/browser/ui/views/accelerator_table.cc
      {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
      {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
      {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1},
-@@ -149,7 +149,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -154,7 +154,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
       IDC_SHOW_AVATAR_MENU},
  
  // Platform-specific key maps.
@@ -33,7 +33,7 @@ Index: chrome/browser/ui/views/accelerator_table.cc
      {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK},
      {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD},
      {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME},
-@@ -244,7 +244,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -250,7 +250,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
  #endif  // !BUILDFLAG(IS_CHROMEOS)
  #endif  // !BUILDFLAG(IS_MAC)
  #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_chrome_browser_main_extra_parts_views_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_chrome_browser_main_extra_parts_views_cc
index ba45a6822..09aa6954c 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_chrome_browser_main_extra_parts_views_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_chrome_browser_main_extra_parts_views_cc
@@ -1,21 +1,21 @@
 Index: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
 --- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig
 +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
-@@ -41,7 +41,7 @@
+@@ -38,7 +38,7 @@
+ #include "ui/wm/core/wm_state.h"
+ #endif  // defined(USE_AURA)
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include <sys/stat.h>
  #include <sys/types.h>
  #include <unistd.h>
-@@ -136,7 +136,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+@@ -131,7 +131,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+         return controller;
+       }));
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // On the Linux desktop, we want to prevent the user from logging in as root,
    // so that we don't destroy the profile. Now that we have some minimal ui
    // initialized, check to see if we're running as root and bail if we are.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h
index 08c41bcf7..3fa797d1f 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/views/chrome_views_delegate.h
 --- chrome/browser/ui/views/chrome_views_delegate.h.orig
 +++ chrome/browser/ui/views/chrome_views_delegate.h
-@@ -54,11 +54,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat
+@@ -59,11 +59,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat
                               base::OnceClosure callback) override;
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_compose_compose_dialog_view_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_compose_compose_dialog_view_cc
new file mode 100644
index 000000000..e68e9941a
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_compose_compose_dialog_view_cc
@@ -0,0 +1,12 @@
+Index: chrome/browser/ui/views/compose/compose_dialog_view.cc
+--- chrome/browser/ui/views/compose/compose_dialog_view.cc.orig
++++ chrome/browser/ui/views/compose/compose_dialog_view.cc
+@@ -159,7 +159,7 @@ void ComposeDialogView::OnBeforeBubbleWidgetInit(
+     views::Widget::InitParams* params,
+     views::Widget* widget) const {
+   WebUIBubbleDialogView::OnBeforeBubbleWidgetInit(params, widget);
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // In linux, windows may be clipped to their anchors' bounds,
+   // resulting in visual errors, unless they use accelerated rendering. See
+   // crbug.com/1445770 for details.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_eye_dropper_eye_dropper_view_aura_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_eye_dropper_eye_dropper_view_aura_cc
deleted file mode 100644
index bb120185d..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_eye_dropper_eye_dropper_view_aura_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc
---- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig
-+++ chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc
-@@ -119,7 +119,7 @@ void EyeDropperView::MoveViewToFront() {
- }
- 
- void EyeDropperView::CaptureInputIfNeeded() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // The eye dropper needs to capture input since it is not activated
-   // in order to avoid dismissing the color picker.
-   GetWidget()->GetNativeWindow()->SetCapture();
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_cc
index c98af8928..720db507e 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_cc
@@ -10,8 +10,8 @@ Index: chrome/browser/ui/views/frame/browser_frame.cc
  #include "ui/display/screen.h"
  #include "ui/linux/linux_ui.h"
  #endif
-@@ -66,7 +66,7 @@
- namespace {
+@@ -89,7 +89,7 @@ class ThemeChangedObserver : public views::WidgetObser
+ };
  
  bool IsUsingLinuxSystemTheme(Profile* profile) {
 -#if BUILDFLAG(IS_LINUX)
@@ -19,7 +19,16 @@ Index: chrome/browser/ui/views/frame/browser_frame.cc
    return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
  #else
    return false;
-@@ -319,7 +319,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
+@@ -184,7 +184,7 @@ void BrowserFrame::InitBrowserFrame() {
+ 
+   Init(std::move(params));
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   SelectNativeTheme();
+ #else
+   SetNativeTheme(ui::NativeTheme::GetInstanceForNativeUi());
+@@ -370,7 +370,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
    chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
    chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
                                             IsVisibleOnAllWorkspaces());
@@ -28,16 +37,16 @@ Index: chrome/browser/ui/views/frame/browser_frame.cc
    // If the window was sent to a different workspace, prioritize it if
    // it was sent to the current workspace and deprioritize it
    // otherwise.  This is done by MoveBrowsersInWorkspaceToFront()
-@@ -547,7 +547,7 @@ void BrowserFrame::SelectNativeTheme() {
-     return;
-   }
+@@ -563,7 +563,7 @@ void BrowserFrame::OnMenuClosed() {
+ }
  
+ void BrowserFrame::SelectNativeTheme() {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const auto* linux_ui_theme =
-       ui::LinuxUiTheme::GetForWindow(GetNativeWindow());
-   // Ignore the system theme for web apps with window-controls-overlay as the
-@@ -564,7 +564,7 @@ void BrowserFrame::SelectNativeTheme() {
+   // Use the regular NativeTheme instance if running incognito mode, regardless
+   // of system theme (gtk, qt etc).
+   ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi();
+@@ -604,7 +604,7 @@ void BrowserFrame::OnTouchUiChanged() {
  bool BrowserFrame::RegenerateFrameOnThemeChange(
      BrowserThemeChangeType theme_change_type) {
    bool need_regenerate = false;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_h
index ddc038ca8..2e638a254 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_h
@@ -1,30 +1,21 @@
 Index: chrome/browser/ui/views/frame/browser_frame.h
 --- chrome/browser/ui/views/frame/browser_frame.h.orig
 +++ chrome/browser/ui/views/frame/browser_frame.h
-@@ -12,7 +12,7 @@
- #include "ui/views/context_menu_controller.h"
- #include "ui/views/widget/widget.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- #include "ui/base/ui_base_types.h"
- #endif
- 
-@@ -68,7 +68,7 @@ class BrowserFrame : public views::Widget, public view
+@@ -65,7 +65,7 @@ class BrowserFrame : public views::Widget, public view
  
    ~BrowserFrame() override;
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-   // Returns which edges of the frame are tiled.
-   const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; }
-   void set_tiled_edges(ui::WindowTiledEdges tiled_edges) {
-@@ -231,7 +231,7 @@ class BrowserFrame : public views::Widget, public view
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Returns whether the frame is in a tiled state.
+   bool tiled() const { return tiled_; }
+   void set_tiled(bool tiled) { tiled_ = tiled; }
+@@ -225,7 +225,7 @@ class BrowserFrame : public views::Widget, public view
    // contents for smoother dragging.
    TabDragKind tab_drag_kind_ = TabDragKind::kNone;
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-   ui::WindowTiledEdges tiled_edges_;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   bool tiled_ = false;
  #endif
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_view_layout_linux_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_view_layout_linux_cc
new file mode 100644
index 000000000..bf2974dab
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_view_layout_linux_cc
@@ -0,0 +1,12 @@
+Index: chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc
+--- chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc.orig
++++ chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc
+@@ -53,7 +53,7 @@ gfx::Insets BrowserFrameViewLayoutLinux::RestoredFrame
+         OpaqueBrowserFrameViewLayout::RestoredFrameBorderInsets());
+   }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   const bool tiled = delegate_->IsTiled();
+ #else
+   const bool tiled = false;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_view_layout_linux_native_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_view_layout_linux_native_cc
new file mode 100644
index 000000000..4aec83b54
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_view_layout_linux_native_cc
@@ -0,0 +1,12 @@
+Index: chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc
+--- chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc.orig
++++ chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc
+@@ -18,7 +18,7 @@ BrowserFrameViewLayoutLinuxNative::~BrowserFrameViewLa
+ 
+ ui::WindowFrameProvider* BrowserFrameViewLayoutLinuxNative::GetFrameProvider()
+     const {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   const bool tiled = delegate_->IsTiled();
+ #else
+   const bool tiled = false;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_view_linux_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_view_linux_cc
new file mode 100644
index 000000000..2b13a7d2c
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_view_linux_cc
@@ -0,0 +1,21 @@
+Index: chrome/browser/ui/views/frame/browser_frame_view_linux.cc
+--- chrome/browser/ui/views/frame/browser_frame_view_linux.cc.orig
++++ chrome/browser/ui/views/frame/browser_frame_view_linux.cc
+@@ -60,7 +60,7 @@ gfx::ShadowValues BrowserFrameViewLinux::GetShadowValu
+ 
+ void BrowserFrameViewLinux::PaintRestoredFrameBorder(
+     gfx::Canvas* canvas) const {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   const bool tiled = frame()->tiled();
+ #else
+   const bool tiled = false;
+@@ -104,7 +104,7 @@ void BrowserFrameViewLinux::OnWindowButtonOrderingChan
+ }
+ 
+ float BrowserFrameViewLinux::GetRestoredCornerRadiusDip() const {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   const bool tiled = frame()->tiled();
+ #else
+   const bool tiled = false;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views_cc
index 7f5cdd127..e50f8b63a 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views_cc
@@ -19,12 +19,3 @@ Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views
    auto* profile = browser_view->browser()->profile();
    auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
    auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile);
-@@ -81,7 +81,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows
-   if (browser_view->browser()->is_type_picture_in_picture()) {
-     auto view =
-         std::make_unique<PictureInPictureBrowserFrameView>(frame, browser_view);
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     auto* profile = browser_view->browser()->profile();
-     auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
-     auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile);
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc
index 543775b46..e1cd3f88a 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/views/frame/browser_view.cc
 --- chrome/browser/ui/views/frame/browser_view.cc.orig
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -2080,7 +2080,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
+@@ -2238,7 +2238,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
    // CrOS cleanup is done.
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc
index 24263d510..e8d7dcb58 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc
@@ -10,7 +10,7 @@ Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
  #include "ui/views/controls/menu/menu_runner.h"
  #endif
  
-@@ -572,7 +572,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
+@@ -566,7 +566,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
  OpaqueBrowserFrameView::GetFrameButtonStyle() const {
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -19,16 +19,16 @@ Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
    return FrameButtonStyle::kMdButton;
  #else
    return FrameButtonStyle::kImageButton;
-@@ -595,7 +595,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh
+@@ -585,7 +585,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh
    return false;
  }
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- ui::WindowTiledEdges OpaqueBrowserFrameView::GetTiledEdges() const {
-   return frame()->tiled_edges();
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool OpaqueBrowserFrameView::IsTiled() const {
+   return frame()->tiled();
  }
-@@ -796,7 +796,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
+@@ -783,7 +783,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
  }
  
  void OpaqueBrowserFrameView::WindowIconPressed() {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_h
index 117fa0cbb..63837f679 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_h
@@ -1,16 +1,16 @@
 Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.h
 --- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h
-@@ -117,7 +117,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
+@@ -115,7 +115,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
+   void UpdateWindowControlsOverlay(
        const gfx::Rect& bounding_rect) const override;
-   bool IsTranslucentWindowOpacitySupported() const override;
    bool ShouldDrawRestoredFrameShadow() const override;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-   ui::WindowTiledEdges GetTiledEdges() const override;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   bool IsTiled() const override;
  #endif
    int WebAppButtonHeight() const override;
-@@ -234,7 +234,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
+@@ -232,7 +232,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
    // Background painter for the window frame.
    std::unique_ptr<views::FrameBackground> frame_background_;
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_layout_delegate_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_layout_delegate_h
index baad2bcd3..561b27014 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_layout_delegate_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_layout_delegate_h
@@ -10,12 +10,12 @@ Index: chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h
  #include "ui/base/ui_base_types.h"
  #endif
  
-@@ -97,7 +97,7 @@ class OpaqueBrowserFrameViewLayoutDelegate {
+@@ -94,7 +94,7 @@ class OpaqueBrowserFrameViewLayoutDelegate {
    // Returns true if a client-side shadow should be drawn for restored windows.
    virtual bool ShouldDrawRestoredFrameShadow() const = 0;
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-   // Returns which edges of the window are snapped to the edges of the desktop
-   // (or "tiled").
-   virtual ui::WindowTiledEdges GetTiledEdges() const = 0;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Returns whether the window is in a tiled state.
+   virtual bool IsTiled() const = 0;
+ #endif
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_cc
index 4141a6570..dadd0eae7 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_cc
@@ -1,25 +1,25 @@
 Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
 --- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig
 +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
-@@ -56,7 +56,7 @@
+@@ -59,7 +59,7 @@
  #include "ui/aura/window.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/themes/theme_service.h"
+ #include "chrome/browser/themes/theme_service_factory.h"
  #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h"
- #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h"
- #endif
-@@ -78,7 +78,7 @@ constexpr int kBackToTabImageSize = 16;
+@@ -89,7 +89,7 @@ constexpr int kContentSettingIconSize = 16;
  // The height of the controls bar at the top of the window.
- constexpr int kTopControlsHeight = 30;
+ constexpr int kTopControlsHeight = 34;
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Frame border when window shadow is not drawn.
  constexpr int kFrameBorderThickness = 4;
  #endif
-@@ -173,7 +173,7 @@ class WindowEventObserver : public ui::EventObserver {
+@@ -184,7 +184,7 @@ class WindowEventObserver : public ui::EventObserver {
  
      gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds();
  
@@ -28,16 +28,16 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
      // Calculate input bounds for Linux. This is needed because the input bounds
      // is not necessary the same as the local bounds on Linux.
      if (pip_browser_frame_view_->ShouldDrawFrameShadow()) {
-@@ -399,7 +399,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
+@@ -585,7 +585,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
+         AddChildView(std::move(auto_pip_setting_overlay));
    }
- #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   frame_background_ = std::make_unique<views::FrameBackground>();
- #endif
- 
-@@ -578,7 +578,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
+   auto* profile = browser_view->browser()->profile();
+   auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
+   auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile);
+@@ -804,7 +804,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
    for (ContentSettingImageView* view : content_setting_views_)
      view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground));
  
@@ -46,7 +46,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
    // On Linux the top bar background will be drawn in OnPaint().
    top_bar_container_view_->SetBackground(views::CreateSolidBackground(
        color_provider->GetColor(kColorPipWindowTopBarBackground)));
-@@ -634,7 +634,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
+@@ -886,7 +886,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
    BrowserNonClientFrameView::RemovedFromWidget();
  }
  
@@ -55,7 +55,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
  gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets()
      const {
    auto border = FrameBorderInsets();
-@@ -875,7 +875,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
+@@ -1147,7 +1147,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
  // views::View implementations:
  
  void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
@@ -64,7 +64,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
    // Draw the PiP window frame borders and shadows, including the top bar
    // background.
    if (window_frame_provider_) {
-@@ -998,7 +998,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
+@@ -1281,7 +1281,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
  }
  
  gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
@@ -72,22 +72,22 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (window_frame_provider_) {
      const auto insets = window_frame_provider_->GetFrameThicknessDip();
-     const auto tiled_edges = frame()->tiled_edges();
-@@ -1019,7 +1019,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
+     const bool tiled = frame()->tiled();
+@@ -1299,7 +1299,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
  }
  
  gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return FrameBorderInsets();
- #elif BUILDFLAG(IS_CHROMEOS_ASH)
-   return gfx::Insets(chromeos::kResizeInsideBoundsSize);
-@@ -1040,7 +1040,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
+ #elif !BUILDFLAG(IS_CHROMEOS_ASH)
+   return gfx::Insets(kResizeBorder);
+@@ -1320,7 +1320,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
                     top_height + border_thickness.bottom());
  }
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void PictureInPictureBrowserFrameView::SetWindowFrameProvider(
-     ui::WindowFrameProvider* window_frame_provider) {
-   DCHECK(window_frame_provider);
+ bool PictureInPictureBrowserFrameView::ShouldDrawFrameShadow() const {
+   return static_cast<DesktopBrowserFrameAuraLinux*>(
+              frame()->native_browser_frame())
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_h
index 30288834b..42527d056 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_h
@@ -1,8 +1,8 @@
 Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
 --- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig
 +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
-@@ -23,7 +23,7 @@
- #include "ui/views/controls/image_view.h"
+@@ -27,7 +27,7 @@
+ #include "ui/views/layout/flex_layout_view.h"
  #include "ui/views/widget/widget_observer.h"
  
 -#if BUILDFLAG(IS_LINUX)
@@ -10,8 +10,17 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
  #include "ui/linux/window_frame_provider.h"
  #endif
  
-@@ -86,7 +86,7 @@ class PictureInPictureBrowserFrameView
-   void Layout() override;
+@@ -35,7 +35,7 @@
+ // parent window, so to prevent cutting off important dialogs we resize the
+ // picture-in-picture window to fit them. While ChromeOS Ash also uses Aura, it
+ // does not have this issue so we do not resize on ChromeOS Ash.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+ #define RESIZE_DOCUMENT_PICTURE_IN_PICTURE_TO_DIALOG 1
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ||
+         // BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -101,7 +101,7 @@ class PictureInPictureBrowserFrameView
+   void Layout(PassKey) override;
    void AddedToWidget() override;
    void RemovedFromWidget() override;
 -#if BUILDFLAG(IS_LINUX)
@@ -19,18 +28,18 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
    gfx::Insets MirroredFrameBorderInsets() const override;
    gfx::Insets GetInputInsets() const override;
    SkRRect GetRestoredClipRegion() const override;
-@@ -175,7 +175,7 @@ class PictureInPictureBrowserFrameView
-   // Called when mouse entered or exited the pip window.
-   void OnMouseEnteredOrExitedWindow(bool entered);
+@@ -192,7 +192,7 @@ class PictureInPictureBrowserFrameView
+   // Returns true if there's an overlay view that's currently shown.
+   bool IsOverlayViewVisible() const;
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Sets the window frame provider so that it will be used for drawing.
-   void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider);
+   // Returns whether a client-side shadow should be drawn for the window.
+   bool ShouldDrawFrameShadow() const;
  
-@@ -258,7 +258,7 @@ class PictureInPictureBrowserFrameView
+@@ -368,7 +368,7 @@ class PictureInPictureBrowserFrameView
    // `top_bar_color_animation_`.
-   absl::optional<SkColor> current_foreground_color_;
+   std::optional<SkColor> current_foreground_color_;
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_hung_renderer_view_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_hung_renderer_view_cc
index 8c523f2e9..c9c17a5e8 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_hung_renderer_view_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_hung_renderer_view_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/views/hung_renderer_view.cc
 --- chrome/browser/ui/views/hung_renderer_view.cc.orig
 +++ chrome/browser/ui/views/hung_renderer_view.cc
-@@ -404,7 +404,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() 
+@@ -406,7 +406,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() 
    content::RenderProcessHost* rph =
        hung_pages_table_model_->GetRenderWidgetHost()->GetProcess();
    if (rph) {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_passwords_password_bubble_view_base_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_passwords_password_bubble_view_base_cc
new file mode 100644
index 000000000..c6aae0695
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_passwords_password_bubble_view_base_cc
@@ -0,0 +1,21 @@
+Index: chrome/browser/ui/views/passwords/password_bubble_view_base.cc
+--- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig
++++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc
+@@ -34,7 +34,7 @@
+ #include "ui/base/metadata/metadata_impl_macros.h"
+ #include "ui/views/controls/button/button.h"
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/ui/views/passwords/password_relaunch_chrome_view.h"
+ #endif
+ 
+@@ -139,7 +139,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create
+   } else if (model_state ==
+              password_manager::ui::NOTIFY_RECEIVED_SHARED_CREDENTIALS) {
+     view = new SharedPasswordsNotificationView(web_contents, anchor_view);
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   } else if (model_state == password_manager::ui::KEYCHAIN_ERROR_STATE) {
+     view = new RelaunchChromeView(
+         web_contents, anchor_view,
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_profile_menu_view_base_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_profile_menu_view_base_cc
index 53b3d2bd5..323e0be2a 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_profile_menu_view_base_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_profile_menu_view_base_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/views/profiles/profile_menu_view_base.cc
 --- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig
 +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-@@ -651,7 +651,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
+@@ -726,7 +726,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
  
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_signin_view_controller_delegate_views_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_signin_view_controller_delegate_views_cc
index c1635e7d0..407da5f30 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_signin_view_controller_delegate_views_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_signin_view_controller_delegate_views_cc
@@ -1,16 +1,16 @@
 Index: chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
 --- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig
 +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
-@@ -49,7 +49,7 @@ namespace {
+@@ -55,7 +55,7 @@ namespace {
  
  const int kModalDialogWidth = 448;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS_LACROS)
 +    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- const int kEnterpriseConfirmationDialogWidth = 512;
- const int kEnterpriseConfirmationDialogHeight = 576;
+ const int kManagedUserNoticeConfirmationDialogWidth = 512;
+ const int kManagedUserNoticeConfirmationDialogHeight = 576;
  #endif
-@@ -167,7 +167,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom
+@@ -182,7 +182,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom
  #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,8 +18,26 @@ Index: chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
 +    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
  // static
  std::unique_ptr<views::WebView>
- SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView(
-@@ -442,7 +442,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
+ SigninViewControllerDelegateViews::CreateManagedUserNoticeConfirmationWebView(
+@@ -328,7 +328,7 @@ SigninViewControllerDelegateViews::SigninViewControlle
+   SetButtons(ui::DIALOG_BUTTON_NONE);
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS_LACROS)
++    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+   // On the local profile creation dialog, cancelling the dialog (for instance
+   // through the VKEY_ESCAPE accelerator) should delete the profile.
+   if (delete_profile_on_cancel) {
+@@ -418,7 +418,7 @@ void SigninViewControllerDelegateViews::DisplayModal()
+ }
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS_LACROS)
++    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+ void SigninViewControllerDelegateViews::DeleteProfileOnCancel() {
+   ProfileAttributesEntry* entry =
+       g_browser_process->profile_manager()
+@@ -491,7 +491,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
  #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,4 +45,4 @@ Index: chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
 +    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
  // static
  SigninViewControllerDelegate*
- SigninViewControllerDelegate::CreateEnterpriseConfirmationDelegate(
+ SigninViewControllerDelegate::CreateManagedUserNoticeDelegate(
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_signin_view_controller_delegate_views_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_signin_view_controller_delegate_views_h
index 22b1835c3..ca380deaa 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_signin_view_controller_delegate_views_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_signin_view_controller_delegate_views_h
@@ -1,12 +1,21 @@
 Index: chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
 --- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig
 +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
-@@ -74,7 +74,7 @@ class SigninViewControllerDelegateViews
+@@ -73,7 +73,7 @@ class SigninViewControllerDelegateViews
  #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS_LACROS)
 +    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-   static std::unique_ptr<views::WebView> CreateEnterpriseConfirmationWebView(
+   static std::unique_ptr<views::WebView>
+   CreateManagedUserNoticeConfirmationWebView(
        Browser* browser,
-       const AccountInfo& account_info,
+@@ -138,7 +138,7 @@ class SigninViewControllerDelegateViews
+       InitializeSigninWebDialogUI initialize_signin_web_dialog_ui);
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS_LACROS)
++    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+   // Deletes the ephemeral profile when cancelling the local profile creation
+   // dialog.
+   void DeleteProfileOnCancel();
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tab_search_bubble_host_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tab_search_bubble_host_cc
index da1cf541d..aaa39fe58 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tab_search_bubble_host_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tab_search_bubble_host_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/views/tab_search_bubble_host.cc
 --- chrome/browser/ui/views/tab_search_bubble_host.cc.orig
 +++ chrome/browser/ui/views/tab_search_bubble_host.cc
-@@ -184,7 +184,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT
+@@ -263,7 +263,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT
  // Mac should have tabsearch on the right side. Windows >= Win10 has the
  // Tab Search button as a FrameCaptionButton, but it still needs to be on the
  // left if it exists.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_cc
index dd6203fe6..749454bd6 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_cc
@@ -1,9 +1,9 @@
 Index: chrome/browser/ui/views/tabs/tab.cc
 --- chrome/browser/ui/views/tabs/tab.cc.orig
 +++ chrome/browser/ui/views/tabs/tab.cc
-@@ -594,7 +594,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
-   if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled())
+@@ -622,7 +622,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
      return;
+   }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc
index f9f38d196..b9870c8aa 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
 --- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig
 +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -89,7 +89,7 @@
+@@ -93,7 +93,7 @@
  #include "components/remote_cocoa/browser/window.h"
  #endif
  
@@ -10,7 +10,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
  #include "ui/aura/client/drag_drop_client.h"
  #endif
  
-@@ -206,7 +206,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
+@@ -213,7 +213,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
  
  void UpdateSystemDnDDragImage(TabDragContext* attached_context,
                                const gfx::ImageSkia& image) {
@@ -19,16 +19,16 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
    aura::Window* root_window =
        attached_context->GetWidget()->GetNativeWindow()->GetRootWindow();
    if (aura::client::GetDragDropClient(root_window)) {
-@@ -386,7 +386,7 @@ void TabDragController::Init(TabDragContext* source_co
+@@ -403,7 +403,7 @@ TabDragController::Liveness TabDragController::Init(
    //     synchronous on desktop Linux, so use that.
    // - ChromeOS Ash
    //     Releasing capture on Ash cancels gestures so avoid it.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
-   can_release_capture_ = false;
+   ref->can_release_capture_ = false;
  #endif
-   start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
-@@ -1011,7 +1011,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
+   ref->start_point_in_screen_ =
+@@ -1051,7 +1051,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -37,7 +37,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
      // EndMoveLoop is going to snap the window back to its original location.
      // Hide it so users don't see this. Hiding a window in Linux aura causes
      // it to lose capture so skip it.
-@@ -2051,7 +2051,7 @@ void TabDragController::CompleteDrag() {
+@@ -2103,7 +2103,7 @@ void TabDragController::CompleteDrag() {
        }
  
        // If source window was maximized - maximize the new window as well.
@@ -46,7 +46,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
        // Keeping maximized state breaks snap to Grid on Windows when dragging
        // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
        // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
-@@ -2465,7 +2465,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2533,7 +2533,7 @@ TabDragController::Liveness TabDragController::GetLoca
    }
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_hover_card_bubble_view_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_hover_card_bubble_view_cc
index 976272dc6..b30e78c9c 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_hover_card_bubble_view_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_hover_card_bubble_view_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
 --- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig
 +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
-@@ -372,7 +372,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
+@@ -371,7 +371,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
    // not become active. Setting this to false creates the need to explicitly
    // hide the hovercard on press, touch, and keyboard events.
    SetCanActivate(false);
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_hover_card_controller_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_hover_card_controller_cc
deleted file mode 100644
index c296187f0..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_hover_card_controller_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: chrome/browser/ui/views/tabs/tab_hover_card_controller.cc
---- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig
-+++ chrome/browser/ui/views/tabs/tab_hover_card_controller.cc
-@@ -81,7 +81,7 @@ void FixWidgetStackOrder(views::Widget* widget, const 
-     return;
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Ensure the hover card Widget assumes the highest z-order to avoid occlusion
-   // by other secondary UI Widgets (such as the omnibox Widget, see
-   // crbug.com/1226536).
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_style_views_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_style_views_cc
index 2c2b010c2..f4fda1533 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_style_views_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_style_views_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/views/tabs/tab_style_views.cc
 --- chrome/browser/ui/views/tabs/tab_style_views.cc.orig
 +++ chrome/browser/ui/views/tabs/tab_style_views.cc
-@@ -487,7 +487,7 @@ float GM2TabStyleViews::GetCurrentActiveOpacity() cons
+@@ -490,7 +490,7 @@ float GM2TabStyleViews::GetCurrentActiveOpacity() cons
    if (!IsHoverAnimationActive()) {
      return base_opacity;
    }
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_user_education_browser_user_education_service_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_user_education_browser_user_education_service_cc
new file mode 100644
index 000000000..89fc50ae6
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_user_education_browser_user_education_service_cc
@@ -0,0 +1,12 @@
+Index: chrome/browser/ui/views/user_education/browser_user_education_service.cc
+--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig
++++ chrome/browser/ui/views/user_education/browser_user_education_service.cc
+@@ -790,7 +790,7 @@ void MaybeRegisterChromeFeaturePromos(
+                     FeaturePromoSpecification::AcceleratorInfo())
+                     .SetBubbleArrow(HelpBubbleArrow::kTopLeft)));
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   // kIPHDesktopPWAsLinkCapturingLaunch:
+   registry.RegisterFeature(std::move(
+       FeaturePromoSpecification::CreateForCustomAction(
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_web_apps_web_app_integration_test_driver_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_web_apps_web_app_integration_test_driver_cc
index 49363ecd0..7ee4527d2 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_web_apps_web_app_integration_test_driver_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_web_apps_web_app_integration_test_driver_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
 --- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig
 +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
-@@ -416,7 +416,7 @@ std::string GetFileExtension(FileExtension file_extens
+@@ -514,7 +514,7 @@ std::string GetFileExtension(FileExtension file_extens
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -10,7 +10,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
  SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) {
    SiteConfig config;
    bool is_app_found = false;
-@@ -1862,7 +1862,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
+@@ -2101,7 +2101,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
    if (app_name.empty()) {
      app_name = GetSiteConfiguration(site).app_name;
    }
@@ -19,7 +19,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
    ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated(
        profile(), app_id, app_name));
    ASSERT_TRUE(
-@@ -3106,7 +3106,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
+@@ -3415,7 +3415,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
            app_state->id, app_state->name);
    ASSERT_TRUE(icon_color.has_value());
    ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value()));
@@ -28,7 +28,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
    ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled(
        profile(), app_state->id, app_state->name));
  #endif
-@@ -3121,7 +3121,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
+@@ -3430,7 +3430,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
        GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site);
    ASSERT_TRUE(app_state);
    base::ScopedAllowBlockingForTesting allow_blocking;
@@ -37,7 +37,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
    ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled(
        profile(), app_state->id, app_state->name));
  #endif
-@@ -3131,7 +3131,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
+@@ -3440,7 +3440,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
  void WebAppIntegrationTestDriver::CheckSiteHandlesFile(
      Site site,
      FileExtension file_extension) {
@@ -46,7 +46,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
    if (!BeforeStateCheckAction(__FUNCTION__)) {
      return;
    }
-@@ -3147,7 +3147,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
+@@ -3456,7 +3456,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
  void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile(
      Site site,
      FileExtension file_extension) {
@@ -55,17 +55,17 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
    if (!BeforeStateCheckAction(__FUNCTION__)) {
      return;
    }
-@@ -3939,7 +3939,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
+@@ -4279,7 +4279,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
      base::FilePath shortcut_dir,
      const std::string& app_name,
-     const AppId& app_id) {
+     const webapps::AppId& app_id) {
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    return override_registration_->test_override->GetShortcutPath(
        profile(), shortcut_dir, app_id, app_name);
  #else
-@@ -4126,7 +4126,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
-     const AppId& id) {
+@@ -4479,7 +4479,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
+     const webapps::AppId& id) {
    base::ScopedAllowBlockingForTesting allow_blocking;
    bool is_shortcut_and_icon_correct = false;
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -73,7 +73,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
    bool is_shortcut_correct =
        override_registration_->test_override->IsShortcutCreated(profile, id,
                                                                 name);
-@@ -4170,7 +4170,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
+@@ -4523,7 +4523,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
      do_icon_colors_match =
          (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value());
    }
@@ -81,4 +81,4 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    SkColor expected_icon_pixel_color =
        GetSiteConfigurationFromAppName(name).icon_color;
-   absl::optional<SkColor> actual_color_install_icon_size =
+   std::optional<SkColor> actual_color_install_icon_size =
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_web_applications_web_app_dialogs_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_web_applications_web_app_dialogs_h
new file mode 100644
index 000000000..f8e3dd44f
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_web_applications_web_app_dialogs_h
@@ -0,0 +1,12 @@
+Index: chrome/browser/ui/web_applications/web_app_dialogs.h
+--- chrome/browser/ui/web_applications/web_app_dialogs.h.orig
++++ chrome/browser/ui/web_applications/web_app_dialogs.h
+@@ -22,7 +22,7 @@
+ #include "ui/gfx/native_widget_types.h"
+ 
+ static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+-              BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA));
++              BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD));
+ 
+ class GURL;
+ class Profile;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_web_applications_web_app_ui_manager_impl_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_web_applications_web_app_ui_manager_impl_cc
new file mode 100644
index 000000000..38b457085
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_web_applications_web_app_ui_manager_impl_cc
@@ -0,0 +1,21 @@
+Index: chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc
+--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig
++++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc
+@@ -586,7 +586,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun
+     content::WebContents* web_contents,
+     Profile* profile,
+     const std::string& app_id) {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   WebAppProvider* provider = WebAppProvider::GetForWebApps(profile);
+   CHECK(provider);
+ 
+@@ -806,7 +806,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded(
+   }
+ }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void WebAppUiManagerImpl::ShowIPHPromoForAppsLaunchedViaLinkCapturing(
+     const Browser* browser,
+     const webapps::AppId& app_id,
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_web_applications_web_app_ui_manager_impl_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_web_applications_web_app_ui_manager_impl_h
new file mode 100644
index 000000000..2e3d5444d
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_web_applications_web_app_ui_manager_impl_h
@@ -0,0 +1,12 @@
+Index: chrome/browser/ui/web_applications/web_app_ui_manager_impl.h
+--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.h.orig
++++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.h
+@@ -222,7 +222,7 @@ class WebAppUiManagerImpl : public BrowserListObserver
+       UninstallCompleteCallback uninstall_complete_callback,
+       webapps::UninstallResultCode uninstall_code);
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   void ShowIPHPromoForAppsLaunchedViaLinkCapturing(const Browser* browser,
+                                                    const webapps::AppId& app_id,
+                                                    bool is_activated);
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webauthn_sheet_models_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webauthn_sheet_models_cc
deleted file mode 100644
index 4caac0160..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webauthn_sheet_models_cc
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: chrome/browser/ui/webauthn/sheet_models.cc
---- chrome/browser/ui/webauthn/sheet_models.cc.orig
-+++ chrome/browser/ui/webauthn/sheet_models.cc
-@@ -1496,7 +1496,11 @@ AuthenticatorMultiSourcePickerSheetModel::
- 
-   using CredentialMech = AuthenticatorRequestDialogModel::Mechanism::Credential;
-   bool has_local_passkeys =
-+#if (_LIBCPP_VERSION >= 160000)
-       std::ranges::any_of(dialog_model->mechanisms(), [](const auto& mech) {
-+#else
-+      base::ranges::any_of(dialog_model->mechanisms(), [](const auto& mech) {
-+#endif
-         return absl::holds_alternative<CredentialMech>(mech.type) &&
-                absl::get<CredentialMech>(mech.type).value() !=
-                    device::AuthenticatorType::kPhone;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_about_about_ui_cc
similarity index 68%
rename from www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc
rename to www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_about_about_ui_cc
index 84fe24e92..a10f7f3a6 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_about_about_ui_cc
@@ -1,7 +1,7 @@
-Index: chrome/browser/ui/webui/about_ui.cc
---- chrome/browser/ui/webui/about_ui.cc.orig
-+++ chrome/browser/ui/webui/about_ui.cc
-@@ -635,7 +635,7 @@ std::string ChromeURLs() {
+Index: chrome/browser/ui/webui/about/about_ui.cc
+--- chrome/browser/ui/webui/about/about_ui.cc.orig
++++ chrome/browser/ui/webui/about/about_ui.cc
+@@ -592,7 +592,7 @@ std::string ChromeURLs(content::BrowserContext* browse
    return html;
  }
  
@@ -10,7 +10,7 @@ Index: chrome/browser/ui/webui/about_ui.cc
  std::string AboutLinuxProxyConfig() {
    std::string data;
    AppendHeader(&data,
-@@ -689,7 +689,7 @@ void AboutUIHTMLSource::StartDataRequest(
+@@ -646,7 +646,7 @@ void AboutUIHTMLSource::StartDataRequest(
        response =
            ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
      }
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_app_home_app_home_page_handler_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_app_home_app_home_page_handler_cc
index 800e535a7..f561fcb95 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_app_home_app_home_page_handler_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_app_home_app_home_page_handler_cc
@@ -1,21 +1,21 @@
 Index: chrome/browser/ui/webui/app_home/app_home_page_handler.cc
 --- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig
 +++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc
-@@ -415,7 +415,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create
+@@ -391,7 +391,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create
+   app_info->start_url = start_url;
  
    bool deprecated_app = false;
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    auto* context = extension_system_->extension_service()->GetBrowserContext();
    deprecated_app =
        extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id());
-@@ -478,7 +478,7 @@ void AppHomePageHandler::FillExtensionInfoList(
+@@ -454,7 +454,7 @@ void AppHomePageHandler::FillExtensionInfoList(
+       continue;
      }
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      auto* context = extension_system_->extension_service()->GetBrowserContext();
      const bool is_deprecated_app =
          extensions::IsExtensionUnsupportedDeprecatedApp(context,
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc
index cfd8bb023..ef426cbaa 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc
@@ -1,8 +1,8 @@
 Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 --- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig
 +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -214,7 +214,7 @@
- #include "chrome/browser/ui/webui/app_launcher_page_ui.h"
+@@ -202,7 +202,7 @@
+ #include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -10,7 +10,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
  #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h"
  #endif
  
-@@ -240,17 +240,17 @@
+@@ -228,17 +228,17 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -31,7 +31,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
  #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
  #endif
  
-@@ -403,7 +403,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -390,7 +390,7 @@ bool IsAboutUI(const GURL& url) {
  #if !BUILDFLAG(IS_ANDROID)
            || url.host_piece() == chrome::kChromeUITermsHost
  #endif
@@ -40,7 +40,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
            || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
  #endif
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -668,7 +668,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -625,7 +625,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
    if (url.host_piece() == chrome::kChromeUIMobileSetupHost)
      return &NewWebUI<ash::cellular_setup::MobileSetupUI>;
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -49,7 +49,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
    if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
      return &NewWebUI<WebUIJsErrorUI>;
  #endif
-@@ -730,7 +730,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -681,7 +681,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
    if (url.host_piece() == chrome::kChromeUINaClHost)
      return &NewWebUI<NaClUI>;
  #endif
@@ -58,7 +58,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
       defined(TOOLKIT_VIEWS)) ||                         \
      defined(USE_AURA)
    if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
-@@ -797,27 +797,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -736,27 +736,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
    }
  #endif
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_connectors_internals_device_trust_utils_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_connectors_internals_device_trust_utils_cc
index 98c6db6c7..a6589da86 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_connectors_internals_device_trust_utils_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_connectors_internals_device_trust_utils_cc
@@ -1,16 +1,16 @@
 Index: chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc
 --- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig
 +++ chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc
-@@ -6,7 +6,7 @@
- 
+@@ -7,7 +7,7 @@
  #include "build/build_config.h"
+ #include "components/enterprise/buildflags/buildflags.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
  #include "base/base64url.h"
  #include "chrome/browser/browser_process.h"
  #include "chrome/browser/policy/chrome_browser_policy_connector.h"
-@@ -24,7 +24,7 @@ namespace utils {
+@@ -38,7 +38,7 @@ namespace enterprise_connectors::utils {
  
  namespace {
  
@@ -19,7 +19,7 @@ Index: chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc
  
  connectors_internals::mojom::KeyTrustLevel ParseTrustLevel(
      BPKUR::KeyTrustLevel trust_level) {
-@@ -92,7 +92,7 @@ connectors_internals::mojom::Int32ValuePtr ToMojomValu
+@@ -189,7 +189,7 @@ connectors_internals::mojom::CertificateMetadataPtr Co
  }  // namespace
  
  connectors_internals::mojom::KeyInfoPtr GetKeyInfo() {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_cc
index 45d3880e3..daa3a6a66 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_cc
@@ -1,12 +1,17 @@
 Index: chrome/browser/ui/webui/management/management_ui.cc
 --- chrome/browser/ui/webui/management/management_ui.cc.orig
 +++ chrome/browser/ui/webui/management/management_ui.cc
-@@ -92,7 +92,7 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml
-     {kManagementOnFileTransferVisibleData,
-      IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA},
+@@ -98,11 +98,11 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml
+       {kManagementOnFileTransferVisibleData,
+        IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA},
  #endif  // BUILDFLAG(IS_CHROMEOS)
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {kManagementScreenCaptureEvent, IDS_MANAGEMENT_SCREEN_CAPTURE_EVENT},
-     {kManagementScreenCaptureData, IDS_MANAGEMENT_SCREEN_CAPTURE_DATA},
+       {kManagementScreenCaptureEvent, IDS_MANAGEMENT_SCREEN_CAPTURE_EVENT},
+       {kManagementScreenCaptureData, IDS_MANAGEMENT_SCREEN_CAPTURE_DATA},
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       {kManagementDeviceSignalsDisclosure,
+        IDS_MANAGEMENT_DEVICE_SIGNALS_DISCLOSURE},
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_handler_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_handler_cc
index 8e0a09905..b9c129ca2 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_handler_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_handler_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/ui/webui/management/management_ui_handler.cc
 --- chrome/browser/ui/webui/management/management_ui_handler.cc.orig
 +++ chrome/browser/ui/webui/management/management_ui_handler.cc
-@@ -90,7 +90,7 @@
+@@ -94,7 +94,7 @@
  #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -10,8 +10,8 @@ Index: chrome/browser/ui/webui/management/management_ui_handler.cc
  #include "chrome/browser/enterprise/signals/user_permission_service_factory.h"
  #include "components/device_signals/core/browser/user_permission_service.h"  // nogncheck
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -182,12 +182,12 @@ enum class ReportingType {
-   kUserActivity
+@@ -190,12 +190,12 @@ enum class ReportingType {
+   kLegacyTech,
  };
  
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -25,7 +25,7 @@ Index: chrome/browser/ui/webui/management/management_ui_handler.cc
  const char kManagementDeviceSignalsDisclosure[] =
      "managementDeviceSignalsDisclosure";
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -746,7 +746,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value
+@@ -829,7 +829,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value
               GetReportingTypeValue(report_definition.reporting_type));
      report_sources->Append(std::move(data));
    }
@@ -34,7 +34,7 @@ Index: chrome/browser/ui/webui/management/management_ui_handler.cc
    // Insert the device signals consent disclosure at the end of browser
    // reporting section.
    auto* user_permission_service = GetUserPermissionService();
-@@ -1024,7 +1024,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec
+@@ -1111,7 +1111,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec
                                    &info);
    }
  
@@ -43,7 +43,7 @@ Index: chrome/browser/ui/webui/management/management_ui_handler.cc
    if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) {
      AddThreatProtectionPermission(kManagementScreenCaptureEvent,
                                    kManagementScreenCaptureData, &info);
-@@ -1108,7 +1108,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS
+@@ -1195,7 +1195,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS
        ->policy_service();
  }
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_handler_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_handler_h
index 78f20fc22..7cdb1cdc2 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_handler_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_handler_h
@@ -18,7 +18,7 @@ Index: chrome/browser/ui/webui/management/management_ui_handler.h
  extern const char kManagementDeviceSignalsDisclosure[];
  #endif  // #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
-@@ -114,7 +114,7 @@ class StatusCollector;
+@@ -119,7 +119,7 @@ class StatusCollector;
  class SystemLogUploader;
  }  // namespace policy
  
@@ -27,7 +27,7 @@ Index: chrome/browser/ui/webui/management/management_ui_handler.h
  namespace device_signals {
  class UserPermissionService;
  }  // namespace device_signals
-@@ -174,7 +174,7 @@ class ManagementUIHandler : public content::WebUIMessa
+@@ -179,7 +179,7 @@ class ManagementUIHandler : public content::WebUIMessa
    base::Value::List GetManagedWebsitesInfo(Profile* profile) const;
    base::Value::List GetApplicationsInfo(Profile* profile) const;
    virtual policy::PolicyService* GetPolicyService();
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_ntp_app_launcher_handler_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_ntp_app_launcher_handler_cc
deleted file mode 100644
index a6d5e2005..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_ntp_app_launcher_handler_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: chrome/browser/ui/webui/ntp/app_launcher_handler.cc
---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig
-+++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc
-@@ -320,7 +320,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI
-   bool is_deprecated_app = false;
-   auto* context = extension_service_->GetBrowserContext();
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   is_deprecated_app =
-       extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id());
- #endif
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_password_manager_promo_cards_handler_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_password_manager_promo_cards_handler_cc
new file mode 100644
index 000000000..b28611d04
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_password_manager_promo_cards_handler_cc
@@ -0,0 +1,21 @@
+Index: chrome/browser/ui/webui/password_manager/promo_cards_handler.cc
+--- chrome/browser/ui/webui/password_manager/promo_cards_handler.cc.orig
++++ chrome/browser/ui/webui/password_manager/promo_cards_handler.cc
+@@ -28,7 +28,7 @@
+ #include "chrome/browser/ui/webui/password_manager/promo_cards/web_password_manager_promo.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.h"
+ #endif
+ 
+@@ -71,7 +71,7 @@ std::vector<std::unique_ptr<PasswordPromoCardBase>> Ge
+           .get()));
+ #endif
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   promo_cards.push_back(
+       std::make_unique<RelaunchChromePromo>(profile->GetPrefs()));
+ #endif
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_password_manager_promo_cards_relaunch_chrome_promo_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_password_manager_promo_cards_relaunch_chrome_promo_cc
new file mode 100644
index 000000000..d85ae4bfb
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_password_manager_promo_cards_relaunch_chrome_promo_cc
@@ -0,0 +1,21 @@
+Index: chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.cc
+--- chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.cc.orig
++++ chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.cc
+@@ -37,7 +37,7 @@ std::u16string RelaunchChromePromo::GetTitle() const {
+   return l10n_util::GetStringUTF16(
+ #if BUILDFLAG(IS_MAC)
+       IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_TITLE
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_TITLE_LINUX
+ #endif
+   );
+@@ -47,7 +47,7 @@ std::u16string RelaunchChromePromo::GetDescription() c
+   return l10n_util::GetStringUTF16(
+ #if BUILDFLAG(IS_MAC)
+       IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_DESCRIPTION
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_DESCRIPTION_LINUX
+ #endif
+   );
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_realbox_realbox_handler_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_realbox_realbox_handler_cc
deleted file mode 100644
index efc5f16a0..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_realbox_realbox_handler_cc
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: chrome/browser/ui/webui/realbox/realbox_handler.cc
---- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig
-+++ chrome/browser/ui/webui/realbox/realbox_handler.cc
-@@ -144,7 +144,7 @@ constexpr char kMacShareIconResourceName[] =
- #elif BUILDFLAG(IS_WIN)
- constexpr char kWinShareIconResourceName[] =
-     "//resources/cr_components/omnibox/icons/win_share.svg";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- constexpr char kLinuxShareIconResourceName[] =
-     "//resources/cr_components/omnibox/icons/share.svg";
- #else
-@@ -740,7 +740,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN
-       icon.name == omnibox::kShareWinChromeRefreshIcon.name) {
-     return kWinShareIconResourceName;
-   }
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (icon.name == omnibox::kShareIcon.name ||
-       icon.name == omnibox::kShareLinuxChromeRefreshIcon.name) {
-     return kLinuxShareIconResourceName;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_settings_accessibility_main_handler_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_settings_accessibility_main_handler_cc
new file mode 100644
index 000000000..9e6a61cf3
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_settings_accessibility_main_handler_cc
@@ -0,0 +1,12 @@
+Index: chrome/browser/ui/webui/settings/accessibility_main_handler.cc
+--- chrome/browser/ui/webui/settings/accessibility_main_handler.cc.orig
++++ chrome/browser/ui/webui/settings/accessibility_main_handler.cc
+@@ -19,7 +19,7 @@
+ #include "content/public/browser/web_contents.h"
+ #include "content/public/browser/web_ui.h"
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ #include "ui/accessibility/accessibility_features.h"
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+ 
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_settings_accessibility_main_handler_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_settings_accessibility_main_handler_h
new file mode 100644
index 000000000..83be334b2
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_settings_accessibility_main_handler_h
@@ -0,0 +1,12 @@
+Index: chrome/browser/ui/webui/settings/accessibility_main_handler.h
+--- chrome/browser/ui/webui/settings/accessibility_main_handler.h.orig
++++ chrome/browser/ui/webui/settings/accessibility_main_handler.h
+@@ -37,7 +37,7 @@ class AccessibilityMainHandler
+   void HandleGetScreenReaderState(const base::Value::List& args);
+   void HandleCheckAccessibilityImageLabels(const base::Value::List& args);
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   void HandleGetScreenAIInstallState(const base::Value::List& args);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+ 
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_settings_settings_localized_strings_provider_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_settings_settings_localized_strings_provider_cc
index df4e42df2..eb553c691 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_settings_settings_localized_strings_provider_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_settings_settings_localized_strings_provider_cc
@@ -1,16 +1,16 @@
 Index: chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 --- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig
 +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -134,7 +134,7 @@
- #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
+@@ -137,7 +137,7 @@
+ #include "ash/webui/settings/public/constants/routes.mojom.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
  #include "ui/display/screen.h"
  #endif
  
-@@ -154,7 +154,7 @@
+@@ -156,7 +156,7 @@
  #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h"
  #endif
  
@@ -19,39 +19,48 @@ Index: chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
  #include "ui/linux/linux_ui_factory.h"
  #include "ui/ozone/public/ozone_platform.h"
  #endif
-@@ -254,7 +254,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s
-       base::FeatureList::IsEnabled(
-           supervised_user::kClearingCookiesKeepsSupervisedUsersSignedIn));
+@@ -259,7 +259,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s
+ 
+   html_source->AddBoolean("isChildAccount", profile->IsChild());
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt);
  #else
    bool allow_qt_theme = false;
-@@ -415,7 +415,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
-     {"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
-     {"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT},
-     {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT},
+@@ -289,7 +289,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou
+       {"focusHighlightLabel",
+        IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION},
+ #endif
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+       {"overscrollHistoryNavigationTitle",
+        IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE},
+       {"overscrollHistoryNavigationSubtitle",
+@@ -432,7 +432,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+       {"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
+       {"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT},
+       {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT},
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"gtkTheme", IDS_SETTINGS_GTK_THEME},
-     {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
-     {"qtTheme", IDS_SETTINGS_QT_THEME},
-@@ -425,7 +425,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+       {"gtkTheme", IDS_SETTINGS_GTK_THEME},
+       {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
+       {"qtTheme", IDS_SETTINGS_QT_THEME},
+@@ -442,7 +442,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
  #else
-     {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
+       {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
  #endif
 -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
-     {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
+       {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
  #endif
  #if BUILDFLAG(IS_MAC)
-@@ -450,7 +450,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -467,7 +467,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
    bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance()
                                        ->GetPlatformRuntimeProperties()
                                        .supports_server_side_window_decorations;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_commands_install_app_locally_command_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_commands_install_app_locally_command_cc
index a9df41890..604136e85 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_commands_install_app_locally_command_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_commands_install_app_locally_command_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/web_applications/commands/install_app_locally_command.cc
 --- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig
 +++ chrome/browser/web_applications/commands/install_app_locally_command.cc
-@@ -80,7 +80,7 @@ void InstallAppLocallyCommand::StartWithLock(
+@@ -75,7 +75,7 @@ void InstallAppLocallyCommand::StartWithLock(
    options.os_hooks[OsHookType::kUninstallationViaOsSettings] =
        web_app->CanUserUninstallWebApp();
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_extension_status_utils_h b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_extension_status_utils_h
index 1bdb118b0..7a341da89 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_extension_status_utils_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_extension_status_utils_h
@@ -1,12 +1,12 @@
 Index: chrome/browser/web_applications/extension_status_utils.h
 --- chrome/browser/web_applications/extension_status_utils.h.orig
 +++ chrome/browser/web_applications/extension_status_utils.h
-@@ -56,7 +56,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
+@@ -55,7 +55,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo
+ bool ClearExternalExtensionUninstalled(content::BrowserContext* context,
                                         const std::string& extension_id);
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- // Returns whether |extension_id| is a Chrome App and should be blocked by the
- // Chrome Apps Deprecation. Policy installed Chrome Apps are still allowed, and
- // all apps are allowed if the deprecation feature flag is not enabled.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // If this method returns true, then |extension_id| will not be launchable.
+ //
+ // The eventual goal is that this method should return true for all hosted apps,
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_extensions_extension_status_utils_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_extensions_extension_status_utils_cc
index 073fb2e06..8d195820b 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_extensions_extension_status_utils_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_extensions_extension_status_utils_cc
@@ -1,21 +1,21 @@
 Index: chrome/browser/web_applications/extensions/extension_status_utils.cc
 --- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig
 +++ chrome/browser/web_applications/extensions/extension_status_utils.cc
-@@ -26,7 +26,7 @@ namespace {
+@@ -25,7 +25,7 @@ namespace {
+ 
  const char* g_preinstalled_app_for_testing = nullptr;
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // TODO(b/268221237): Remove this allow-list.
  const char kDefaultAllowedExtensionIds[] =
      "alhngdkjgnedakdlnamimgfihgkmenbh,"
-@@ -116,7 +116,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
+@@ -114,7 +114,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
+       extension_id);
  }
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  bool IsExtensionUnsupportedDeprecatedApp(content::BrowserContext* context,
                                           const std::string& extension_id) {
    if (testing::g_enable_chrome_apps_for_testing) {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_shortcut_sub_manager_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_shortcut_sub_manager_cc
index a21b28929..739083ea4 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_shortcut_sub_manager_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_shortcut_sub_manager_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc
 --- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig
 +++ chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc
-@@ -171,7 +171,7 @@ void ShortcutSubManager::Execute(
+@@ -182,7 +182,7 @@ void ShortcutSubManager::Execute(
      return;
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_file_handler_registration_h b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_file_handler_registration_h
index 6f470a29a..c0d4d25a7 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_file_handler_registration_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_file_handler_registration_h
@@ -1,7 +1,7 @@
 Index: chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h
 --- chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h.orig
 +++ chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h
-@@ -43,7 +43,7 @@ void UnregisterFileHandlersWithOs(const AppId& app_id,
+@@ -43,7 +43,7 @@ void UnregisterFileHandlersWithOs(const webapps::AppId
                                    const base::FilePath& profile_path,
                                    ResultCallback callback);
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_shortcut_manager_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_shortcut_manager_cc
index 3aaa5d89e..a0f3394e1 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_shortcut_manager_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_shortcut_manager_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc
 --- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig
 +++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc
-@@ -434,7 +434,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B
+@@ -441,7 +441,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B
      }
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_policy_web_app_policy_manager_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_policy_web_app_policy_manager_cc
new file mode 100644
index 000000000..02af91310
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_policy_web_app_policy_manager_cc
@@ -0,0 +1,12 @@
+Index: chrome/browser/web_applications/policy/web_app_policy_manager.cc
+--- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig
++++ chrome/browser/web_applications/policy/web_app_policy_manager.cc
+@@ -111,7 +111,7 @@ namespace web_app {
+ 
+ BASE_FEATURE(kDesktopPWAsForceUnregisterOSIntegration,
+              "DesktopPWAsForceUnregisterOSIntegration",
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_test_os_integration_test_override_impl_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_test_os_integration_test_override_impl_cc
index c40ec62d9..16c86951d 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_test_os_integration_test_override_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_test_os_integration_test_override_impl_cc
@@ -9,7 +9,7 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.cc
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  // Performs a blocking read of app icons from the disk.
  SkColor IconManagerReadIconTopLeftColorForSize(WebAppIconManager& icon_manager,
-                                                const AppId& app_id,
+                                                const webapps::AppId& app_id,
 @@ -224,7 +224,7 @@ bool OsIntegrationTestOverrideImpl::SimulateDeleteShor
        GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
    CHECK(base::PathExists(app_folder_shortcut_path));
@@ -30,7 +30,7 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.cc
      return desktop_.Delete();
 @@ -278,7 +278,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab
      Profile* profile,
-     const AppId& app_id,
+     const webapps::AppId& app_id,
      const std::string& app_name) {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
@@ -47,14 +47,14 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.cc
        applications_dir().Append("applications");
    bool database_update_called = false;
 @@ -378,7 +378,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC
-     return absl::nullopt;
+     return std::nullopt;
    }
    return GetIconTopLeftColorFromShortcutFile(shortcut_path);
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    WebAppProvider* provider = WebAppProvider::GetForLocalAppsUnchecked(profile);
    if (!provider) {
-     return absl::nullopt;
+     return std::nullopt;
 @@ -428,7 +428,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort
        app_installed_profiles.end()) {
      return shortcut_path;
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_web_app_helpers_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_web_app_helpers_cc
new file mode 100644
index 000000000..9a6ae730e
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_web_app_helpers_cc
@@ -0,0 +1,12 @@
+Index: chrome/browser/web_applications/web_app_helpers.cc
+--- chrome/browser/web_applications/web_app_helpers.cc.orig
++++ chrome/browser/web_applications/web_app_helpers.cc
+@@ -146,7 +146,7 @@ bool IsValidWebAppUrl(const GURL& app_url) {
+ 
+   bool allow_extension_apps = true;
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   // Stop allowing apps to be extension urls when the shortcuts are separated -
+   // they can be extension urls instead.
+   allow_extension_apps =
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_web_app_install_info_h b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_web_app_install_info_h
new file mode 100644
index 000000000..18fb32559
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_web_app_install_info_h
@@ -0,0 +1,12 @@
+Index: chrome/browser/web_applications/web_app_install_info.h
+--- chrome/browser/web_applications/web_app_install_info.h.orig
++++ chrome/browser/web_applications/web_app_install_info.h
+@@ -35,7 +35,7 @@
+ #include "url/gurl.h"
+ 
+ static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+-              BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA));
++              BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD));
+ 
+ namespace web_app {
+ 
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_webauthn_chrome_authenticator_request_delegate_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_webauthn_chrome_authenticator_request_delegate_cc
index 8234df6c7..b681ded4a 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_webauthn_chrome_authenticator_request_delegate_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_browser_webauthn_chrome_authenticator_request_delegate_cc
@@ -1,7 +1,7 @@
 Index: chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
 --- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig
 +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -602,7 +602,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc
+@@ -859,7 +859,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc
      g_observer->ConfiguringCable(request_type);
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_features_cc b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_features_cc
index 33306faab..7ec566cec 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_features_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_features_cc
@@ -1,8 +1,8 @@
 Index: chrome/common/chrome_features.cc
 --- chrome/common/chrome_features.cc.orig
 +++ chrome/common/chrome_features.cc
-@@ -77,7 +77,7 @@ BASE_FEATURE(kAsyncDns,
- );
+@@ -81,7 +81,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims,
+ #endif  // BUILDFLAG(IS_MAC)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
@@ -10,7 +10,7 @@ Index: chrome/common/chrome_features.cc
  // Enables or disables the Autofill survey triggered by opening a prompt to
  // save address info.
  BASE_FEATURE(kAutofillAddressSurvey,
-@@ -95,7 +95,7 @@ BASE_FEATURE(kAutofillPasswordSurvey,
+@@ -99,7 +99,7 @@ BASE_FEATURE(kAutofillPasswordSurvey,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif
  
@@ -19,16 +19,16 @@ Index: chrome/common/chrome_features.cc
  // Enables the Restart background mode optimization. When all Chrome UI is
  // closed and it goes in the background, allows to restart the browser to
  // discard memory.
-@@ -278,7 +278,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy,
- // Enables or disables Desktop PWAs to be auto-started on OS login.
+@@ -302,7 +302,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy,
  BASE_FEATURE(kDesktopPWAsRunOnOsLogin,
               "DesktopPWAsRunOnOsLogin",
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -307,7 +307,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles,
+@@ -341,7 +341,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings,
               base::FEATURE_DISABLED_BY_DEFAULT);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -37,25 +37,25 @@ Index: chrome/common/chrome_features.cc
  // Controls whether Chrome Apps are supported. See https://crbug.com/1221251.
  // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome
  // Apps will not launch and will be marked in the UI as deprecated.
-@@ -351,7 +351,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
- const base::FeatureParam<bool> kDnsOverHttpsShowUiParam {
-   &kDnsOverHttps, "ShowUi",
+@@ -375,7 +375,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
+ const base::FeatureParam<bool> kDnsOverHttpsShowUiParam{&kDnsOverHttps,
+                                                         "ShowUi",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
 +    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       true
+                                                         true
  #else
-       false
-@@ -820,7 +820,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
-              "KAnonymityServiceStorage",
+                                                         false
+@@ -913,7 +913,7 @@ BASE_FEATURE(kLacrosSharedComponentsDir,
               base::FEATURE_ENABLED_BY_DEFAULT);
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
 -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
 +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
  BASE_FEATURE(kLinuxLowMemoryMonitor,
               "LinuxLowMemoryMonitor",
               base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -833,7 +833,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
+@@ -926,7 +926,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
      &kLinuxLowMemoryMonitor, "critical_level", 255};
  #endif  // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_features_h b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_features_h
index c89810521..7641ccb8b 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_features_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_features_h
@@ -1,8 +1,8 @@
 Index: chrome/common/chrome_features.h
 --- chrome/common/chrome_features.h.orig
 +++ chrome/common/chrome_features.h
-@@ -59,13 +59,13 @@ BASE_DECLARE_FEATURE(kAppShimNewCloseBehavior);
- COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns);
+@@ -60,13 +60,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims);
+ #endif  // BUILDFLAG(IS_MAC)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
@@ -17,25 +17,25 @@ Index: chrome/common/chrome_features.h
  COMPONENT_EXPORT(CHROME_FEATURES)
  BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart);
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -190,7 +190,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings);
- COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsWebBundles);
+@@ -216,7 +216,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
  COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation);
  COMPONENT_EXPORT(CHROME_FEATURES)
- BASE_DECLARE_FEATURE(kKeepForceInstalledPreinstalledApps);
-@@ -487,7 +487,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests);
- COMPONENT_EXPORT(CHROME_FEATURES)
- BASE_DECLARE_FEATURE(kKAnonymityServiceStorage);
+ BASE_DECLARE_FEATURE(kShortcutsNotApps);
+@@ -543,7 +543,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+ BASE_DECLARE_FEATURE(kLacrosSharedComponentsDir);
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
 -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
 +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
  COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor);
  COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel;
-@@ -495,7 +495,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -551,7 +551,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel;
  #endif  // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_cc b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_cc
index 9ef5b1aa0..5cd976114 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_cc
@@ -1,7 +1,16 @@
 Index: chrome/common/chrome_paths.cc
 --- chrome/common/chrome_paths.cc.orig
 +++ chrome/common/chrome_paths.cc
-@@ -45,14 +45,14 @@
+@@ -30,7 +30,7 @@
+ #include "base/apple/foundation_util.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD)
++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
+ #include "components/policy/core/common/policy_paths.h"
+ #endif
+ 
+@@ -52,14 +52,14 @@
  
  namespace {
  
@@ -19,7 +28,7 @@ Index: chrome/common/chrome_paths.cc
  #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
  
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -207,7 +207,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -225,7 +225,7 @@ bool PathProvider(int key, base::FilePath* result) {
        }
        break;
      case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
@@ -28,24 +37,16 @@ Index: chrome/common/chrome_paths.cc
        if (!GetUserDownloadsDirectorySafe(&cur)) {
          return false;
        }
-@@ -500,12 +500,14 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -544,7 +544,7 @@ bool PathProvider(int key, base::FilePath* result) {
          return false;
        }
        break;
 -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD)
 +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
      case chrome::DIR_POLICY_FILES: {
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-       cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
-+#elif BUILDFLAG(IS_FREEBSD)
-+      cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/ungoogled-chromium/policies"));
- #else
--      cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
-+      cur = base::FilePath(FILE_PATH_LITERAL("/etc/ungoogled-chromium/policies"));
- #endif
+       cur = base::FilePath(policy::kPolicyPath);
        break;
-     }
-@@ -515,7 +517,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -555,7 +555,7 @@ bool PathProvider(int key, base::FilePath* result) {
  #if BUILDFLAG(IS_CHROMEOS_ASH) ||                              \
      ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
       BUILDFLAG(CHROMIUM_BRANDING)) ||                          \
@@ -54,7 +55,7 @@ Index: chrome/common/chrome_paths.cc
      case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
        if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) {
          return false;
-@@ -524,7 +526,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -564,7 +564,7 @@ bool PathProvider(int key, base::FilePath* result) {
        break;
      }
  #endif
@@ -63,16 +64,16 @@ Index: chrome/common/chrome_paths.cc
      case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
        cur = base::FilePath(kFilepathSinglePrefExtensions);
        break;
-@@ -571,7 +573,7 @@ bool PathProvider(int key, base::FilePath* result) {
-       break;
+@@ -612,7 +612,7 @@ bool PathProvider(int key, base::FilePath* result) {
  #endif
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(ENABLE_EXTENSIONS) && \
+-    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC))
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD))
      case chrome::DIR_NATIVE_MESSAGING:
  #if BUILDFLAG(IS_MAC)
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -585,9 +587,12 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -626,9 +626,12 @@ bool PathProvider(int key, base::FilePath* result) {
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
        cur = base::FilePath(
            FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts"));
diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_h b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_h
index fa72e8cd8..9c5a69f02 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_h
@@ -1,7 +1,7 @@
 Index: chrome/common/chrome_paths.h
 --- chrome/common/chrome_paths.h.orig
 +++ chrome/common/chrome_paths.h
-@@ -57,7 +57,7 @@ enum {
+@@ -59,7 +59,7 @@ enum {
  #if BUILDFLAG(IS_CHROMEOS_ASH) ||                              \
      ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
       BUILDFLAG(CHROMIUM_BRANDING)) ||                          \
@@ -10,7 +10,7 @@ Index: chrome/common/chrome_paths.h
    DIR_USER_EXTERNAL_EXTENSIONS,  // Directory for per-user external extensions
                                   // on Chrome Mac and Chromium Linux.
                                   // On Chrome OS, this path is used for OEM
-@@ -65,7 +65,7 @@ enum {
+@@ -67,7 +67,7 @@ enum {
                                   // create it.
  #endif
  
@@ -19,12 +19,12 @@ Index: chrome/common/chrome_paths.h
    DIR_STANDALONE_EXTERNAL_EXTENSIONS,  // Directory for 'per-extension'
                                         // definition manifest files that
                                         // describe extensions which are to be
-@@ -123,7 +123,7 @@ enum {
-                           // must be cleared on device reboot.
+@@ -126,7 +126,7 @@ enum {
  
  #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(ENABLE_EXTENSIONS) && \
+-    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC))
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD))
    DIR_NATIVE_MESSAGING,       // System directory where native messaging host
                                // manifest files are stored.
    DIR_USER_NATIVE_MESSAGING,  // Directory with Native Messaging Hosts
diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_linux_cc b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_linux_cc
index 683c0f789..685353470 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_linux_cc
@@ -1,8 +1,8 @@
 Index: chrome/common/chrome_paths_linux.cc
 --- chrome/common/chrome_paths_linux.cc.orig
 +++ chrome/common/chrome_paths_linux.cc
-@@ -92,7 +92,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+@@ -94,7 +94,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul
+ #elif BUILDFLAG(GOOGLE_CHROME_BRANDING)
    std::string data_dir_basename = "google-chrome";
  #else
 -  std::string data_dir_basename = "chromium";
diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_switches_cc b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_switches_cc
index 759929b66..625401fca 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_switches_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_switches_cc
@@ -1,7 +1,7 @@
 Index: chrome/common/chrome_switches.cc
 --- chrome/common/chrome_switches.cc.orig
 +++ chrome/common/chrome_switches.cc
-@@ -853,14 +853,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
+@@ -881,14 +881,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_switches_h b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_switches_h
index c1615e23d..606d34765 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_switches_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_switches_h
@@ -1,7 +1,7 @@
 Index: chrome/common/chrome_switches.h
 --- chrome/common/chrome_switches.h.orig
 +++ chrome/common/chrome_switches.h
-@@ -270,12 +270,12 @@ extern const char kAllowNaClSocketAPI[];
+@@ -277,12 +277,12 @@ extern const char kAllowNaClSocketAPI[];
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_media_cdm_registration_cc b/www/ungoogled-chromium/patches/patch-chrome_common_media_cdm_registration_cc
new file mode 100644
index 000000000..f0a9220a0
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_common_media_cdm_registration_cc
@@ -0,0 +1,53 @@
+Index: chrome/common/media/cdm_registration.cc
+--- chrome/common/media/cdm_registration.cc.orig
++++ chrome/common/media/cdm_registration.cc
+@@ -26,11 +26,11 @@
+ 
+ #if BUILDFLAG(ENABLE_WIDEVINE)
+ #include "third_party/widevine/cdm/widevine_cdm_common.h"  // nogncheck
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "base/native_library.h"
+ #include "chrome/common/chrome_paths.h"
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "base/no_destructor.h"
+ #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h"
+ #include "media/cdm/supported_audio_codecs.h"
+@@ -56,7 +56,7 @@ using Robustness = content::CdmInfo::Robustness;
+ #if BUILDFLAG(ENABLE_WIDEVINE)
+ #if (BUILDFLAG(BUNDLE_WIDEVINE_CDM) ||            \
+      BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)) && \
+-    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
+ // Create a CdmInfo for a Widevine CDM, using |version|, |cdm_library_path|, and
+ // |capability|.
+ std::unique_ptr<content::CdmInfo> CreateWidevineCdmInfo(
+@@ -101,7 +101,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid
+         // BUILDFLAG(IS_CHROMEOS))
+ 
+ #if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && \
+-    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
+ // On Linux/ChromeOS we have to preload the CDM since it uses the zygote
+ // sandbox. On Windows and Mac, the bundled CDM is handled by the component
+ // updater.
+@@ -125,7 +125,7 @@ content::CdmInfo* GetBundledWidevine() {
+         // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
+ 
+ #if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \
+-    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
+ // This code checks to see if a component updated Widevine CDM can be found. If
+ // there is one and it looks valid, return the CdmInfo for that CDM. Otherwise
+ // return nullptr.
+@@ -160,7 +160,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd
+       /*supports_sub_key_systems=*/false, kWidevineCdmDisplayName,
+       kWidevineCdmType, base::Version(), base::FilePath());
+ 
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
+   base::Version glibc_version(gnu_get_libc_version());
+   DCHECK(glibc_version.IsValid());
diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_media_component_widevine_cdm_hint_file_linux_h b/www/ungoogled-chromium/patches/patch-chrome_common_media_component_widevine_cdm_hint_file_linux_h
new file mode 100644
index 000000000..356a5a4e5
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-chrome_common_media_component_widevine_cdm_hint_file_linux_h
@@ -0,0 +1,12 @@
+Index: chrome/common/media/component_widevine_cdm_hint_file_linux.h
+--- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig
++++ chrome/common/media/component_widevine_cdm_hint_file_linux.h
+@@ -15,7 +15,7 @@
+ 
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
++#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
+ #error "This file only applies to desktop Linux and ChromeOS."
+ #endif
+ 
diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_pref_names_h b/www/ungoogled-chromium/patches/patch-chrome_common_pref_names_h
index 14c06baab..df47c2da3 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_common_pref_names_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_common_pref_names_h
@@ -1,16 +1,16 @@
 Index: chrome/common/pref_names.h
 --- chrome/common/pref_names.h.orig
 +++ chrome/common/pref_names.h
-@@ -1329,7 +1329,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u
+@@ -1288,7 +1288,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
  // Linux specific preference on whether we should match the system theme.
- inline constexpr char kUsesSystemThemeDeprecated[] =
-     "extensions.theme.use_system";
-@@ -1451,7 +1451,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] =
+ inline constexpr char kSystemTheme[] = "extensions.theme.system_theme";
+ #endif
+@@ -1428,7 +1428,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] =
      "browser.show_update_promotion_info_bar";
  #endif
  
@@ -19,8 +19,8 @@ Index: chrome/common/pref_names.h
  // Boolean that is false if we should show window manager decorations.  If
  // true, we draw a custom chrome frame (thicker title bar and blue border).
  inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -2004,7 +2004,7 @@ inline constexpr char kDownloadLastCompleteTime[] =
-     "download.last_complete_time";
+@@ -1997,7 +1997,7 @@ inline constexpr char kDownloadDefaultDirectory[] =
+ inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_MAC)
@@ -28,7 +28,7 @@ Index: chrome/common/pref_names.h
  inline constexpr char kOpenPdfDownloadInSystemReader[] =
      "download.open_pdf_in_system_reader";
  #endif
-@@ -2396,7 +2396,7 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s
+@@ -2431,14 +2431,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s
  inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data";
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -37,7 +37,15 @@ Index: chrome/common/pref_names.h
  // A boolean pref to determine whether or not the network service is running
  // sandboxed.
  inline constexpr char kNetworkServiceSandboxEnabled[] =
-@@ -2475,7 +2475,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM
+     "net.network_service_sandbox";
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Records whether the user has seen an HTTP auth "negotiate" header.
+ inline constexpr char kReceivedHttpAuthNegotiateHeader[] =
+     "net.received_http_auth_negotiate_headers";
+@@ -2516,7 +2516,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM
  inline constexpr char kBasicAuthOverHttpEnabled[] =
      "auth.basic_over_http_enabled";
  
@@ -46,7 +54,16 @@ Index: chrome/common/pref_names.h
  // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
  // along with kAuthNegotiateDelegateAllowlist.
  inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] =
-@@ -3545,7 +3545,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes
+@@ -3034,7 +3034,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] 
+ 
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ // Defines administrator-set availability of Chrome for Testing.
+ inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed";
+ #endif
+@@ -3584,7 +3584,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes
  inline constexpr char kSandboxExternalProtocolBlocked[] =
      "profile.sandbox_external_protocol_blocked";
  
@@ -55,16 +72,16 @@ Index: chrome/common/pref_names.h
  // Boolean that indicates if system notifications are allowed to be used in
  // place of Chrome notifications.
  inline constexpr char kAllowSystemNotifications[] =
-@@ -3601,7 +3601,7 @@ inline constexpr char kCACertificateManagementAllowed[
- inline constexpr char kChromeRootStoreEnabled[] = "chrome_root_store_enabled";
+@@ -3633,7 +3633,7 @@ inline constexpr char kCACertificateManagementAllowed[
  #endif
+ 
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
  inline constexpr char kEnforceLocalAnchorConstraintsEnabled[] =
      "enforce_local_anchor_constraints_enabled";
  #endif
-@@ -3928,7 +3928,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf
+@@ -3941,7 +3941,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ
  inline constexpr char kNewBaseUrlInheritanceBehaviorAllowed[] =
      "new_base_url_inheritance_behavior_allowed";
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_url_constants_cc b/www/ungoogled-chromium/patches/patch-chrome_common_url_constants_cc
deleted file mode 100644
index cc404b668..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_common_url_constants_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: chrome/common/url_constants.cc
---- chrome/common/url_constants.cc.orig
-+++ chrome/common/url_constants.cc
-@@ -554,7 +554,7 @@ const char kPhoneHubPermissionLearnMoreURL[] =
-     "https://support.9oo91e.qjz9zk/chromebook/?p=multidevice";
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- const char kChromeAppsDeprecationLearnMoreURL[] =
-     "https://support.9oo91e.qjz9zk/chrome/?p=chrome_app_deprecation";
- #endif
diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_url_constants_h b/www/ungoogled-chromium/patches/patch-chrome_common_url_constants_h
index a6c911728..975c0ebcb 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_common_url_constants_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_common_url_constants_h
@@ -1,12 +1,12 @@
 Index: chrome/common/url_constants.h
 --- chrome/common/url_constants.h.orig
 +++ chrome/common/url_constants.h
-@@ -531,7 +531,7 @@ extern const char kOutdatedPluginLearnMoreURL[];
- extern const char kPhoneHubPermissionLearnMoreURL[];
+@@ -848,7 +848,7 @@ inline constexpr char kPhoneHubPermissionLearnMoreURL[
+     "https://support.9oo91e.qjz9zk/chromebook?p=multidevice";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- 
  // "Learn more" URL for the chrome apps deprecation dialog.
- extern const char kChromeAppsDeprecationLearnMoreURL[];
+ inline constexpr char kChromeAppsDeprecationLearnMoreURL[] =
+     "https://support.9oo91e.qjz9zk/chrome?p=chrome_app_deprecation";
diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_webui_url_constants_cc b/www/ungoogled-chromium/patches/patch-chrome_common_webui_url_constants_cc
index ac59e6513..258831115 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_common_webui_url_constants_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_common_webui_url_constants_cc
@@ -1,7 +1,7 @@
 Index: chrome/common/webui_url_constants.cc
 --- chrome/common/webui_url_constants.cc.orig
 +++ chrome/common/webui_url_constants.cc
-@@ -490,18 +490,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os://
+@@ -518,18 +518,18 @@ const char kOsUISystemURL[] = "os://system";
  const char kOsUIVersionURL[] = "os://version";
  #endif
  
@@ -23,7 +23,7 @@ Index: chrome/common/webui_url_constants.cc
  const char kChromeUIDiscardsHost[] = "discards";
  const char kChromeUIDiscardsURL[] = "chrome://discards/";
  #endif
-@@ -516,14 +516,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
+@@ -544,14 +544,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -39,8 +39,8 @@ Index: chrome/common/webui_url_constants.cc
 +    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
  const char kChromeUIBrowserSwitchHost[] = "browser-switch";
  const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
- const char kChromeUIEnterpriseProfileWelcomeHost[] =
-@@ -542,7 +542,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
+ const char kChromeUIIntroHost[] = "intro";
+@@ -570,7 +570,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
  const char kChromeUIProfilePickerStartupQuery[] = "startup";
  #endif
  
@@ -49,7 +49,7 @@ Index: chrome/common/webui_url_constants.cc
       defined(TOOLKIT_VIEWS)) ||                         \
      defined(USE_AURA)
  const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
-@@ -622,7 +622,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan
+@@ -650,7 +650,7 @@ const char kCookiesSubPagePath[] = "/cookies";
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -58,7 +58,7 @@ Index: chrome/common/webui_url_constants.cc
  const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/";
  const char kChromeUIWebAppSettingsHost[] = "app-settings";
  #endif
-@@ -857,7 +857,7 @@ const char* const kChromeDebugURLs[] = {
+@@ -879,7 +879,7 @@ const char* const kChromeDebugURLs[] = {
      blink::kChromeUIGpuJavaCrashURL,
      kChromeUIJavaCrashURL,
  #endif
diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_webui_url_constants_h b/www/ungoogled-chromium/patches/patch-chrome_common_webui_url_constants_h
index 2e81de326..e673ea7ba 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_common_webui_url_constants_h
+++ b/www/ungoogled-chromium/patches/patch-chrome_common_webui_url_constants_h
@@ -1,7 +1,7 @@
 Index: chrome/common/webui_url_constants.h
 --- chrome/common/webui_url_constants.h.orig
 +++ chrome/common/webui_url_constants.h
-@@ -411,24 +411,24 @@ extern const char kOsUIShortcutCustomizationAppURL[];
+@@ -437,24 +437,24 @@ extern const char kOsUISystemURL[];
  extern const char kOsUIVersionURL[];
  #endif
  
@@ -30,7 +30,7 @@ Index: chrome/common/webui_url_constants.h
  extern const char kChromeUIWebAppSettingsURL[];
  extern const char kChromeUIWebAppSettingsHost[];
  #endif
-@@ -443,7 +443,7 @@ extern const char kChromeUILinuxProxyConfigHost[];
+@@ -469,14 +469,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -39,7 +39,6 @@ Index: chrome/common/webui_url_constants.h
  extern const char kChromeUISandboxHost[];
  #endif
  
-@@ -455,7 +455,7 @@ extern const char kChromeUISearchEngineChoiceHost[];
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \
@@ -47,8 +46,8 @@ Index: chrome/common/webui_url_constants.h
 +    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
  extern const char kChromeUIBrowserSwitchHost[];
  extern const char kChromeUIBrowserSwitchURL[];
- extern const char kChromeUIEnterpriseProfileWelcomeHost[];
-@@ -471,7 +471,7 @@ extern const char kChromeUIProfilePickerUrl[];
+ extern const char kChromeUIIntroHost[];
+@@ -492,7 +492,7 @@ extern const char kChromeUIProfilePickerUrl[];
  extern const char kChromeUIProfilePickerStartupQuery[];
  #endif
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_renderer_chrome_render_frame_observer_cc b/www/ungoogled-chromium/patches/patch-chrome_renderer_chrome_render_frame_observer_cc
index f3607037e..ebd2f2ac4 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_renderer_chrome_render_frame_observer_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_renderer_chrome_render_frame_observer_cc
@@ -1,7 +1,7 @@
 Index: chrome/renderer/chrome_render_frame_observer.cc
 --- chrome/renderer/chrome_render_frame_observer.cc.orig
 +++ chrome/renderer/chrome_render_frame_observer.cc
-@@ -351,7 +351,7 @@ void ChromeRenderFrameObserver::OnDestruct() {
+@@ -360,7 +360,7 @@ void ChromeRenderFrameObserver::WillDetach(blink::Deta
  
  void ChromeRenderFrameObserver::DraggableRegionsChanged() {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/patches/patch-chrome_services_printing_print_backend_service_impl_cc b/www/ungoogled-chromium/patches/patch-chrome_services_printing_print_backend_service_impl_cc
index 305969e73..4148623eb 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_services_printing_print_backend_service_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_services_printing_print_backend_service_impl_cc
@@ -1,7 +1,7 @@
 Index: chrome/services/printing/print_backend_service_impl.cc
 --- chrome/services/printing/print_backend_service_impl.cc.orig
 +++ chrome/services/printing/print_backend_service_impl.cc
-@@ -46,7 +46,7 @@
+@@ -49,7 +49,7 @@
  #include "printing/backend/cups_connection_pool.h"
  #endif
  
@@ -10,7 +10,7 @@ Index: chrome/services/printing/print_backend_service_impl.cc
  #include "base/no_destructor.h"
  #include "ui/linux/linux_ui.h"
  #include "ui/linux/linux_ui_delegate_stub.h"
-@@ -73,7 +73,7 @@ namespace printing {
+@@ -76,7 +76,7 @@ namespace printing {
  
  namespace {
  
@@ -19,7 +19,7 @@ Index: chrome/services/printing/print_backend_service_impl.cc
  void InstantiateLinuxUiDelegate() {
    // TODO(crbug.com/809738)  Until a real UI can be used in a utility process,
    // need to use the stub version.
-@@ -82,7 +82,7 @@ void InstantiateLinuxUiDelegate() {
+@@ -85,7 +85,7 @@ void InstantiateLinuxUiDelegate() {
  #endif
  
  scoped_refptr<base::SequencedTaskRunner> GetPrintingTaskRunner() {
@@ -28,7 +28,7 @@ Index: chrome/services/printing/print_backend_service_impl.cc
    // Use task runner associated with equivalent of UI thread.  Needed for calls
    // made through `PrintDialogLinuxInterface` to properly execute.
    CHECK(base::SequencedTaskRunner::HasCurrentDefault());
-@@ -466,7 +466,7 @@ void PrintBackendServiceImpl::Init(
+@@ -469,7 +469,7 @@ void PrintBackendServiceImpl::Init(
    // `InitCommon()`.
    InitializeProcessForPrinting();
    print_backend_ = PrintBackend::CreateInstance(locale);
@@ -37,9 +37,9 @@ Index: chrome/services/printing/print_backend_service_impl.cc
    // Test framework already initializes the UI, so this should not go in
    // `InitCommon()`.  Additionally, low-level Linux UI is not needed when tests
    // are using `TestPrintingContext`.
-@@ -686,7 +686,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
+@@ -690,7 +690,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
    crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>(
-       print_backend_->GetPrinterDriverInfo(*printer_name));
+       *printer_name, print_backend_->GetPrinterDriverInfo(*printer_name));
  
 -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_CUPS)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_test_BUILD_gn b/www/ungoogled-chromium/patches/patch-chrome_test_BUILD_gn
deleted file mode 100644
index a72c0522a..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_test_BUILD_gn
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: chrome/test/BUILD.gn
---- chrome/test/BUILD.gn.orig
-+++ chrome/test/BUILD.gn
-@@ -10855,7 +10855,7 @@ test("chrome_app_unittests") {
-     "//components/heap_profiling/in_process",
-     "//components/safe_browsing:buildflags",
-   ]
--  if (!is_fuchsia && !is_mac) {
-+  if (!is_fuchsia && !is_mac && !is_bsd) {
-     deps += [ "//third_party/breakpad:client" ]
-   }
-   if (is_android) {
diff --git a/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_capabilities_cc b/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_capabilities_cc
deleted file mode 100644
index 22014ac52..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_capabilities_cc
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: chrome/test/chromedriver/capabilities.cc
---- chrome/test/chromedriver/capabilities.cc.orig
-+++ chrome/test/chromedriver/capabilities.cc
-@@ -346,7 +346,11 @@ Status ParseMobileEmulation(const base::Value& option,
-                         "'version' field of type string");
-         }
- 
-+#if defined(__clang__) && (__clang_major__ >= 15)
-         brands.emplace_back(*brand, *version);
-+#else
-+        brands.emplace_back() = {*brand, *version};
-+#endif
-       }
- 
-       client_hints.brands = std::move(brands);
-@@ -384,7 +388,11 @@ Status ParseMobileEmulation(const base::Value& option,
-                         "a 'version' field of type string");
-         }
- 
-+#if defined(__clang__) && (__clang_major__ >= 15)
-         full_version_list.emplace_back(*brand, *version);
-+#else
-+        full_version_list.emplace_back() = {*brand, *version};
-+#endif
-       }
- 
-       client_hints.full_version_list = std::move(full_version_list);
diff --git a/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_chrome_chrome_finder_cc b/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_chrome_chrome_finder_cc
index 4711d7bd4..2f9284f58 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_chrome_chrome_finder_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_chrome_chrome_finder_cc
@@ -1,7 +1,7 @@
 Index: chrome/test/chromedriver/chrome/chrome_finder.cc
 --- chrome/test/chromedriver/chrome/chrome_finder.cc.orig
 +++ chrome/test/chromedriver/chrome/chrome_finder.cc
-@@ -57,7 +57,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l
+@@ -58,7 +58,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l
          installation_locations[i].Append(L"Chromium\\Application"));
    }
  }
@@ -10,12 +10,21 @@ Index: chrome/test/chromedriver/chrome/chrome_finder.cc
  void GetApplicationDirs(std::vector<base::FilePath>* locations) {
    // TODO: Respect users' PATH variables.
    // Until then, we use an approximation of the most common defaults.
-@@ -157,7 +157,7 @@ bool FindChrome(base::FilePath* browser_exe) {
-     base::FilePath(chrome::kGoogleChromeForTestingBrowserProcessExecutablePath),
-     base::FilePath(chrome::kGoogleChromeBrowserProcessExecutablePath),
-     base::FilePath(chrome::kChromiumBrowserProcessExecutablePath),
+@@ -125,7 +125,7 @@ std::vector<base::FilePath> GetChromeProgramNames() {
+             chrome::kGoogleChromeForTestingBrowserProcessExecutablePath),
+         base::FilePath(chrome::kGoogleChromeBrowserProcessExecutablePath),
+         base::FilePath(chrome::kChromiumBrowserProcessExecutablePath),
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
      base::FilePath(chrome::kBrowserProcessExecutablePath),
-     base::FilePath("chrome"),  // Chrome for Testing or Google Chrome
-     base::FilePath("google-chrome"),
+         base::FilePath("chrome"),  // Chrome for Testing or Google Chrome
+         base::FilePath("google-chrome"), base::FilePath("chromium"),
+@@ -141,7 +141,7 @@ std::vector<base::FilePath> GetHeadlessShellProgramNam
+   return {
+ #if BUILDFLAG(IS_WIN)
+     base::FilePath(FILE_PATH_LITERAL("chrome-headless-shell.exe")),
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     base::FilePath("chrome-headless-shell"),
+ #else
+     // it will compile but won't work on other OSes
diff --git a/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_chrome_client_hints_h b/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_chrome_client_hints_h
deleted file mode 100644
index 5d0a06e31..000000000
--- a/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_chrome_client_hints_h
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: chrome/test/chromedriver/chrome/client_hints.h
---- chrome/test/chromedriver/chrome/client_hints.h.orig
-+++ chrome/test/chromedriver/chrome/client_hints.h
-@@ -7,6 +7,7 @@
- 
- #include <third_party/abseil-cpp/absl/types/optional.h>
- #include <string>
-+#include <vector>
- 
- struct BrandVersion {
-   // Browser brand.
diff --git a/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_chrome_launcher_cc b/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_chrome_launcher_cc
index bcb78bd51..e9b56d435 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_chrome_launcher_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_chrome_launcher_cc
@@ -1,7 +1,7 @@
 Index: chrome/test/chromedriver/chrome_launcher.cc
 --- chrome/test/chromedriver/chrome_launcher.cc.orig
 +++ chrome/test/chromedriver/chrome_launcher.cc
-@@ -69,6 +69,7 @@
+@@ -73,6 +73,7 @@
  #include <fcntl.h>
  #include <sys/stat.h>
  #include <sys/types.h>
diff --git a/www/ungoogled-chromium/patches/patch-chrome_updater_configurator_cc b/www/ungoogled-chromium/patches/patch-chrome_updater_configurator_cc
index 2d17ef245..d3a626708 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_updater_configurator_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_updater_configurator_cc
@@ -1,9 +1,9 @@
 Index: chrome/updater/configurator.cc
 --- chrome/updater/configurator.cc.orig
 +++ chrome/updater/configurator.cc
-@@ -63,7 +63,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs>
-         return absl::nullopt;
- #endif
+@@ -67,7 +67,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs>
+         return std::nullopt;
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
        }()) {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-chrome_updater_util_posix_util_cc b/www/ungoogled-chromium/patches/patch-chrome_updater_util_posix_util_cc
index 2fa9020f2..f07f87648 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_updater_util_posix_util_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_updater_util_posix_util_cc
@@ -1,7 +1,7 @@
 Index: chrome/updater/util/posix_util.cc
 --- chrome/updater/util/posix_util.cc.orig
 +++ chrome/updater/util/posix_util.cc
-@@ -16,7 +16,7 @@
+@@ -20,7 +20,7 @@
  #include "chrome/updater/updater_branding.h"
  #include "chrome/updater/util/util.h"
  
diff --git a/www/ungoogled-chromium/patches/patch-chrome_utility_services_cc b/www/ungoogled-chromium/patches/patch-chrome_utility_services_cc
index a13bb09a9..480ad4867 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_utility_services_cc
+++ b/www/ungoogled-chromium/patches/patch-chrome_utility_services_cc
@@ -1,7 +1,7 @@
 Index: chrome/utility/services.cc
 --- chrome/utility/services.cc.orig
 +++ chrome/utility/services.cc
-@@ -56,7 +56,7 @@
+@@ -55,7 +55,7 @@
  #include "chrome/services/system_signals/mac/mac_system_signals_service.h"
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -10,7 +10,7 @@ Index: chrome/utility/services.cc
  #include "chrome/services/system_signals/linux/linux_system_signals_service.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -82,7 +82,7 @@
+@@ -81,7 +81,7 @@
  #include "chrome/services/file_util/file_util_service.h"  // nogncheck
  #endif
  
@@ -19,7 +19,7 @@ Index: chrome/utility/services.cc
  #include "chrome/services/file_util/document_analysis_service.h"  // nogncheck
  #endif
  
-@@ -216,7 +216,7 @@ auto RunMacNotificationService(
+@@ -212,7 +212,7 @@ auto RunMacNotificationService(
  }
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -28,7 +28,7 @@ Index: chrome/utility/services.cc
  auto RunSystemSignalsService(
      mojo::PendingReceiver<device_signals::mojom::SystemSignalsService>
          receiver) {
-@@ -276,7 +276,7 @@ auto RunCupsIppParser(
+@@ -272,7 +272,7 @@ auto RunCupsIppParser(
  }
  #endif
  
@@ -37,7 +37,7 @@ Index: chrome/utility/services.cc
  auto RunDocumentAnalysis(
      mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) {
    return std::make_unique<DocumentAnalysisService>(std::move(receiver));
-@@ -452,7 +452,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
+@@ -465,7 +465,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
    services.Add(RunWindowsIconReader);
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -46,7 +46,7 @@ Index: chrome/utility/services.cc
    services.Add(RunSystemSignalsService);
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
-@@ -468,7 +468,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
+@@ -481,7 +481,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
    services.Add(RunFileUtil);
  #endif
  
diff --git a/www/ungoogled-chromium/patches/patch-chromecast_browser_cast_content_browser_client_cc b/www/ungoogled-chromium/patches/patch-chromecast_browser_cast_content_browser_client_cc
index 6167120ea..8a947a14b 100644
--- a/www/ungoogled-chromium/patches/patch-chromecast_browser_cast_content_browser_client_cc
+++ b/www/ungoogled-chromium/patches/patch-chromecast_browser_cast_content_browser_client_cc
@@ -1,7 +1,7 @@
 Index: chromecast/browser/cast_content_browser_client.cc
 --- chromecast/browser/cast_content_browser_client.cc.orig
 +++ chromecast/browser/cast_content_browser_client.cc
-@@ -448,7 +448,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
+@@ -434,7 +434,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
                                            switches::kAudioOutputChannels));
      }
    } else if (process_type == switches::kGpuProcess) {
diff --git a/www/ungoogled-chromium/patches/patch-components_autofill_core_browser_personal_data_manager_cc b/www/ungoogled-chromium/patches/patch-components_autofill_core_browser_personal_data_manager_cc
index bc2aa9ee4..8072b32c0 100644
--- a/www/ungoogled-chromium/patches/patch-components_autofill_core_browser_personal_data_manager_cc
+++ b/www/ungoogled-chromium/patches/patch-components_autofill_core_browser_personal_data_manager_cc
@@ -1,7 +1,7 @@
 Index: components/autofill/core/browser/personal_data_manager.cc
 --- components/autofill/core/browser/personal_data_manager.cc.orig
 +++ components/autofill/core/browser/personal_data_manager.cc
-@@ -2484,7 +2484,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
+@@ -1022,7 +1022,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
@@ -10,4 +10,4 @@ Index: components/autofill/core/browser/personal_data_manager.cc
 +    BUILDFLAG(IS_BSD)
    // This option should only be shown for users that have not enabled the Sync
    // Feature and that have server credit cards available.
-   if (!sync_service_ || sync_service_->IsSyncFeatureEnabled() ||
+   // TODO(crbug.com/40066949): Simplify once ConsentLevel::kSync and
diff --git a/www/ungoogled-chromium/patches/patch-components_autofill_core_common_autofill_payments_features_cc b/www/ungoogled-chromium/patches/patch-components_autofill_core_common_autofill_payments_features_cc
index 805c9da8e..1d573ce47 100644
--- a/www/ungoogled-chromium/patches/patch-components_autofill_core_common_autofill_payments_features_cc
+++ b/www/ungoogled-chromium/patches/patch-components_autofill_core_common_autofill_payments_features_cc
@@ -1,7 +1,7 @@
 Index: components/autofill/core/common/autofill_payments_features.cc
 --- components/autofill/core/common/autofill_payments_features.cc.orig
 +++ components/autofill/core/common/autofill_payments_features.cc
-@@ -305,7 +305,7 @@ BASE_FEATURE(kAutofillEnablePaymentsMandatoryReauthOnB
+@@ -276,7 +276,7 @@ BASE_FEATURE(kAutofillEnableVirtualCards,
  bool ShouldShowImprovedUserConsentForCreditCardSave() {
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-components_autofill_core_common_autofill_util_cc b/www/ungoogled-chromium/patches/patch-components_autofill_core_common_autofill_util_cc
index fa307ba66..374a452a2 100644
--- a/www/ungoogled-chromium/patches/patch-components_autofill_core_common_autofill_util_cc
+++ b/www/ungoogled-chromium/patches/patch-components_autofill_core_common_autofill_util_cc
@@ -1,7 +1,7 @@
 Index: components/autofill/core/common/autofill_util.cc
 --- components/autofill/core/common/autofill_util.cc.orig
 +++ components/autofill/core/common/autofill_util.cc
-@@ -153,7 +153,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value
+@@ -131,7 +131,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value
  
  bool ShouldAutoselectFirstSuggestionOnArrowDown() {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/patches/patch-components_autofill_payments_strings_grdp b/www/ungoogled-chromium/patches/patch-components_autofill_payments_strings_grdp
deleted file mode 100644
index bf617eacd..000000000
--- a/www/ungoogled-chromium/patches/patch-components_autofill_payments_strings_grdp
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: components/autofill_payments_strings.grdp
---- components/autofill_payments_strings.grdp.orig
-+++ components/autofill_payments_strings.grdp
-@@ -124,7 +124,7 @@
-   <message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java">
-     Save card
-   </message>
--  <if expr="is_linux">
-+  <if expr="is_posix">
-     <then>
-       <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD" desc="Title text for the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt can be either a bubble or an infobar.">
-         Do you want to save this card to your Google Account?
diff --git a/www/ungoogled-chromium/patches/patch-components_commerce_core_commerce_feature_list_cc b/www/ungoogled-chromium/patches/patch-components_commerce_core_commerce_feature_list_cc
new file mode 100644
index 000000000..87a76f20f
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_commerce_core_commerce_feature_list_cc
@@ -0,0 +1,21 @@
+Index: components/commerce/core/commerce_feature_list.cc
+--- components/commerce/core/commerce_feature_list.cc.orig
++++ components/commerce/core/commerce_feature_list.cc
+@@ -168,7 +168,7 @@ BASE_FEATURE(kPriceInsights,
+              "PriceInsights",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kPriceInsightsRegionLaunched,
+              "PriceInsightsRegionLaunched",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -244,7 +244,7 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl
+ 
+ BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT);
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS)
++    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kShoppingListRegionLaunched,
+              "ShoppingListRegionLaunched",
+              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/www/ungoogled-chromium/patches/patch-components_components_chromium_strings_grd b/www/ungoogled-chromium/patches/patch-components_components_chromium_strings_grd
deleted file mode 100644
index c2a9f09fd..000000000
--- a/www/ungoogled-chromium/patches/patch-components_components_chromium_strings_grd
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: components/components_chromium_strings.grd
---- components/components_chromium_strings.grd.orig
-+++ components/components_chromium_strings.grd
-@@ -226,7 +226,7 @@
-         </message>
-       </if>
-       <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. -->
--      <if expr="is_linux">
-+      <if expr="is_posix">
-         <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
-           Go to
-           the Chromium menu &gt;
diff --git a/www/ungoogled-chromium/patches/patch-components_components_google_chrome_strings_grd b/www/ungoogled-chromium/patches/patch-components_components_google_chrome_strings_grd
deleted file mode 100644
index e56efc468..000000000
--- a/www/ungoogled-chromium/patches/patch-components_components_google_chrome_strings_grd
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: components/components_google_chrome_strings.grd
---- components/components_google_chrome_strings.grd.orig
-+++ components/components_google_chrome_strings.grd
-@@ -226,7 +226,7 @@
-         </message>
-       </if>
-       <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. -->
--      <if expr="is_linux">
-+      <if expr="is_posix">
-         <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
-           Go to
-           the Chrome menu &gt;
diff --git a/www/ungoogled-chromium/patches/patch-components_constrained_window_constrained_window_views_cc b/www/ungoogled-chromium/patches/patch-components_constrained_window_constrained_window_views_cc
new file mode 100644
index 000000000..07b89e387
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_constrained_window_constrained_window_views_cc
@@ -0,0 +1,12 @@
+Index: components/constrained_window/constrained_window_views.cc
+--- components/constrained_window/constrained_window_views.cc.orig
++++ components/constrained_window/constrained_window_views.cc
+@@ -324,7 +324,7 @@ bool SupportsGlobalScreenCoordinates() {
+ }
+ 
+ bool PlatformClipsChildrenToViewport() {
+-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return true;
+ #else
+   return false;
diff --git a/www/ungoogled-chromium/patches/patch-components_content_settings_core_browser_website_settings_registry_cc b/www/ungoogled-chromium/patches/patch-components_content_settings_core_browser_website_settings_registry_cc
index d93b2432e..eecf4b6b6 100644
--- a/www/ungoogled-chromium/patches/patch-components_content_settings_core_browser_website_settings_registry_cc
+++ b/www/ungoogled-chromium/patches/patch-components_content_settings_core_browser_website_settings_registry_cc
@@ -1,7 +1,7 @@
 Index: components/content_settings/core/browser/website_settings_registry.cc
 --- components/content_settings/core/browser/website_settings_registry.cc.orig
 +++ components/content_settings/core/browser/website_settings_registry.cc
-@@ -66,7 +66,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re
+@@ -67,7 +67,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re
  #if BUILDFLAG(IS_WIN)
    if (!(platform & PLATFORM_WINDOWS))
      return nullptr;
diff --git a/www/ungoogled-chromium/patches/patch-components_cookie_config_cookie_store_util_cc b/www/ungoogled-chromium/patches/patch-components_cookie_config_cookie_store_util_cc
index 19243cc7a..9e4cf220f 100644
--- a/www/ungoogled-chromium/patches/patch-components_cookie_config_cookie_store_util_cc
+++ b/www/ungoogled-chromium/patches/patch-components_cookie_config_cookie_store_util_cc
@@ -4,7 +4,7 @@ Index: components/cookie_config/cookie_store_util.cc
 @@ -12,7 +12,7 @@
  namespace cookie_config {
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  namespace {
diff --git a/www/ungoogled-chromium/patches/patch-components_crash_core_app_BUILD_gn b/www/ungoogled-chromium/patches/patch-components_crash_core_app_BUILD_gn
index 7308301bc..c2c885294 100644
--- a/www/ungoogled-chromium/patches/patch-components_crash_core_app_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-components_crash_core_app_BUILD_gn
@@ -1,16 +1,7 @@
 Index: components/crash/core/app/BUILD.gn
 --- components/crash/core/app/BUILD.gn.orig
 +++ components/crash/core/app/BUILD.gn
-@@ -72,7 +72,7 @@ static_library("app") {
-     "crashpad.h",
-   ]
- 
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     sources += [ "crashpad_linux.cc" ]
-   }
- 
-@@ -85,6 +85,10 @@ static_library("app") {
+@@ -82,6 +82,10 @@ static_library("app") {
      ]
    }
  
@@ -21,7 +12,16 @@ Index: components/crash/core/app/BUILD.gn
    defines = [ "CRASH_IMPLEMENTATION" ]
  
    public_deps = [ ":lib" ]
-@@ -113,7 +117,7 @@ static_library("app") {
+@@ -95,7 +99,7 @@ static_library("app") {
+     "//third_party/crashpad/crashpad/util",
+   ]
+ 
+-  if (is_linux || is_chromeos) {
++  if ((is_linux || is_chromeos) && !is_bsd) {
+     sources += [ "crashpad_linux.cc" ]
+     data_deps = [ ":chrome_crashpad_handler" ]
+   }
+@@ -115,7 +119,7 @@ static_library("app") {
      libs = [ "log" ]
    }
  
@@ -30,7 +30,7 @@ Index: components/crash/core/app/BUILD.gn
      deps += [
        "//base:base_static",
        "//components/crash/core/common",
-@@ -241,11 +245,6 @@ if (is_mac || is_android || is_linux || is_chromeos) {
+@@ -243,11 +247,6 @@ if (is_mac || is_android || is_linux || is_chromeos) {
    # define custom UserStreamDataSources.
    executable("chrome_crashpad_handler") {
      sources = [ "chrome_crashpad_handler.cc" ]
diff --git a/www/ungoogled-chromium/patches/patch-components_crash_core_app_crashpad_handler_main_cc b/www/ungoogled-chromium/patches/patch-components_crash_core_app_crashpad_handler_main_cc
new file mode 100644
index 000000000..40e5cc3b6
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_crash_core_app_crashpad_handler_main_cc
@@ -0,0 +1,21 @@
+Index: components/crash/core/app/crashpad_handler_main.cc
+--- components/crash/core/app/crashpad_handler_main.cc.orig
++++ components/crash/core/app/crashpad_handler_main.cc
+@@ -10,7 +10,7 @@
+ #include "third_party/crashpad/crashpad/handler/handler_main.h"
+ #include "third_party/crashpad/crashpad/handler/user_stream_data_source.h"
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ #include "components/stability_report/user_stream_data_source_posix.h"
+ #endif
+ 
+@@ -31,7 +31,7 @@ __attribute__((visibility("default"), used)) int Crash
+     char* argv[]) {
+   crashpad::UserStreamDataSources user_stream_data_sources;
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   user_stream_data_sources.push_back(
+       std::make_unique<stability_report::UserStreamDataSourcePosix>());
+ #endif
diff --git a/www/ungoogled-chromium/patches/patch-components_device_signals_core_browser_user_permission_service_impl_cc b/www/ungoogled-chromium/patches/patch-components_device_signals_core_browser_user_permission_service_impl_cc
index 66c7799ed..1777e338a 100644
--- a/www/ungoogled-chromium/patches/patch-components_device_signals_core_browser_user_permission_service_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-components_device_signals_core_browser_user_permission_service_impl_cc
@@ -1,7 +1,7 @@
 Index: components/device_signals/core/browser/user_permission_service_impl.cc
 --- components/device_signals/core/browser/user_permission_service_impl.cc.orig
 +++ components/device_signals/core/browser/user_permission_service_impl.cc
-@@ -74,7 +74,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent()
+@@ -92,7 +92,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent()
           consent_required_by_dependent_policy;
  }
  
diff --git a/www/ungoogled-chromium/patches/patch-components_discardable_memory_service_discardable_shared_memory_manager_cc b/www/ungoogled-chromium/patches/patch-components_discardable_memory_service_discardable_shared_memory_manager_cc
index 14f8277fd..2074b9aac 100644
--- a/www/ungoogled-chromium/patches/patch-components_discardable_memory_service_discardable_shared_memory_manager_cc
+++ b/www/ungoogled-chromium/patches/patch-components_discardable_memory_service_discardable_shared_memory_manager_cc
@@ -1,7 +1,7 @@
 Index: components/discardable_memory/service/discardable_shared_memory_manager.cc
 --- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig
 +++ components/discardable_memory/service/discardable_shared_memory_manager.cc
-@@ -171,7 +171,7 @@ uint64_t GetDefaultMemoryLimit() {
+@@ -172,7 +172,7 @@ uint64_t GetDefaultMemoryLimit() {
    // Limits the number of FDs used to 32, assuming a 4MB allocation size.
    uint64_t max_default_memory_limit = 128 * kMegabyte;
  #else
diff --git a/www/ungoogled-chromium/patches/patch-components_embedder_support_user_agent_utils_cc b/www/ungoogled-chromium/patches/patch-components_embedder_support_user_agent_utils_cc
index 3baf0233b..bbc48481d 100644
--- a/www/ungoogled-chromium/patches/patch-components_embedder_support_user_agent_utils_cc
+++ b/www/ungoogled-chromium/patches/patch-components_embedder_support_user_agent_utils_cc
@@ -1,7 +1,7 @@
 Index: components/embedder_support/user_agent_utils.cc
 --- components/embedder_support/user_agent_utils.cc.orig
 +++ components/embedder_support/user_agent_utils.cc
-@@ -540,6 +540,9 @@ std::string GetPlatformForUAMetadata() {
+@@ -445,6 +445,9 @@ std::string GetPlatformForUAMetadata() {
  # else
    return "Chromium OS";
  # endif
diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_eye_dropper_eye_dropper_view_cc b/www/ungoogled-chromium/patches/patch-components_eye_dropper_eye_dropper_view_cc
similarity index 56%
rename from www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_eye_dropper_eye_dropper_view_cc
rename to www/ungoogled-chromium/patches/patch-components_eye_dropper_eye_dropper_view_cc
index b2328cdc5..f2467b05a 100644
--- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_eye_dropper_eye_dropper_view_cc
+++ b/www/ungoogled-chromium/patches/patch-components_eye_dropper_eye_dropper_view_cc
@@ -1,7 +1,7 @@
-Index: chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc
---- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig
-+++ chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc
-@@ -159,7 +159,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos
+Index: components/eye_dropper/eye_dropper_view.cc
+--- components/eye_dropper/eye_dropper_view.cc.orig
++++ components/eye_dropper/eye_dropper_view.cc
+@@ -200,7 +200,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent,
    // EyeDropper/WidgetDelegate.
    set_owned_by_client();
    SetPreferredSize(GetSize());
diff --git a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_configurations_cc b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_configurations_cc
index 8828a1ebd..776a8b4ab 100644
--- a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_configurations_cc
+++ b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_configurations_cc
@@ -1,16 +1,25 @@
 Index: components/feature_engagement/public/feature_configurations.cc
 --- components/feature_engagement/public/feature_configurations.cc.orig
 +++ components/feature_engagement/public/feature_configurations.cc
-@@ -40,7 +40,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe
- absl::optional<FeatureConfig> GetClientSideFeatureConfig(
+@@ -94,7 +94,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro
+ 
+ std::optional<FeatureConfig> GetClientSideFeatureConfig(
      const base::Feature* feature) {
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ 
+   // The IPH bubble for link capturing has a trigger set to ANY so that it
+   // always shows up. The per app specific guardrails are independently stored
+@@ -113,7 +113,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi
+ 
+ #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    if (kIPHPasswordsAccountStorageFeature.name == feature->name) {
-     absl::optional<FeatureConfig> config = FeatureConfig();
+     std::optional<FeatureConfig> config = FeatureConfig();
      config->valid = true;
-@@ -1320,7 +1320,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf
+@@ -1393,7 +1393,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -20,3 +29,12 @@ Index: components/feature_engagement/public/feature_configurations.cc
  
    if (kIPHAutofillExternalAccountProfileSuggestionFeature.name ==
        feature->name) {
+@@ -1965,7 +1966,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi
+   }
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   if (kIPHDeepScanPromptRemovalFeature.name == feature->name) {
+     std::optional<FeatureConfig> config = FeatureConfig();
+     config->valid = true;
diff --git a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_constants_cc b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_constants_cc
index c18f53c56..4badbd138 100644
--- a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_constants_cc
+++ b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_constants_cc
@@ -1,16 +1,16 @@
 Index: components/feature_engagement/public/feature_constants.cc
 --- components/feature_engagement/public/feature_constants.cc.orig
 +++ components/feature_engagement/public/feature_constants.cc
-@@ -21,7 +21,7 @@ BASE_FEATURE(kUseClientConfigIPH,
+@@ -18,7 +18,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode", base::FEATU
  BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature,
-              "IPH_AutofillFeedbackNewBadge",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -516,7 +516,8 @@ BASE_FEATURE(kIPHiOSPromoPostRestoreDefaultBrowserFeat
+ BASE_FEATURE(kIPHBatterySaverModeFeature,
+              "IPH_BatterySaverMode",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -584,7 +584,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment,
  #endif  // BUILDFLAG(IS_IOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -20,3 +20,12 @@ Index: components/feature_engagement/public/feature_constants.cc
  BASE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature,
               "IPH_AutofillExternalAccountProfileSuggestion",
               base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -712,7 +713,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature,
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // This can be enabled by default, as the DesktopPWAsLinkCapturing
+ // flag is needed for the IPH linked to this feature to work, and
+ // use-cases to show the IPH are guarded by that flag.
diff --git a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_constants_h b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_constants_h
index f2669d0c5..bbc1620cd 100644
--- a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_constants_h
+++ b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_constants_h
@@ -1,22 +1,30 @@
 Index: components/feature_engagement/public/feature_constants.h
 --- components/feature_engagement/public/feature_constants.h.orig
 +++ components/feature_engagement/public/feature_constants.h
-@@ -23,7 +23,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH);
+@@ -20,7 +20,7 @@ BASE_DECLARE_FEATURE(kIPHDemoMode);
  BASE_DECLARE_FEATURE(kIPHDummyFeature);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- BASE_DECLARE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature);
  BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature);
  BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature);
-@@ -210,7 +210,8 @@ BASE_DECLARE_FEATURE(kIPHiOSPromoPostRestoreDefaultBro
+ BASE_DECLARE_FEATURE(kIPHCompanionSidePanelRegionSearchFeature);
+@@ -244,7 +244,7 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp
+ 
  #endif  // BUILDFLAG(IS_IOS)
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
-+    BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
  BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature);
- BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardCVCSuggestionFeature);
- BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardSuggestionFeature);
+ BASE_DECLARE_FEATURE(kIPHAutofillManualFallbackFeature);
+@@ -293,7 +293,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea
+ BASE_DECLARE_FEATURE(kIPHScalableIphGamingFeature);
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kIPHDesktopPWAsLinkCapturingLaunch);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
diff --git a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_list_cc b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_list_cc
index dc95b8444..b5a64c5e1 100644
--- a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_list_cc
+++ b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_list_cc
@@ -1,22 +1,30 @@
 Index: components/feature_engagement/public/feature_list.cc
 --- components/feature_engagement/public/feature_list.cc.orig
 +++ components/feature_engagement/public/feature_list.cc
-@@ -139,7 +139,7 @@ const base::Feature* const kAllFeatures[] = {
-     &kIPHiOSPromoPostRestoreDefaultBrowserFeature,
+@@ -147,7 +147,7 @@ const base::Feature* const kAllFeatures[] = {
+     &kIPHiOSOverflowMenuCustomizationFeature,
  #endif  // BUILDFLAG(IS_IOS)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     &kIPHAutofillFeedbackNewBadgeFeature,
      &kIPHBatterySaverModeFeature,
      &kIPHCompanionSidePanelFeature,
-@@ -185,7 +185,8 @@ const base::Feature* const kAllFeatures[] = {
+     &kIPHCompanionSidePanelRegionSearchFeature,
+@@ -203,7 +203,7 @@ const base::Feature* const kAllFeatures[] = {
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
-+    BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
      &kIPHAutofillExternalAccountProfileSuggestionFeature,
-     &kIPHAutofillVirtualCardCVCSuggestionFeature,
-     &kIPHAutofillVirtualCardSuggestionFeature,
+     &kIPHAutofillManualFallbackFeature,
+@@ -252,7 +252,7 @@ const base::Feature* const kAllFeatures[] = {
+     &kIPHScalableIphGamingFeature,
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     &kIPHDesktopPWAsLinkCapturingLaunch,
+ #endif  // BUILDFLAG(IS_WIN) ||  BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
diff --git a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_list_h b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_list_h
index 6302751a1..bd3bb9b97 100644
--- a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_list_h
+++ b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_list_h
@@ -1,41 +1,57 @@
 Index: components/feature_engagement/public/feature_list.h
 --- components/feature_engagement/public/feature_list.h.orig
 +++ components/feature_engagement/public/feature_list.h
-@@ -258,7 +258,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoPostRestoreDefaultB
+@@ -266,7 +266,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSOverflowMenuCustomizatio
  #endif  // BUILDFLAG(IS_IOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- DEFINE_VARIATION_PARAM(kIPHAutofillFeedbackNewBadgeFeature,
-                        "IPH_AutofillFeedbackNewBadge");
  DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode");
-@@ -332,7 +332,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, 
+ DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelFeature, "IPH_CompanionSidePanel");
+ DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelRegionSearchFeature,
+@@ -362,7 +362,7 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, 
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
-+    BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
  DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature,
                         "IPH_AutofillExternalAccountProfileSuggestion");
- DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardCVCSuggestionFeature,
-@@ -538,7 +539,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
-         VARIATION_ENTRY(kIPHiOSShareToolbarItemFeature),
-         VARIATION_ENTRY(kIPHiOSPromoPostRestoreDefaultBrowserFeature),
+@@ -448,7 +448,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF
+ DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming");
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch,
+                        "IPH_DesktopPWAsLinkCapturingLaunch");
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+@@ -598,7 +598,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+         VARIATION_ENTRY(kIPHiOSPromoGenericDefaultBrowserFeature),
+         VARIATION_ENTRY(kIPHiOSOverflowMenuCustomizationFeature),
  #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-         VARIATION_ENTRY(kIPHAutofillFeedbackNewBadgeFeature),
          VARIATION_ENTRY(kIPHBatterySaverModeFeature),
          VARIATION_ENTRY(kIPHCompanionSidePanelFeature),
-@@ -585,7 +586,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+         VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature),
+@@ -654,7 +654,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
-+    BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
          VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature),
-         VARIATION_ENTRY(kIPHAutofillVirtualCardCVCSuggestionFeature),
-         VARIATION_ENTRY(kIPHAutofillVirtualCardSuggestionFeature),
+         VARIATION_ENTRY(kIPHAutofillManualFallbackFeature),
+@@ -703,7 +703,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+         VARIATION_ENTRY(kIPHScalableIphGamingFeature),
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+         VARIATION_ENTRY(kIPHDesktopPWAsLinkCapturingLaunch),
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
diff --git a/www/ungoogled-chromium/patches/patch-components_feed_core_v2_feed_network_impl_unittest_cc b/www/ungoogled-chromium/patches/patch-components_feed_core_v2_feed_network_impl_unittest_cc
index eab88ca4e..bc9489b2a 100644
--- a/www/ungoogled-chromium/patches/patch-components_feed_core_v2_feed_network_impl_unittest_cc
+++ b/www/ungoogled-chromium/patches/patch-components_feed_core_v2_feed_network_impl_unittest_cc
@@ -1,7 +1,7 @@
 Index: components/feed/core/v2/feed_network_impl_unittest.cc
 --- components/feed/core/v2/feed_network_impl_unittest.cc.orig
 +++ components/feed/core/v2/feed_network_impl_unittest.cc
-@@ -801,8 +801,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn
+@@ -781,8 +781,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn
  
    EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, client_info.app_type());
    EXPECT_EQ(feedwire::Version::RELEASE, client_info.app_version().build_type());
diff --git a/www/ungoogled-chromium/patches/patch-components_gwp_asan_client_gwp_asan_cc b/www/ungoogled-chromium/patches/patch-components_gwp_asan_client_gwp_asan_cc
index 72ed756d0..d3cdaf5a0 100644
--- a/www/ungoogled-chromium/patches/patch-components_gwp_asan_client_gwp_asan_cc
+++ b/www/ungoogled-chromium/patches/patch-components_gwp_asan_client_gwp_asan_cc
@@ -1,7 +1,7 @@
 Index: components/gwp_asan/client/gwp_asan.cc
 --- components/gwp_asan/client/gwp_asan.cc.orig
 +++ components/gwp_asan/client/gwp_asan.cc
-@@ -64,7 +64,7 @@ constexpr bool kCpuIs64Bit =
+@@ -72,7 +72,7 @@ namespace {
  // ProcessSamplingBoost is the multiplier to increase the
  // ProcessSamplingProbability in scenarios where we want to perform additional
  // testing (e.g., on canary/dev builds).
@@ -10,12 +10,3 @@ Index: components/gwp_asan/client/gwp_asan.cc
  constexpr int kDefaultMaxAllocations = 50;
  constexpr int kDefaultMaxMetadata = 210;
  constexpr int kDefaultTotalPages = kCpuIs64Bit ? 2048 : kDefaultMaxMetadata * 2;
-@@ -84,7 +84,7 @@ constexpr int kDefaultProcessSamplingBoost2 = 10;
-         // BUILDFLAG(IS_FUCHSIA)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- constexpr base::FeatureState kDefaultEnabled = base::FEATURE_ENABLED_BY_DEFAULT;
- #else
- constexpr base::FeatureState kDefaultEnabled =
diff --git a/www/ungoogled-chromium/patches/patch-components_gwp_asan_client_gwp_asan_features_cc b/www/ungoogled-chromium/patches/patch-components_gwp_asan_client_gwp_asan_features_cc
new file mode 100644
index 000000000..755623a00
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_gwp_asan_client_gwp_asan_features_cc
@@ -0,0 +1,12 @@
+Index: components/gwp_asan/client/gwp_asan_features.cc
+--- components/gwp_asan/client/gwp_asan_features.cc.orig
++++ components/gwp_asan/client/gwp_asan_features.cc
+@@ -9,7 +9,7 @@
+ namespace gwp_asan::internal {
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) ||                                          \
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ||                     \
+     (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS))
+ constexpr base::FeatureState kDefaultEnabled = base::FEATURE_ENABLED_BY_DEFAULT;
+ #else
diff --git a/www/ungoogled-chromium/patches/patch-components_live_caption_caption_util_h b/www/ungoogled-chromium/patches/patch-components_live_caption_caption_util_h
index b469d787b..3c22ab340 100644
--- a/www/ungoogled-chromium/patches/patch-components_live_caption_caption_util_h
+++ b/www/ungoogled-chromium/patches/patch-components_live_caption_caption_util_h
@@ -1,7 +1,7 @@
 Index: components/live_caption/caption_util.h
 --- components/live_caption/caption_util.h.orig
 +++ components/live_caption/caption_util.h
-@@ -14,7 +14,7 @@ class PrefService;
+@@ -15,7 +15,7 @@ class PrefService;
  namespace captions {
  
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
diff --git a/www/ungoogled-chromium/patches/patch-components_management_strings_grdp b/www/ungoogled-chromium/patches/patch-components_management_strings_grdp
deleted file mode 100644
index 8babda7e9..000000000
--- a/www/ungoogled-chromium/patches/patch-components_management_strings_grdp
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: components/management_strings.grdp
---- components/management_strings.grdp.orig
-+++ components/management_strings.grdp
-@@ -343,7 +343,7 @@
-   </if>
- 
-   <!-- Strings related to Chrome Enterprise Device Signals Sharing -->
--  <if expr="is_win or is_linux or is_macosx">
-+  <if expr="is_win or is_posix or is_macosx">
-     <message name="IDS_MANAGEMENT_DEVICE_SIGNALS_DISCLOSURE" desc="Disclosure message explaining that device signals can be shared.">
-       Information about your browser, OS, device, installed software, and files
-     </message>
diff --git a/www/ungoogled-chromium/patches/patch-components_media_router_common_media_source_cc b/www/ungoogled-chromium/patches/patch-components_media_router_common_media_source_cc
new file mode 100644
index 000000000..9a8be42ce
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_media_router_common_media_source_cc
@@ -0,0 +1,12 @@
+Index: components/media_router/common/media_source.cc
+--- components/media_router/common/media_source.cc.orig
++++ components/media_router/common/media_source.cc
+@@ -59,7 +59,7 @@ bool IsSystemAudioCaptureSupported() {
+   }
+ #if BUILDFLAG(IS_MAC)
+   return base::FeatureList::IsEnabled(media::kMacLoopbackAudioForCast);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return base::FeatureList::IsEnabled(media::kPulseaudioLoopbackForCast);
+ #else
+   return true;
diff --git a/www/ungoogled-chromium/patches/patch-components_media_router_common_providers_cast_channel_cast_message_util_cc b/www/ungoogled-chromium/patches/patch-components_media_router_common_providers_cast_channel_cast_message_util_cc
index b8d372955..39e3051ec 100644
--- a/www/ungoogled-chromium/patches/patch-components_media_router_common_providers_cast_channel_cast_message_util_cc
+++ b/www/ungoogled-chromium/patches/patch-components_media_router_common_providers_cast_channel_cast_message_util_cc
@@ -1,7 +1,7 @@
 Index: components/media_router/common/providers/cast/channel/cast_message_util.cc
 --- components/media_router/common/providers/cast/channel/cast_message_util.cc.orig
 +++ components/media_router/common/providers/cast/channel/cast_message_util.cc
-@@ -170,7 +170,7 @@ int GetVirtualConnectPlatformValue() {
+@@ -169,7 +169,7 @@ int GetVirtualConnectPlatformValue() {
    return 4;
  #elif BUILDFLAG(IS_CHROMEOS_ASH)
    return 5;
diff --git a/www/ungoogled-chromium/patches/patch-components_metrics_metrics_log_cc b/www/ungoogled-chromium/patches/patch-components_metrics_metrics_log_cc
index 507d29395..a36d319bc 100644
--- a/www/ungoogled-chromium/patches/patch-components_metrics_metrics_log_cc
+++ b/www/ungoogled-chromium/patches/patch-components_metrics_metrics_log_cc
@@ -1,7 +1,7 @@
 Index: components/metrics/metrics_log.cc
 --- components/metrics/metrics_log.cc.orig
 +++ components/metrics/metrics_log.cc
-@@ -52,7 +52,7 @@
+@@ -53,7 +53,7 @@
  #include "base/win/current_module.h"
  #endif
  
@@ -10,7 +10,7 @@ Index: components/metrics/metrics_log.cc
  #include "base/environment.h"
  #include "base/nix/xdg_util.h"
  #endif
-@@ -130,7 +130,7 @@ void RecordCurrentTime(
+@@ -142,7 +142,7 @@ void RecordCurrentTime(
    }
  }
  
@@ -19,7 +19,7 @@ Index: components/metrics/metrics_log.cc
  metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType(
      base::nix::SessionType session_type) {
    switch (session_type) {
-@@ -390,7 +390,7 @@ void MetricsLog::RecordCoreSystemProfile(
+@@ -393,7 +393,7 @@ void MetricsLog::RecordCoreSystemProfile(
  // OperatingSystemVersion refers to the ChromeOS release version.
  #if BUILDFLAG(IS_CHROMEOS_ASH)
    os->set_kernel_version(base::SysInfo::KernelVersion());
@@ -28,7 +28,7 @@ Index: components/metrics/metrics_log.cc
    // Linux operating system version is copied over into kernel version to be
    // consistent.
    os->set_kernel_version(base::SysInfo::OperatingSystemVersion());
-@@ -407,7 +407,7 @@ void MetricsLog::RecordCoreSystemProfile(
+@@ -410,7 +410,7 @@ void MetricsLog::RecordCoreSystemProfile(
    os->set_build_number(base::SysInfo::GetIOSBuildNumber());
  #endif
  
diff --git a/www/ungoogled-chromium/patches/patch-components_named_mojo_ipc_server_connection_info_h b/www/ungoogled-chromium/patches/patch-components_named_mojo_ipc_server_connection_info_h
index 43be0a7c0..89e0afeea 100644
--- a/www/ungoogled-chromium/patches/patch-components_named_mojo_ipc_server_connection_info_h
+++ b/www/ungoogled-chromium/patches/patch-components_named_mojo_ipc_server_connection_info_h
@@ -1,7 +1,7 @@
 Index: components/named_mojo_ipc_server/connection_info.h
 --- components/named_mojo_ipc_server/connection_info.h.orig
 +++ components/named_mojo_ipc_server/connection_info.h
-@@ -13,7 +13,7 @@
+@@ -14,7 +14,7 @@
  #include "base/win/scoped_handle.h"
  #elif BUILDFLAG(IS_MAC)
  #include <bsm/libbsm.h>
@@ -10,8 +10,8 @@ Index: components/named_mojo_ipc_server/connection_info.h
  #include <sys/socket.h>
  #endif
  
-@@ -32,7 +32,7 @@ struct ConnectionInfo {
-   absl::optional<base::win::ScopedHandle> impersonation_token{};
+@@ -33,7 +33,7 @@ struct ConnectionInfo {
+   std::optional<base::win::ScopedHandle> impersonation_token{};
  #elif BUILDFLAG(IS_MAC)
    audit_token_t audit_token{};
 -#elif BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/patches/patch-components_neterror_resources_neterror_js b/www/ungoogled-chromium/patches/patch-components_neterror_resources_neterror_js
index 2fe5608f9..ef5be9eab 100644
--- a/www/ungoogled-chromium/patches/patch-components_neterror_resources_neterror_js
+++ b/www/ungoogled-chromium/patches/patch-components_neterror_resources_neterror_js
@@ -1,7 +1,7 @@
 Index: components/neterror/resources/neterror.js
 --- components/neterror/resources/neterror.js.orig
 +++ components/neterror/resources/neterror.js
-@@ -137,7 +137,7 @@ function detailsButtonClick() {
+@@ -142,7 +142,7 @@ function detailsButtonClick() {
  
  let primaryControlOnLeft = true;
  // clang-format off
diff --git a/www/ungoogled-chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_cc b/www/ungoogled-chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_cc
index 2802485e1..52a5a259d 100644
--- a/www/ungoogled-chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_cc
+++ b/www/ungoogled-chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_cc
@@ -1,7 +1,7 @@
 Index: components/network_session_configurator/browser/network_session_configurator.cc
 --- components/network_session_configurator/browser/network_session_configurator.cc.orig
 +++ components/network_session_configurator/browser/network_session_configurator.cc
-@@ -793,7 +793,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
+@@ -817,7 +817,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
    // backport, having it behave differently than in stable would be a bigger
    // problem. TODO: Does this work in later macOS releases?
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_unittest_cc b/www/ungoogled-chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_unittest_cc
index 5d7682ae5..1a4dbe5b1 100644
--- a/www/ungoogled-chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_unittest_cc
+++ b/www/ungoogled-chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_unittest_cc
@@ -1,7 +1,7 @@
 Index: components/network_session_configurator/browser/network_session_configurator_unittest.cc
 --- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig
 +++ components/network_session_configurator/browser/network_session_configurator_unittest.cc
-@@ -775,7 +775,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) {
+@@ -781,7 +781,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) {
  
  TEST_F(NetworkSessionConfiguratorTest, DefaultCacheBackend) {
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/patches/patch-components_new_or_sad_tab_strings_grdp b/www/ungoogled-chromium/patches/patch-components_new_or_sad_tab_strings_grdp
deleted file mode 100644
index 576cddacb..000000000
--- a/www/ungoogled-chromium/patches/patch-components_new_or_sad_tab_strings_grdp
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: components/new_or_sad_tab_strings.grdp
---- components/new_or_sad_tab_strings.grdp.orig
-+++ components/new_or_sad_tab_strings.grdp
-@@ -66,7 +66,7 @@
-           Close other tabs or apps
-         </message>
-       </if>
--      <if expr="is_linux">
-+      <if expr="is_posix">
-         <message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other Chrome tabs or programs running on their computer.">
-           Close other tabs or programs
-         </message>
-@@ -76,7 +76,7 @@
-           Close other apps
-         </message>
-       </if>
--      <if expr="is_linux">
-+      <if expr="is_posix">
-         <message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other programs running on their computer (Linux).">
-           Close other programs
-         </message>
diff --git a/www/ungoogled-chromium/patches/patch-components_omnibox_browser_omnibox_edit_model_cc b/www/ungoogled-chromium/patches/patch-components_omnibox_browser_omnibox_edit_model_cc
deleted file mode 100644
index 97ffa6eba..000000000
--- a/www/ungoogled-chromium/patches/patch-components_omnibox_browser_omnibox_edit_model_cc
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: components/omnibox/browser/omnibox_edit_model.cc
---- components/omnibox/browser/omnibox_edit_model.cc.orig
-+++ components/omnibox/browser/omnibox_edit_model.cc
-@@ -23,6 +23,7 @@
- #include "base/trace_event/trace_event.h"
- #include "base/trace_event/typed_macros.h"
- #include "build/build_config.h"
-+#include "build/branding_buildflags.h"
- #include "components/bookmarks/browser/bookmark_model.h"
- #include "components/dom_distiller/core/url_constants.h"
- #include "components/dom_distiller/core/url_utils.h"
diff --git a/www/ungoogled-chromium/patches/patch-components_optimization_guide_core_optimization_guide_util_cc b/www/ungoogled-chromium/patches/patch-components_optimization_guide_core_optimization_guide_util_cc
index ed021aac9..d3277dd2e 100644
--- a/www/ungoogled-chromium/patches/patch-components_optimization_guide_core_optimization_guide_util_cc
+++ b/www/ungoogled-chromium/patches/patch-components_optimization_guide_core_optimization_guide_util_cc
@@ -1,7 +1,7 @@
 Index: components/optimization_guide/core/optimization_guide_util.cc
 --- components/optimization_guide/core/optimization_guide_util.cc.orig
 +++ components/optimization_guide/core/optimization_guide_util.cc
-@@ -27,7 +27,7 @@ optimization_guide::proto::Platform GetPlatform() {
+@@ -39,7 +39,7 @@ optimization_guide::proto::Platform GetPlatform() {
    return optimization_guide::proto::PLATFORM_CHROMEOS;
  #elif BUILDFLAG(IS_ANDROID)
    return optimization_guide::proto::PLATFORM_ANDROID;
@@ -9,4 +9,4 @@ Index: components/optimization_guide/core/optimization_guide_util.cc
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return optimization_guide::proto::PLATFORM_LINUX;
  #else
-   return optimization_guide::proto::PLATFORM_UNKNOWN;
+   return optimization_guide::proto::PLATFORM_UNDEFINED;
diff --git a/www/ungoogled-chromium/patches/patch-components_optimization_guide_core_tflite_model_executor_h b/www/ungoogled-chromium/patches/patch-components_optimization_guide_core_tflite_model_executor_h
deleted file mode 100644
index fcf6fe032..000000000
--- a/www/ungoogled-chromium/patches/patch-components_optimization_guide_core_tflite_model_executor_h
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: components/optimization_guide/core/tflite_model_executor.h
---- components/optimization_guide/core/tflite_model_executor.h.orig
-+++ components/optimization_guide/core/tflite_model_executor.h
-@@ -212,7 +212,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu
-   void SendForBatchExecution(
-       BatchExecutionCallback callback_on_complete,
-       base::TimeTicks start_time,
-+#if defined(__clang__) && (__clang_major__ >= 15)
-       ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
-+#else
-+      typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
-+#endif
-       override {
-     DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
-     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -234,7 +238,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu
-   // Starts the synchronous execution of the model. Returns model outputs.
-   // Model needs to be loaded. Synchronous calls do not load or unload model.
-   std::vector<absl::optional<OutputType>> SendForBatchExecutionSync(
-+#if defined(__clang__) && (__clang_major__ >= 15)
-       ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
-+#else
-+      typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
-+#endif
-       override {
-     DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
-     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -389,7 +397,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu
-   // executes it on the model execution thread.
-   void LoadModelFileAndBatchExecute(
-       BatchExecutionCallback callback_on_complete,
-+#if defined(__clang__) && (__clang_major__ >= 15)
-       ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) {
-+#else
-+      typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) {
-+#endif
-     DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
-     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- 
-@@ -406,7 +418,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu
- 
-   // Batch executes the loaded model for inputs.
-   void BatchExecuteLoadedModel(
-+#if defined(__clang__) && (__clang_major__ >= 15)
-       ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
-+#else
-+      typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
-+#endif
-       std::vector<absl::optional<OutputType>>* outputs) {
-     DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
-     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -466,7 +482,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu
-   // Unloads the model if needed.
-   void BatchExecuteLoadedModelAndRunCallback(
-       BatchExecutionCallback callback_on_complete,
-+#if defined(__clang__) && (__clang_major__ >= 15)
-       ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
-+#else
-+      typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
-+#endif
-       ExecutionStatus execution_status) {
-     DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
-     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
diff --git a/www/ungoogled-chromium/patches/patch-components_paint_preview_browser_paint_preview_client_cc b/www/ungoogled-chromium/patches/patch-components_paint_preview_browser_paint_preview_client_cc
index 1c1c241c5..e81bd6a83 100644
--- a/www/ungoogled-chromium/patches/patch-components_paint_preview_browser_paint_preview_client_cc
+++ b/www/ungoogled-chromium/patches/patch-components_paint_preview_browser_paint_preview_client_cc
@@ -1,14 +1,14 @@
 Index: components/paint_preview/browser/paint_preview_client.cc
 --- components/paint_preview/browser/paint_preview_client.cc.orig
 +++ components/paint_preview/browser/paint_preview_client.cc
-@@ -310,8 +310,8 @@ void PaintPreviewClient::CapturePaintPreview(
-   metadata->set_url(url.spec());
+@@ -313,8 +313,8 @@ void PaintPreviewClient::CapturePaintPreview(
    metadata->set_version(kPaintPreviewVersion);
    auto* chromeVersion = metadata->mutable_chrome_version();
--  chromeVersion->set_major(CHROME_VERSION_MAJOR);
--  chromeVersion->set_minor(CHROME_VERSION_MINOR);
-+  chromeVersion->set_gmajor(CHROME_VERSION_MAJOR);
-+  chromeVersion->set_gminor(CHROME_VERSION_MINOR);
-   chromeVersion->set_build(CHROME_VERSION_BUILD);
-   chromeVersion->set_patch(CHROME_VERSION_PATCH);
+   const auto& current_chrome_version = version_info::GetVersion();
+-  chromeVersion->set_major(current_chrome_version.components()[0]);
+-  chromeVersion->set_minor(current_chrome_version.components()[1]);
++  chromeVersion->set_gmajor(current_chrome_version.components()[0]);
++  chromeVersion->set_gminor(current_chrome_version.components()[1]);
+   chromeVersion->set_build(current_chrome_version.components()[2]);
+   chromeVersion->set_patch(current_chrome_version.components()[3]);
    document_data.callback = std::move(callback);
diff --git a/www/ungoogled-chromium/patches/patch-components_paint_preview_browser_paint_preview_client_unittest_cc b/www/ungoogled-chromium/patches/patch-components_paint_preview_browser_paint_preview_client_unittest_cc
index e897a34c0..99bf0b645 100644
--- a/www/ungoogled-chromium/patches/patch-components_paint_preview_browser_paint_preview_client_unittest_cc
+++ b/www/ungoogled-chromium/patches/patch-components_paint_preview_browser_paint_preview_client_unittest_cc
@@ -1,14 +1,14 @@
 Index: components/paint_preview/browser/paint_preview_client_unittest.cc
 --- components/paint_preview/browser/paint_preview_client_unittest.cc.orig
 +++ components/paint_preview/browser/paint_preview_client_unittest.cc
-@@ -171,8 +171,8 @@ TEST_P(PaintPreviewClientRenderViewHostTest, CaptureMa
-   metadata->set_url(expected_url.spec());
+@@ -174,8 +174,8 @@ TEST_P(PaintPreviewClientRenderViewHostTest, CaptureMa
    metadata->set_version(kPaintPreviewVersion);
    auto* chromeVersion = metadata->mutable_chrome_version();
--  chromeVersion->set_major(CHROME_VERSION_MAJOR);
--  chromeVersion->set_minor(CHROME_VERSION_MINOR);
-+  chromeVersion->set_gmajor(CHROME_VERSION_MAJOR);
-+  chromeVersion->set_gminor(CHROME_VERSION_MINOR);
-   chromeVersion->set_build(CHROME_VERSION_BUILD);
-   chromeVersion->set_patch(CHROME_VERSION_PATCH);
+   const auto& current_chrome_version = version_info::GetVersion();
+-  chromeVersion->set_major(current_chrome_version.components()[0]);
+-  chromeVersion->set_minor(current_chrome_version.components()[1]);
++  chromeVersion->set_gmajor(current_chrome_version.components()[0]);
++  chromeVersion->set_gminor(current_chrome_version.components()[1]);
+   chromeVersion->set_build(current_chrome_version.components()[2]);
+   chromeVersion->set_patch(current_chrome_version.components()[3]);
    PaintPreviewFrameProto* main_frame = expected_proto.mutable_root_frame();
diff --git a/www/ungoogled-chromium/patches/patch-components_paint_preview_player_player_compositor_delegate_cc b/www/ungoogled-chromium/patches/patch-components_paint_preview_player_player_compositor_delegate_cc
index 0ce5403a8..39744d9f8 100644
--- a/www/ungoogled-chromium/patches/patch-components_paint_preview_player_player_compositor_delegate_cc
+++ b/www/ungoogled-chromium/patches/patch-components_paint_preview_player_player_compositor_delegate_cc
@@ -1,14 +1,14 @@
 Index: components/paint_preview/player/player_compositor_delegate.cc
 --- components/paint_preview/player/player_compositor_delegate.cc.orig
 +++ components/paint_preview/player/player_compositor_delegate.cc
-@@ -452,8 +452,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT
-   // use the AXTreeUpdate.
+@@ -455,8 +455,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT
    auto chrome_version = capture_result_->proto.metadata().chrome_version();
+   const auto& current_chrome_version = version_info::GetVersion();
    if (capture_result_->proto.metadata().has_chrome_version() &&
--      chrome_version.major() == CHROME_VERSION_MAJOR &&
--      chrome_version.minor() == CHROME_VERSION_MINOR &&
-+      chrome_version.gmajor() == CHROME_VERSION_MAJOR &&
-+      chrome_version.gminor() == CHROME_VERSION_MINOR &&
-       chrome_version.build() == CHROME_VERSION_BUILD &&
-       chrome_version.patch() == CHROME_VERSION_PATCH) {
+-      chrome_version.major() == current_chrome_version.components()[0] &&
+-      chrome_version.minor() == current_chrome_version.components()[1] &&
++      chrome_version.gmajor() == current_chrome_version.components()[0] &&
++      chrome_version.gminor() == current_chrome_version.components()[1] &&
+       chrome_version.build() == current_chrome_version.components()[2] &&
+       chrome_version.patch() == current_chrome_version.components()[3]) {
      paint_preview_service_->GetFileMixin()->GetAXTreeUpdate(
diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_features_password_features_cc b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_features_password_features_cc
new file mode 100644
index 000000000..e003ff4f5
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_features_password_features_cc
@@ -0,0 +1,21 @@
+Index: components/password_manager/core/browser/features/password_features.cc
+--- components/password_manager/core/browser/features/password_features.cc.orig
++++ components/password_manager/core/browser/features/password_features.cc
+@@ -30,7 +30,7 @@ BASE_FEATURE(kButterOnDesktopFollowup,
+ 
+ BASE_FEATURE(kClearUndecryptablePasswordsOnSync,
+              "ClearUndecryptablePasswordsInSync",
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
+@@ -99,7 +99,7 @@ BASE_FEATURE(kPasswordManualFallbackAvailable,
+              "PasswordManualFallbackAvailable",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kRestartToGainAccessToKeychain,
+              "RestartToGainAccessToKeychain",
+              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_features_password_features_h b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_features_password_features_h
new file mode 100644
index 000000000..4e2c451db
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_features_password_features_h
@@ -0,0 +1,12 @@
+Index: components/password_manager/core/browser/features/password_features.h
+--- components/password_manager/core/browser/features/password_features.h.orig
++++ components/password_manager/core/browser/features/password_features.h
+@@ -94,7 +94,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal);
+ // Enables triggering password suggestions through the context menu.
+ BASE_DECLARE_FEATURE(kPasswordManualFallbackAvailable);
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Enables "Needs access to keychain, restart chrome" bubble and banner.
+ BASE_DECLARE_FEATURE(kRestartToGainAccessToKeychain);
+ #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_login_database_cc b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_login_database_cc
deleted file mode 100644
index fa5095e65..000000000
--- a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_login_database_cc
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: components/password_manager/core/browser/login_database.cc
---- components/password_manager/core/browser/login_database.cc.orig
-+++ components/password_manager/core/browser/login_database.cc
-@@ -1046,7 +1046,7 @@ std::string GeneratePlaceholders(size_t count) {
-   return result;
- }
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Fills |form| with necessary data required to be removed from the database
- // and returns it.
- PasswordForm GetFormForRemoval(sql::Statement& statement) {
-@@ -1063,7 +1063,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
- // Whether we should try to return the decryptable passwords while the
- // encryption service fails for some passwords.
- bool ShouldReturnPartialPasswords() {
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords);
- #else
-   return false;
-@@ -1918,7 +1918,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
- }
- 
- DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() {
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   TRACE_EVENT0("passwords", "LoginDatabase::DeleteUndecryptableLogins");
-   // If the Keychain in MacOS or the real secret key in Linux is unavailable,
-   // don't delete any logins.
diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_login_database_unittest_cc b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_login_database_unittest_cc
deleted file mode 100644
index 961e81392..000000000
--- a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_login_database_unittest_cc
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: components/password_manager/core/browser/login_database_unittest.cc
---- components/password_manager/core/browser/login_database_unittest.cc.orig
-+++ components/password_manager/core/browser/login_database_unittest.cc
-@@ -2159,7 +2159,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd
-   base::HistogramTester histogram_tester;
-   ASSERT_TRUE(db.Init());
- 
--#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
-+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)
-   // Make sure that we can't get any logins when database is corrupted.
-   // Disabling the checks in chromecast because encryption is unavailable.
-   std::vector<std::unique_ptr<PasswordForm>> result;
-@@ -2186,7 +2186,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd
- #endif
- 
- // Check histograms.
--#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
-+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)
-   histogram_tester.ExpectUniqueSample(
-       "PasswordManager.DeleteUndecryptableLoginsReturnValue",
-       metrics_util::DeleteCorruptedPasswordsResult::kSuccessPasswordsDeleted,
-@@ -2229,7 +2229,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL
- }
- #endif  // BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Test getting auto sign in logins when there are undecryptable ones
- TEST_F(LoginDatabaseUndecryptableLoginsTest, GetAutoSignInLogins) {
-   std::vector<std::unique_ptr<PasswordForm>> forms;
diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_password_form_manager_cc b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_password_form_manager_cc
new file mode 100644
index 000000000..334591e38
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_password_form_manager_cc
@@ -0,0 +1,30 @@
+Index: components/password_manager/core/browser/password_form_manager.cc
+--- components/password_manager/core/browser/password_form_manager.cc.orig
++++ components/password_manager/core/browser/password_form_manager.cc
+@@ -58,7 +58,7 @@
+ #include "components/webauthn/android/webauthn_cred_man_delegate.h"
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "components/os_crypt/sync/os_crypt.h"
+ #endif
+ 
+@@ -229,7 +229,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest
+   return false;
+ }
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool ShouldShowKeychainErrorBubble(
+     std::optional<PasswordStoreBackendError> backend_error) {
+   if (!backend_error.has_value()) {
+@@ -833,7 +833,7 @@ void PasswordFormManager::OnFetchCompleted() {
+         error.value().type);
+   }
+ 
+-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (ShouldShowKeychainErrorBubble(
+           form_fetcher_->GetProfileStoreBackendError())) {
+     client_->NotifyKeychainError();
diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_password_manager_cc b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_password_manager_cc
new file mode 100644
index 000000000..ed05177f4
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_password_manager_cc
@@ -0,0 +1,12 @@
+Index: components/password_manager/core/browser/password_manager.cc
+--- components/password_manager/core/browser/password_manager.cc.orig
++++ components/password_manager/core/browser/password_manager.cc
+@@ -363,7 +363,7 @@ void PasswordManager::RegisterProfilePrefs(
+   registry->RegisterListPref(prefs::kPasswordManagerPromoCardsList);
+ #endif  // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
+   registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true);
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter,
+                                 0);
+ #endif
diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_password_store_login_database_async_helper_cc b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_password_store_login_database_async_helper_cc
new file mode 100644
index 000000000..61334f675
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_password_store_login_database_async_helper_cc
@@ -0,0 +1,12 @@
+Index: components/password_manager/core/browser/password_store/login_database_async_helper.cc
+--- components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig
++++ components/password_manager/core/browser/password_store/login_database_async_helper.cc
+@@ -135,7 +135,7 @@ LoginsResultOrError LoginDatabaseAsyncHelper::FillMatc
+     std::vector<PasswordForm> matched_forms;
+     if (!login_db_ ||
+         !login_db_->GetLogins(form, include_psl, &matched_forms)) {
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       return PasswordStoreBackendError(
+           OSCrypt::IsEncryptionAvailable()
+               ? PasswordStoreBackendErrorType::kUncategorized
diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_password_store_login_database_unittest_cc b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_password_store_login_database_unittest_cc
new file mode 100644
index 000000000..7cbf27ef8
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_password_store_login_database_unittest_cc
@@ -0,0 +1,12 @@
+Index: components/password_manager/core/browser/password_store/login_database_unittest.cc
+--- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig
++++ components/password_manager/core/browser/password_store/login_database_unittest.cc
+@@ -2105,7 +2105,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent,
+                          LoginDatabaseMigrationTestBroken,
+                          testing::Values(1, 2, 3, 24));
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
+ class LoginDatabaseUndecryptableLoginsTest : public testing::Test {
+  protected:
+   LoginDatabaseUndecryptableLoginsTest() = default;
diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_sync_password_sync_bridge_cc b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_sync_password_sync_bridge_cc
index 68ca16282..2e7f4edc6 100644
--- a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_sync_password_sync_bridge_cc
+++ b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_sync_password_sync_bridge_cc
@@ -1,16 +1,7 @@
 Index: components/password_manager/core/browser/sync/password_sync_bridge.cc
 --- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig
 +++ components/password_manager/core/browser/sync/password_sync_bridge.cc
-@@ -191,7 +191,7 @@ bool IsCredentialPhished(const sync_pb::PasswordSpecif
- // merge.
- bool ShouldRecoverPasswordsDuringMerge() {
-   // Delete the local undecryptable copy when this is MacOS or Linux only.
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return true;
- #else
-   return false;
-@@ -199,7 +199,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
+@@ -195,7 +195,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
  }
  
  bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() {
diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_ui_passwords_grouper_cc b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_ui_passwords_grouper_cc
deleted file mode 100644
index bcd695a2e..000000000
--- a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_ui_passwords_grouper_cc
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: components/password_manager/core/browser/ui/passwords_grouper.cc
---- components/password_manager/core/browser/ui/passwords_grouper.cc.orig
-+++ components/password_manager/core/browser/ui/passwords_grouper.cc
-@@ -277,7 +277,11 @@ absl::optional<PasskeyCredential> PasswordsGrouper::Ge
-   const std::vector<PasskeyCredential>& passkeys =
-       map_group_id_to_credentials_[group_id_iterator->second].passkeys;
-   const auto passkey_it =
-+#if (_LIBCPP_VERSION >= 160000)
-       std::ranges::find_if(passkeys, [&credential](const auto& passkey) {
-+#else
-+      base::ranges::find_if(passkeys, [&credential](const auto& passkey) {
-+#endif
-         return credential.passkey_credential_id == passkey.credential_id();
-       });
-   if (passkey_it == passkeys.end()) {
diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_features_cc b/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_features_cc
index 9a01f1708..0a4d8a024 100644
--- a/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_features_cc
+++ b/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_features_cc
@@ -10,12 +10,3 @@ Index: components/password_manager/core/common/password_manager_features.cc
  // When enabled, initial sync will be forced during startup if the password
  // store has encryption service failures.
  BASE_FEATURE(kForceInitialSyncWhenDecryptionFails,
-@@ -101,7 +101,7 @@ BASE_FEATURE(kRevampedPasswordManagementBubble,
-              base::FEATURE_ENABLED_BY_DEFAULT);
- #endif
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Displays at least the decryptable and never saved logins in the password
- // manager
- BASE_FEATURE(kSkipUndecryptablePasswords,
diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_features_h b/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_features_h
index ffeabbf14..498cdb571 100644
--- a/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_features_h
+++ b/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_features_h
@@ -1,7 +1,7 @@
 Index: components/password_manager/core/common/password_manager_features.h
 --- components/password_manager/core/common/password_manager_features.h.orig
 +++ components/password_manager/core/common/password_manager_features.h
-@@ -24,7 +24,7 @@ namespace password_manager::features {
+@@ -19,7 +19,7 @@ namespace password_manager::features {
  // alongside the definition of their values in the .cc file.
  BASE_DECLARE_FEATURE(kEnableOverwritingPlaceholderUsernames);
  
@@ -10,12 +10,3 @@ Index: components/password_manager/core/common/password_manager_features.h
  BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails);
  #endif
  BASE_DECLARE_FEATURE(kForgotPasswordFormSupport);
-@@ -45,7 +45,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid);
- #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)  // Desktop
- BASE_DECLARE_FEATURE(kRevampedPasswordManagementBubble);
- #endif
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_DECLARE_FEATURE(kSkipUndecryptablePasswords);
- #endif
- #if BUILDFLAG(IS_ANDROID)
diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_pref_names_h b/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_pref_names_h
new file mode 100644
index 000000000..77a078507
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_pref_names_h
@@ -0,0 +1,12 @@
+Index: components/password_manager/core/common/password_manager_pref_names.h
+--- components/password_manager/core/common/password_manager_pref_names.h.orig
++++ components/password_manager/core/common/password_manager_pref_names.h
+@@ -332,7 +332,7 @@ inline constexpr char kPasswordManagerPromoCardsList[]
+ inline constexpr char kPasswordSharingEnabled[] =
+     "password_manager.password_sharing_enabled";
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Integer pref indicating how many times relaunch Chrome bubble was dismissed.
+ inline constexpr char kRelaunchChromeBubbleDismissedCounter[] =
+     "password_manager.relaunch_chrome_bubble_dismissed_counter";
diff --git a/www/ungoogled-chromium/patches/patch-components_performance_manager_public_features_h b/www/ungoogled-chromium/patches/patch-components_performance_manager_public_features_h
index 064f22512..4d3fe9062 100644
--- a/www/ungoogled-chromium/patches/patch-components_performance_manager_public_features_h
+++ b/www/ungoogled-chromium/patches/patch-components_performance_manager_public_features_h
@@ -5,8 +5,8 @@ Index: components/performance_manager/public/features.h
  
  #if !BUILDFLAG(IS_ANDROID)
  
--#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #define URGENT_DISCARDING_FROM_PERFORMANCE_MANAGER() false
  #else
  #define URGENT_DISCARDING_FROM_PERFORMANCE_MANAGER() true
diff --git a/www/ungoogled-chromium/patches/patch-components_policy_core_browser_policy_pref_mapping_test_cc b/www/ungoogled-chromium/patches/patch-components_policy_core_browser_policy_pref_mapping_test_cc
index 7eb3a9059..05c1ed2a0 100644
--- a/www/ungoogled-chromium/patches/patch-components_policy_core_browser_policy_pref_mapping_test_cc
+++ b/www/ungoogled-chromium/patches/patch-components_policy_core_browser_policy_pref_mapping_test_cc
@@ -1,7 +1,7 @@
 Index: components/policy/core/browser/policy_pref_mapping_test.cc
 --- components/policy/core/browser/policy_pref_mapping_test.cc.orig
 +++ components/policy/core/browser/policy_pref_mapping_test.cc
-@@ -327,7 +327,7 @@ class PolicyTestCase {
+@@ -413,7 +413,7 @@ class PolicyTestCase {
      const std::string os("chromeos_lacros");
  #elif BUILDFLAG(IS_IOS)
      const std::string os("ios");
diff --git a/www/ungoogled-chromium/patches/patch-components_policy_core_common_cloud_cloud_policy_client_cc b/www/ungoogled-chromium/patches/patch-components_policy_core_common_cloud_cloud_policy_client_cc
index cd478d4ab..184063f54 100644
--- a/www/ungoogled-chromium/patches/patch-components_policy_core_common_cloud_cloud_policy_client_cc
+++ b/www/ungoogled-chromium/patches/patch-components_policy_core_common_cloud_cloud_policy_client_cc
@@ -1,7 +1,7 @@
 Index: components/policy/core/common/cloud/cloud_policy_client.cc
 --- components/policy/core/common/cloud/cloud_policy_client.cc.orig
 +++ components/policy/core/common/cloud/cloud_policy_client.cc
-@@ -455,7 +455,7 @@ void CloudPolicyClient::FetchPolicy() {
+@@ -594,7 +594,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason 
          fetch_request->set_invalidation_payload(invalidation_payload_);
        }
      }
diff --git a/www/ungoogled-chromium/patches/patch-components_policy_core_common_cloud_cloud_policy_util_cc b/www/ungoogled-chromium/patches/patch-components_policy_core_common_cloud_cloud_policy_util_cc
index a17bf27d8..94d906673 100644
--- a/www/ungoogled-chromium/patches/patch-components_policy_core_common_cloud_cloud_policy_util_cc
+++ b/www/ungoogled-chromium/patches/patch-components_policy_core_common_cloud_cloud_policy_util_cc
@@ -27,7 +27,7 @@ Index: components/policy/core/common/cloud/cloud_policy_util.cc
  #include <algorithm>
  #include <utility>
  
-@@ -82,7 +87,7 @@ namespace em = enterprise_management;
+@@ -88,7 +93,7 @@ namespace em = enterprise_management;
  
  std::string GetMachineName() {
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
@@ -36,7 +36,7 @@ Index: components/policy/core/common/cloud/cloud_policy_util.cc
    char hostname[HOST_NAME_MAX];
    if (gethostname(hostname, HOST_NAME_MAX) == 0)  // Success.
      return hostname;
-@@ -140,7 +145,7 @@ std::string GetMachineName() {
+@@ -145,7 +150,7 @@ std::string GetMachineName() {
  
  std::string GetOSVersion() {
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
@@ -45,7 +45,7 @@ Index: components/policy/core/common/cloud/cloud_policy_util.cc
    return base::SysInfo::OperatingSystemVersion();
  #elif BUILDFLAG(IS_WIN)
    base::win::OSInfo::VersionNumber version_number =
-@@ -163,7 +168,7 @@ std::string GetOSArchitecture() {
+@@ -168,7 +173,7 @@ std::string GetOSArchitecture() {
  }
  
  std::string GetOSUsername() {
diff --git a/www/ungoogled-chromium/patches/patch-components_policy_core_common_policy_loader_common_cc b/www/ungoogled-chromium/patches/patch-components_policy_core_common_policy_loader_common_cc
index 14ba3b479..db16e0599 100644
--- a/www/ungoogled-chromium/patches/patch-components_policy_core_common_policy_loader_common_cc
+++ b/www/ungoogled-chromium/patches/patch-components_policy_core_common_policy_loader_common_cc
@@ -8,11 +8,11 @@ Index: components/policy/core/common/policy_loader_common.cc
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
      key::kAutoOpenFileTypes,
-     key::kSafeBrowsingAllowlistDomains,
      key::kHomepageIsNewTabPage,
-@@ -55,7 +55,7 @@ const char* kSensitivePolicies[] = {
-     key::kRestoreOnStartup,
-     key::kRestoreOnStartupURLs,
+     key::kPasswordProtectionChangePasswordURL,
+@@ -56,7 +56,7 @@ const char* kSensitivePolicies[] = {
+     key::kSafeBrowsingAllowlistDomains,
+     key::kSiteSearchSettings,
  #endif
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-components_policy_core_common_policy_paths_cc b/www/ungoogled-chromium/patches/patch-components_policy_core_common_policy_paths_cc
new file mode 100644
index 000000000..e67654e4a
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_policy_core_common_policy_paths_cc
@@ -0,0 +1,12 @@
+Index: components/policy/core/common/policy_paths.cc
+--- components/policy/core/common/policy_paths.cc.orig
++++ components/policy/core/common/policy_paths.cc
+@@ -17,6 +17,8 @@ namespace policy {
+ const char kPolicyPath[] = "/etc/opt/chrome/policies";
+ #elif BUILDFLAG(GOOGLE_CHROME_FOR_TESTING_BRANDING)
+ const char kPolicyPath[] = "/etc/opt/chrome_for_testing/policies";
++#elif BUILDFLAG(IS_FREEBSD)
++const char kPolicyPath[] = "/usr/local/etc/chromium/policies";
+ #else
+ const char kPolicyPath[] = "/etc/chromium/policies";
+ #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
diff --git a/www/ungoogled-chromium/patches/patch-components_policy_core_common_policy_utils_cc b/www/ungoogled-chromium/patches/patch-components_policy_core_common_policy_utils_cc
new file mode 100644
index 000000000..9c11125d3
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_policy_core_common_policy_utils_cc
@@ -0,0 +1,12 @@
+Index: components/policy/core/common/policy_utils.cc
+--- components/policy/core/common/policy_utils.cc.orig
++++ components/policy/core/common/policy_utils.cc
+@@ -28,7 +28,7 @@ bool IsPolicyTestingEnabled(PrefService* pref_service,
+     return true;
+   }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (channel == version_info::Channel::DEV) {
+     return true;
+   }
diff --git a/www/ungoogled-chromium/patches/patch-components_policy_tools_generate_policy_source_py b/www/ungoogled-chromium/patches/patch-components_policy_tools_generate_policy_source_py
index 2335fbd2c..8e595cb4a 100644
--- a/www/ungoogled-chromium/patches/patch-components_policy_tools_generate_policy_source_py
+++ b/www/ungoogled-chromium/patches/patch-components_policy_tools_generate_policy_source_py
@@ -1,7 +1,7 @@
 Index: components/policy/tools/generate_policy_source.py
 --- components/policy/tools/generate_policy_source.py.orig
 +++ components/policy/tools/generate_policy_source.py
-@@ -37,9 +37,9 @@ PLATFORM_STRINGS = {
+@@ -38,9 +38,9 @@ PLATFORM_STRINGS = {
      'ios': ['ios'],
      'fuchsia': ['fuchsia'],
      'chrome.win': ['win'],
diff --git a/www/ungoogled-chromium/patches/patch-components_safe_browsing_core_browser_db_v4_protocol_manager_util_cc b/www/ungoogled-chromium/patches/patch-components_safe_browsing_core_browser_db_v4_protocol_manager_util_cc
index f1d90da6e..0066bc90f 100644
--- a/www/ungoogled-chromium/patches/patch-components_safe_browsing_core_browser_db_v4_protocol_manager_util_cc
+++ b/www/ungoogled-chromium/patches/patch-components_safe_browsing_core_browser_db_v4_protocol_manager_util_cc
@@ -1,7 +1,7 @@
 Index: components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
 --- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig
 +++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
-@@ -114,7 +114,7 @@ std::ostream& operator<<(std::ostream& os, const ListI
+@@ -113,7 +113,7 @@ std::ostream& operator<<(std::ostream& os, const ListI
  PlatformType GetCurrentPlatformType() {
  #if BUILDFLAG(IS_WIN)
    return WINDOWS_PLATFORM;
diff --git a/www/ungoogled-chromium/patches/patch-components_search_engines_search_engine_choice_search_engine_choice_service_cc b/www/ungoogled-chromium/patches/patch-components_search_engines_search_engine_choice_search_engine_choice_service_cc
new file mode 100644
index 000000000..b15e6d489
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_search_engines_search_engine_choice_search_engine_choice_service_cc
@@ -0,0 +1,12 @@
+Index: components/search_engines/search_engine_choice/search_engine_choice_service.cc
+--- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig
++++ components/search_engines/search_engine_choice/search_engine_choice_service.cc
+@@ -437,7 +437,7 @@ void SearchEngineChoiceService::PreprocessPrefsForRepr
+ 
+ int SearchEngineChoiceService::GetCountryIdInternal() {
+   // `country_codes::kCountryIDAtInstall` may not be set yet.
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // On Android, ChromeOS and Linux, `country_codes::kCountryIDAtInstall` is
+   // computed asynchronously using platform-specific signals, and may not be
+   // available yet.
diff --git a/www/ungoogled-chromium/patches/patch-components_search_engines_template_url_service_cc b/www/ungoogled-chromium/patches/patch-components_search_engines_template_url_service_cc
new file mode 100644
index 000000000..850cefc51
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_search_engines_template_url_service_cc
@@ -0,0 +1,12 @@
+Index: components/search_engines/template_url_service.cc
+--- components/search_engines/template_url_service.cc.orig
++++ components/search_engines/template_url_service.cc
+@@ -2945,7 +2945,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider(
+ std::unique_ptr<EnterpriseSiteSearchManager>
+ TemplateURLService::GetEnterpriseSiteSearchManager(PrefService* prefs) {
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   return base::FeatureList::IsEnabled(omnibox::kSiteSearchSettingsPolicy)
+              ? std::make_unique<EnterpriseSiteSearchManager>(
+                    prefs, base::BindRepeating(
diff --git a/www/ungoogled-chromium/patches/patch-components_segmentation_platform_embedder_default_model_cross_device_user_segment_cc b/www/ungoogled-chromium/patches/patch-components_segmentation_platform_embedder_default_model_cross_device_user_segment_cc
index fbd5333c8..b9b2084e6 100644
--- a/www/ungoogled-chromium/patches/patch-components_segmentation_platform_embedder_default_model_cross_device_user_segment_cc
+++ b/www/ungoogled-chromium/patches/patch-components_segmentation_platform_embedder_default_model_cross_device_user_segment_cc
@@ -1,7 +1,7 @@
 Index: components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc
 --- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig
 +++ components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc
-@@ -179,7 +179,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput(
+@@ -148,7 +148,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput(
  // Check for current device type and subtract it from the device count
  // calculation.
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/patches/patch-components_services_paint_preview_compositor_paint_preview_compositor_collection_impl_cc b/www/ungoogled-chromium/patches/patch-components_services_paint_preview_compositor_paint_preview_compositor_collection_impl_cc
index 2ac56d5f4..8b09943c4 100644
--- a/www/ungoogled-chromium/patches/patch-components_services_paint_preview_compositor_paint_preview_compositor_collection_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-components_services_paint_preview_compositor_paint_preview_compositor_collection_impl_cc
@@ -1,7 +1,7 @@
 Index: components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc
 --- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig
 +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc
-@@ -21,7 +21,7 @@
+@@ -22,7 +22,7 @@
  
  #if BUILDFLAG(IS_WIN)
  #include "content/public/child/dwrite_font_proxy_init_win.h"
@@ -10,7 +10,7 @@ Index: components/services/paint_preview_compositor/paint_preview_compositor_col
  #include "components/services/font/public/cpp/font_loader.h"
  #endif
  
-@@ -78,7 +78,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp
+@@ -79,7 +79,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp
      // Initialize font access for Skia.
  #if BUILDFLAG(IS_WIN)
    content::InitializeDWriteFontProxy();
@@ -19,8 +19,8 @@ Index: components/services/paint_preview_compositor/paint_preview_compositor_col
    mojo::PendingRemote<font_service::mojom::FontService> font_service;
    content::UtilityThread::Get()->BindHostReceiver(
        font_service.InitWithNewPipeAndPassReceiver());
-@@ -101,7 +101,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp
-                              base::BindOnce([] { SkFontMgr::RefDefault(); }));
+@@ -102,7 +102,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp
+                              base::BindOnce([] { skia::DefaultFontMgr(); }));
  
    // Sanity check that fonts are working.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/ungoogled-chromium/patches/patch-components_services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_cc b/www/ungoogled-chromium/patches/patch-components_services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_cc
deleted file mode 100644
index 1596af09c..000000000
--- a/www/ungoogled-chromium/patches/patch-components_services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_cc
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc
---- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig
-+++ components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc
-@@ -53,6 +53,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
-     }
-   }
- 
-+#if !BUILDFLAG(IS_BSD)
-   auto* instance = sandbox::policy::SandboxLinux::GetInstance();
- 
-   std::vector<BrokerFilePermission> permissions{
-@@ -82,6 +83,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
-                             sandbox::syscall_broker::COMMAND_OPEN}),
-       permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options);
-   instance->EngageNamespaceSandboxIfPossible();
-+#endif
- 
-   return true;
- }
diff --git a/www/ungoogled-chromium/patches/patch-components_services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_h b/www/ungoogled-chromium/patches/patch-components_services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_h
deleted file mode 100644
index c9d13f92a..000000000
--- a/www/ungoogled-chromium/patches/patch-components_services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_h
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h
---- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig
-+++ components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h
-@@ -5,7 +5,13 @@
- #ifndef COMPONENTS_SERVICES_SCREEN_AI_SANDBOX_SCREEN_AI_SANDBOX_HOOK_LINUX_H_
- #define COMPONENTS_SERVICES_SCREEN_AI_SANDBOX_SCREEN_AI_SANDBOX_HOOK_LINUX_H_
- 
-+#include "build/build_config.h"
-+
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#else
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- 
- namespace screen_ai {
- 
diff --git a/www/ungoogled-chromium/patches/patch-components_services_screen_ai_screen_ai_library_wrapper_cc b/www/ungoogled-chromium/patches/patch-components_services_screen_ai_screen_ai_library_wrapper_cc
deleted file mode 100644
index bae053afe..000000000
--- a/www/ungoogled-chromium/patches/patch-components_services_screen_ai_screen_ai_library_wrapper_cc
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: components/services/screen_ai/screen_ai_library_wrapper.cc
---- components/services/screen_ai/screen_ai_library_wrapper.cc.orig
-+++ components/services/screen_ai/screen_ai_library_wrapper.cc
-@@ -187,7 +187,7 @@ ScreenAILibraryWrapper::PerformOcr(const SkBitmap& ima
- 
-   // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux
-   // official.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   free_library_allocated_char_array_(library_buffer.release());
- #endif
- 
-@@ -219,7 +219,7 @@ ScreenAILibraryWrapper::ExtractLayout(const SkBitmap& 
- 
-   // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux
-   // official.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   free_library_allocated_char_array_(library_buffer.release());
- #endif
- 
-@@ -253,7 +253,7 @@ absl::optional<std::vector<int32_t>> ScreenAILibraryWr
- 
-   // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux
-   // official.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   free_library_allocated_int32_array_(library_buffer.release());
- #endif
- 
diff --git a/www/ungoogled-chromium/patches/patch-components_signin_public_base_signin_switches_cc b/www/ungoogled-chromium/patches/patch-components_signin_public_base_signin_switches_cc
new file mode 100644
index 000000000..5cef64fa8
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_signin_public_base_signin_switches_cc
@@ -0,0 +1,21 @@
+Index: components/signin/public/base/signin_switches.cc
+--- components/signin/public/base/signin_switches.cc.orig
++++ components/signin/public/base/signin_switches.cc
+@@ -126,7 +126,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled(
+ }
+ 
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kMinorModeRestrictionsForHistorySyncOptIn,
+              "MinorModeRestrictionsForHistorySyncOptIn",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -135,7 +135,7 @@ constexpr int kMinorModeRestrictionsFetchDeadlineDefau
+ #if BUILDFLAG(IS_ANDROID)
+     // Based on Signin.AccountCapabilities.UserVisibleLatency
+     400;
+-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+     // Based on Signin.SyncOptIn.PreSyncConfirmationLatency
+     900;
+ #elif BUILDFLAG(IS_IOS)
diff --git a/www/ungoogled-chromium/patches/patch-components_signin_public_base_signin_switches_h b/www/ungoogled-chromium/patches/patch-components_signin_public_base_signin_switches_h
new file mode 100644
index 000000000..2266295bb
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_signin_public_base_signin_switches_h
@@ -0,0 +1,12 @@
+Index: components/signin/public/base/signin_switches.h
+--- components/signin/public/base/signin_switches.h.orig
++++ components/signin/public/base/signin_switches.h
+@@ -123,7 +123,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled(
+ 
+ // Controls the view mode for (history) sync screen.
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(SIGNIN_SWITCHES)
+ BASE_DECLARE_FEATURE(kMinorModeRestrictionsForHistorySyncOptIn);
+ 
diff --git a/www/ungoogled-chromium/patches/patch-components_startup_metric_utils_common_startup_metric_utils_cc b/www/ungoogled-chromium/patches/patch-components_startup_metric_utils_common_startup_metric_utils_cc
index 2fe14e06e..6aeac861e 100644
--- a/www/ungoogled-chromium/patches/patch-components_startup_metric_utils_common_startup_metric_utils_cc
+++ b/www/ungoogled-chromium/patches/patch-components_startup_metric_utils_common_startup_metric_utils_cc
@@ -1,7 +1,7 @@
 Index: components/startup_metric_utils/common/startup_metric_utils.cc
 --- components/startup_metric_utils/common/startup_metric_utils.cc.orig
 +++ components/startup_metric_utils/common/startup_metric_utils.cc
-@@ -78,7 +78,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi
+@@ -85,7 +85,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi
    // Enabling this logic on OS X causes a significant performance regression.
    // TODO(crbug.com/601270): Remove IS_APPLE ifdef once priority changes are
    // ignored on Mac main thread.
diff --git a/www/ungoogled-chromium/patches/patch-components_storage_monitor_BUILD_gn b/www/ungoogled-chromium/patches/patch-components_storage_monitor_BUILD_gn
index bf2c0cc33..db1d5677e 100644
--- a/www/ungoogled-chromium/patches/patch-components_storage_monitor_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-components_storage_monitor_BUILD_gn
@@ -1,7 +1,7 @@
 Index: components/storage_monitor/BUILD.gn
 --- components/storage_monitor/BUILD.gn.orig
 +++ components/storage_monitor/BUILD.gn
-@@ -74,7 +74,7 @@ static_library("storage_monitor") {
+@@ -77,7 +77,7 @@ static_library("storage_monitor") {
        deps += [ "//services/device/public/mojom" ]
      }
    } else if (is_linux || is_chromeos_lacros) {
@@ -10,7 +10,7 @@ Index: components/storage_monitor/BUILD.gn
        sources += [
          "mtab_watcher_linux.cc",
          "mtab_watcher_linux.h",
-@@ -178,7 +178,7 @@ source_set("unit_tests") {
+@@ -184,7 +184,7 @@ source_set("unit_tests") {
          "storage_monitor_chromeos_unittest.cc",
        ]
      }
diff --git a/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_proto_fetcher_cc b/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_proto_fetcher_cc
deleted file mode 100644
index be657d93d..000000000
--- a/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_proto_fetcher_cc
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: components/supervised_user/core/browser/proto_fetcher.cc
---- components/supervised_user/core/browser/proto_fetcher.cc.orig
-+++ components/supervised_user/core/browser/proto_fetcher.cc
-@@ -398,8 +398,11 @@ class RetryingFetcherImpl final : public DeferredFetch
-   // Not copyable.
-   RetryingFetcherImpl(const RetryingFetcherImpl&) = delete;
-   RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete;
--
-+#if defined(__clang__) && (__clang_major__ >= 15)
-   void Start(ProtoFetcher<Response>::Callback callback) override {
-+#else
-+  void Start(typename ProtoFetcher<Response>::Callback callback) override {
-+#endif
-     callback_ = std::move(callback);
-     Retry();
-   }
-@@ -435,7 +438,11 @@ class RetryingFetcherImpl final : public DeferredFetch
-   }
- 
-   // Client callback.
-+#if defined(__clang__) && (__clang_major__ >= 15)
-   ProtoFetcher<Response>::Callback callback_;
-+#else
-+  typename ProtoFetcher<Response>::Callback callback_;
-+#endif
- 
-   // Retry controls.
-   base::OneShotTimer timer_;
-@@ -578,7 +585,11 @@ ParallelFetchManager<Request, Response>::ParallelFetch
- template <typename Request, typename Response>
- void ParallelFetchManager<Request, Response>::Fetch(
-     const Request& request,
-+#if defined(__clang__) && (__clang_major__ >= 15)
-     Fetcher::Callback callback) {
-+#else
-+    typename Fetcher::Callback callback) {
-+#endif
-   CHECK(callback) << "Use base::DoNothing() instead of empty callback.";
-   KeyType key = requests_in_flight_.Add(MakeFetcher(request));
-   requests_in_flight_.Lookup(key)->Start(
diff --git a/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_proto_fetcher_h b/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_proto_fetcher_h
deleted file mode 100644
index dd8c582ec..000000000
--- a/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_proto_fetcher_h
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: components/supervised_user/core/browser/proto_fetcher.h
---- components/supervised_user/core/browser/proto_fetcher.h.orig
-+++ components/supervised_user/core/browser/proto_fetcher.h
-@@ -165,10 +165,18 @@ class ParallelFetchManager {
- 
-   // Starts the fetch. Underlying fetcher is stored internally, and will be
-   // cleaned up after finish or when this manager is destroyed.
-+#if defined(__clang__) && (__clang_major__ >= 15) 
-   void Fetch(const Request& request, Fetcher::Callback callback);
-+#else
-+  void Fetch(const Request& request, typename Fetcher::Callback callback);
-+#endif
- 
-  private:
-+#if defined(__clang__) && (__clang_major__ >= 15) 
-   using KeyType = base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
-+#else
-+  using KeyType = typename base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
-+#endif
- 
-   // Remove fetcher under key from requests_in_flight_.
-   void Remove(KeyType key);
diff --git a/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_supervised_user_service_cc b/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_supervised_user_service_cc
index be5706a81..d1b0b6d45 100644
--- a/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_supervised_user_service_cc
+++ b/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_supervised_user_service_cc
@@ -1,12 +1,12 @@
 Index: components/supervised_user/core/browser/supervised_user_service.cc
 --- components/supervised_user/core/browser/supervised_user_service.cc.orig
 +++ components/supervised_user/core/browser/supervised_user_service.cc
-@@ -73,7 +73,7 @@ void SupervisedUserService::Init() {
-       static_cast<supervised_user::FirstTimeInterstitialBannerState>(
-           user_prefs_->GetInteger(prefs::kFirstTimeInterstitialBannerState));
+@@ -170,7 +170,7 @@ FirstTimeInterstitialBannerState SupervisedUserService
+     const FirstTimeInterstitialBannerState original_state) {
+   FirstTimeInterstitialBannerState target_state = original_state;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_IOS)
 +    BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
-   if (supervised_user::CanDisplayFirstTimeInterstitialBanner()) {
-     if (banner_state ==
-             supervised_user::FirstTimeInterstitialBannerState::kUnknown &&
+   if (original_state != FirstTimeInterstitialBannerState::kSetupComplete &&
+       can_show_first_time_interstitial_banner_) {
+     target_state = FirstTimeInterstitialBannerState::kNeedToShow;
diff --git a/www/ungoogled-chromium/patches/patch-components_supervised_user_core_common_features_cc b/www/ungoogled-chromium/patches/patch-components_supervised_user_core_common_features_cc
new file mode 100644
index 000000000..0138d467c
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_supervised_user_core_common_features_cc
@@ -0,0 +1,21 @@
+Index: components/supervised_user/core/common/features.cc
+--- components/supervised_user/core/common/features.cc.orig
++++ components/supervised_user/core/common/features.cc
+@@ -63,7 +63,7 @@ BASE_FEATURE(kEnableSupervisedUserSkipParentApprovalTo
+              "EnableSupervisedUserSkipParentApprovalToInstallExtensions",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop,
+              "EnableExtensionsPermissionsForSupervisedUsersOnDesktop",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -74,7 +74,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens
+ #if BUILDFLAG(IS_CHROMEOS)
+   return base::FeatureList::IsEnabled(
+       kEnableSupervisedUserSkipParentApprovalToInstallExtensions);
+-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   bool skipParentApprovalEnabled = base::FeatureList::IsEnabled(
+       kEnableSupervisedUserSkipParentApprovalToInstallExtensions);
+   bool permissionExtensionsForSupervisedUsersEnabled =
diff --git a/www/ungoogled-chromium/patches/patch-components_supervised_user_core_common_features_h b/www/ungoogled-chromium/patches/patch-components_supervised_user_core_common_features_h
new file mode 100644
index 000000000..d8ca96eb8
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_supervised_user_core_common_features_h
@@ -0,0 +1,12 @@
+Index: components/supervised_user/core/common/features.h
+--- components/supervised_user/core/common/features.h.orig
++++ components/supervised_user/core/common/features.h
+@@ -23,7 +23,7 @@ BASE_DECLARE_FEATURE(kLocalWebApprovals);
+ BASE_DECLARE_FEATURE(
+     kEnableSupervisedUserSkipParentApprovalToInstallExtensions);
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop);
+ #endif
+ 
diff --git a/www/ungoogled-chromium/patches/patch-components_supervised_user_core_common_pref_names_h b/www/ungoogled-chromium/patches/patch-components_supervised_user_core_common_pref_names_h
new file mode 100644
index 000000000..f6348fed6
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_supervised_user_core_common_pref_names_h
@@ -0,0 +1,12 @@
+Index: components/supervised_user/core/common/pref_names.h
+--- components/supervised_user/core/common/pref_names.h.orig
++++ components/supervised_user/core/common/pref_names.h
+@@ -131,7 +131,7 @@ inline constexpr char kFirstTimeInterstitialBannerStat
+     "profile.managed.banner_state";
+ 
+ #if BUILDFLAG(ENABLE_EXTENSIONS)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // An integer pref that stores the current state of the local extension
+ // parent approval migration when the feature
+ // `kEnableSupervisedUserSkipParentApprovalToInstallExtensions` becomes enabled.
diff --git a/www/ungoogled-chromium/patches/patch-components_sync_base_features_cc b/www/ungoogled-chromium/patches/patch-components_sync_base_features_cc
new file mode 100644
index 000000000..c798c0541
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_sync_base_features_cc
@@ -0,0 +1,12 @@
+Index: components/sync/base/features.cc
+--- components/sync/base/features.cc.orig
++++ components/sync/base/features.cc
+@@ -126,7 +126,7 @@ BASE_FEATURE(kEnablePreferencesAccountStorage,
+ BASE_FEATURE(kSyncPollImmediatelyOnEveryStartup,
+              "SyncPollImmediatelyOnEveryStartup2",
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/ungoogled-chromium/patches/patch-components_system_cpu_cpu_probe_cc b/www/ungoogled-chromium/patches/patch-components_system_cpu_cpu_probe_cc
new file mode 100644
index 000000000..d41b9e8e6
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-components_system_cpu_cpu_probe_cc
@@ -0,0 +1,13 @@
+Index: components/system_cpu/cpu_probe.cc
+--- components/system_cpu/cpu_probe.cc.orig
++++ components/system_cpu/cpu_probe.cc
+@@ -30,6 +30,9 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() {
+   return CpuProbeWin::Create();
+ #elif BUILDFLAG(IS_MAC)
+   return CpuProbeMac::Create();
++#elif BUILDFLAG(IS_BSD)
++  NOTIMPLEMENTED();
++  return nullptr;
+ #else
+   return nullptr;
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/ungoogled-chromium/patches/patch-components_url_formatter_spoof_checks_idn_spoof_checker_cc b/www/ungoogled-chromium/patches/patch-components_url_formatter_spoof_checks_idn_spoof_checker_cc
index d0653776f..7395c8a8e 100644
--- a/www/ungoogled-chromium/patches/patch-components_url_formatter_spoof_checks_idn_spoof_checker_cc
+++ b/www/ungoogled-chromium/patches/patch-components_url_formatter_spoof_checks_idn_spoof_checker_cc
@@ -1,7 +1,7 @@
 Index: components/url_formatter/spoof_checks/idn_spoof_checker.cc
 --- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig
 +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc
-@@ -293,7 +293,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
+@@ -294,7 +294,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
    // The ideal fix would be to change the omnibox font used for Thai. In
    // that case, the Linux-only list should be revisited and potentially
    // removed.
diff --git a/www/ungoogled-chromium/patches/patch-components_user_education_views_help_bubble_view_cc b/www/ungoogled-chromium/patches/patch-components_user_education_views_help_bubble_view_cc
index d059b2673..4ac4754d7 100644
--- a/www/ungoogled-chromium/patches/patch-components_user_education_views_help_bubble_view_cc
+++ b/www/ungoogled-chromium/patches/patch-components_user_education_views_help_bubble_view_cc
@@ -1,7 +1,7 @@
 Index: components/user_education/views/help_bubble_view.cc
 --- components/user_education/views/help_bubble_view.cc.orig
 +++ components/user_education/views/help_bubble_view.cc
-@@ -991,7 +991,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const {
+@@ -1011,7 +1011,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const {
  void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params,
                                                views::Widget* widget) const {
    BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget);
diff --git a/www/ungoogled-chromium/patches/patch-components_variations_service_google_groups_updater_service_cc b/www/ungoogled-chromium/patches/patch-components_variations_service_google_groups_updater_service_cc
deleted file mode 100644
index beaec6cbf..000000000
--- a/www/ungoogled-chromium/patches/patch-components_variations_service_google_groups_updater_service_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: components/variations/service/google_groups_updater_service.cc
---- components/variations/service/google_groups_updater_service.cc.orig
-+++ components/variations/service/google_groups_updater_service.cc
-@@ -15,7 +15,7 @@
- // information from per-profile data to local-state.
- BASE_FEATURE(kVariationsGoogleGroupFiltering,
-              "VariationsGoogleGroupFiltering",
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              // TODO(b/286365351): launch on Android, iOS and ChromeOS.
diff --git a/www/ungoogled-chromium/patches/patch-components_variations_service_variations_service_cc b/www/ungoogled-chromium/patches/patch-components_variations_service_variations_service_cc
index d659978ea..9e9e4ba82 100644
--- a/www/ungoogled-chromium/patches/patch-components_variations_service_variations_service_cc
+++ b/www/ungoogled-chromium/patches/patch-components_variations_service_variations_service_cc
@@ -1,7 +1,7 @@
 Index: components/variations/service/variations_service.cc
 --- components/variations/service/variations_service.cc.orig
 +++ components/variations/service/variations_service.cc
-@@ -95,7 +95,7 @@ std::string GetPlatformString() {
+@@ -99,7 +99,7 @@ std::string GetPlatformString() {
    return "android";
  #elif BUILDFLAG(IS_FUCHSIA)
    return "fuchsia";
diff --git a/www/ungoogled-chromium/patches/patch-components_viz_host_host_display_client_cc b/www/ungoogled-chromium/patches/patch-components_viz_host_host_display_client_cc
index 32b5eef2d..25d6cbecd 100644
--- a/www/ungoogled-chromium/patches/patch-components_viz_host_host_display_client_cc
+++ b/www/ungoogled-chromium/patches/patch-components_viz_host_host_display_client_cc
@@ -1,12 +1,12 @@
 Index: components/viz/host/host_display_client.cc
 --- components/viz/host/host_display_client.cc.orig
 +++ components/viz/host/host_display_client.cc
-@@ -67,7 +67,7 @@ void HostDisplayClient::AddChildWindowToBrowser(
+@@ -64,7 +64,7 @@ void HostDisplayClient::AddChildWindowToBrowser(
+ }
+ #endif
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
  void HostDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) {
    NOTIMPLEMENTED();
  }
diff --git a/www/ungoogled-chromium/patches/patch-components_viz_host_host_display_client_h b/www/ungoogled-chromium/patches/patch-components_viz_host_host_display_client_h
index d1e063ad7..2d6be1f4f 100644
--- a/www/ungoogled-chromium/patches/patch-components_viz_host_host_display_client_h
+++ b/www/ungoogled-chromium/patches/patch-components_viz_host_host_display_client_h
@@ -1,12 +1,12 @@
 Index: components/viz/host/host_display_client.h
 --- components/viz/host/host_display_client.h.orig
 +++ components/viz/host/host_display_client.h
-@@ -54,7 +54,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom
- 
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-   void DidCompleteSwapWithNewSize(const gfx::Size& size) override;
+@@ -52,7 +52,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom
+   void AddChildWindowToBrowser(gpu::SurfaceHandle child_window) override;
  #endif
  
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
+   void DidCompleteSwapWithNewSize(const gfx::Size& size) override;
+ #endif  // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
+ 
diff --git a/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_skia_output_surface_impl_cc b/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_skia_output_surface_impl_cc
index 04979019c..bee032de9 100644
--- a/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_skia_output_surface_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_skia_output_surface_impl_cc
@@ -1,12 +1,12 @@
 Index: components/viz/service/display_embedder/skia_output_surface_impl.cc
 --- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig
 +++ components/viz/service/display_embedder/skia_output_surface_impl.cc
-@@ -1450,7 +1450,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
-                                           ->GetDeviceQueue()
+@@ -1527,7 +1527,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
                                            ->GetVulkanPhysicalDevice(),
-                                       VK_IMAGE_TILING_OPTIMAL, ycbcr_info);
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+                                       VK_IMAGE_TILING_OPTIMAL, vk_format,
+                                       si_format, yuv_color_space, ycbcr_info);
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
      // Textures that were allocated _on linux_ with ycbcr info came from
      // VaapiVideoDecoder, which exports using DRM format modifiers.
-     return GrBackendFormat::MakeVk(gr_ycbcr_info,
+     return GrBackendFormats::MakeVk(gr_ycbcr_info,
diff --git a/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_skia_output_surface_impl_on_gpu_cc b/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_skia_output_surface_impl_on_gpu_cc
deleted file mode 100644
index 02b4505ee..000000000
--- a/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_skia_output_surface_impl_on_gpu_cc
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
---- components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.orig
-+++ components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
-@@ -1508,7 +1508,12 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12(
- 
-       // Issue readbacks from the surfaces:
-       for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) {
-+#if defined(__clang__) && (__clang_major__ >= 16)
-         SkISize size(plane_surfaces[i]->width(), plane_surfaces[i]->height());
-+#else
-+        SkISize s = { plane_surfaces[i]->width(), plane_surfaces[i]->height() };
-+        SkISize size(s);
-+#endif
-         SkImageInfo dst_info = SkImageInfo::Make(
-             size, (i == 0) ? kAlpha_8_SkColorType : kR8G8_unorm_SkColorType,
-             kUnpremul_SkAlphaType);
diff --git a/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_software_output_surface_cc b/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_software_output_surface_cc
index f057aac72..61794c28a 100644
--- a/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_software_output_surface_cc
+++ b/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_software_output_surface_cc
@@ -1,7 +1,7 @@
 Index: components/viz/service/display_embedder/software_output_surface.cc
 --- components/viz/service/display_embedder/software_output_surface.cc.orig
 +++ components/viz/service/display_embedder/software_output_surface.cc
-@@ -98,7 +98,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
+@@ -124,7 +124,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
        now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now;
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -10,7 +10,7 @@ Index: components/viz/service/display_embedder/software_output_surface.cc
    if (needs_swap_size_notifications_)
      client_->DidSwapWithSize(pixel_size);
  #endif
-@@ -125,7 +125,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
+@@ -153,7 +153,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_software_output_surface_h b/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_software_output_surface_h
index b967e7849..f02e14a84 100644
--- a/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_software_output_surface_h
+++ b/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_software_output_surface_h
@@ -10,7 +10,7 @@ Index: components/viz/service/display_embedder/software_output_surface.h
    void SetNeedsSwapSizeNotifications(
        bool needs_swap_size_notifications) override;
  #endif
-@@ -69,7 +69,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
+@@ -70,7 +70,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-components_viz_service_display_skia_renderer_cc b/www/ungoogled-chromium/patches/patch-components_viz_service_display_skia_renderer_cc
index 2a3e813c2..af57f0d59 100644
--- a/www/ungoogled-chromium/patches/patch-components_viz_service_display_skia_renderer_cc
+++ b/www/ungoogled-chromium/patches/patch-components_viz_service_display_skia_renderer_cc
@@ -1,7 +1,7 @@
 Index: components/viz/service/display/skia_renderer.cc
 --- components/viz/service/display/skia_renderer.cc.orig
 +++ components/viz/service/display/skia_renderer.cc
-@@ -1216,7 +1216,7 @@ void SkiaRenderer::ClearFramebuffer() {
+@@ -1448,7 +1448,7 @@ void SkiaRenderer::ClearFramebuffer() {
    if (current_frame()->current_render_pass->has_transparent_background) {
      ClearCanvas(SkColors::kTransparent);
    } else {
diff --git a/www/ungoogled-chromium/patches/patch-components_viz_service_frame_sinks_root_compositor_frame_sink_impl_cc b/www/ungoogled-chromium/patches/patch-components_viz_service_frame_sinks_root_compositor_frame_sink_impl_cc
index 915ae9852..1d772a0f6 100644
--- a/www/ungoogled-chromium/patches/patch-components_viz_service_frame_sinks_root_compositor_frame_sink_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-components_viz_service_frame_sinks_root_compositor_frame_sink_impl_cc
@@ -1,21 +1,21 @@
 Index: components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
 --- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig
 +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -109,7 +109,7 @@ RootCompositorFrameSinkImpl::Create(
+@@ -111,7 +111,7 @@ RootCompositorFrameSinkImpl::Create(
+   output_surface->SetNeedsSwapSizeNotifications(
+       params->send_swap_size_notifications);
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
    // For X11, we need notify client about swap completion after resizing, so the
    // client can use it for synchronize with X11 WM.
    output_surface->SetNeedsSwapSizeNotifications(true);
-@@ -644,7 +644,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
+@@ -649,7 +649,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
+   if (display_client_ && enable_swap_completion_callback_) {
      display_client_->DidCompleteSwapWithSize(pixel_size);
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+   }
+-#elif BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
    if (display_client_ && pixel_size != last_swap_pixel_size_) {
      last_swap_pixel_size_ = pixel_size;
      display_client_->DidCompleteSwapWithNewSize(last_swap_pixel_size_);
diff --git a/www/ungoogled-chromium/patches/patch-components_viz_service_frame_sinks_root_compositor_frame_sink_impl_h b/www/ungoogled-chromium/patches/patch-components_viz_service_frame_sinks_root_compositor_frame_sink_impl_h
index b3ed9bf7d..23e258085 100644
--- a/www/ungoogled-chromium/patches/patch-components_viz_service_frame_sinks_root_compositor_frame_sink_impl_h
+++ b/www/ungoogled-chromium/patches/patch-components_viz_service_frame_sinks_root_compositor_frame_sink_impl_h
@@ -1,12 +1,12 @@
 Index: components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
 --- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig
 +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
-@@ -205,7 +205,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl
+@@ -209,7 +209,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl
+   // See comments on `EvictionHandler`.
+   EvictionHandler eviction_handler_;
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
    gfx::Size last_swap_pixel_size_;
- #endif
+ #endif  // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
  
diff --git a/www/ungoogled-chromium/patches/patch-components_viz_test_fake_display_client_cc b/www/ungoogled-chromium/patches/patch-components_viz_test_fake_display_client_cc
index 863cd49d2..78fcee668 100644
--- a/www/ungoogled-chromium/patches/patch-components_viz_test_fake_display_client_cc
+++ b/www/ungoogled-chromium/patches/patch-components_viz_test_fake_display_client_cc
@@ -5,8 +5,8 @@ Index: components/viz/test/fake_display_client.cc
      gpu::SurfaceHandle child_window) {}
  #endif
  
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
  void FakeDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) {}
- #endif
+ #endif  // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
  
diff --git a/www/ungoogled-chromium/patches/patch-components_viz_test_fake_display_client_h b/www/ungoogled-chromium/patches/patch-components_viz_test_fake_display_client_h
index 0882eb18d..36f9cc88e 100644
--- a/www/ungoogled-chromium/patches/patch-components_viz_test_fake_display_client_h
+++ b/www/ungoogled-chromium/patches/patch-components_viz_test_fake_display_client_h
@@ -1,12 +1,12 @@
 Index: components/viz/test/fake_display_client.h
 --- components/viz/test/fake_display_client.h.orig
 +++ components/viz/test/fake_display_client.h
-@@ -35,7 +35,7 @@ class FakeDisplayClient : public mojom::DisplayClient 
+@@ -36,7 +36,7 @@ class FakeDisplayClient : public mojom::DisplayClient 
    void AddChildWindowToBrowser(gpu::SurfaceHandle child_window) override;
  #endif
  
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
    void DidCompleteSwapWithNewSize(const gfx::Size& size) override;
- #endif
+ #endif  // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
  
diff --git a/www/ungoogled-chromium/patches/patch-components_viz_test_mock_display_client_h b/www/ungoogled-chromium/patches/patch-components_viz_test_mock_display_client_h
index 246f1f6de..662c1bfed 100644
--- a/www/ungoogled-chromium/patches/patch-components_viz_test_mock_display_client_h
+++ b/www/ungoogled-chromium/patches/patch-components_viz_test_mock_display_client_h
@@ -1,12 +1,12 @@
 Index: components/viz/test/mock_display_client.h
 --- components/viz/test/mock_display_client.h.orig
 +++ components/viz/test/mock_display_client.h
-@@ -45,7 +45,7 @@ class MockDisplayClient : public mojom::DisplayClient 
+@@ -43,7 +43,7 @@ class MockDisplayClient : public mojom::DisplayClient 
+   MOCK_METHOD1(SetWideColorEnabled, void(bool enabled));
+   MOCK_METHOD1(SetPreferredRefreshRate, void(float refresh_rate));
  #endif
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
    MOCK_METHOD1(DidCompleteSwapWithNewSize, void(const gfx::Size&));
- #endif
+ #endif  // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
  
diff --git a/www/ungoogled-chromium/patches/patch-components_webauthn_core_browser_passkey_sync_bridge_cc b/www/ungoogled-chromium/patches/patch-components_webauthn_core_browser_passkey_sync_bridge_cc
deleted file mode 100644
index 9d1c38498..000000000
--- a/www/ungoogled-chromium/patches/patch-components_webauthn_core_browser_passkey_sync_bridge_cc
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: components/webauthn/core/browser/passkey_sync_bridge.cc
---- components/webauthn/core/browser/passkey_sync_bridge.cc.orig
-+++ components/webauthn/core/browser/passkey_sync_bridge.cc
-@@ -257,7 +257,11 @@ PasskeySyncBridge::GetPasskeysForRelyingPartyId(
- bool PasskeySyncBridge::DeletePasskey(const std::string& credential_id) {
-   // Find the credential with the given |credential_id|.
-   const auto passkey_it =
-+#if (_LIBCPP_VERSION >= 160000)
-       std::ranges::find_if(data_, [&credential_id](const auto& passkey) {
-+#else
-+      base::ranges::find_if(data_, [&credential_id](const auto& passkey) {
-+#endif
-         return passkey.second.credential_id() == credential_id;
-       });
-   if (passkey_it == data_.end()) {
-@@ -308,7 +312,11 @@ bool PasskeySyncBridge::UpdatePasskey(const std::strin
-                                       PasskeyChange change) {
-   // Find the credential with the given |credential_id|.
-   const auto passkey_it =
-+#if (_LIBCPP_VERSION >= 160000)
-       std::ranges::find_if(data_, [&credential_id](const auto& passkey) {
-+#else
-+      base::ranges::find_if(data_, [&credential_id](const auto& passkey) {
-+#endif
-         return passkey.second.credential_id() == credential_id;
-       });
-   if (passkey_it == data_.end()) {
diff --git a/www/ungoogled-chromium/patches/patch-content_app_content_main_cc b/www/ungoogled-chromium/patches/patch-content_app_content_main_cc
index f7ba0a3fa..0a594ecf3 100644
--- a/www/ungoogled-chromium/patches/patch-content_app_content_main_cc
+++ b/www/ungoogled-chromium/patches/patch-content_app_content_main_cc
@@ -1,7 +1,7 @@
 Index: content/app/content_main.cc
 --- content/app/content_main.cc.orig
 +++ content/app/content_main.cc
-@@ -205,7 +205,7 @@ RunContentProcess(ContentMainParams params,
+@@ -207,7 +207,7 @@ RunContentProcess(ContentMainParams params,
  #endif
      base::EnableTerminationOnOutOfMemory();
  
diff --git a/www/ungoogled-chromium/patches/patch-content_app_content_main_runner_impl_cc b/www/ungoogled-chromium/patches/patch-content_app_content_main_runner_impl_cc
index cdc2903a2..82d1a18d5 100644
--- a/www/ungoogled-chromium/patches/patch-content_app_content_main_runner_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-content_app_content_main_runner_impl_cc
@@ -1,7 +1,7 @@
 Index: content/app/content_main_runner_impl.cc
 --- content/app/content_main_runner_impl.cc.orig
 +++ content/app/content_main_runner_impl.cc
-@@ -142,13 +142,13 @@
+@@ -143,13 +143,13 @@
  #include "content/browser/posix_file_descriptor_info_impl.h"
  #include "content/public/common/content_descriptors.h"
  
@@ -17,7 +17,7 @@ Index: content/app/content_main_runner_impl.cc
  #include "base/files/file_path_watcher_inotify.h"
  #include "base/native_library.h"
  #include "base/rand_util.h"
-@@ -186,6 +186,10 @@
+@@ -187,6 +187,10 @@
  #include "media/base/media_switches.h"
  #endif
  
@@ -28,7 +28,7 @@ Index: content/app/content_main_runner_impl.cc
  #if BUILDFLAG(IS_ANDROID)
  #include "base/system/sys_info.h"
  #include "content/browser/android/battery_metrics.h"
-@@ -372,7 +376,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -373,7 +377,7 @@ void InitializeZygoteSandboxForBrowserProcess(
  }
  #endif  // BUILDFLAG(USE_ZYGOTE)
  
@@ -37,7 +37,7 @@ Index: content/app/content_main_runner_impl.cc
  
  #if BUILDFLAG(ENABLE_PPAPI)
  // Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -410,7 +414,10 @@ void PreloadLibraryCdms() {
+@@ -411,7 +415,10 @@ void PreloadLibraryCdms() {
  
  void PreSandboxInit() {
    // Ensure the /dev/urandom is opened.
@@ -48,7 +48,7 @@ Index: content/app/content_main_runner_impl.cc
  
    // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/
    // files.
-@@ -421,9 +428,16 @@ void PreSandboxInit() {
+@@ -423,9 +430,16 @@ void PreSandboxInit() {
    // https://boringssl.9oo91esource.qjz9zk/boringssl/+/HEAD/SANDBOXING.md
    CRYPTO_pre_sandbox_init();
  
@@ -65,8 +65,8 @@ Index: content/app/content_main_runner_impl.cc
  
  #if BUILDFLAG(ENABLE_PPAPI)
    // Ensure access to the Pepper plugins before the sandbox is turned on.
-@@ -808,11 +822,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
-              kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
+@@ -838,11 +852,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+                  base::GlobalDescriptors::kBaseDescriptor);
  #endif  // !BUILDFLAG(IS_ANDROID)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD)
@@ -79,7 +79,7 @@ Index: content/app/content_main_runner_impl.cc
  
  #endif  // !BUILDFLAG(IS_WIN)
  
-@@ -1007,8 +1020,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -1035,8 +1048,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
        process_type == switches::kZygoteProcess) {
      PreSandboxInit();
    }
@@ -100,7 +100,7 @@ Index: content/app/content_main_runner_impl.cc
    delegate_->SandboxInitialized(process_type);
  
  #if BUILDFLAG(USE_ZYGOTE)
-@@ -1076,7 +1101,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1104,7 +1129,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
            ->ReconfigureAfterFeatureListInit(process_type);
      }
  
@@ -109,7 +109,7 @@ Index: content/app/content_main_runner_impl.cc
      // If dynamic Mojo Core is being used, ensure that it's loaded very early in
      // the child/zygote process, before any sandbox is initialized. The library
      // is not fully initialized with IPC support until a ChildProcess is later
-@@ -1111,6 +1136,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1139,6 +1164,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
    content_main_params_.reset();
  
    RegisterMainThreadFactories();
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_BUILD_gn b/www/ungoogled-chromium/patches/patch-content_browser_BUILD_gn
index d7597bf8e..6b81d047d 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-content_browser_BUILD_gn
@@ -1,7 +1,7 @@
 Index: content/browser/BUILD.gn
 --- content/browser/BUILD.gn.orig
 +++ content/browser/BUILD.gn
-@@ -2434,6 +2434,13 @@ source_set("browser") {
+@@ -2406,6 +2406,13 @@ source_set("browser") {
      deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ]
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_audio_audio_service_cc b/www/ungoogled-chromium/patches/patch-content_browser_audio_audio_service_cc
index c032a31b9..f1ea19bb9 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_audio_audio_service_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_audio_audio_service_cc
@@ -1,7 +1,7 @@
 Index: content/browser/audio/audio_service.cc
 --- content/browser/audio/audio_service.cc.orig
 +++ content/browser/audio/audio_service.cc
-@@ -33,7 +33,7 @@
+@@ -34,7 +34,7 @@
  #if BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
  #include "ui/display/util/edid_parser.h"
  
@@ -10,7 +10,7 @@ Index: content/browser/audio/audio_service.cc
  #include "ui/display/display_util.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -225,7 +225,7 @@ audio::mojom::AudioService& GetAudioService() {
+@@ -202,7 +202,7 @@ audio::mojom::AudioService& GetAudioService() {
          ->PostTaskAndReplyWithResult(
              FROM_HERE, base::BindOnce(&ScanEdidBitstreams),
              base::BindOnce(&LaunchAudioService, std::move(receiver)));
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_browser_child_process_host_impl_cc b/www/ungoogled-chromium/patches/patch-content_browser_browser_child_process_host_impl_cc
index 61bc6e03a..40937b28d 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_browser_child_process_host_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_browser_child_process_host_impl_cc
@@ -1,11 +1,20 @@
 Index: content/browser/browser_child_process_host_impl.cc
 --- content/browser/browser_child_process_host_impl.cc.orig
 +++ content/browser/browser_child_process_host_impl.cc
-@@ -321,6 +321,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo
-       switches::kDisableBestEffortTasks,
-       switches::kDisableLogging,
-       switches::kEnableLogging,
+@@ -329,6 +329,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo
+       switches::kMojoCoreLibraryPath,
+       switches::kPerfettoDisableInterning,
+       switches::kTraceToConsole,
 +      switches::kDisableUnveil,
-       switches::kIPCConnectionTimeout,
-       switches::kLogBestEffortTasks,
-       switches::kLogFile,
+   };
+   cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches);
+ 
+@@ -644,7 +645,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() 
+           ->child_process());
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   child_thread_type_switcher_.SetPid(process.Pid());
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ 
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_browser_child_process_host_impl_h b/www/ungoogled-chromium/patches/patch-content_browser_browser_child_process_host_impl_h
new file mode 100644
index 000000000..ca82917f0
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-content_browser_browser_child_process_host_impl_h
@@ -0,0 +1,21 @@
+Index: content/browser/browser_child_process_host_impl.h
+--- content/browser/browser_child_process_host_impl.h.orig
++++ content/browser/browser_child_process_host_impl.h
+@@ -34,7 +34,7 @@
+ #include "base/win/object_watcher.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "content/browser/child_thread_type_switcher_linux.h"
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ 
+@@ -266,7 +266,7 @@ class BrowserChildProcessHostImpl
+   std::unique_ptr<tracing::SystemTracingService> system_tracing_service_;
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   ChildThreadTypeSwitcher child_thread_type_switcher_;
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ 
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_browser_child_process_host_impl_receiver_bindings_cc b/www/ungoogled-chromium/patches/patch-content_browser_browser_child_process_host_impl_receiver_bindings_cc
new file mode 100644
index 000000000..793aaaa90
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-content_browser_browser_child_process_host_impl_receiver_bindings_cc
@@ -0,0 +1,12 @@
+Index: content/browser/browser_child_process_host_impl_receiver_bindings.cc
+--- content/browser/browser_child_process_host_impl_receiver_bindings.cc.orig
++++ content/browser/browser_child_process_host_impl_receiver_bindings.cc
+@@ -62,7 +62,7 @@ void BrowserChildProcessHostImpl::BindHostReceiver(
+     }
+   }
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   if (auto r = receiver.As<mojom::ThreadTypeSwitcher>()) {
+     child_thread_type_switcher_.Bind(std::move(r));
+     return;
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_browser_main_loop_cc b/www/ungoogled-chromium/patches/patch-content_browser_browser_main_loop_cc
index f0446ab25..2c98b0cdc 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_browser_main_loop_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_browser_main_loop_cc
@@ -1,7 +1,7 @@
 Index: content/browser/browser_main_loop.cc
 --- content/browser/browser_main_loop.cc.orig
 +++ content/browser/browser_main_loop.cc
-@@ -246,6 +246,12 @@
+@@ -251,6 +251,12 @@
  #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
  #endif
  
@@ -14,7 +14,7 @@ Index: content/browser/browser_main_loop.cc
  // One of the linux specific headers defines this as a macro.
  #ifdef DestroyAll
  #undef DestroyAll
-@@ -539,6 +545,12 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -556,6 +562,12 @@ int BrowserMainLoop::EarlyInitialization() {
    // by now since a thread to start the ServiceManager has been created
    // before the browser main loop starts.
    DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
@@ -27,7 +27,7 @@ Index: content/browser/browser_main_loop.cc
  #endif
  
    // GLib's spawning of new processes is buggy, so it's important that at this
-@@ -576,7 +588,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -593,7 +605,7 @@ int BrowserMainLoop::EarlyInitialization() {
    base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing);
  
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_child_process_launcher_helper_h b/www/ungoogled-chromium/patches/patch-content_browser_child_process_launcher_helper_h
new file mode 100644
index 000000000..c9e351e50
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-content_browser_child_process_launcher_helper_h
@@ -0,0 +1,12 @@
+Index: content/browser/child_process_launcher_helper.h
+--- content/browser/child_process_launcher_helper.h.orig
++++ content/browser/child_process_launcher_helper.h
+@@ -293,7 +293,7 @@ class ChildProcessLauncherHelper
+   std::unique_ptr<SandboxedProcessLauncherDelegate> delegate_;
+   base::WeakPtr<ChildProcessLauncher> child_process_launcher_;
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // The priority of the process. The state is stored to avoid changing the
+   // setting repeatedly.
+   std::optional<base::Process::Priority> priority_;
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_child_process_launcher_helper_linux_cc b/www/ungoogled-chromium/patches/patch-content_browser_child_process_launcher_helper_linux_cc
index 06bfae5b3..ec4ac0bae 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_child_process_launcher_helper_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_child_process_launcher_helper_linux_cc
@@ -1,7 +1,7 @@
 Index: content/browser/child_process_launcher_helper_linux.cc
 --- content/browser/child_process_launcher_helper_linux.cc.orig
 +++ content/browser/child_process_launcher_helper_linux.cc
-@@ -20,7 +20,9 @@
+@@ -21,7 +21,9 @@
  #include "content/public/common/result_codes.h"
  #include "content/public/common/sandboxed_process_launcher_delegate.h"
  #include "content/public/common/zygote/sandbox_support_linux.h"
@@ -11,7 +11,7 @@ Index: content/browser/child_process_launcher_helper_linux.cc
  #include "sandbox/policy/linux/sandbox_linux.h"
  
  namespace content {
-@@ -45,14 +47,20 @@ ChildProcessLauncherHelper::GetFilesToMap() {
+@@ -46,14 +48,20 @@ ChildProcessLauncherHelper::GetFilesToMap() {
  }
  
  bool ChildProcessLauncherHelper::IsUsingLaunchOptions() {
@@ -32,7 +32,7 @@ Index: content/browser/child_process_launcher_helper_linux.cc
      // Convert FD mapping to FileHandleMappingVector
      options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment(
          base::GlobalDescriptors::kBaseDescriptor);
-@@ -64,7 +72,9 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche
+@@ -65,7 +73,9 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche
  
      options->environment = delegate_->GetEnvironment();
    } else {
@@ -42,7 +42,7 @@ Index: content/browser/child_process_launcher_helper_linux.cc
      // Environment variables could be supported in the future, but are not
      // currently supported when launching with the zygote.
      DCHECK(delegate_->GetEnvironment().empty());
-@@ -81,6 +91,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -82,6 +92,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
      int* launch_result) {
    *is_synchronous_launch = true;
    Process process;
@@ -50,7 +50,7 @@ Index: content/browser/child_process_launcher_helper_linux.cc
    ZygoteCommunication* zygote_handle = GetZygoteForLaunch();
    if (zygote_handle) {
      // TODO(crbug.com/569191): If chrome supported multiple zygotes they could
-@@ -91,7 +102,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -92,7 +103,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
          GetProcessType());
      *launch_result = LAUNCH_RESULT_SUCCESS;
  
@@ -58,7 +58,7 @@ Index: content/browser/child_process_launcher_helper_linux.cc
      if (handle) {
        // It could be a renderer process or an utility process.
        int oom_score = content::kMiscOomScore;
-@@ -100,15 +110,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -101,15 +111,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
          oom_score = content::kLowestRendererOomScore;
        ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(handle, oom_score);
      }
@@ -77,7 +77,7 @@ Index: content/browser/child_process_launcher_helper_linux.cc
  
  #if BUILDFLAG(IS_CHROMEOS)
    if (GetProcessType() == switches::kRendererProcess) {
-@@ -130,10 +142,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
+@@ -131,10 +143,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
      const ChildProcessLauncherHelper::Process& process,
      bool known_dead) {
    ChildProcessTerminationInfo info;
@@ -92,7 +92,7 @@ Index: content/browser/child_process_launcher_helper_linux.cc
      info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(),
                                                        &info.exit_code);
    } else {
-@@ -157,13 +173,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
+@@ -160,13 +176,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
    DCHECK(CurrentlyOnProcessLauncherTaskRunner());
    process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
    // On POSIX, we must additionally reap the child.
@@ -110,7 +110,7 @@ Index: content/browser/child_process_launcher_helper_linux.cc
  }
  
  void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread(
-@@ -175,11 +195,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL
+@@ -179,11 +199,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL
    }
  }
  
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_child_thread_type_switcher_linux_cc b/www/ungoogled-chromium/patches/patch-content_browser_child_thread_type_switcher_linux_cc
new file mode 100644
index 000000000..a40d59f81
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-content_browser_child_thread_type_switcher_linux_cc
@@ -0,0 +1,21 @@
+Index: content/browser/child_thread_type_switcher_linux.cc
+--- content/browser/child_thread_type_switcher_linux.cc.orig
++++ content/browser/child_thread_type_switcher_linux.cc
+@@ -20,6 +20,9 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee
+                                    base::ThreadType thread_type) {
+   DCHECK(CurrentlyOnProcessLauncherTaskRunner());
+ 
++#if BUILDFLAG(IS_BSD)
++  NOTIMPLEMENTED();
++#else
+   bool ns_pid_supported = false;
+   pid_t peer_tid = base::FindThreadID(peer_pid, ns_tid, &ns_pid_supported);
+   if (peer_tid == -1) {
+@@ -37,6 +40,7 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee
+ 
+   base::PlatformThread::SetThreadType(peer_pid, peer_tid, thread_type,
+                                       base::IsViaIPC(true));
++#endif
+ }
+ 
+ }  // namespace
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_compositor_viz_process_transport_factory_cc b/www/ungoogled-chromium/patches/patch-content_browser_compositor_viz_process_transport_factory_cc
index 6b74376a6..e63f8b68c 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_compositor_viz_process_transport_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_compositor_viz_process_transport_factory_cc
@@ -1,12 +1,12 @@
 Index: content/browser/compositor/viz_process_transport_factory.cc
 --- content/browser/compositor/viz_process_transport_factory.cc.orig
 +++ content/browser/compositor/viz_process_transport_factory.cc
-@@ -110,7 +110,7 @@ class HostDisplayClient : public viz::HostDisplayClien
+@@ -105,7 +105,7 @@ class HostDisplayClient : public viz::HostDisplayClien
+   HostDisplayClient& operator=(const HostDisplayClient&) = delete;
+ 
    // viz::HostDisplayClient:
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
    void DidCompleteSwapWithNewSize(const gfx::Size& size) override {
      compositor_->OnCompleteSwapWithNewSize(size);
    }
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_devtools_devtools_frontend_host_impl_cc b/www/ungoogled-chromium/patches/patch-content_browser_devtools_devtools_frontend_host_impl_cc
new file mode 100644
index 000000000..138aee3dc
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-content_browser_devtools_devtools_frontend_host_impl_cc
@@ -0,0 +1,39 @@
+Index: content/browser/devtools/devtools_frontend_host_impl.cc
+--- content/browser/devtools/devtools_frontend_host_impl.cc.orig
++++ content/browser/devtools/devtools_frontend_host_impl.cc
+@@ -22,7 +22,7 @@
+ #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
+ #include "ui/base/webui/resource_path.h"
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "components/crash/content/browser/error_reporting/javascript_error_report.h"  // nogncheck
+ #include "components/crash/content/browser/error_reporting/js_error_report_processor.h"  // nogncheck
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -37,7 +37,7 @@ const char kCompatibilityScriptSourceURL[] =
+     "\n//# "
+     "sourceURL=devtools://devtools/bundled/devtools_compatibility.js";
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // Remove the pieces of the URL we don't want to send back with the error
+ // reports. In particular, do not send query or fragments as those can have
+ // privacy-sensitive information in them.
+@@ -107,7 +107,7 @@ DevToolsFrontendHostImpl::DevToolsFrontendHostImpl(
+     const HandleMessageCallback& handle_message_callback)
+     : web_contents_(WebContents::FromRenderFrameHost(frame_host)),
+       handle_message_callback_(handle_message_callback) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   Observe(web_contents_);
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+   mojo::AssociatedRemote<blink::mojom::DevToolsFrontend> frontend;
+@@ -132,7 +132,7 @@ void DevToolsFrontendHostImpl::DispatchEmbedderMessage
+   handle_message_callback_.Run(std::move(message));
+ }
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ void DevToolsFrontendHostImpl::OnDidAddMessageToConsole(
+     RenderFrameHost* source_frame,
+     blink::mojom::ConsoleMessageLevel log_level,
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_devtools_devtools_frontend_host_impl_h b/www/ungoogled-chromium/patches/patch-content_browser_devtools_devtools_frontend_host_impl_h
new file mode 100644
index 000000000..7ab2519df
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-content_browser_devtools_devtools_frontend_host_impl_h
@@ -0,0 +1,12 @@
+Index: content/browser/devtools/devtools_frontend_host_impl.h
+--- content/browser/devtools/devtools_frontend_host_impl.h.orig
++++ content/browser/devtools/devtools_frontend_host_impl.h
+@@ -33,7 +33,7 @@ class DevToolsFrontendHostImpl : public DevToolsFronte
+ 
+   void BadMessageReceived() override;
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   void OnDidAddMessageToConsole(
+       RenderFrameHost* source_frame,
+       blink::mojom::ConsoleMessageLevel log_level,
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_devtools_protocol_system_info_handler_cc b/www/ungoogled-chromium/patches/patch-content_browser_devtools_protocol_system_info_handler_cc
index 1ce49e728..8799231ee 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_devtools_protocol_system_info_handler_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_devtools_protocol_system_info_handler_cc
@@ -1,7 +1,7 @@
 Index: content/browser/devtools/protocol/system_info_handler.cc
 --- content/browser/devtools/protocol/system_info_handler.cc.orig
 +++ content/browser/devtools/protocol/system_info_handler.cc
-@@ -49,7 +49,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS
+@@ -50,7 +50,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS
  // 1046598, and 1153667.
  // Windows builds need more time -- see Issue 873112 and 1004472.
  // Mac builds need more time - see Issue angleproject:6182.
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_download_save_package_cc b/www/ungoogled-chromium/patches/patch-content_browser_download_save_package_cc
deleted file mode 100644
index 7cdcfa76c..000000000
--- a/www/ungoogled-chromium/patches/patch-content_browser_download_save_package_cc
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: content/browser/download/save_package.cc
---- content/browser/download/save_package.cc.orig
-+++ content/browser/download/save_package.cc
-@@ -764,8 +764,13 @@ void SavePackage::Finish() {
-   if (download_) {
-     std::vector<download::DownloadSaveItemData::ItemInfo> files;
-     for (auto& item : saved_success_items_) {
-+#if defined(__clang__) && (__clang_major__ >= 16)
-       files.emplace_back(item.second->full_path(), item.second->url(),
-                          item.second->referrer().url);
-+#else
-+      files.emplace_back(download::DownloadSaveItemData::ItemInfo{item.second->full_path(), item.second->url(),
-+                         item.second->referrer().url});
-+#endif
-     }
-     download::DownloadSaveItemData::AttachItemData(download_, std::move(files));
-   }
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_file_system_access_file_system_access_local_path_watcher_cc b/www/ungoogled-chromium/patches/patch-content_browser_file_system_access_file_system_access_local_path_watcher_cc
new file mode 100644
index 000000000..310281e68
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-content_browser_file_system_access_file_system_access_local_path_watcher_cc
@@ -0,0 +1,12 @@
+Index: content/browser/file_system_access/file_system_access_local_path_watcher.cc
+--- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig
++++ content/browser/file_system_access/file_system_access_local_path_watcher.cc
+@@ -63,7 +63,7 @@ void FileSystemAccessLocalPathWatcher::Initialize(
+   base::FilePathWatcher::WatchOptions watch_options {
+     .type = scope().IsRecursive() ? base::FilePathWatcher::Type::kRecursive
+                                   : base::FilePathWatcher::Type::kNonRecursive,
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     // Note: `report_modified_path` is also present on Android
+     // and Fuchsia. Update this switch if support for watching
+     // the local file system is added on those platforms.
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_font_access_font_enumeration_data_source_cc b/www/ungoogled-chromium/patches/patch-content_browser_font_access_font_enumeration_data_source_cc
index c20425910..b669f957a 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_font_access_font_enumeration_data_source_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_font_access_font_enumeration_data_source_cc
@@ -3,7 +3,7 @@ Index: content/browser/font_access/font_enumeration_data_source.cc
 +++ content/browser/font_access/font_enumeration_data_source.cc
 @@ -16,7 +16,7 @@
  #include "content/browser/font_access/font_enumeration_data_source_win.h"
- #elif BUILDFLAG(IS_MAC)
+ #elif BUILDFLAG(IS_APPLE)
  #include "content/browser/font_access/font_enumeration_data_source_mac.h"
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
@@ -12,7 +12,7 @@ Index: content/browser/font_access/font_enumeration_data_source.cc
  
 @@ -61,7 +61,7 @@ std::unique_ptr<FontEnumerationDataSource> FontEnumera
    return std::make_unique<FontEnumerationDataSourceWin>();
- #elif BUILDFLAG(IS_MAC)
+ #elif BUILDFLAG(IS_APPLE)
    return std::make_unique<FontEnumerationDataSourceMac>();
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
@@ -21,7 +21,7 @@ Index: content/browser/font_access/font_enumeration_data_source.cc
    return std::make_unique<FontEnumerationDataSourceNull>();
 @@ -76,7 +76,7 @@ bool FontEnumerationDataSource::IsOsSupported() {
    return true;
- #elif BUILDFLAG(IS_MAC)
+ #elif BUILDFLAG(IS_APPLE)
    return true;
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_gpu_compositor_util_cc b/www/ungoogled-chromium/patches/patch-content_browser_gpu_compositor_util_cc
index 1016e6823..82ecfbaa9 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_gpu_compositor_util_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_gpu_compositor_util_cc
@@ -1,21 +1,21 @@
 Index: content/browser/gpu/compositor_util.cc
 --- content/browser/gpu/compositor_util.cc.orig
 +++ content/browser/gpu/compositor_util.cc
-@@ -148,7 +148,7 @@ const GpuFeatureData GetGpuFeatureData(
-     {"video_decode",
-      SafeGetFeatureStatus(gpu_feature_info,
-                           gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
+@@ -149,7 +149,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData(
+       "video_decode",
+       SafeGetFeatureStatus(
+           gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE,
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-      !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) ||
+           !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) ||
  #endif  // BUILDFLAG(IS_LINUX)
-          command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode),
-@@ -159,7 +159,7 @@ const GpuFeatureData GetGpuFeatureData(
-     {"video_encode",
-      SafeGetFeatureStatus(gpu_feature_info,
-                           gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE),
+               command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)),
+@@ -161,7 +161,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData(
+       "video_encode",
+       SafeGetFeatureStatus(
+           gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE,
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-      !base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux),
+           !base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux)),
  #else
-      command_line.HasSwitch(switches::kDisableAcceleratedVideoEncode),
+           command_line.HasSwitch(switches::kDisableAcceleratedVideoEncode)),
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_cc b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_cc
index 9d1155da1..cfa701fc7 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_cc
@@ -1,7 +1,7 @@
 Index: content/browser/gpu/gpu_data_manager_impl.cc
 --- content/browser/gpu/gpu_data_manager_impl.cc.orig
 +++ content/browser/gpu/gpu_data_manager_impl.cc
-@@ -405,7 +405,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged(
+@@ -394,7 +394,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged(
    private_->OnDisplayMetricsChanged(display, changed_metrics);
  }
  
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_h b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_h
index e14782b5d..89fa07236 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_h
+++ b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_h
@@ -1,7 +1,7 @@
 Index: content/browser/gpu/gpu_data_manager_impl.h
 --- content/browser/gpu/gpu_data_manager_impl.h.orig
 +++ content/browser/gpu/gpu_data_manager_impl.h
-@@ -221,7 +221,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa
+@@ -217,7 +217,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa
    void OnDisplayMetricsChanged(const display::Display& display,
                                 uint32_t changed_metrics) override;
  
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_private_cc b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_private_cc
index a8b30c60c..d4b161f75 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_private_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_private_cc
@@ -1,7 +1,7 @@
 Index: content/browser/gpu/gpu_data_manager_impl_private.cc
 --- content/browser/gpu/gpu_data_manager_impl_private.cc.orig
 +++ content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -1753,7 +1753,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode(
+@@ -1673,7 +1673,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode(
    UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode);
  }
  
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_private_h b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_private_h
index f7540708a..9f09afeb7 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_private_h
+++ b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_private_h
@@ -1,7 +1,7 @@
 Index: content/browser/gpu/gpu_data_manager_impl_private.h
 --- content/browser/gpu/gpu_data_manager_impl_private.h.orig
 +++ content/browser/gpu/gpu_data_manager_impl_private.h
-@@ -151,7 +151,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
+@@ -149,7 +149,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
    void OnDisplayMetricsChanged(const display::Display& display,
                                 uint32_t changed_metrics);
  
@@ -10,7 +10,7 @@ Index: content/browser/gpu/gpu_data_manager_impl_private.h
    bool IsGpuMemoryBufferNV12Supported();
    void SetGpuMemoryBufferNV12Supported(bool supported);
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -306,7 +306,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
+@@ -301,7 +301,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
    bool application_is_visible_ = true;
  
    bool disable_gpu_compositing_ = false;
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_memory_buffer_manager_singleton_cc b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_memory_buffer_manager_singleton_cc
index 9f6db35eb..fa0275268 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_memory_buffer_manager_singleton_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_memory_buffer_manager_singleton_cc
@@ -1,7 +1,7 @@
 Index: content/browser/gpu/gpu_memory_buffer_manager_singleton.cc
 --- content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig
 +++ content/browser/gpu/gpu_memory_buffer_manager_singleton.cc
-@@ -53,7 +53,7 @@ scoped_refptr<base::SingleThreadTaskRunner> GetTaskRun
+@@ -54,7 +54,7 @@ scoped_refptr<base::SingleThreadTaskRunner> GetTaskRun
  #endif
  }
  
@@ -10,10 +10,10 @@ Index: content/browser/gpu/gpu_memory_buffer_manager_singleton.cc
  bool IsGpuMemoryBufferNV12Supported() {
    static bool is_computed = false;
    static bool supported = false;
-@@ -116,7 +116,7 @@ void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUp
+@@ -117,7 +117,7 @@ void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUp
      SetNativeConfigurations(std::move(configs));
    }
- #endif
+ #endif  // BUILDFLAG(IS_OZONE_X11)
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Dynamic check whether the NV12 format is supported as it may be
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_process_host_cc b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_process_host_cc
index 3d2a05343..0f9ad1da3 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_process_host_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_process_host_cc
@@ -1,17 +1,17 @@
 Index: content/browser/gpu/gpu_process_host.cc
 --- content/browser/gpu/gpu_process_host.cc.orig
 +++ content/browser/gpu/gpu_process_host.cc
-@@ -254,6 +254,7 @@ static const char* const kSwitchNames[] = {
-     switches::kEnableBackgroundThreadPool,
-     switches::kEnableGpuRasterization,
-     switches::kEnableLogging,
+@@ -264,6 +264,7 @@ static const char* const kSwitchNames[] = {
+     switches::kEnableLowEndDeviceMode,
+     switches::kDisableSkiaGraphite,
+     switches::kDisableLowEndDeviceMode,
 +    switches::kDisableUnveil,
-     switches::kDoubleBufferCompositing,
-     switches::kHeadless,
-     switches::kLoggingLevel,
-@@ -287,7 +288,7 @@ static const char* const kSwitchNames[] = {
+     switches::kProfilingAtStart,
+     switches::kProfilingFile,
+     switches::kProfilingFlush,
+@@ -290,7 +291,7 @@ static const char* const kSwitchNames[] = {
+     switches::kDisableExplicitDmaFences,
      switches::kOzoneDumpFile,
-     switches::kDisableBufferBWCompression,
  #endif
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_interest_group_header_direct_from_seller_signals_cc b/www/ungoogled-chromium/patches/patch-content_browser_interest_group_header_direct_from_seller_signals_cc
deleted file mode 100644
index 8b79b973d..000000000
--- a/www/ungoogled-chromium/patches/patch-content_browser_interest_group_header_direct_from_seller_signals_cc
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: content/browser/interest_group/header_direct_from_seller_signals.cc
---- content/browser/interest_group/header_direct_from_seller_signals.cc.orig
-+++ content/browser/interest_group/header_direct_from_seller_signals.cc
-@@ -187,7 +187,11 @@ void OnJsonDecoded(std::unique_ptr<const std::set<std:
- 
- }  // namespace
- 
-+#if defined(__clang__) && (__clang_major__ >= 16)
- HeaderDirectFromSellerSignals::HeaderDirectFromSellerSignals() = default;
-+#else
-+HeaderDirectFromSellerSignals::HeaderDirectFromSellerSignals() {}
-+#endif
- 
- HeaderDirectFromSellerSignals::~HeaderDirectFromSellerSignals() = default;
- 
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_media_media_keys_listener_manager_impl_cc b/www/ungoogled-chromium/patches/patch-content_browser_media_media_keys_listener_manager_impl_cc
index 714b80ef7..514abe7f2 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_media_media_keys_listener_manager_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_media_media_keys_listener_manager_impl_cc
@@ -1,12 +1,12 @@
 Index: content/browser/media/media_keys_listener_manager_impl.cc
 --- content/browser/media/media_keys_listener_manager_impl.cc.orig
 +++ content/browser/media/media_keys_listener_manager_impl.cc
-@@ -234,7 +234,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
+@@ -334,7 +334,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe
+   }
+ 
  #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
 -    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   system_media_controls_ = system_media_controls::SystemMediaControls::Create(
-       media::AudioManager::GetGlobalAppName());
- #endif
+   // Create SystemMediaControls with the SingletonHwnd.
+   browser_system_media_controls_ =
+       system_media_controls::SystemMediaControls::Create(
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_network_service_instance_impl_cc b/www/ungoogled-chromium/patches/patch-content_browser_network_service_instance_impl_cc
index 9235f3ebd..a877bbeca 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_network_service_instance_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_network_service_instance_impl_cc
@@ -1,7 +1,7 @@
 Index: content/browser/network_service_instance_impl.cc
 --- content/browser/network_service_instance_impl.cc.orig
 +++ content/browser/network_service_instance_impl.cc
-@@ -82,7 +82,7 @@
+@@ -81,7 +81,7 @@
  #include "content/browser/network/network_service_process_tracker_win.h"
  #endif
  
@@ -10,8 +10,8 @@ Index: content/browser/network_service_instance_impl.cc
  #include "content/browser/system_dns_resolution/system_dns_resolver.h"
  #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h"
  #endif
-@@ -421,7 +421,7 @@ void CreateInProcessNetworkService(
- #endif
+@@ -359,7 +359,7 @@ void CreateInProcessNetworkService(
+                                 std::move(receiver)));
  }
  
 -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
@@ -19,7 +19,7 @@ Index: content/browser/network_service_instance_impl.cc
  // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a
  // high-priority thread pool.
  void RunSystemDnsResolverOnThreadPool(
-@@ -488,7 +488,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS
+@@ -428,7 +428,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS
    }
  #endif  // BUILDFLAG(IS_POSIX)
  
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_delegated_frame_host_cc b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_delegated_frame_host_cc
index 2b5a1a812..167b0473f 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_delegated_frame_host_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_delegated_frame_host_cc
@@ -1,7 +1,7 @@
 Index: content/browser/renderer_host/delegated_frame_host.cc
 --- content/browser/renderer_host/delegated_frame_host.cc.orig
 +++ content/browser/renderer_host/delegated_frame_host.cc
-@@ -312,7 +312,7 @@ void DelegatedFrameHost::EmbedSurface(
+@@ -318,7 +318,7 @@ void DelegatedFrameHost::EmbedSurface(
  
    if (!primary_surface_id ||
        primary_surface_id->local_surface_id() != local_surface_id_) {
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_media_service_video_capture_device_launcher_cc b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_media_service_video_capture_device_launcher_cc
index 8f0728d75..6421337ab 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_media_service_video_capture_device_launcher_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_media_service_video_capture_device_launcher_cc
@@ -1,7 +1,7 @@
 Index: content/browser/renderer_host/media/service_video_capture_device_launcher.cc
 --- content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig
 +++ content/browser/renderer_host/media/service_video_capture_device_launcher.cc
-@@ -24,7 +24,7 @@
+@@ -25,7 +25,7 @@
  #include "media/base/media_switches.h"
  #endif
  
@@ -10,7 +10,7 @@ Index: content/browser/renderer_host/media/service_video_capture_device_launcher
  #include "content/browser/gpu/gpu_data_manager_impl.h"
  #endif
  
-@@ -166,7 +166,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs
+@@ -172,7 +172,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs
    }
  #else
    if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_frame_host_impl_cc b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_frame_host_impl_cc
deleted file mode 100644
index 442fe3ebd..000000000
--- a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_frame_host_impl_cc
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: content/browser/renderer_host/render_frame_host_impl.cc
---- content/browser/renderer_host/render_frame_host_impl.cc.orig
-+++ content/browser/renderer_host/render_frame_host_impl.cc
-@@ -8509,7 +8509,11 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeac
-   for (const blink::FencedFrame::ReportingDestination& destination :
-        destinations) {
-     SendFencedFrameReportingBeaconInternal(
-+#if defined(__clang__) && (__clang_major__ >= 16)
-         DestinationEnumEvent(event_type, event_data), destination,
-+#else
-+        DestinationEnumEvent(DestinationEnumEvent{event_type, event_data}), destination,
-+#endif
-         /*from_renderer=*/true, attribution_reporting_runtime_features,
-         GetFrameTreeNodeId());
-   }
-@@ -8545,7 +8549,11 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeac
-   }
- 
-   SendFencedFrameReportingBeaconInternal(
-+#if defined(__clang__) && (__clang_major__ >= 16)
-       DestinationURLEvent(destination_url),
-+#else
-+      DestinationURLEvent(DestinationURLEvent{destination_url}),
-+#endif
-       blink::FencedFrame::ReportingDestination::kBuyer,
-       /*from_renderer=*/true, attribution_reporting_runtime_features,
-       GetFrameTreeNodeId());
-@@ -8617,8 +8625,13 @@ void RenderFrameHostImpl::MaybeSendFencedFrameReportin
-   for (blink::FencedFrame::ReportingDestination destination :
-        info->destinations) {
-     initiator_rfh->SendFencedFrameReportingBeaconInternal(
-+#if defined(__clang__) && (__clang_major__ >= 16)
-         DestinationEnumEvent(blink::kFencedFrameTopNavigationBeaconType,
-                              info->data),
-+#else
-+        DestinationEnumEvent(DestinationEnumEvent{blink::kFencedFrameTopNavigationBeaconType,
-+                             info->data}),
-+#endif
-         destination,
-         /*from_renderer=*/false, info->attribution_reporting_runtime_features,
-         GetFrameTreeNodeId(), navigation_request.GetNavigationId());
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_process_host_impl_cc b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_process_host_impl_cc
index 73fc9f4c6..dd97c758c 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_process_host_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_process_host_impl_cc
@@ -1,7 +1,7 @@
 Index: content/browser/renderer_host/render_process_host_impl.cc
 --- content/browser/renderer_host/render_process_host_impl.cc.orig
 +++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -221,7 +221,7 @@
+@@ -226,7 +226,7 @@
  #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
  #endif
  
@@ -10,7 +10,7 @@ Index: content/browser/renderer_host/render_process_host_impl.cc
  #include <sys/resource.h>
  
  #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
-@@ -1219,7 +1219,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -968,7 +968,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
  // to indicate failure and std::numeric_limits<size_t>::max() to indicate
  // unlimited.
  size_t GetPlatformProcessLimit() {
@@ -19,7 +19,16 @@ Index: content/browser/renderer_host/render_process_host_impl.cc
    struct rlimit limit;
    if (getrlimit(RLIMIT_NPROC, &limit) != 0)
      return kUnknownPlatformProcessLimit;
-@@ -1362,7 +1362,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1150,7 +1150,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+   IOThreadHostImpl& operator=(const IOThreadHostImpl& other) = delete;
+ 
+   void SetPid(base::ProcessId child_pid) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     child_thread_type_switcher_.SetPid(child_pid);
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+   }
+@@ -1167,7 +1167,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
          return;
      }
  
@@ -28,7 +37,7 @@ Index: content/browser/renderer_host/render_process_host_impl.cc
      if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
        ConnectToFontService(std::move(font_receiver));
        return;
-@@ -1451,7 +1451,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1261,7 +1261,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
    std::unique_ptr<service_manager::BinderRegistry> binders_;
    mojo::Receiver<mojom::ChildProcessHost> receiver_{this};
  
@@ -36,8 +45,8 @@ Index: content/browser/renderer_host/render_process_host_impl.cc
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory>
        video_encode_accelerator_factory_remote_;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -3515,7 +3515,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
+   ChildThreadTypeSwitcher child_thread_type_switcher_;
+@@ -3354,7 +3354,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
              base::TimeTicks::UnixEpoch().since_origin().InMicroseconds()));
    }
  
@@ -46,7 +55,7 @@ Index: content/browser/renderer_host/render_process_host_impl.cc
    // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support
    // for NV12 GPU memory buffer.
    if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() &&
-@@ -3576,6 +3576,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+@@ -3413,6 +3413,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
      switches::kDisableSpeechAPI,
      switches::kDisableThreadedCompositing,
      switches::kDisableTouchDragDrop,
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_process_host_impl_h b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_process_host_impl_h
index c4c013d4b..6426ef369 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_process_host_impl_h
+++ b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_process_host_impl_h
@@ -1,7 +1,7 @@
 Index: content/browser/renderer_host/render_process_host_impl.h
 --- content/browser/renderer_host/render_process_host_impl.h.orig
 +++ content/browser/renderer_host/render_process_host_impl.h
-@@ -539,7 +539,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -548,7 +548,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // Sets this RenderProcessHost to be guest only. For Testing only.
    void SetForGuestsOnlyForTesting();
  
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_view_host_impl_cc b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_view_host_impl_cc
index 03ec26dc0..87dfc4459 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_view_host_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_view_host_impl_cc
@@ -1,12 +1,12 @@
 Index: content/browser/renderer_host/render_view_host_impl.cc
 --- content/browser/renderer_host/render_view_host_impl.cc.orig
 +++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -273,7 +273,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
+@@ -272,7 +272,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
    prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   prefs->system_font_family_name = gfx::Font().GetFontName();
- #elif BUILDFLAG(IS_FUCHSIA)
-   // Make Blink's "focus ring" invisible. The focus ring is a hairline border
+   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+   if (command_line->HasSwitch(switches::kSystemFontFamily)) {
+     prefs->system_font_family_name =
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc
index 46c73b93c..5025b7562 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc
@@ -1,7 +1,7 @@
 Index: content/browser/renderer_host/render_widget_host_view_aura.cc
 --- content/browser/renderer_host/render_widget_host_view_aura.cc.orig
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -121,7 +121,7 @@
+@@ -119,7 +119,7 @@
  #include "ui/gfx/gdi_util.h"
  #endif
  
@@ -9,8 +9,8 @@ Index: content/browser/renderer_host/render_widget_host_view_aura.cc
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "content/browser/accessibility/browser_accessibility_auralinux.h"
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
- #include "ui/linux/linux_ui.h"
-@@ -464,7 +464,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
+ #include "ui/base/ime/text_input_flags.h"
+@@ -452,7 +452,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
      return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot())
          ->GetCOM();
  
@@ -19,8 +19,8 @@ Index: content/browser/renderer_host/render_widget_host_view_aura.cc
    BrowserAccessibilityManager* manager =
        host()->GetOrCreateRootBrowserAccessibilityManager();
    if (manager && manager->GetBrowserAccessibilityRoot())
-@@ -1692,7 +1692,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
-   return GetTextInputManager() && GetTextInputManager()->should_do_learning();
+@@ -1705,7 +1705,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
+   return host_->delegate() && host_->delegate()->ShouldDoLearning();
  }
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -28,7 +28,7 @@ Index: content/browser/renderer_host/render_widget_host_view_aura.cc
  bool RenderWidgetHostViewAura::SetCompositionFromExistingText(
      const gfx::Range& range,
      const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
-@@ -2537,7 +2537,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2538,7 +2538,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
  }
  
  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -37,7 +37,7 @@ Index: content/browser/renderer_host/render_widget_host_view_aura.cc
    return NeedsInputGrab();
  #else
    return false;
-@@ -2713,7 +2713,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -2722,7 +2722,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
    if (!target_host)
      return;
  
@@ -45,4 +45,4 @@ Index: content/browser/renderer_host/render_widget_host_view_aura.cc
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    auto* linux_ui = ui::LinuxUi::instance();
    std::vector<ui::TextEditCommandAuraLinux> commands;
-   if (!event.skip_in_browser && linux_ui && event.os_event &&
+   if (!event.skip_if_unhandled && linux_ui && event.os_event &&
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_h b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_h
index 2e20d769d..d175c772c 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_h
+++ b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_h
@@ -1,7 +1,7 @@
 Index: content/browser/renderer_host/render_widget_host_view_aura.h
 --- content/browser/renderer_host/render_widget_host_view_aura.h.orig
 +++ content/browser/renderer_host/render_widget_host_view_aura.h
-@@ -256,7 +256,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
+@@ -259,7 +259,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
    ukm::SourceId GetClientSourceForMetrics() const override;
    bool ShouldDoLearning() override;
  
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_event_handler_cc b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_event_handler_cc
index 3ee2e0dee..1e03eddc3 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_event_handler_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_event_handler_cc
@@ -1,7 +1,7 @@
 Index: content/browser/renderer_host/render_widget_host_view_event_handler.cc
 --- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig
 +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
-@@ -597,7 +597,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
+@@ -599,7 +599,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
    if (event->type() == ui::ET_MOUSE_EXITED) {
      if (mouse_locked || selection_popup)
        return false;
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_service_worker_service_worker_context_wrapper_cc b/www/ungoogled-chromium/patches/patch-content_browser_service_worker_service_worker_context_wrapper_cc
deleted file mode 100644
index 617ac1181..000000000
--- a/www/ungoogled-chromium/patches/patch-content_browser_service_worker_service_worker_context_wrapper_cc
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: content/browser/service_worker/service_worker_context_wrapper.cc
---- content/browser/service_worker/service_worker_context_wrapper.cc.orig
-+++ content/browser/service_worker/service_worker_context_wrapper.cc
-@@ -1406,7 +1406,12 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingW
-     return;
-   }
- 
-+#if defined(__clang__) && (__clang_major__ >= 16)
-   auto [document_url, key, callback] = std::move(*request);
-+#else
-+  auto [d_u, key, callback] = std::move(*request);
-+  auto document_url = d_u;
-+#endif
- 
-   DCHECK(document_url.is_valid());
-   TRACE_EVENT1("ServiceWorker",
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_cc b/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_cc
index 9bfeae9b9..93cb19736 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_cc
@@ -1,7 +1,7 @@
 Index: content/browser/utility_process_host.cc
 --- content/browser/utility_process_host.cc.orig
 +++ content/browser/utility_process_host.cc
-@@ -59,7 +59,7 @@
+@@ -61,7 +61,7 @@
  #include "content/browser/v8_snapshot_files.h"
  #endif
  
@@ -10,16 +10,16 @@ Index: content/browser/utility_process_host.cc
  #include "base/files/file_util.h"
  #include "base/files/scoped_file.h"
  #include "base/pickle.h"
-@@ -69,7 +69,7 @@
- #include "media/capture/capture_switches.h"
+@@ -75,7 +75,7 @@
+ #include "services/network/public/mojom/network_service.mojom.h"
  #endif
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
  #include "base/task/sequenced_task_runner.h"
  #include "components/viz/host/gpu_client.h"
  #include "media/capture/capture_switches.h"
-@@ -80,7 +80,7 @@ namespace content {
+@@ -86,7 +86,7 @@ namespace content {
  
  namespace {
  
@@ -28,16 +28,25 @@ Index: content/browser/utility_process_host.cc
  base::ScopedFD PassNetworkContextParentDirs(
      std::vector<base::FilePath> network_context_parent_dirs) {
    base::Pickle pickle;
-@@ -129,7 +129,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr
+@@ -150,7 +150,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr
        started_(false),
        name_(u"utility process"),
        file_data_(std::make_unique<ChildProcessLauncherFileData>()),
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+       allowed_gpu_(false),
        gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)),
  #endif
-       client_(std::move(client)) {
-@@ -420,7 +420,7 @@ bool UtilityProcessHost::StartProcess() {
+@@ -234,7 +234,7 @@ void UtilityProcessHost::SetPinUser32() {
+ #endif  // BUILDFLAG(IS_WIN)
+ 
+ void UtilityProcessHost::SetAllowGpuClient() {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+   allowed_gpu_ = true;
+ #endif
+ }
+@@ -434,7 +434,7 @@ bool UtilityProcessHost::StartProcess() {
      file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload());
  #endif  // BUILDFLAG(IS_POSIX)
  
@@ -46,12 +55,19 @@ Index: content/browser/utility_process_host.cc
      // The network service should have access to the parent directories
      // necessary for its usage.
      if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) {
-@@ -431,7 +431,7 @@ bool UtilityProcessHost::StartProcess() {
+@@ -445,13 +445,13 @@ bool UtilityProcessHost::StartProcess() {
      }
  #endif  // BUILDFLAG(IS_LINUX)
  
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+     // Pass `kVideoCaptureUseGpuMemoryBuffer` flag to video capture service only
+     // when the video capture use GPU memory buffer enabled.
+     if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) {
+       bool pass_gpu_buffer_flag =
+           switches::IsVideoCaptureUseGpuMemoryBufferEnabled();
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // Pass `kVideoCaptureUseGpuMemoryBuffer` flag to video capture service only
-     // when the video capture use GPU memory buffer enabled and NV12 GPU memory
-     // buffer supported.
+       // Check if NV12 GPU memory buffer supported at the same time.
+       pass_gpu_buffer_flag =
+           pass_gpu_buffer_flag &&
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_h b/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_h
index ad3e785e9..8e373ad51 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_h
+++ b/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_h
@@ -5,17 +5,17 @@ Index: content/browser/utility_process_host.h
  class Thread;
  }  // namespace base
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
  namespace viz {
  class GpuClient;
  }  // namespace viz
-@@ -225,7 +225,7 @@ class CONTENT_EXPORT UtilityProcessHost
+@@ -228,7 +228,7 @@ class CONTENT_EXPORT UtilityProcessHost
    std::vector<RunServiceDeprecatedCallback> pending_run_service_callbacks_;
  #endif
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+   bool allowed_gpu_;
    std::unique_ptr<viz::GpuClient, base::OnTaskRunnerDeleter> gpu_client_;
  #endif
- 
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_receiver_bindings_cc b/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_receiver_bindings_cc
index ebad53ed5..4a54b6694 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_receiver_bindings_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_receiver_bindings_cc
@@ -11,8 +11,8 @@ Index: content/browser/utility_process_host_receiver_bindings.cc
  #include "content/browser/font_service.h"  // nogncheck
  #endif
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
  #include "components/viz/host/gpu_client.h"
  #include "content/public/browser/gpu_client.h"
  #endif
@@ -27,8 +27,8 @@ Index: content/browser/utility_process_host_receiver_bindings.cc
      return;
    }
  #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   if (auto gpu_receiver = receiver.As<viz::mojom::Gpu>()) {
-     gpu_client_ =
-         content::CreateGpuClient(std::move(gpu_receiver), base::DoNothing());
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+   if (allowed_gpu_) {
+     // TODO(crbug.com/328099369) Remove once all clients get this directly.
+     if (auto gpu_receiver = receiver.As<viz::mojom::Gpu>()) {
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_utility_sandbox_delegate_cc b/www/ungoogled-chromium/patches/patch-content_browser_utility_sandbox_delegate_cc
index f9e92308c..20868a60e 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_utility_sandbox_delegate_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_utility_sandbox_delegate_cc
@@ -1,12 +1,8 @@
 Index: content/browser/utility_sandbox_delegate.cc
 --- content/browser/utility_sandbox_delegate.cc.orig
 +++ content/browser/utility_sandbox_delegate.cc
-@@ -63,13 +63,13 @@ UtilitySandboxedProcessLauncherDelegate::
- #if BUILDFLAG(ENABLE_PPAPI)
-       sandbox_type_ == sandbox::mojom::Sandbox::kPpapi ||
- #endif
--#if BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+@@ -67,10 +67,10 @@ UtilitySandboxedProcessLauncherDelegate::
+ #if BUILDFLAG(IS_FUCHSIA)
        sandbox_type_ == sandbox::mojom::Sandbox::kVideoCapture ||
  #endif
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -18,10 +14,10 @@ Index: content/browser/utility_sandbox_delegate.cc
        sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding ||
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -124,10 +124,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe
-   // unsandboxed zygote and then apply their actual sandboxes in the forked
+@@ -126,10 +126,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe
    // process upon startup.
    if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork ||
+       sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceModelExecution ||
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
        sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_web_contents_web_contents_view_aura_cc b/www/ungoogled-chromium/patches/patch-content_browser_web_contents_web_contents_view_aura_cc
index 13ab5278a..7478be876 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_web_contents_web_contents_view_aura_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_web_contents_web_contents_view_aura_cc
@@ -1,7 +1,7 @@
 Index: content/browser/web_contents/web_contents_view_aura.cc
 --- content/browser/web_contents/web_contents_view_aura.cc.orig
 +++ content/browser/web_contents/web_contents_view_aura.cc
-@@ -178,7 +178,7 @@ class WebDragSourceAura : public content::WebContentsO
+@@ -174,7 +174,7 @@ class WebDragSourceAura : public content::WebContentsO
    raw_ptr<aura::Window> window_;
  };
  
@@ -10,7 +10,7 @@ Index: content/browser/web_contents/web_contents_view_aura.cc
  // Fill out the OSExchangeData with a file contents, synthesizing a name if
  // necessary.
  void PrepareDragForFileContents(const DropData& drop_data,
-@@ -261,7 +261,7 @@ void PrepareDragData(const DropData& drop_data,
+@@ -258,7 +258,7 @@ void PrepareDragData(const DropData& drop_data,
    if (!drop_data.download_metadata.empty())
      PrepareDragForDownload(drop_data, provider, web_contents);
  #endif
@@ -19,7 +19,7 @@ Index: content/browser/web_contents/web_contents_view_aura.cc
    // We set the file contents before the URL because the URL also sets file
    // contents (to a .URL shortcut).  We want to prefer file content data over
    // a shortcut so we add it first.
-@@ -1337,7 +1337,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
+@@ -1330,7 +1330,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
      // Linux window managers like to handle raise-on-click themselves.  If we
      // raise-on-click manually, this may override user settings that prevent
      // focus-stealing.
diff --git a/www/ungoogled-chromium/patches/patch-content_browser_zygote_host_zygote_host_impl_linux_cc b/www/ungoogled-chromium/patches/patch-content_browser_zygote_host_zygote_host_impl_linux_cc
index c81fff3b2..94cae7061 100644
--- a/www/ungoogled-chromium/patches/patch-content_browser_zygote_host_zygote_host_impl_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-content_browser_zygote_host_zygote_host_impl_linux_cc
@@ -1,7 +1,7 @@
 Index: content/browser/zygote_host/zygote_host_impl_linux.cc
 --- content/browser/zygote_host/zygote_host_impl_linux.cc.orig
 +++ content/browser/zygote_host/zygote_host_impl_linux.cc
-@@ -19,8 +19,10 @@
+@@ -18,8 +18,10 @@
  #include "build/chromeos_buildflags.h"
  #include "content/common/zygote/zygote_commands_linux.h"
  #include "content/common/zygote/zygote_communication_linux.h"
@@ -12,7 +12,7 @@ Index: content/browser/zygote_host/zygote_host_impl_linux.cc
  #include "sandbox/linux/services/credentials.h"
  #include "sandbox/linux/services/namespace_sandbox.h"
  #include "sandbox/linux/suid/client/setuid_sandbox_host.h"
-@@ -38,6 +40,7 @@ namespace content {
+@@ -37,6 +39,7 @@ namespace content {
  
  namespace {
  
@@ -20,7 +20,7 @@ Index: content/browser/zygote_host/zygote_host_impl_linux.cc
  // Receive a fixed message on fd and return the sender's PID.
  // Returns true if the message received matches the expected message.
  bool ReceiveFixedMessage(int fd,
-@@ -59,6 +62,7 @@ bool ReceiveFixedMessage(int fd,
+@@ -58,6 +61,7 @@ bool ReceiveFixedMessage(int fd,
      return false;
    return true;
  }
@@ -28,7 +28,7 @@ Index: content/browser/zygote_host/zygote_host_impl_linux.cc
  
  }  // namespace
  
-@@ -68,9 +72,13 @@ ZygoteHost* ZygoteHost::GetInstance() {
+@@ -67,9 +71,13 @@ ZygoteHost* ZygoteHost::GetInstance() {
  }
  
  ZygoteHostImpl::ZygoteHostImpl()
@@ -42,7 +42,7 @@ Index: content/browser/zygote_host/zygote_host_impl_linux.cc
        sandbox_binary_(),
        zygote_pids_lock_(),
        zygote_pids_() {}
-@@ -83,6 +91,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() {
+@@ -82,6 +90,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() {
  }
  
  void ZygoteHostImpl::Init(const base::CommandLine& command_line) {
@@ -50,7 +50,7 @@ Index: content/browser/zygote_host/zygote_host_impl_linux.cc
    if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) {
      return;
    }
-@@ -133,6 +142,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com
+@@ -132,6 +141,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com
             "you can try using --"
          << sandbox::policy::switches::kNoSandbox << ".";
    }
@@ -58,13 +58,13 @@ Index: content/browser/zygote_host/zygote_host_impl_linux.cc
  }
  
  void ZygoteHostImpl::AddZygotePid(pid_t pid) {
-@@ -157,6 +167,7 @@ pid_t ZygoteHostImpl::LaunchZygote(
+@@ -156,6 +166,7 @@ pid_t ZygoteHostImpl::LaunchZygote(
      base::CommandLine* cmd_line,
      base::ScopedFD* control_fd,
      base::FileHandleMappingVector additional_remapped_fds) {
 +#if !BUILDFLAG(IS_BSD)
    int fds[2];
-   CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds));
+   CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, fds));
    CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0]));
 @@ -224,9 +235,12 @@ pid_t ZygoteHostImpl::LaunchZygote(
  
diff --git a/www/ungoogled-chromium/patches/patch-content_child_BUILD_gn b/www/ungoogled-chromium/patches/patch-content_child_BUILD_gn
new file mode 100644
index 000000000..99812a2e2
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-content_child_BUILD_gn
@@ -0,0 +1,17 @@
+Index: content/child/BUILD.gn
+--- content/child/BUILD.gn.orig
++++ content/child/BUILD.gn
+@@ -132,6 +132,13 @@ target(link_target_type, "child") {
+     ]
+   }
+ 
++  if (is_bsd) {
++    sources -= [
++      "sandboxed_process_thread_type_handler.cc",
++      "sandboxed_process_thread_type_handler.h",
++    ]
++  }
++
+   if (is_win) {
+     sources += [
+       "dwrite_font_proxy/dwrite_font_proxy_init_impl_win.cc",
diff --git a/www/ungoogled-chromium/patches/patch-content_child_child_process_cc b/www/ungoogled-chromium/patches/patch-content_child_child_process_cc
index 26cff2d52..ee60619dc 100644
--- a/www/ungoogled-chromium/patches/patch-content_child_child_process_cc
+++ b/www/ungoogled-chromium/patches/patch-content_child_child_process_cc
@@ -1,12 +1,12 @@
 Index: content/child/child_process.cc
 --- content/child/child_process.cc.orig
 +++ content/child/child_process.cc
-@@ -70,7 +70,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_
+@@ -66,7 +66,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_
+                                thread_pool_init_params)
+     : resetter_(&child_process, this, nullptr),
        io_thread_(std::make_unique<ChildIOThread>()) {
-   const base::CommandLine& command_line =
-       *base::CommandLine::ForCurrentProcess();
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   const base::CommandLine& command_line =
+       *base::CommandLine::ForCurrentProcess();
    const bool is_embedded_in_browser_process =
-       !command_line.HasSwitch(switches::kProcessType);
-   if (IsMojoCoreSharedLibraryEnabled() && !is_embedded_in_browser_process) {
diff --git a/www/ungoogled-chromium/patches/patch-content_common_BUILD_gn b/www/ungoogled-chromium/patches/patch-content_common_BUILD_gn
index 891a4b1f6..9ea095240 100644
--- a/www/ungoogled-chromium/patches/patch-content_common_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-content_common_BUILD_gn
@@ -1,22 +1,37 @@
 Index: content/common/BUILD.gn
 --- content/common/BUILD.gn.orig
 +++ content/common/BUILD.gn
-@@ -433,6 +433,9 @@ if (is_linux || is_chromeos) {
-     public = [ "set_process_title_linux.h" ]
-     sources = [ "set_process_title_linux.cc" ]
-     deps = [ "//base" ]
-+    if (is_bsd) {
-+      sources -= [ "set_process_title_linux.cc" ]
-+    }
+@@ -444,19 +444,28 @@ source_set("common") {
    }
- }
  
-@@ -478,7 +481,7 @@ mojom("mojo_bindings") {
-   if (enable_ipc_logging) {
-     enabled_features += [ "ipc_logging" ]
-   }
--  if (is_linux || is_chromeos) {
-+  if (!is_bsd && (is_linux || is_chromeos)) {
-     enabled_features += [ "supports_thread_types" ]
-   }
-   if (use_clang_profiling_inside_sandbox) {
+   if (is_linux || is_chromeos) {
+-    sources += [
+-      "gpu_pre_sandbox_hook_linux.cc",
+-      "gpu_pre_sandbox_hook_linux.h",
+-    ]
++    if (is_bsd) {
++      sources += [
++        "gpu_pre_sandbox_hook_bsd.cc",
++        "gpu_pre_sandbox_hook_bsd.h",
++      ]
++    } else {
++      sources += [
++        "gpu_pre_sandbox_hook_linux.cc",
++        "gpu_pre_sandbox_hook_linux.h",
++      ]
++    }
+     public_deps += [ "//sandbox/policy" ]
+     deps += [
+       ":sandbox_support_linux",
+       "//media/gpu:buildflags",
+       "//sandbox/linux:sandbox_services",
+-      "//sandbox/linux:seccomp_bpf",
+       "//sandbox/policy:chromecast_sandbox_allowlist_buildflags",
+       "//third_party/fontconfig",
+     ]
++    if (use_seccomp_bpf) {
++      deps += [ "//sandbox/linux:seccomp_bpf" ]
++    }
+     if (use_v4l2_codec) {
+       deps += [ "//media/gpu/v4l2" ]
+     }
diff --git a/www/ungoogled-chromium/patches/patch-content_common_features_cc b/www/ungoogled-chromium/patches/patch-content_common_features_cc
new file mode 100644
index 000000000..dafb544c6
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-content_common_features_cc
@@ -0,0 +1,21 @@
+Index: content/common/features.cc
+--- content/common/features.cc.orig
++++ content/common/features.cc
+@@ -169,7 +169,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+ // Enables error reporting for JS errors inside DevTools frontend host
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kEnableDevToolsJsErrorReporting,
+              "EnableDevToolsJsErrorReporting",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -272,7 +272,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin,
+ // process and having browser process handle adjusting thread properties (nice
+ // value, c-group, latency sensitivity...) for children which have sandbox
+ // restrictions.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kHandleChildThreadTypeChangesInBrowser,
+              "HandleChildThreadTypeChangesInBrowser",
+              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/www/ungoogled-chromium/patches/patch-content_common_features_h b/www/ungoogled-chromium/patches/patch-content_common_features_h
new file mode 100644
index 000000000..7ff07df0a
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-content_common_features_h
@@ -0,0 +1,21 @@
+Index: content/common/features.h
+--- content/common/features.h.orig
++++ content/common/features.h
+@@ -38,7 +38,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader);
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(
+     kEnableBackForwardCacheForOngoingSubframeNavigation);
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting);
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnsureAllowBindingsIsAlwaysForWebUI);
+@@ -63,7 +63,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int>
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kGpuInfoCollectionSeparatePrefetch);
+ #endif
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kGroupNIKByJoiningOrigin);
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kHandleChildThreadTypeChangesInBrowser);
+ #endif
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kHighPriorityBeforeUnload);
diff --git a/www/ungoogled-chromium/patches/patch-content_gpu_gpu_sandbox_hook_bsd_cc b/www/ungoogled-chromium/patches/patch-content_common_gpu_pre_sandbox_hook_bsd_cc
similarity index 83%
rename from www/ungoogled-chromium/patches/patch-content_gpu_gpu_sandbox_hook_bsd_cc
rename to www/ungoogled-chromium/patches/patch-content_common_gpu_pre_sandbox_hook_bsd_cc
index adfb99ada..a5ed85c12 100644
--- a/www/ungoogled-chromium/patches/patch-content_gpu_gpu_sandbox_hook_bsd_cc
+++ b/www/ungoogled-chromium/patches/patch-content_common_gpu_pre_sandbox_hook_bsd_cc
@@ -1,12 +1,12 @@
-Index: content/gpu/gpu_sandbox_hook_bsd.cc
---- content/gpu/gpu_sandbox_hook_bsd.cc.orig
-+++ content/gpu/gpu_sandbox_hook_bsd.cc
-@@ -0,0 +1,69 @@
+Index: content/common/gpu_pre_sandbox_hook_bsd.cc
+--- content/common/gpu_pre_sandbox_hook_bsd.cc.orig
++++ content/common/gpu_pre_sandbox_hook_bsd.cc
+@@ -0,0 +1,68 @@
 +// Copyright 2023 The Chromium Authors
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
 +
-+#include "content/gpu/gpu_sandbox_hook_bsd.h"
++#include "content/common/gpu_pre_sandbox_hook_bsd.h"
 +
 +#include <dlfcn.h>
 +#include <errno.h>
@@ -28,7 +28,6 @@ Index: content/gpu/gpu_sandbox_hook_bsd.cc
 +#include "build/build_config.h"
 +#include "build/buildflag.h"
 +#include "build/chromeos_buildflags.h"
-+#include "content/common/set_process_title.h"
 +#include "content/public/common/content_switches.h"
 +#include "media/gpu/buildflags.h"
 +
@@ -60,7 +59,7 @@ Index: content/gpu/gpu_sandbox_hook_bsd.cc
 +
 +}  // namespace
 +
-+bool GpuProcessPreSandboxHook(sandbox::policy::SandboxLinux::Options options) {
++bool GpuPreSandboxHook(sandbox::policy::SandboxLinux::Options options) {
 +  if (!LoadLibrariesForGpu(options))
 +    return false;
 +
diff --git a/www/ungoogled-chromium/patches/patch-content_common_gpu_pre_sandbox_hook_bsd_h b/www/ungoogled-chromium/patches/patch-content_common_gpu_pre_sandbox_hook_bsd_h
new file mode 100644
index 000000000..1511d69ad
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-content_common_gpu_pre_sandbox_hook_bsd_h
@@ -0,0 +1,24 @@
+Index: content/common/gpu_pre_sandbox_hook_bsd.h
+--- content/common/gpu_pre_sandbox_hook_bsd.h.orig
++++ content/common/gpu_pre_sandbox_hook_bsd.h
+@@ -0,0 +1,20 @@
++// Copyright 2017 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_BSD_H_
++#define CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_BSD_H_
++
++#include "base/component_export.h"
++#include "sandbox/policy/sandbox.h"
++
++namespace content {
++
++// A pre-sandbox hook to use on Linux-based systems in sandboxed processes that
++// require general GPU usage.
++COMPONENT_EXPORT(GPU_PRE_SANDBOX_HOOK)
++bool GpuPreSandboxHook(sandbox::policy::SandboxLinux::Options options);
++
++}  // namespace content
++
++#endif  // CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_BSD_H_
diff --git a/www/ungoogled-chromium/patches/patch-content_common_gpu_pre_sandbox_hook_linux_h b/www/ungoogled-chromium/patches/patch-content_common_gpu_pre_sandbox_hook_linux_h
new file mode 100644
index 000000000..43997c74b
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-content_common_gpu_pre_sandbox_hook_linux_h
@@ -0,0 +1,17 @@
+Index: content/common/gpu_pre_sandbox_hook_linux.h
+--- content/common/gpu_pre_sandbox_hook_linux.h.orig
++++ content/common/gpu_pre_sandbox_hook_linux.h
+@@ -5,8 +5,13 @@
+ #ifndef CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_LINUX_H_
+ #define CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_LINUX_H_
+ 
++#include "build/build_config.h"
+ #include "base/component_export.h"
++#if BUILDFLAG(IS_BSD)
++#include "sandbox/policy/sandbox.h"
++#else
+ #include "sandbox/policy/linux/sandbox_linux.h"
++#endif
+ 
+ namespace content {
+ 
diff --git a/www/ungoogled-chromium/patches/patch-content_common_mojo_core_library_support_cc b/www/ungoogled-chromium/patches/patch-content_common_mojo_core_library_support_cc
index 14b794775..e46837795 100644
--- a/www/ungoogled-chromium/patches/patch-content_common_mojo_core_library_support_cc
+++ b/www/ungoogled-chromium/patches/patch-content_common_mojo_core_library_support_cc
@@ -4,7 +4,7 @@ Index: content/common/mojo_core_library_support.cc
 @@ -15,7 +15,7 @@ bool IsMojoCoreSharedLibraryEnabled() {
  }
  
- absl::optional<base::FilePath> GetMojoCoreSharedLibraryPath() {
+ std::optional<base::FilePath> GetMojoCoreSharedLibraryPath() {
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    const base::CommandLine& command_line =
diff --git a/www/ungoogled-chromium/patches/patch-content_gpu_BUILD_gn b/www/ungoogled-chromium/patches/patch-content_gpu_BUILD_gn
deleted file mode 100644
index 583a32889..000000000
--- a/www/ungoogled-chromium/patches/patch-content_gpu_BUILD_gn
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: content/gpu/BUILD.gn
---- content/gpu/BUILD.gn.orig
-+++ content/gpu/BUILD.gn
-@@ -104,6 +104,17 @@ target(link_target_type, "gpu_sources") {
-     }
-   }
- 
-+  if (is_bsd) {
-+    sources -= [
-+      "gpu_sandbox_hook_linux.cc",
-+      "gpu_sandbox_hook_linux.h",
-+    ]
-+    sources += [
-+      "gpu_sandbox_hook_bsd.cc",
-+      "gpu_sandbox_hook_bsd.h",
-+    ]
-+  }
-+
-   if (is_chromeos_ash) {
-     deps += [
-       "//components/services/font/public/cpp",
diff --git a/www/ungoogled-chromium/patches/patch-content_gpu_gpu_child_thread_cc b/www/ungoogled-chromium/patches/patch-content_gpu_gpu_child_thread_cc
new file mode 100644
index 000000000..e95920058
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-content_gpu_gpu_child_thread_cc
@@ -0,0 +1,22 @@
+Index: content/gpu/gpu_child_thread.cc
+--- content/gpu/gpu_child_thread.cc.orig
++++ content/gpu/gpu_child_thread.cc
+@@ -58,7 +58,7 @@
+ #include "third_party/skia/include/ports/SkFontConfigInterface.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "content/child/sandboxed_process_thread_type_handler.h"
+ #endif
+ 
+@@ -142,7 +142,8 @@ void GpuChildThread::Init(const base::TimeTicks& proce
+ 
+   viz_main_.gpu_service()->set_start_time(process_start_time);
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++// XXX BSD
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
+   SandboxedProcessThreadTypeHandler::NotifyMainChildThreadCreated();
+ #endif
+ 
diff --git a/www/ungoogled-chromium/patches/patch-content_gpu_gpu_main_cc b/www/ungoogled-chromium/patches/patch-content_gpu_gpu_main_cc
index 8400abcfc..b62c9e78f 100644
--- a/www/ungoogled-chromium/patches/patch-content_gpu_gpu_main_cc
+++ b/www/ungoogled-chromium/patches/patch-content_gpu_gpu_main_cc
@@ -1,16 +1,23 @@
 Index: content/gpu/gpu_main.cc
 --- content/gpu/gpu_main.cc.orig
 +++ content/gpu/gpu_main.cc
-@@ -90,7 +90,7 @@
+@@ -91,10 +91,14 @@
  #include "sandbox/win/src/sandbox.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/gpu/gpu_sandbox_hook_linux.h"
+ #include "content/child/sandboxed_process_thread_type_handler.h"
+ #include "content/common/gpu_pre_sandbox_hook_linux.h"
++#if BUILDFLAG(IS_BSD)
++#include "sandbox/policy/sandbox.h"
++#else
  #include "sandbox/policy/linux/sandbox_linux.h"
++#endif
  #include "sandbox/policy/sandbox_type.h"
-@@ -112,7 +112,7 @@ namespace content {
+ #endif
+ 
+@@ -114,7 +118,7 @@ namespace content {
  
  namespace {
  
@@ -19,7 +26,7 @@ Index: content/gpu/gpu_main.cc
  bool StartSandboxLinux(gpu::GpuWatchdogThread*,
                         const gpu::GPUInfo*,
                         const gpu::GpuPreferences&);
-@@ -177,7 +177,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
+@@ -179,7 +183,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
    bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
                                  const gpu::GPUInfo* gpu_info,
                                  const gpu::GpuPreferences& gpu_prefs) override {
@@ -28,7 +35,7 @@ Index: content/gpu/gpu_main.cc
      return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
  #elif BUILDFLAG(IS_WIN)
      return StartSandboxWindows(sandbox_info_);
-@@ -287,7 +287,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -291,7 +295,7 @@ int GpuMain(MainFunctionParams parameters) {
            std::make_unique<base::SingleThreadTaskExecutor>(
                gpu_preferences.message_pump_type);
      }
@@ -37,7 +44,17 @@ Index: content/gpu/gpu_main.cc
  #error "Unsupported Linux platform."
  #elif BUILDFLAG(IS_MAC)
      // Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -422,7 +422,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -328,7 +332,8 @@ int GpuMain(MainFunctionParams parameters) {
+   // before it.
+   InitializeSkia();
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++// XXX BSD
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
+   // Thread type delegate of the process should be registered before
+   // first thread type change in ChildProcess constructor.
+   // It also needs to be registered before the process has multiple threads,
+@@ -436,7 +441,7 @@ int GpuMain(MainFunctionParams parameters) {
  
  namespace {
  
@@ -46,7 +63,7 @@ Index: content/gpu/gpu_main.cc
  bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
                         const gpu::GPUInfo* gpu_info,
                         const gpu::GpuPreferences& gpu_prefs) {
-@@ -462,7 +462,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
+@@ -476,7 +481,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
    sandbox_options.accelerated_video_encode_enabled =
        !gpu_prefs.disable_accelerated_video_encode;
  
diff --git a/www/ungoogled-chromium/patches/patch-content_gpu_gpu_sandbox_hook_bsd_h b/www/ungoogled-chromium/patches/patch-content_gpu_gpu_sandbox_hook_bsd_h
deleted file mode 100644
index fc92d7a6a..000000000
--- a/www/ungoogled-chromium/patches/patch-content_gpu_gpu_sandbox_hook_bsd_h
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: content/gpu/gpu_sandbox_hook_bsd.h
---- content/gpu/gpu_sandbox_hook_bsd.h.orig
-+++ content/gpu/gpu_sandbox_hook_bsd.h
-@@ -0,0 +1,16 @@
-+// Copyright 2023 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CONTENT_GPU_GPU_SANDBOX_HOOK_BSD_H_
-+#define CONTENT_GPU_GPU_SANDBOX_HOOK_BSD_H_
-+
-+#include "sandbox/policy/sandbox.h"
-+
-+namespace content {
-+
-+bool GpuProcessPreSandboxHook(sandbox::policy::SandboxLinux::Options options);
-+
-+}  // namespace content
-+
-+#endif  // CONTENT_GPU_GPU_SANDBOX_HOOK_BSD_H_
diff --git a/www/ungoogled-chromium/patches/patch-content_ppapi_plugin_ppapi_blink_platform_impl_cc b/www/ungoogled-chromium/patches/patch-content_ppapi_plugin_ppapi_blink_platform_impl_cc
index b74e6392e..6bab194f3 100644
--- a/www/ungoogled-chromium/patches/patch-content_ppapi_plugin_ppapi_blink_platform_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-content_ppapi_plugin_ppapi_blink_platform_impl_cc
@@ -1,7 +1,7 @@
 Index: content/ppapi_plugin/ppapi_blink_platform_impl.cc
 --- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig
 +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
  
  #if BUILDFLAG(IS_MAC)
  #include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -10,7 +10,7 @@ Index: content/ppapi_plugin/ppapi_blink_platform_impl.cc
  #include "content/child/child_process_sandbox_support_impl_linux.h"
  #include "mojo/public/cpp/bindings/pending_remote.h"
  #endif
-@@ -35,7 +35,7 @@ typedef struct CGFont* CGFontRef;
+@@ -36,7 +36,7 @@ typedef struct CGFont* CGFontRef;
  namespace content {
  
  PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() {
@@ -19,7 +19,7 @@ Index: content/ppapi_plugin/ppapi_blink_platform_impl.cc
    mojo::PendingRemote<font_service::mojom::FontService> font_service;
    ChildThread::Get()->BindHostReceiver(
        font_service.InitWithNewPipeAndPassReceiver());
-@@ -54,7 +54,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
+@@ -55,7 +55,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
  void PpapiBlinkPlatformImpl::Shutdown() {}
  
  blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() {
diff --git a/www/ungoogled-chromium/patches/patch-content_ppapi_plugin_ppapi_blink_platform_impl_h b/www/ungoogled-chromium/patches/patch-content_ppapi_plugin_ppapi_blink_platform_impl_h
index 31e2a1c5a..39eb967dd 100644
--- a/www/ungoogled-chromium/patches/patch-content_ppapi_plugin_ppapi_blink_platform_impl_h
+++ b/www/ungoogled-chromium/patches/patch-content_ppapi_plugin_ppapi_blink_platform_impl_h
@@ -1,7 +1,7 @@
 Index: content/ppapi_plugin/ppapi_blink_platform_impl.h
 --- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig
 +++ content/ppapi_plugin/ppapi_blink_platform_impl.h
-@@ -33,7 +33,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
+@@ -34,7 +34,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
    blink::WebString DefaultLocale() override;
  
   private:
diff --git a/www/ungoogled-chromium/patches/patch-content_public_browser_content_browser_client_cc b/www/ungoogled-chromium/patches/patch-content_public_browser_content_browser_client_cc
new file mode 100644
index 000000000..39873f377
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-content_public_browser_content_browser_client_cc
@@ -0,0 +1,12 @@
+Index: content/public/browser/content_browser_client.cc
+--- content/public/browser/content_browser_client.cc.orig
++++ content/public/browser/content_browser_client.cc
+@@ -1283,7 +1283,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem
+ // that can be adequately sandboxed.
+ // Currently Android's network service will not run out of process or sandboxed,
+ // so OutOfProcessSystemDnsResolution is not currently enabled on Android.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return true;
+ #else
+   return false;
diff --git a/www/ungoogled-chromium/patches/patch-content_public_browser_service_process_host_cc b/www/ungoogled-chromium/patches/patch-content_public_browser_service_process_host_cc
new file mode 100644
index 000000000..533a42ce0
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-content_public_browser_service_process_host_cc
@@ -0,0 +1,12 @@
+Index: content/public/browser/service_process_host.cc
+--- content/public/browser/service_process_host.cc.orig
++++ content/public/browser/service_process_host.cc
+@@ -76,7 +76,7 @@ ServiceProcessHost::Options& ServiceProcessHost::Optio
+ 
+ ServiceProcessHost::Options& ServiceProcessHost::Options::WithGpuClient(
+     base::PassKey<ServiceProcessHostGpuClient> passkey) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+   allow_gpu_client = true;
+ #endif
+   return *this;
diff --git a/www/ungoogled-chromium/patches/patch-content_public_browser_web_ui_browser_interface_broker_registry_h b/www/ungoogled-chromium/patches/patch-content_public_browser_web_ui_browser_interface_broker_registry_h
deleted file mode 100644
index f65235cfd..000000000
--- a/www/ungoogled-chromium/patches/patch-content_public_browser_web_ui_browser_interface_broker_registry_h
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: content/public/browser/web_ui_browser_interface_broker_registry.h
---- content/public/browser/web_ui_browser_interface_broker_registry.h.orig
-+++ content/public/browser/web_ui_browser_interface_broker_registry.h
-@@ -127,10 +127,10 @@ class CONTENT_EXPORT WebUIBrowserInterfaceBrokerRegist
-   //
-   // TODO(crbug.com/1407936): Point to WebUIJsBridge documentation.
-   template <typename ControllerType>
--  JsBridgeTraits<ControllerType>::BinderInitializer& ForWebUIWithJsBridge() {
-+  typename JsBridgeTraits<ControllerType>::BinderInitializer& ForWebUIWithJsBridge() {
-     using Traits = JsBridgeTraits<ControllerType>;
--    using Interface = Traits::Interface;
--    using JsBridgeBinderInitializer = Traits::BinderInitializer;
-+    using Interface = typename Traits::Interface;
-+    using JsBridgeBinderInitializer = typename Traits::BinderInitializer;
- 
-     // WebUIController::GetType() requires an instantiated WebUIController
-     // (because it's a virtual method and can't be static). Here we only have
diff --git a/www/ungoogled-chromium/patches/patch-content_public_common_common_param_traits_macros_h b/www/ungoogled-chromium/patches/patch-content_public_common_common_param_traits_macros_h
deleted file mode 100644
index 497ad8d1d..000000000
--- a/www/ungoogled-chromium/patches/patch-content_public_common_common_param_traits_macros_h
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: content/public/common/common_param_traits_macros.h
---- content/public/common/common_param_traits_macros.h.orig
-+++ content/public/common/common_param_traits_macros.h
-@@ -113,7 +113,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences)
-   IPC_STRUCT_TRAITS_MEMBER(accept_languages)
-   IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
-   IPC_STRUCT_TRAITS_MEMBER(caret_browsing_enabled)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   IPC_STRUCT_TRAITS_MEMBER(system_font_family_name)
- #endif
- #if BUILDFLAG(IS_WIN)
diff --git a/www/ungoogled-chromium/patches/patch-content_public_common_content_features_cc b/www/ungoogled-chromium/patches/patch-content_public_common_content_features_cc
index 4d545f5aa..de472ba66 100644
--- a/www/ungoogled-chromium/patches/patch-content_public_common_content_features_cc
+++ b/www/ungoogled-chromium/patches/patch-content_public_common_content_features_cc
@@ -1,7 +1,7 @@
 Index: content/public/common/content_features.cc
 --- content/public/common/content_features.cc.orig
 +++ content/public/common/content_features.cc
-@@ -52,7 +52,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
+@@ -27,7 +27,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
               "AudioServiceOutOfProcess",
  // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being
  // built with OS_CHROMEOS instead of OS_LINUX.
@@ -10,7 +10,7 @@ Index: content/public/common/content_features.cc
      (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
-@@ -64,7 +64,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
+@@ -39,7 +39,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
  // kAudioServiceOutOfProcess feature is enabled.
  BASE_FEATURE(kAudioServiceSandbox,
               "AudioServiceSandbox",
@@ -19,16 +19,7 @@ Index: content/public/common/content_features.cc
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -507,7 +507,7 @@ BASE_FEATURE(kNetworkQualityEstimatorWebHoldback,
- // (activated by kUserAgentClientHint)
- BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Supports proxying thread type changes of renderer processes to browser
- // process and having browser process handle adjusting thread properties (nice
- // value, c-group, latency sensitivity...) for renderers which have sandbox
-@@ -1408,7 +1408,7 @@ BASE_FEATURE(kWebAssemblyTiering,
+@@ -1199,7 +1199,7 @@ BASE_FEATURE(kWebAssemblyTiering,
  BASE_FEATURE(kWebAssemblyTrapHandler,
               "WebAssemblyTrapHandler",
  #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
@@ -37,7 +28,7 @@ Index: content/public/common/content_features.cc
       defined(ARCH_CPU_X86_64)) ||                                           \
      (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))
               base::FEATURE_ENABLED_BY_DEFAULT
-@@ -1466,7 +1466,11 @@ BASE_FEATURE(kWebUICodeCache,
+@@ -1241,7 +1241,11 @@ BASE_FEATURE(kWebUICodeCache,
  
  // Controls whether the WebUSB API is enabled:
  // https://wicg.github.io/webusb
diff --git a/www/ungoogled-chromium/patches/patch-content_public_common_content_features_h b/www/ungoogled-chromium/patches/patch-content_public_common_content_features_h
deleted file mode 100644
index b27cc8265..000000000
--- a/www/ungoogled-chromium/patches/patch-content_public_common_content_features_h
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: content/public/common/content_features.h
---- content/public/common/content_features.h.orig
-+++ content/public/common/content_features.h
-@@ -108,7 +108,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int>
-     kFledgeLimitNumAuctionsParam;
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollOffsets);
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kGreaseUACH);
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kHandleRendererThreadTypeChangesInBrowser);
- #endif
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kIdleDetection);
diff --git a/www/ungoogled-chromium/patches/patch-content_public_common_content_switches_cc b/www/ungoogled-chromium/patches/patch-content_public_common_content_switches_cc
index f19b210d1..23934c168 100644
--- a/www/ungoogled-chromium/patches/patch-content_public_common_content_switches_cc
+++ b/www/ungoogled-chromium/patches/patch-content_public_common_content_switches_cc
@@ -1,7 +1,7 @@
 Index: content/public/common/content_switches.cc
 --- content/public/common/content_switches.cc.orig
 +++ content/public/common/content_switches.cc
-@@ -372,6 +372,8 @@ const char kEnableIsolatedWebAppsInRenderer[] =
+@@ -366,6 +366,8 @@ const char kEnableIsolatedWebAppsInRenderer[] =
  // builds.
  const char kEnableLogging[]                 = "enable-logging";
  
@@ -10,7 +10,7 @@ Index: content/public/common/content_switches.cc
  // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables
  // triggering of change attribute of the NetInfo API when there is a change in
  // the connection type.
-@@ -1005,7 +1007,7 @@ const char kEnableAutomation[] = "enable-automation";
+@@ -1007,7 +1009,7 @@ const char kPreventResizingContentsForTesting[] =
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-content_public_common_content_switches_h b/www/ungoogled-chromium/patches/patch-content_public_common_content_switches_h
index a183db47e..2fc55a4c1 100644
--- a/www/ungoogled-chromium/patches/patch-content_public_common_content_switches_h
+++ b/www/ungoogled-chromium/patches/patch-content_public_common_content_switches_h
@@ -1,7 +1,7 @@
 Index: content/public/common/content_switches.h
 --- content/public/common/content_switches.h.orig
 +++ content/public/common/content_switches.h
-@@ -118,6 +118,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe
+@@ -113,6 +113,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe
  CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[];
  CONTENT_EXPORT extern const char kEnableLCDText[];
  CONTENT_EXPORT extern const char kEnableLogging[];
@@ -9,7 +9,7 @@ Index: content/public/common/content_switches.h
  CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[];
  CONTENT_EXPORT extern const char kEnableCanvas2DLayers[];
  CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[];
-@@ -268,7 +269,7 @@ CONTENT_EXPORT extern const char kUserLevelMemoryPress
+@@ -268,7 +269,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-content_public_test_mock_render_thread_cc b/www/ungoogled-chromium/patches/patch-content_public_test_mock_render_thread_cc
deleted file mode 100644
index 28ae1e0fb..000000000
--- a/www/ungoogled-chromium/patches/patch-content_public_test_mock_render_thread_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: content/public/test/mock_render_thread.cc
---- content/public/test/mock_render_thread.cc.orig
-+++ content/public/test/mock_render_thread.cc
-@@ -64,7 +64,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend
-     std::move(callback).Run(false);
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   void SetThreadType(int32_t platform_thread_id,
-                      base::ThreadType thread_type) override {}
- #endif
diff --git a/www/ungoogled-chromium/patches/patch-content_renderer_BUILD_gn b/www/ungoogled-chromium/patches/patch-content_renderer_BUILD_gn
deleted file mode 100644
index 94e7bc139..000000000
--- a/www/ungoogled-chromium/patches/patch-content_renderer_BUILD_gn
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: content/renderer/BUILD.gn
---- content/renderer/BUILD.gn.orig
-+++ content/renderer/BUILD.gn
-@@ -200,6 +200,13 @@ target(link_target_type, "renderer") {
-     ]
-   }
- 
-+  if (is_bsd) {
-+    sources -= [
-+      "renderer_thread_type_handler.cc",
-+      "renderer_thread_type_handler.h",
-+    ]
-+  }
-+
-   if (is_mac) {
-     sources += [
-       "renderer_main_platform_delegate_mac.mm",
diff --git a/www/ungoogled-chromium/patches/patch-content_renderer_render_process_impl_cc b/www/ungoogled-chromium/patches/patch-content_renderer_render_process_impl_cc
index 5ee11e79c..5dc1ed16e 100644
--- a/www/ungoogled-chromium/patches/patch-content_renderer_render_process_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-content_renderer_render_process_impl_cc
@@ -1,21 +1,12 @@
 Index: content/renderer/render_process_impl.cc
 --- content/renderer/render_process_impl.cc.orig
 +++ content/renderer/render_process_impl.cc
-@@ -45,7 +45,7 @@
- #if BUILDFLAG(IS_WIN)
- #include "base/win/win_util.h"
- #endif
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64)
- #include "v8/include/v8-wasm-trap-handler-posix.h"
- #endif
+@@ -44,7 +44,7 @@
+ #include "third_party/blink/public/web/web_frame.h"
+ #include "v8/include/v8-initialization.h"
  
-@@ -211,7 +211,7 @@ RenderProcessImpl::RenderProcessImpl()
-     v8::V8::SetFlagsFromString(kSABPerContextFlag, sizeof(kSABPerContextFlag));
-   }
- 
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64)
-   if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) {
-     base::CommandLine* const command_line =
-         base::CommandLine::ForCurrentProcess();
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
+     (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM64))
+ #define ENABLE_WEB_ASSEMBLY_TRAP_HANDLER_LINUX
+ #endif
diff --git a/www/ungoogled-chromium/patches/patch-content_renderer_render_thread_impl_cc b/www/ungoogled-chromium/patches/patch-content_renderer_render_thread_impl_cc
index 9fc425663..d959f0e6f 100644
--- a/www/ungoogled-chromium/patches/patch-content_renderer_render_thread_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-content_renderer_render_thread_impl_cc
@@ -1,7 +1,7 @@
 Index: content/renderer/render_thread_impl.cc
 --- content/renderer/render_thread_impl.cc.orig
 +++ content/renderer/render_thread_impl.cc
-@@ -204,6 +204,8 @@
+@@ -203,6 +203,8 @@
  
  #if BUILDFLAG(IS_APPLE)
  #include <malloc/malloc.h>
@@ -10,8 +10,8 @@ Index: content/renderer/render_thread_impl.cc
  #else
  #include <malloc.h>
  #endif
-@@ -1055,7 +1057,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
-           kGpuStreamPriorityMedia);
+@@ -996,7 +998,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+                              kGpuStreamIdMedia, kGpuStreamPriorityMedia);
  
    const bool enable_video_decode_accelerator =
 -#if BUILDFLAG(IS_LINUX)
@@ -19,7 +19,7 @@ Index: content/renderer/render_thread_impl.cc
        base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) &&
  #endif  // BUILDFLAG(IS_LINUX)
        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-@@ -1064,7 +1066,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1005,7 +1007,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
         gpu::kGpuFeatureStatusEnabled);
  
    const bool enable_video_encode_accelerator =
@@ -28,7 +28,7 @@ Index: content/renderer/render_thread_impl.cc
        base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) &&
  #else
        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) &&
-@@ -1839,7 +1841,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create
+@@ -1769,7 +1771,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create
      bool enable_video_encode_accelerator) {
    mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
        vea_provider;
diff --git a/www/ungoogled-chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc b/www/ungoogled-chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc
index 2d7f523c6..a7701a65a 100644
--- a/www/ungoogled-chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc
@@ -1,19 +1,19 @@
 Index: content/renderer/renderer_blink_platform_impl.cc
 --- content/renderer/renderer_blink_platform_impl.cc.orig
 +++ content/renderer/renderer_blink_platform_impl.cc
-@@ -113,7 +113,7 @@
+@@ -115,7 +115,7 @@
  
  #if BUILDFLAG(IS_MAC)
  #include "content/child/child_process_sandbox_support_impl_mac.h"
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "content/child/child_process_sandbox_support_impl_linux.h"
+ #include "content/child/sandboxed_process_thread_type_handler.h"
  #endif
- 
-@@ -181,13 +181,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
-       sudden_termination_disables_(0),
+@@ -185,13 +185,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
        is_locked_to_site_(false),
-       main_thread_scheduler_(main_thread_scheduler) {
+       main_thread_scheduler_(main_thread_scheduler),
+       next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) {
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    sk_sp<font_service::FontLoader> font_loader;
@@ -26,7 +26,7 @@ Index: content/renderer/renderer_blink_platform_impl.cc
      mojo::PendingRemote<font_service::mojom::FontService> font_service;
      RenderThreadImpl::current()->BindHostReceiver(
          font_service.InitWithNewPipeAndPassReceiver());
-@@ -196,7 +196,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -200,7 +200,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
  #endif
    }
  
@@ -35,7 +35,7 @@ Index: content/renderer/renderer_blink_platform_impl.cc
    if (sandboxEnabled()) {
  #if BUILDFLAG(IS_MAC)
      sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -254,7 +254,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
+@@ -261,7 +261,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
  #endif
  
  blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
diff --git a/www/ungoogled-chromium/patches/patch-content_renderer_renderer_blink_platform_impl_h b/www/ungoogled-chromium/patches/patch-content_renderer_renderer_blink_platform_impl_h
index af5e8e564..0f5b4e310 100644
--- a/www/ungoogled-chromium/patches/patch-content_renderer_renderer_blink_platform_impl_h
+++ b/www/ungoogled-chromium/patches/patch-content_renderer_renderer_blink_platform_impl_h
@@ -1,7 +1,7 @@
 Index: content/renderer/renderer_blink_platform_impl.h
 --- content/renderer/renderer_blink_platform_impl.h.orig
 +++ content/renderer/renderer_blink_platform_impl.h
-@@ -234,7 +234,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -246,7 +246,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
    void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info,
                                     const gpu::GPUInfo& gpu_info) const;
  
diff --git a/www/ungoogled-chromium/patches/patch-content_shell_BUILD_gn b/www/ungoogled-chromium/patches/patch-content_shell_BUILD_gn
index e063b517c..61134d27b 100644
--- a/www/ungoogled-chromium/patches/patch-content_shell_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-content_shell_BUILD_gn
@@ -1,7 +1,7 @@
 Index: content/shell/BUILD.gn
 --- content/shell/BUILD.gn.orig
 +++ content/shell/BUILD.gn
-@@ -1021,7 +1021,7 @@ group("content_shell_crash_test") {
+@@ -1061,7 +1061,7 @@ group("content_shell_crash_test") {
    if (is_win) {
      data_deps += [ "//build/win:copy_cdb_to_output" ]
    }
diff --git a/www/ungoogled-chromium/patches/patch-content_shell_app_shell_main_delegate_cc b/www/ungoogled-chromium/patches/patch-content_shell_app_shell_main_delegate_cc
index 5fd3f3d47..f64a5b206 100644
--- a/www/ungoogled-chromium/patches/patch-content_shell_app_shell_main_delegate_cc
+++ b/www/ungoogled-chromium/patches/patch-content_shell_app_shell_main_delegate_cc
@@ -1,7 +1,7 @@
 Index: content/shell/app/shell_main_delegate.cc
 --- content/shell/app/shell_main_delegate.cc.orig
 +++ content/shell/app/shell_main_delegate.cc
-@@ -223,7 +223,7 @@ void ShellMainDelegate::PreSandboxStartup() {
+@@ -283,7 +283,7 @@ void ShellMainDelegate::PreSandboxStartup() {
      // Reporting for sub-processes will be initialized in ZygoteForked.
      if (process_type != switches::kZygoteProcess) {
        crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
diff --git a/www/ungoogled-chromium/patches/patch-content_shell_browser_shell_browser_main_parts_cc b/www/ungoogled-chromium/patches/patch-content_shell_browser_shell_browser_main_parts_cc
index 37c2a94d5..4b8798702 100644
--- a/www/ungoogled-chromium/patches/patch-content_shell_browser_shell_browser_main_parts_cc
+++ b/www/ungoogled-chromium/patches/patch-content_shell_browser_shell_browser_main_parts_cc
@@ -1,7 +1,7 @@
 Index: content/shell/browser/shell_browser_main_parts.cc
 --- content/shell/browser/shell_browser_main_parts.cc.orig
 +++ content/shell/browser/shell_browser_main_parts.cc
-@@ -50,7 +50,7 @@
+@@ -51,7 +51,7 @@
  #include "net/base/network_change_notifier.h"
  #endif
  
@@ -10,7 +10,7 @@ Index: content/shell/browser/shell_browser_main_parts.cc
  #include "ui/base/ime/init/input_method_initializer.h"
  #endif
  
-@@ -67,7 +67,7 @@
+@@ -68,7 +68,7 @@
  #include "chromeos/lacros/dbus/lacros_dbus_thread_manager.h"
  #endif
  
@@ -19,7 +19,7 @@ Index: content/shell/browser/shell_browser_main_parts.cc
  #include "ui/linux/linux_ui.h"          // nogncheck
  #include "ui/linux/linux_ui_factory.h"  // nogncheck
  #endif
-@@ -138,7 +138,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop(
+@@ -139,7 +139,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop(
  }
  
  int ShellBrowserMainParts::PreEarlyInitialization() {
@@ -28,7 +28,7 @@ Index: content/shell/browser/shell_browser_main_parts.cc
    ui::InitializeInputMethodForTesting();
  #endif
  #if BUILDFLAG(IS_ANDROID)
-@@ -167,7 +167,7 @@ void ShellBrowserMainParts::ToolkitInitialized() {
+@@ -168,7 +168,7 @@ void ShellBrowserMainParts::ToolkitInitialized() {
    if (switches::IsRunWebTestsSwitchPresent())
      return;
  
@@ -37,7 +37,7 @@ Index: content/shell/browser/shell_browser_main_parts.cc
    ui::LinuxUi::SetInstance(ui::GetDefaultLinuxUi());
  #endif
  }
-@@ -214,7 +214,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
+@@ -215,7 +215,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
    ShellDevToolsManagerDelegate::StopHttpHandler();
    browser_context_.reset();
    off_the_record_browser_context_.reset();
diff --git a/www/ungoogled-chromium/patches/patch-content_test_BUILD_gn b/www/ungoogled-chromium/patches/patch-content_test_BUILD_gn
deleted file mode 100644
index f757314cc..000000000
--- a/www/ungoogled-chromium/patches/patch-content_test_BUILD_gn
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: content/test/BUILD.gn
---- content/test/BUILD.gn.orig
-+++ content/test/BUILD.gn
-@@ -2217,7 +2217,7 @@ static_library("run_all_unittests") {
-     ":test_support",
-     "//base/test:test_support",
-   ]
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     deps += [ "//content/common:set_process_title_linux" ]
-   }
- }
-@@ -3288,7 +3288,7 @@ test("content_unittests") {
-     deps += [ "//third_party/boringssl" ]
-   }
- 
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     sources += [ "../common/set_process_title_linux_unittest.cc" ]
-     deps += [ "//content/common:set_process_title_linux" ]
-   }
diff --git a/www/ungoogled-chromium/patches/patch-content_utility_services_cc b/www/ungoogled-chromium/patches/patch-content_utility_services_cc
index 2ec6baaed..a34dd68e0 100644
--- a/www/ungoogled-chromium/patches/patch-content_utility_services_cc
+++ b/www/ungoogled-chromium/patches/patch-content_utility_services_cc
@@ -1,7 +1,7 @@
 Index: content/utility/services.cc
 --- content/utility/services.cc.orig
 +++ content/utility/services.cc
-@@ -64,7 +64,7 @@
+@@ -74,7 +74,7 @@
  extern sandbox::TargetServices* g_utility_target_services;
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -10,25 +10,32 @@ Index: content/utility/services.cc
  #include "media/mojo/services/mojo_video_encode_accelerator_provider_factory.h"
  #include "sandbox/linux/services/libc_interceptor.h"
  #include "sandbox/policy/mojom/sandbox.mojom.h"
-@@ -87,7 +87,7 @@ extern sandbox::TargetServices* g_utility_target_servi
+@@ -97,7 +97,7 @@ extern sandbox::TargetServices* g_utility_target_servi
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
          // BUILDFLAG(USE_V4L2_CODEC))
  
 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
+ #include "content/common/features.h"
  #include "media/mojo/services/stable_video_decoder_factory_process_service.h"  // nogncheck
- #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
-@@ -109,7 +109,7 @@ extern sandbox::TargetServices* g_utility_target_servi
- #include "ui/accessibility/accessibility_features.h"
+@@ -115,13 +115,13 @@ extern sandbox::TargetServices* g_utility_target_servi
  #endif  // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE)
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "media/capture/capture_switches.h"
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
+-    BUILDFLAG(ENABLE_VIDEO_EFFECTS)
++    BUILDFLAG(ENABLE_VIDEO_EFFECTS) || BUILDFLAG(IS_BSD)
  #include "services/viz/public/cpp/gpu/gpu.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-@@ -226,7 +226,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
+ #include "services/viz/public/mojom/gpu.mojom.h"
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ||
+         // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(ENABLE_VIDEO_EFFECTS)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ #include "media/capture/capture_switches.h"
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ||
+         // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -239,7 +239,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
        << "task_policy_set TASK_QOS_POLICY";
  #endif
  
@@ -37,16 +44,16 @@ Index: content/utility/services.cc
    auto* command_line = base::CommandLine::ForCurrentProcess();
    if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) ==
        sandbox::mojom::Sandbox::kNoSandbox) {
-@@ -308,7 +308,7 @@ auto RunVideoCapture(
-     mojo::PendingReceiver<video_capture::mojom::VideoCaptureService> receiver) {
+@@ -328,7 +328,7 @@ auto RunVideoCapture(
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
    auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>(
        std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault());
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
-     mojo::PendingRemote<viz::mojom::Gpu> remote_gpu;
-     content::UtilityThread::Get()->BindHostReceiver(
-@@ -340,7 +340,7 @@ auto RunOOPArcVideoAcceleratorFactoryService(
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+   {
+ #else
+@@ -407,7 +407,7 @@ auto RunOOPArcVideoAcceleratorFactoryService(
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
          // BUILDFLAG(USE_V4L2_CODEC))
  
@@ -55,7 +62,7 @@ Index: content/utility/services.cc
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  auto RunStableVideoDecoderFactoryProcessService(
      mojo::PendingReceiver<
-@@ -351,7 +351,7 @@ auto RunStableVideoDecoderFactoryProcessService(
+@@ -418,7 +418,7 @@ auto RunStableVideoDecoderFactoryProcessService(
  #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
          // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  
@@ -64,14 +71,25 @@ Index: content/utility/services.cc
  auto RunVideoEncodeAcceleratorProviderFactory(
      mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory>
          receiver) {
-@@ -415,13 +415,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
+@@ -441,7 +441,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se
+   // loop of type IO that can get notified when pipes have data.
+   services.Add(RunNetworkService);
+ 
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \
+     (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
+   if (base::FeatureList::IsEnabled(
+           features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) {
+@@ -493,7 +493,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
          // BUILDFLAG(USE_V4L2_CODEC))
  
 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
-   services.Add(RunStableVideoDecoderFactoryProcessService);
+   if (!base::FeatureList::IsEnabled(
+           features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) {
+@@ -502,7 +502,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
  #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
          // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  
diff --git a/www/ungoogled-chromium/patches/patch-content_utility_speech_speech_recognition_sandbox_hook_linux_cc b/www/ungoogled-chromium/patches/patch-content_utility_speech_speech_recognition_sandbox_hook_linux_cc
index b4cefd40f..aa8885c28 100644
--- a/www/ungoogled-chromium/patches/patch-content_utility_speech_speech_recognition_sandbox_hook_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-content_utility_speech_speech_recognition_sandbox_hook_linux_cc
@@ -28,9 +28,9 @@ Index: content/utility/speech/speech_recognition_sandbox_hook_linux.cc
  #if BUILDFLAG(ENABLE_SODA_INTEGRATION_TESTS)
    base::FilePath test_binary_path = GetSodaTestBinaryPath();
    DVLOG(0) << "SODA test binary path: " << test_binary_path.value().c_str();
-@@ -77,6 +82,7 @@ bool SpeechRecognitionPreSandboxHook(
-                                sandbox::policy::SandboxLinux::PreSandboxHook(),
-                                options);
+@@ -75,6 +80,7 @@ bool SpeechRecognitionPreSandboxHook(
+                                }),
+                                GetSodaFilePermissions(), options);
    instance->EngageNamespaceSandboxIfPossible();
 +#endif
  
diff --git a/www/ungoogled-chromium/patches/patch-content_utility_utility_main_cc b/www/ungoogled-chromium/patches/patch-content_utility_utility_main_cc
index f9f0be181..10fc85098 100644
--- a/www/ungoogled-chromium/patches/patch-content_utility_utility_main_cc
+++ b/www/ungoogled-chromium/patches/patch-content_utility_utility_main_cc
@@ -1,7 +1,7 @@
 Index: content/utility/utility_main.cc
 --- content/utility/utility_main.cc.orig
 +++ content/utility/utility_main.cc
-@@ -31,7 +31,7 @@
+@@ -37,17 +37,21 @@
  #include "third_party/icu/source/common/unicode/unistr.h"
  #include "third_party/icu/source/i18n/unicode/timezone.h"
  
@@ -10,7 +10,11 @@ Index: content/utility/utility_main.cc
  #include "base/file_descriptor_store.h"
  #include "base/files/file_util.h"
  #include "base/pickle.h"
-@@ -39,7 +39,9 @@
+ #include "content/child/sandboxed_process_thread_type_handler.h"
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "content/common/gpu_pre_sandbox_hook_linux.h"
++#endif
+ #include "content/public/common/content_descriptor_keys.h"
  #include "content/utility/speech/speech_recognition_sandbox_hook_linux.h"
  #include "gpu/config/gpu_info_collector.h"
  #include "media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h"
@@ -20,7 +24,7 @@ Index: content/utility/utility_main.cc
  #include "services/audio/audio_sandbox_hook_linux.h"
  #include "services/network/network_sandbox_hook_linux.h"
  // gn check is not smart enough to realize that this include only applies to
-@@ -51,10 +53,14 @@
+@@ -59,10 +63,15 @@
  #endif
  #endif
  
@@ -31,21 +35,22 @@ Index: content/utility/utility_main.cc
  
 +#if BUILDFLAG(IS_BSD)
 +#include "sandbox/policy/sandbox.h"
++#include "content/common/gpu_pre_sandbox_hook_bsd.h"
 +#endif
 +
  #if BUILDFLAG(IS_CHROMEOS_ASH)
  #include "chromeos/ash/components/assistant/buildflags.h"
  #include "chromeos/ash/services/ime/ime_sandbox_hook.h"
-@@ -66,7 +72,7 @@
+@@ -74,7 +83,7 @@
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
  #if (BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \
 -     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)))
 +     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)))
- #include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h"  // nogncheck
+ #include "services/screen_ai/public/cpp/utilities.h"  // nogncheck
+ #include "services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h"  // nogncheck
  #endif
- 
-@@ -92,7 +98,7 @@ namespace content {
+@@ -101,7 +110,7 @@ namespace content {
  
  namespace {
  
@@ -54,8 +59,11 @@ Index: content/utility/utility_main.cc
  std::vector<std::string> GetNetworkContextsParentDirectories() {
    base::MemoryMappedFile::Region region;
    base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD(
-@@ -120,7 +126,7 @@ std::vector<std::string> GetNetworkContextsParentDirec
+@@ -127,9 +136,10 @@ std::vector<std::string> GetNetworkContextsParentDirec
+   return dirs;
+ }
  
++#if !BUILDFLAG(IS_BSD)
  bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox sandbox_type) {
    const bool obtain_gpu_info =
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -63,17 +71,35 @@ Index: content/utility/utility_main.cc
        sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
        sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding;
-@@ -236,7 +242,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -144,6 +154,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san
+ 
+   return false;
+ }
++#endif
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ 
+ #if BUILDFLAG(IS_WIN)
+@@ -252,7 +263,8 @@ int UtilityMain(MainFunctionParams parameters) {
      }
    }
  
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++// XXX BSD
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
+   // Thread type delegate of the process should be registered before
+   // first thread type change in ChildProcess constructor.
+   // It also needs to be registered before the process has multiple threads,
+@@ -263,7 +275,7 @@ int UtilityMain(MainFunctionParams parameters) {
+   }
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ 
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    // Initializes the sandbox before any threads are created.
    // TODO(jorgelo): move this after GTK initialization when we enable a strict
    // Seccomp-BPF policy.
-@@ -265,7 +271,7 @@ int UtilityMain(MainFunctionParams parameters) {
-       pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook);
+@@ -301,7 +313,7 @@ int UtilityMain(MainFunctionParams parameters) {
+                              screen_ai::GetBinaryPathSwitch()));
        break;
  #endif
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -81,15 +107,15 @@ Index: content/utility/utility_main.cc
      case sandbox::mojom::Sandbox::kHardwareVideoDecoding:
        pre_sandbox_hook =
            base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook);
-@@ -292,6 +298,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -328,6 +340,7 @@ int UtilityMain(MainFunctionParams parameters) {
      default:
        break;
    }
 +#if !BUILDFLAG(IS_BSD)
    if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) &&
        (parameters.zygote_child || !pre_sandbox_hook.is_null())) {
-     sandbox::policy::SandboxLinux::Options sandbox_options;
-@@ -300,6 +307,11 @@ int UtilityMain(MainFunctionParams parameters) {
+     sandbox_options.use_amd_specific_policies =
+@@ -335,6 +348,11 @@ int UtilityMain(MainFunctionParams parameters) {
      sandbox::policy::Sandbox::Initialize(
          sandbox_type, std::move(pre_sandbox_hook), sandbox_options);
    }
@@ -98,6 +124,6 @@ Index: content/utility/utility_main.cc
 +      sandbox_type, std::move(pre_sandbox_hook),
 +      sandbox::policy::SandboxLinux::Options());
 +#endif
- #elif BUILDFLAG(IS_WIN)
-   g_utility_target_services = parameters.sandbox_info->target_services;
  
+   // Start the HangWatcher now that the sandbox is engaged, if it hasn't
+   // already been started.
diff --git a/www/ungoogled-chromium/patches/patch-content_utility_utility_thread_impl_cc b/www/ungoogled-chromium/patches/patch-content_utility_utility_thread_impl_cc
new file mode 100644
index 000000000..3ab0063bb
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-content_utility_utility_thread_impl_cc
@@ -0,0 +1,22 @@
+Index: content/utility/utility_thread_impl.cc
+--- content/utility/utility_thread_impl.cc.orig
++++ content/utility/utility_thread_impl.cc
+@@ -32,7 +32,7 @@
+ #include "mojo/public/cpp/bindings/pending_receiver.h"
+ #include "mojo/public/cpp/bindings/service_factory.h"
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "content/child/sandboxed_process_thread_type_handler.h"
+ #endif
+ 
+@@ -252,7 +252,8 @@ void UtilityThreadImpl::Init() {
+ 
+   GetContentClient()->utility()->UtilityThreadStarted();
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++// XXX BSD
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
+   SandboxedProcessThreadTypeHandler::NotifyMainChildThreadCreated();
+ #endif
+ 
diff --git a/www/ungoogled-chromium/patches/patch-content_zygote_zygote_linux_cc b/www/ungoogled-chromium/patches/patch-content_zygote_zygote_linux_cc
index f43f6bbe0..cc42a0a21 100644
--- a/www/ungoogled-chromium/patches/patch-content_zygote_zygote_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-content_zygote_zygote_linux_cc
@@ -9,7 +9,7 @@ Index: content/zygote/zygote_linux.cc
  
  #include "content/zygote/zygote_linux.h"
  
-@@ -707,3 +708,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi
+@@ -717,3 +718,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi
  }
  
  }  // namespace content
diff --git a/www/ungoogled-chromium/patches/patch-device_bluetooth_bluetooth_adapter_cc b/www/ungoogled-chromium/patches/patch-device_bluetooth_bluetooth_adapter_cc
index 0d073bc9c..027efb829 100644
--- a/www/ungoogled-chromium/patches/patch-device_bluetooth_bluetooth_adapter_cc
+++ b/www/ungoogled-chromium/patches/patch-device_bluetooth_bluetooth_adapter_cc
@@ -1,7 +1,7 @@
 Index: device/bluetooth/bluetooth_adapter.cc
 --- device/bluetooth/bluetooth_adapter.cc.orig
 +++ device/bluetooth/bluetooth_adapter.cc
-@@ -31,7 +31,7 @@ namespace device {
+@@ -32,7 +32,7 @@ namespace device {
  BluetoothAdapter::ServiceOptions::ServiceOptions() = default;
  BluetoothAdapter::ServiceOptions::~ServiceOptions() = default;
  
diff --git a/www/ungoogled-chromium/patches/patch-device_gamepad_BUILD_gn b/www/ungoogled-chromium/patches/patch-device_gamepad_BUILD_gn
index db87d32c8..00d2cf53e 100644
--- a/www/ungoogled-chromium/patches/patch-device_gamepad_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-device_gamepad_BUILD_gn
@@ -1,7 +1,7 @@
 Index: device/gamepad/BUILD.gn
 --- device/gamepad/BUILD.gn.orig
 +++ device/gamepad/BUILD.gn
-@@ -98,7 +98,7 @@ component("gamepad") {
+@@ -99,7 +99,7 @@ component("gamepad") {
        "hid_writer_linux.cc",
        "hid_writer_linux.h",
      ]
diff --git a/www/ungoogled-chromium/patches/patch-extensions_browser_api_api_browser_context_keyed_service_factories_cc b/www/ungoogled-chromium/patches/patch-extensions_browser_api_api_browser_context_keyed_service_factories_cc
index 5f34a9a96..233085f97 100644
--- a/www/ungoogled-chromium/patches/patch-extensions_browser_api_api_browser_context_keyed_service_factories_cc
+++ b/www/ungoogled-chromium/patches/patch-extensions_browser_api_api_browser_context_keyed_service_factories_cc
@@ -1,9 +1,9 @@
 Index: extensions/browser/api/api_browser_context_keyed_service_factories.cc
 --- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig
 +++ extensions/browser/api/api_browser_context_keyed_service_factories.cc
-@@ -104,7 +104,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
+@@ -102,7 +102,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
+ #endif
    MessageService::GetFactoryInstance();
-   MessagingAPIMessageFilter::EnsureAssociatedFactoryBuilt();
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
 -    BUILDFLAG(IS_MAC)
 +    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-extensions_browser_api_management_management_api_cc b/www/ungoogled-chromium/patches/patch-extensions_browser_api_management_management_api_cc
new file mode 100644
index 000000000..145947ebc
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-extensions_browser_api_management_management_api_cc
@@ -0,0 +1,12 @@
+Index: extensions/browser/api/management/management_api.cc
+--- extensions/browser/api/management/management_api.cc.orig
++++ extensions/browser/api/management/management_api.cc
+@@ -280,7 +280,7 @@ bool PlatformSupportsApprovalFlowForExtensions() {
+ #if BUILDFLAG(IS_CHROMEOS)
+   // ChromeOS devices have this feature already shipped.
+   return true;
+-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   return base::FeatureList::IsEnabled(
+       supervised_user::kEnableExtensionsPermissionsForSupervisedUsersOnDesktop);
+ #else
diff --git a/www/ungoogled-chromium/patches/patch-extensions_browser_api_messaging_message_service_cc b/www/ungoogled-chromium/patches/patch-extensions_browser_api_messaging_message_service_cc
index 7e1260491..3c8d34393 100644
--- a/www/ungoogled-chromium/patches/patch-extensions_browser_api_messaging_message_service_cc
+++ b/www/ungoogled-chromium/patches/patch-extensions_browser_api_messaging_message_service_cc
@@ -10,7 +10,7 @@ Index: extensions/browser/api/messaging/message_service.cc
  const char kMissingPermissionError[] =
      "Access to native messaging requires nativeMessaging permission.";
  const char kProhibitedByPoliciesError[] =
-@@ -486,7 +486,7 @@ void MessageService::OpenChannelToNativeApp(
+@@ -541,7 +541,7 @@ void MessageService::OpenChannelToNativeAppImpl(
      return;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/patches/patch-extensions_browser_api_networking_private_networking_private_delegate_factory_cc b/www/ungoogled-chromium/patches/patch-extensions_browser_api_networking_private_networking_private_delegate_factory_cc
index 6cb2bcbc2..a7f62dc48 100644
--- a/www/ungoogled-chromium/patches/patch-extensions_browser_api_networking_private_networking_private_delegate_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-extensions_browser_api_networking_private_networking_private_delegate_factory_cc
@@ -10,12 +10,12 @@ Index: extensions/browser/api/networking_private/networking_private_delegate_fac
  #include "extensions/browser/api/networking_private/networking_private_linux.h"
  #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
  #include "components/wifi/wifi_service.h"
-@@ -66,7 +66,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS
-   delegate = new NetworkingPrivateChromeOS(browser_context);
+@@ -67,7 +67,7 @@ NetworkingPrivateDelegateFactory::BuildServiceInstance
+   delegate = std::make_unique<NetworkingPrivateChromeOS>(browser_context);
  #elif BUILDFLAG(IS_CHROMEOS_LACROS)
-   delegate = new NetworkingPrivateLacros(browser_context);
+   delegate = std::make_unique<NetworkingPrivateLacros>(browser_context);
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   delegate = new NetworkingPrivateLinux();
+   delegate = std::make_unique<NetworkingPrivateLinux>();
  #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
    std::unique_ptr<wifi::WiFiService> wifi_service(wifi::WiFiService::Create());
diff --git a/www/ungoogled-chromium/patches/patch-extensions_common_api__permission_features_json b/www/ungoogled-chromium/patches/patch-extensions_common_api__permission_features_json
index deffd4a5d..1afeb34bd 100644
--- a/www/ungoogled-chromium/patches/patch-extensions_common_api__permission_features_json
+++ b/www/ungoogled-chromium/patches/patch-extensions_common_api__permission_features_json
@@ -19,7 +19,7 @@ Index: extensions/common/api/_permission_features.json
      "allowlist": [
        "0DE0F05680A4A056BCEC864ED8DDA84296F82B40",  // http://crbug.com/434651
        "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/293683
-@@ -474,7 +474,7 @@
+@@ -476,7 +476,7 @@
    "networkingPrivate": {
      "channel": "stable",
      "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
diff --git a/www/ungoogled-chromium/patches/patch-extensions_common_api_runtime_json b/www/ungoogled-chromium/patches/patch-extensions_common_api_runtime_json
index 2bfcd56e5..57f1294b7 100644
--- a/www/ungoogled-chromium/patches/patch-extensions_common_api_runtime_json
+++ b/www/ungoogled-chromium/patches/patch-extensions_common_api_runtime_json
@@ -1,7 +1,7 @@
 Index: extensions/common/api/runtime.json
 --- extensions/common/api/runtime.json.orig
 +++ extensions/common/api/runtime.json
-@@ -89,6 +89,7 @@
+@@ -86,6 +86,7 @@
              {"name": "cros", "description": "Specifies the Chrome operating system."},
              {"name": "linux", "description": "Specifies the Linux operating system."},
              {"name": "openbsd", "description": "Specifies the OpenBSD operating system."},
diff --git a/www/ungoogled-chromium/patches/patch-extensions_common_command_cc b/www/ungoogled-chromium/patches/patch-extensions_common_command_cc
index a0f00775c..358a9a121 100644
--- a/www/ungoogled-chromium/patches/patch-extensions_common_command_cc
+++ b/www/ungoogled-chromium/patches/patch-extensions_common_command_cc
@@ -1,7 +1,7 @@
 Index: extensions/common/command.cc
 --- extensions/common/command.cc.orig
 +++ extensions/common/command.cc
-@@ -280,7 +280,7 @@ std::string Command::CommandPlatform() {
+@@ -283,7 +283,7 @@ std::string Command::CommandPlatform() {
    return values::kKeybindingPlatformMac;
  #elif BUILDFLAG(IS_CHROMEOS)
    return values::kKeybindingPlatformChromeOs;
diff --git a/www/ungoogled-chromium/patches/patch-extensions_shell_app_shell_main_delegate_cc b/www/ungoogled-chromium/patches/patch-extensions_shell_app_shell_main_delegate_cc
index 3db519695..f120ece9a 100644
--- a/www/ungoogled-chromium/patches/patch-extensions_shell_app_shell_main_delegate_cc
+++ b/www/ungoogled-chromium/patches/patch-extensions_shell_app_shell_main_delegate_cc
@@ -1,17 +1,17 @@
 Index: extensions/shell/app/shell_main_delegate.cc
 --- extensions/shell/app/shell_main_delegate.cc.orig
 +++ extensions/shell/app/shell_main_delegate.cc
-@@ -42,7 +42,7 @@
- 
+@@ -43,7 +43,7 @@
  #if BUILDFLAG(IS_WIN)
  #include "base/base_paths_win.h"
+ #include "base/process/process_info.h"
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "base/nix/xdg_util.h"
  #elif BUILDFLAG(IS_MAC)
  #include "base/base_paths_mac.h"
-@@ -61,7 +61,7 @@ base::FilePath GetDataPath() {
-     return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath);
+@@ -63,7 +63,7 @@ base::FilePath GetDataPath() {
+   }
  
    base::FilePath data_dir;
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_common_gpu_memory_buffer_support_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_common_gpu_memory_buffer_support_cc
index 5027cabf6..dbfcb0fee 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_common_gpu_memory_buffer_support_cc
+++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_common_gpu_memory_buffer_support_cc
@@ -10,7 +10,7 @@ Index: gpu/command_buffer/common/gpu_memory_buffer_support.cc
    return GL_TEXTURE_EXTERNAL_OES;
  #elif BUILDFLAG(IS_IOS)
    return GL_TEXTURE_2D;
-@@ -217,7 +217,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu
+@@ -209,7 +209,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu
      gfx::BufferFormat format,
      gfx::BufferPlane plane) {
  #if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_dawn_context_provider_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_dawn_context_provider_cc
index 833167e79..4466ed2de 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_dawn_context_provider_cc
+++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_dawn_context_provider_cc
@@ -1,12 +1,12 @@
 Index: gpu/command_buffer/service/dawn_context_provider.cc
 --- gpu/command_buffer/service/dawn_context_provider.cc.orig
 +++ gpu/command_buffer/service/dawn_context_provider.cc
-@@ -53,7 +53,7 @@ wgpu::BackendType GetDefaultBackendType() {
+@@ -203,7 +203,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke
    return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12)
               ? wgpu::BackendType::D3D12
               : wgpu::BackendType::D3D11;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
    return wgpu::BackendType::Vulkan;
  #elif BUILDFLAG(IS_APPLE)
    return wgpu::BackendType::Metal;
diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_gles2_cmd_decoder_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_gles2_cmd_decoder_cc
index 03e58806e..70a8c6ee2 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_gles2_cmd_decoder_cc
+++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_gles2_cmd_decoder_cc
@@ -1,7 +1,7 @@
 Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
 --- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig
 +++ gpu/command_buffer/service/gles2_cmd_decoder.cc
-@@ -2980,7 +2980,7 @@ GLES2Decoder* GLES2Decoder::Create(
+@@ -2987,7 +2987,7 @@ GLES2Decoder* GLES2Decoder::Create(
    }
  
  // Allow linux to run fuzzers.
diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_angle_vulkan_image_backing_factory_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_angle_vulkan_image_backing_factory_cc
index 0394d7f2a..776ac59a5 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_angle_vulkan_image_backing_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_angle_vulkan_image_backing_factory_cc
@@ -9,4 +9,4 @@ Index: gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factor
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      SHARED_IMAGE_USAGE_SCANOUT |
  #endif
-     SHARED_IMAGE_USAGE_GLES2 | SHARED_IMAGE_USAGE_GLES2_FRAMEBUFFER_HINT |
+     SHARED_IMAGE_USAGE_GLES2_READ | SHARED_IMAGE_USAGE_GLES2_WRITE |
diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_external_vk_image_backing_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_external_vk_image_backing_cc
index 292e6611f..ef1d62645 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_external_vk_image_backing_cc
+++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_external_vk_image_backing_cc
@@ -1,19 +1,19 @@
 Index: gpu/command_buffer/service/shared_image/external_vk_image_backing.cc
 --- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig
 +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc
-@@ -46,7 +46,7 @@
+@@ -50,7 +50,7 @@
  #include "ui/gl/gl_version_info.h"
  #include "ui/gl/scoped_binders.h"
  
 -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN)
  #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h"
- #endif
- 
-@@ -656,7 +656,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma
-     const wgpu::Device& wgpuDevice,
+ #if BUILDFLAG(DAWN_ENABLE_BACKEND_OPENGLES)
+ #include "gpu/command_buffer/service/shared_image/dawn_gl_texture_representation.h"
+@@ -689,7 +689,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma
      wgpu::BackendType backend_type,
-     std::vector<wgpu::TextureFormat> view_formats) {
+     std::vector<wgpu::TextureFormat> view_formats,
+     scoped_refptr<SharedContextState> context_state) {
 -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN)
    auto wgpu_format = ToDawnFormat(format());
diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_external_vk_image_backing_factory_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_external_vk_image_backing_factory_cc
index aabb48af1..edce9e37a 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_external_vk_image_backing_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_external_vk_image_backing_factory_cc
@@ -1,21 +1,12 @@
 Index: gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc
 --- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig
 +++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc
-@@ -89,7 +89,7 @@ base::flat_map<VkFormat, VkImageUsageFlags> CreateImag
+@@ -147,7 +147,7 @@ bool IsFormatSupported(viz::SharedImageFormat format,
  }  // namespace
  
  constexpr uint32_t kSupportedUsage =
 -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN)
-     SHARED_IMAGE_USAGE_WEBGPU | SHARED_IMAGE_USAGE_WEBGPU_SWAP_CHAIN_TEXTURE |
+     SHARED_IMAGE_USAGE_WEBGPU_READ | SHARED_IMAGE_USAGE_WEBGPU_WRITE |
+     SHARED_IMAGE_USAGE_WEBGPU_SWAP_CHAIN_TEXTURE |
      SHARED_IMAGE_USAGE_WEBGPU_STORAGE_TEXTURE |
- #endif
-@@ -257,7 +257,7 @@ bool ExternalVkImageBackingFactory::IsSupported(
-     return false;
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (format.IsLegacyMultiplanar()) {
-     // ExternalVkImageBacking doesn't work properly with external sampler
-     // multi-planar formats on Linux, see https://crbug.com/1394888.
diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_shared_image_factory_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_shared_image_factory_cc
index 3d9f5a181..f3d028034 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_shared_image_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_shared_image_factory_cc
@@ -1,7 +1,7 @@
 Index: gpu/command_buffer/service/shared_image/shared_image_factory.cc
 --- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig
 +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc
-@@ -142,7 +142,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() {
+@@ -144,7 +144,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() {
    return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER;
  #elif BUILDFLAG(IS_ANDROID)
    return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER;
diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_shared_image_manager_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_shared_image_manager_cc
index 23964452f..85633daf5 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_shared_image_manager_cc
+++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_shared_image_manager_cc
@@ -1,7 +1,7 @@
 Index: gpu/command_buffer/service/shared_image/shared_image_manager.cc
 --- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig
 +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc
-@@ -507,7 +507,7 @@ bool SharedImageManager::SupportsScanoutImages() {
+@@ -569,7 +569,7 @@ bool SharedImageManager::SupportsScanoutImages() {
    return true;
  #elif BUILDFLAG(IS_ANDROID)
    return base::AndroidHardwareBufferCompat::IsSupportAvailable();
diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_wrapped_sk_image_backing_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_wrapped_sk_image_backing_cc
index 917a699cc..946b9b5d8 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_wrapped_sk_image_backing_cc
+++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_wrapped_sk_image_backing_cc
@@ -1,7 +1,7 @@
 Index: gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc
 --- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig
 +++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc
-@@ -211,7 +211,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri
+@@ -214,7 +214,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri
  
      constexpr GrRenderable is_renderable = GrRenderable::kYes;
      constexpr GrProtected is_protected = GrProtected::kNo;
diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_webgpu_decoder_impl_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_webgpu_decoder_impl_cc
index 6c8c85956..ee0eb2d33 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_webgpu_decoder_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_webgpu_decoder_impl_cc
@@ -1,12 +1,21 @@
 Index: gpu/command_buffer/service/webgpu_decoder_impl.cc
 --- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig
 +++ gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -1193,7 +1193,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
+@@ -1255,7 +1255,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
+     force_fallback_adapter = true;
+   }
  
-   if (gr_context_type_ != GrContextType::kVulkan &&
-       use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     callback(WGPURequestAdapterStatus_Unavailable, nullptr,
-              "WebGPU on Linux requires command-line flag "
-              "--enable-features=Vulkan",
+   if (!shared_context_state_->GrContextIsVulkan() &&
+       !shared_context_state_->IsGraphiteDawnVulkan() &&
+       use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) {
+@@ -1922,7 +1922,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn(
+   }
+ 
+ #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \
+-    !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_LINUX)
++    !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+   if (usage & wgpu::TextureUsage::StorageBinding) {
+     LOG(ERROR) << "AssociateMailbox: wgpu::TextureUsage::StorageBinding is NOT "
+                   "supported yet on this platform.";
diff --git a/www/ungoogled-chromium/patches/patch-gpu_config_gpu_control_list_cc b/www/ungoogled-chromium/patches/patch-gpu_config_gpu_control_list_cc
index 5a89b70a2..2920aad2f 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_config_gpu_control_list_cc
+++ b/www/ungoogled-chromium/patches/patch-gpu_config_gpu_control_list_cc
@@ -10,7 +10,7 @@ Index: gpu/config/gpu_control_list.cc
    return kGLTypeGL;
  #elif BUILDFLAG(IS_MAC)
    return kGLTypeGL;
-@@ -817,7 +817,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
+@@ -811,7 +811,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
    return kOsAndroid;
  #elif BUILDFLAG(IS_FUCHSIA)
    return kOsFuchsia;
diff --git a/www/ungoogled-chromium/patches/patch-gpu_config_gpu_finch_features_cc b/www/ungoogled-chromium/patches/patch-gpu_config_gpu_finch_features_cc
index 7e41614a2..3f15941b2 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_config_gpu_finch_features_cc
+++ b/www/ungoogled-chromium/patches/patch-gpu_config_gpu_finch_features_cc
@@ -1,22 +1,21 @@
 Index: gpu/config/gpu_finch_features.cc
 --- gpu/config/gpu_finch_features.cc.orig
 +++ gpu/config/gpu_finch_features.cc
-@@ -58,7 +58,7 @@ bool IsDeviceBlocked(const char* field, const std::str
- BASE_FEATURE(kUseGles2ForOopR,
-              "UseGles2ForOopR",
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-              base::FEATURE_DISABLED_BY_DEFAULT
- #else
-              base::FEATURE_ENABLED_BY_DEFAULT
-@@ -142,7 +142,8 @@ BASE_FEATURE(kAggressiveSkiaGpuResourcePurge,
+@@ -145,7 +145,7 @@ const base::FeatureParam<std::string>
  BASE_FEATURE(kDefaultEnableGpuRasterization,
               "DefaultEnableGpuRasterization",
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
-+    BUILDFLAG(IS_BSD)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
+@@ -158,7 +158,7 @@ BASE_FEATURE(kCanvasOopRasterization,
+              "CanvasOopRasterization",
+ #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_WIN) ||         \
+     (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_ANDROID) || \
+-    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
++    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/ungoogled-chromium/patches/patch-gpu_config_gpu_info_collector_cc b/www/ungoogled-chromium/patches/patch-gpu_config_gpu_info_collector_cc
new file mode 100644
index 000000000..dd2648249
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-gpu_config_gpu_info_collector_cc
@@ -0,0 +1,12 @@
+Index: gpu/config/gpu_info_collector.cc
+--- gpu/config/gpu_info_collector.cc.orig
++++ gpu/config/gpu_info_collector.cc
+@@ -364,7 +364,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance
+ void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) {
+   static BASE_FEATURE(kCollectWebGPUSupportMetrics,
+                       "CollectWebGPUSupportMetrics",
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+                       base::FEATURE_DISABLED_BY_DEFAULT);
+ #else
+                       base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/www/ungoogled-chromium/patches/patch-gpu_ipc_service_gpu_init_cc b/www/ungoogled-chromium/patches/patch-gpu_ipc_service_gpu_init_cc
index 184c1474d..e12137b54 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_ipc_service_gpu_init_cc
+++ b/www/ungoogled-chromium/patches/patch-gpu_ipc_service_gpu_init_cc
@@ -1,7 +1,7 @@
 Index: gpu/ipc/service/gpu_init.cc
 --- gpu/ipc/service/gpu_init.cc.orig
 +++ gpu/ipc/service/gpu_init.cc
-@@ -357,7 +357,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -391,7 +391,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    enable_watchdog = false;
  #endif
  
@@ -10,7 +10,7 @@ Index: gpu/ipc/service/gpu_init.cc
    bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early;
  #else   // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
    // For some reasons MacOSX's VideoToolbox might crash when called after
-@@ -394,7 +394,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -428,7 +428,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    }
  
    bool attempted_startsandbox = false;
@@ -19,8 +19,8 @@ Index: gpu/ipc/service/gpu_init.cc
    // On Chrome OS ARM Mali, GPU driver userspace creates threads when
    // initializing a GL context, so start the sandbox early.
    // TODO(zmo): Need to collect OS version before this.
-@@ -451,7 +451,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
-     }
+@@ -529,7 +529,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+     gpu_preferences_.gr_context_type = GrContextType::kGL;
    }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -28,7 +28,7 @@ Index: gpu/ipc/service/gpu_init.cc
    // The ContentSandboxHelper is currently the only one implementation of
    // GpuSandboxHelper and it has no dependency. Except on Linux where
    // VaapiWrapper checks the GL implementation to determine which display
-@@ -533,7 +533,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -611,7 +611,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
            command_line, gpu_feature_info_,
            gpu_preferences_.disable_software_rasterizer, false);
        if (gl_use_swiftshader_) {
@@ -37,7 +37,7 @@ Index: gpu/ipc/service/gpu_init.cc
          VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
                  << "on Linux";
          return false;
-@@ -686,7 +686,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -767,7 +767,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
  
    InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
  
@@ -46,7 +46,7 @@ Index: gpu/ipc/service/gpu_init.cc
    // Driver may create a compatibility profile context when collect graphics
    // information on Linux platform. Try to collect graphics information
    // based on core profile context after disabling platform extensions.
-@@ -740,7 +740,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -822,7 +822,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
        }
      }
    }
@@ -55,7 +55,7 @@ Index: gpu/ipc/service/gpu_init.cc
      (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
    if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
      // https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -894,7 +894,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -989,7 +989,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
    }
    bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled;
  
@@ -64,7 +64,7 @@ Index: gpu/ipc/service/gpu_init.cc
      (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
    if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
      // https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -964,7 +964,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -1049,7 +1049,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
      }
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-gpu_ipc_service_x_util_h b/www/ungoogled-chromium/patches/patch-gpu_ipc_service_x_util_h
index 604e2852a..ba5892de2 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_ipc_service_x_util_h
+++ b/www/ungoogled-chromium/patches/patch-gpu_ipc_service_x_util_h
@@ -1,17 +1,12 @@
 Index: gpu/ipc/service/x_util.h
 --- gpu/ipc/service/x_util.h.orig
 +++ gpu/ipc/service/x_util.h
-@@ -11,11 +11,11 @@
- #include "build/build_config.h"
+@@ -12,7 +12,7 @@
  #include "gpu/ipc/service/gpu_config.h"
+ #include "ui/base/ozone_buildflags.h"
  
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/ozone/buildflags.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #if BUILDFLAG(OZONE_PLATFORM_X11)
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
  
  namespace gpu {
+ 
diff --git a/www/ungoogled-chromium/patches/patch-gpu_vulkan_generate_bindings_py b/www/ungoogled-chromium/patches/patch-gpu_vulkan_generate_bindings_py
index c8591f187..dde4b87a9 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_vulkan_generate_bindings_py
+++ b/www/ungoogled-chromium/patches/patch-gpu_vulkan_generate_bindings_py
@@ -1,7 +1,7 @@
 Index: gpu/vulkan/generate_bindings.py
 --- gpu/vulkan/generate_bindings.py.orig
 +++ gpu/vulkan/generate_bindings.py
-@@ -260,7 +260,7 @@ VULKAN_DEVICE_FUNCTIONS = [
+@@ -270,7 +270,7 @@ VULKAN_DEVICE_FUNCTIONS = [
      ]
    },
    {
diff --git a/www/ungoogled-chromium/patches/patch-gpu_vulkan_semaphore_handle_cc b/www/ungoogled-chromium/patches/patch-gpu_vulkan_semaphore_handle_cc
new file mode 100644
index 000000000..3d5ae614c
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-gpu_vulkan_semaphore_handle_cc
@@ -0,0 +1,21 @@
+Index: gpu/vulkan/semaphore_handle.cc
+--- gpu/vulkan/semaphore_handle.cc.orig
++++ gpu/vulkan/semaphore_handle.cc
+@@ -39,7 +39,7 @@ SemaphoreHandle::SemaphoreHandle(gfx::GpuFenceHandle f
+   // https://fuchsia.dev/reference/fidl/fuchsia.ui.scenic.
+   Init(VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_ZIRCON_EVENT_BIT_FUCHSIA,
+        fence_handle.Release());
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+   Init(VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR,
+        fence_handle.Release());
+ #elif BUILDFLAG(IS_POSIX)
+@@ -64,7 +64,7 @@ gfx::GpuFenceHandle SemaphoreHandle::ToGpuFenceHandle(
+   // VkSemaphore, which can then be used to submit present work, see
+   // https://fuchsia.dev/reference/fidl/fuchsia.ui.scenic.
+   fence_handle.Adopt(TakeHandle());
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+   if (type_ == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR) {
+     fence_handle.Adopt(TakeHandle());
+   } else {
diff --git a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_device_queue_cc b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_device_queue_cc
index 7bf905115..6c1ad822d 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_device_queue_cc
+++ b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_device_queue_cc
@@ -10,7 +10,7 @@ Index: gpu/vulkan/vulkan_device_queue.cc
      // If gpu_info is provided, the device should match it.
      if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id ||
                       device_properties.deviceID != gpu_info->gpu.device_id)) {
-@@ -263,7 +263,7 @@ bool VulkanDeviceQueue::Initialize(
+@@ -264,7 +264,7 @@ bool VulkanDeviceQueue::Initialize(
    // Android, Fuchsia, Linux, and CrOS (VaapiVideoDecoder) need YCbCr sampler
    // support.
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_device_queue_h b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_device_queue_h
index 7f81431f7..2e0405e54 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_device_queue_h
+++ b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_device_queue_h
@@ -1,7 +1,7 @@
 Index: gpu/vulkan/vulkan_device_queue.h
 --- gpu/vulkan/vulkan_device_queue.h.orig
 +++ gpu/vulkan/vulkan_device_queue.h
-@@ -166,7 +166,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue
+@@ -169,7 +169,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue
    bool allow_protected_memory_ = false;
  
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_function_pointers_cc b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_function_pointers_cc
index 62dfbc7cc..1f45f32fe 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_function_pointers_cc
+++ b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_function_pointers_cc
@@ -1,7 +1,7 @@
 Index: gpu/vulkan/vulkan_function_pointers.cc
 --- gpu/vulkan/vulkan_function_pointers.cc.orig
 +++ gpu/vulkan/vulkan_function_pointers.cc
-@@ -1161,7 +1161,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
+@@ -1289,7 +1289,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
      }
    }
  
@@ -9,8 +9,8 @@ Index: gpu/vulkan/vulkan_function_pointers.cc
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    if (gfx::HasExtension(enabled_extensions,
                          VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) {
-     vkGetImageDrmFormatModifierPropertiesEXT =
-@@ -1350,7 +1350,7 @@ void VulkanFunctionPointers::ResetForTesting() {
+     constexpr char kvkGetImageDrmFormatModifierPropertiesEXT[] =
+@@ -1489,7 +1489,7 @@ void VulkanFunctionPointers::ResetForTesting() {
    vkGetSwapchainImagesKHR = nullptr;
    vkQueuePresentKHR = nullptr;
  
diff --git a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_function_pointers_h b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_function_pointers_h
index 0803d522c..75c138558 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_function_pointers_h
+++ b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_function_pointers_h
@@ -1,7 +1,7 @@
 Index: gpu/vulkan/vulkan_function_pointers.h
 --- gpu/vulkan/vulkan_function_pointers.h.orig
 +++ gpu/vulkan/vulkan_function_pointers.h
-@@ -311,7 +311,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
+@@ -321,7 +321,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
    VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR;
    VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR;
  
@@ -10,7 +10,7 @@ Index: gpu/vulkan/vulkan_function_pointers.h
    VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT>
        vkGetImageDrmFormatModifierPropertiesEXT;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -1235,7 +1235,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
+@@ -1324,7 +1324,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
                                                               pPresentInfo);
  }
  
@@ -19,7 +19,7 @@ Index: gpu/vulkan/vulkan_function_pointers.h
  ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT(
      VkDevice device,
      VkImage image,
-@@ -1245,4 +1245,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp
+@@ -1334,4 +1334,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp
  }
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_util_cc b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_util_cc
index 3ea4dd2ce..cc9425f06 100644
--- a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_util_cc
+++ b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_util_cc
@@ -1,7 +1,7 @@
 Index: gpu/vulkan/vulkan_util.cc
 --- gpu/vulkan/vulkan_util.cc.orig
 +++ gpu/vulkan/vulkan_util.cc
-@@ -343,7 +343,7 @@ bool CheckVulkanCompabilities(const VulkanInfo& vulkan
+@@ -467,7 +467,7 @@ bool CheckVulkanCompatibilities(
      }
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-headless_lib_browser_headless_browser_main_parts_posix_cc b/www/ungoogled-chromium/patches/patch-headless_lib_browser_headless_browser_main_parts_posix_cc
index 1a92f8c72..6621465f2 100644
--- a/www/ungoogled-chromium/patches/patch-headless_lib_browser_headless_browser_main_parts_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-headless_lib_browser_headless_browser_main_parts_posix_cc
@@ -1,7 +1,7 @@
 Index: headless/lib/browser/headless_browser_main_parts_posix.cc
 --- headless/lib/browser/headless_browser_main_parts_posix.cc.orig
 +++ headless/lib/browser/headless_browser_main_parts_posix.cc
-@@ -19,13 +19,13 @@
+@@ -21,13 +21,13 @@
  #include "content/public/browser/browser_thread.h"
  #include "headless/lib/browser/headless_browser_impl.h"
  
@@ -17,7 +17,7 @@ Index: headless/lib/browser/headless_browser_main_parts_posix.cc
  #include "device/bluetooth/dbus/bluez_dbus_manager.h"
  #endif
  
-@@ -123,7 +123,7 @@ class BrowserShutdownHandler {
+@@ -161,7 +161,7 @@ class BrowserShutdownHandler {
  
  }  // namespace
  
@@ -26,7 +26,7 @@ Index: headless/lib/browser/headless_browser_main_parts_posix.cc
  constexpr char kProductName[] = "HeadlessChrome";
  #endif
  
-@@ -131,9 +131,9 @@ void HeadlessBrowserMainParts::PostCreateMainMessageLo
+@@ -169,9 +169,9 @@ void HeadlessBrowserMainParts::PostCreateMainMessageLo
    BrowserShutdownHandler::Install(base::BindOnce(
        &HeadlessBrowserImpl::ShutdownWithExitCode, browser_->GetWeakPtr()));
  
diff --git a/www/ungoogled-chromium/patches/patch-headless_lib_browser_headless_request_context_manager_cc b/www/ungoogled-chromium/patches/patch-headless_lib_browser_headless_request_context_manager_cc
index 97269d0f3..51a42677a 100644
--- a/www/ungoogled-chromium/patches/patch-headless_lib_browser_headless_request_context_manager_cc
+++ b/www/ungoogled-chromium/patches/patch-headless_lib_browser_headless_request_context_manager_cc
@@ -1,7 +1,7 @@
 Index: headless/lib/browser/headless_request_context_manager.cc
 --- headless/lib/browser/headless_request_context_manager.cc.orig
 +++ headless/lib/browser/headless_request_context_manager.cc
-@@ -65,7 +65,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p
+@@ -64,7 +64,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p
      return;
    done_once = true;
  
diff --git a/www/ungoogled-chromium/patches/patch-headless_lib_headless_content_main_delegate_cc b/www/ungoogled-chromium/patches/patch-headless_lib_headless_content_main_delegate_cc
index 212dacefd..c38ead469 100644
--- a/www/ungoogled-chromium/patches/patch-headless_lib_headless_content_main_delegate_cc
+++ b/www/ungoogled-chromium/patches/patch-headless_lib_headless_content_main_delegate_cc
@@ -1,7 +1,7 @@
 Index: headless/lib/headless_content_main_delegate.cc
 --- headless/lib/headless_content_main_delegate.cc.orig
 +++ headless/lib/headless_content_main_delegate.cc
-@@ -344,7 +344,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
+@@ -362,7 +362,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
    if (process_type != ::switches::kZygoteProcess) {
      g_headless_crash_client.Pointer()->set_crash_dumps_dir(
          command_line.GetSwitchValuePath(switches::kCrashDumpsDir));
diff --git a/www/ungoogled-chromium/patches/patch-ipc_ipc_channel_h b/www/ungoogled-chromium/patches/patch-ipc_ipc_channel_h
index e7220b395..767cd8cbe 100644
--- a/www/ungoogled-chromium/patches/patch-ipc_ipc_channel_h
+++ b/www/ungoogled-chromium/patches/patch-ipc_ipc_channel_h
@@ -1,7 +1,7 @@
 Index: ipc/ipc_channel.h
 --- ipc/ipc_channel.h.orig
 +++ ipc/ipc_channel.h
-@@ -233,7 +233,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
+@@ -240,7 +240,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
    static std::string GenerateUniqueRandomChannelID();
  #endif
  
diff --git a/www/ungoogled-chromium/patches/patch-ipc_ipc_message_utils_cc b/www/ungoogled-chromium/patches/patch-ipc_ipc_message_utils_cc
index 6ef39dde3..c12ac79f0 100644
--- a/www/ungoogled-chromium/patches/patch-ipc_ipc_message_utils_cc
+++ b/www/ungoogled-chromium/patches/patch-ipc_ipc_message_utils_cc
@@ -1,7 +1,7 @@
 Index: ipc/ipc_message_utils.cc
 --- ipc/ipc_message_utils.cc.orig
 +++ ipc/ipc_message_utils.cc
-@@ -393,7 +393,7 @@ void ParamTraits<unsigned int>::Log(const param_type& 
+@@ -394,7 +394,7 @@ void ParamTraits<unsigned int>::Log(const param_type& 
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/patches/patch-media_BUILD_gn b/www/ungoogled-chromium/patches/patch-media_BUILD_gn
index afcf9fffe..d1c93ca38 100644
--- a/www/ungoogled-chromium/patches/patch-media_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-media_BUILD_gn
@@ -1,7 +1,7 @@
 Index: media/BUILD.gn
 --- media/BUILD.gn.orig
 +++ media/BUILD.gn
-@@ -94,6 +94,9 @@ config("media_config") {
+@@ -96,6 +96,9 @@ config("media_config") {
        defines += [ "DLOPEN_PULSEAUDIO" ]
      }
    }
diff --git a/www/ungoogled-chromium/patches/patch-media_audio_BUILD_gn b/www/ungoogled-chromium/patches/patch-media_audio_BUILD_gn
index f92ad8581..006e96456 100644
--- a/www/ungoogled-chromium/patches/patch-media_audio_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-media_audio_BUILD_gn
@@ -1,8 +1,8 @@
 Index: media/audio/BUILD.gn
 --- media/audio/BUILD.gn.orig
 +++ media/audio/BUILD.gn
-@@ -279,9 +279,20 @@ source_set("audio") {
-     ]
+@@ -270,9 +270,20 @@ source_set("audio") {
+     deps += [ "//media/base/android:media_jni_headers" ]
    }
  
 -  if (is_linux || is_chromeos) {
diff --git a/www/ungoogled-chromium/patches/patch-media_audio_audio_input_device_cc b/www/ungoogled-chromium/patches/patch-media_audio_audio_input_device_cc
index 93acd8f14..dff1ce999 100644
--- a/www/ungoogled-chromium/patches/patch-media_audio_audio_input_device_cc
+++ b/www/ungoogled-chromium/patches/patch-media_audio_audio_input_device_cc
@@ -1,7 +1,7 @@
 Index: media/audio/audio_input_device.cc
 --- media/audio/audio_input_device.cc.orig
 +++ media/audio/audio_input_device.cc
-@@ -262,7 +262,7 @@ void AudioInputDevice::OnStreamCreated(
+@@ -264,7 +264,7 @@ void AudioInputDevice::OnStreamCreated(
  // here. See comments in AliveChecker and PowerObserverHelper for details and
  // todos.
    if (detect_dead_stream_ == DeadStreamDetection::kEnabled) {
diff --git a/www/ungoogled-chromium/patches/patch-media_base_cdm_promise_adapter_cc b/www/ungoogled-chromium/patches/patch-media_base_cdm_promise_adapter_cc
deleted file mode 100644
index ff929403d..000000000
--- a/www/ungoogled-chromium/patches/patch-media_base_cdm_promise_adapter_cc
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: media/base/cdm_promise_adapter.cc
---- media/base/cdm_promise_adapter.cc.orig
-+++ media/base/cdm_promise_adapter.cc
-@@ -94,7 +94,13 @@ void CdmPromiseAdapter::RejectPromise(uint32_t promise
- void CdmPromiseAdapter::Clear(ClearReason reason) {
-   // Reject all outstanding promises.
-   DCHECK(thread_checker_.CalledOnValidThread());
-+#if defined(__clang__) && (__clang_major__ >= 16)
-   for (auto& [promise_id, promise] : promises_) {
-+#else
-+  for (auto& [p_i, p_e] : promises_) {
-+    auto& promise_id = p_i;
-+    auto& promise = p_e;
-+#endif
-     TRACE_EVENT_NESTABLE_ASYNC_END1(
-         "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
-         "status", "cleared");
diff --git a/www/ungoogled-chromium/patches/patch-media_base_libaom_thread_wrapper_cc b/www/ungoogled-chromium/patches/patch-media_base_libaom_thread_wrapper_cc
new file mode 100644
index 000000000..7dc6a8327
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-media_base_libaom_thread_wrapper_cc
@@ -0,0 +1,25 @@
+Index: media/base/libaom_thread_wrapper.cc
+--- media/base/libaom_thread_wrapper.cc.orig
++++ media/base/libaom_thread_wrapper.cc
+@@ -5,17 +5,21 @@
+ #include "base/logging.h"
+ #include "media/base/codec_worker_impl.h"
+ #include "media/base/libvpx_thread_wrapper.h"
++#if !BUILDFLAG(IS_BSD)
+ #include "third_party/libaom/source/libaom/aom_util/aom_thread.h"
++#endif
+ 
+ namespace media {
+ 
+ void InitLibAomThreadWrapper() {
++#if !BUILDFLAG(IS_BSD)
+   const AVxWorkerInterface interface =
+       CodecWorkerImpl<AVxWorkerInterface, AVxWorkerImpl, AVxWorker,
+                       AVxWorkerStatus, AVX_WORKER_STATUS_NOT_OK,
+                       AVX_WORKER_STATUS_OK,
+                       AVX_WORKER_STATUS_WORKING>::GetCodecWorkerInterface();
+   CHECK(aom_set_worker_interface(&interface));
++#endif
+ }
+ 
+ }  // namespace media
diff --git a/www/ungoogled-chromium/patches/patch-media_base_libvpx_thread_wrapper_cc b/www/ungoogled-chromium/patches/patch-media_base_libvpx_thread_wrapper_cc
new file mode 100644
index 000000000..1e158d0c5
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-media_base_libvpx_thread_wrapper_cc
@@ -0,0 +1,26 @@
+Index: media/base/libvpx_thread_wrapper.cc
+--- media/base/libvpx_thread_wrapper.cc.orig
++++ media/base/libvpx_thread_wrapper.cc
+@@ -5,11 +5,14 @@
+ #include "media/base/libvpx_thread_wrapper.h"
+ 
+ #include "media/base/codec_worker_impl.h"
++#if !BUILDFLAG(IS_OPENBSD)
+ #include "third_party/libvpx/source/libvpx/vpx_util/vpx_thread.h"
++#endif
+ 
+ namespace media {
+ 
+ void InitLibVpxThreadWrapper() {
++#if !BUILDFLAG(IS_OPENBSD)
+   const VPxWorkerInterface interface =
+       CodecWorkerImpl<VPxWorkerInterface, VPxWorkerImpl, VPxWorker,
+                       VPxWorkerStatus, VPX_WORKER_STATUS_NOT_OK,
+@@ -17,6 +20,7 @@ void InitLibVpxThreadWrapper() {
+                       VPX_WORKER_STATUS_WORKING>::GetCodecWorkerInterface();
+ 
+   CHECK(vpx_set_worker_interface(&interface));
++#endif
+ }
+ 
+ }  // namespace media
diff --git a/www/ungoogled-chromium/patches/patch-media_base_media_switches_cc b/www/ungoogled-chromium/patches/patch-media_base_media_switches_cc
index 02b57967b..41bc38df2 100644
--- a/www/ungoogled-chromium/patches/patch-media_base_media_switches_cc
+++ b/www/ungoogled-chromium/patches/patch-media_base_media_switches_cc
@@ -1,16 +1,36 @@
 Index: media/base/media_switches.cc
 --- media/base/media_switches.cc.orig
 +++ media/base/media_switches.cc
-@@ -15,7 +15,7 @@
- #include "gpu/config/gpu_finch_features.h"
- #include "media/media_buildflags.h"
+@@ -21,7 +21,7 @@
+ #include "ui/gl/gl_features.h"
+ #include "ui/gl/gl_utils.h"
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "base/cpu.h"
  #endif
  
-@@ -652,7 +652,7 @@ BASE_FEATURE(kFallbackAfterDecodeError,
+@@ -363,8 +363,8 @@ BASE_FEATURE(kMacLoopbackAudioForScreenShare,
+              "MacLoopbackAudioForScreenShare",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif  // BUILDFLAG(IS_MAC)
+-
+-#if BUILDFLAG(IS_LINUX)
++ 
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Enables system audio mirroring using pulseaudio.
+ BASE_FEATURE(kPulseaudioLoopbackForCast,
+              "PulseaudioLoopbackForCast",
+@@ -597,7 +597,7 @@ BASE_FEATURE(kUseWritePixelsYUV,
+ BASE_FEATURE(kUseMultiPlaneFormatForHardwareVideo,
+              "UseMultiPlaneFormatForHardwareVideo",
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || \
+-    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
+@@ -713,7 +713,7 @@ BASE_FEATURE(kFallbackAfterDecodeError,
  // Show toolbar button that opens dialog for controlling media sessions.
  BASE_FEATURE(kGlobalMediaControls,
               "GlobalMediaControls",
@@ -19,7 +39,7 @@ Index: media/base/media_switches.cc
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -675,7 +675,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI,
+@@ -741,7 +741,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI,
  // If enabled, users can request Media Remoting without fullscreen-in-tab.
  BASE_FEATURE(kMediaRemotingWithoutFullscreen,
               "MediaRemotingWithoutFullscreen",
@@ -28,7 +48,7 @@ Index: media/base/media_switches.cc
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -687,7 +687,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
+@@ -753,7 +753,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
  BASE_FEATURE(kGlobalMediaControlsPictureInPicture,
               "GlobalMediaControlsPictureInPicture",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -37,7 +57,7 @@ Index: media/base/media_switches.cc
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -731,7 +731,7 @@ BASE_FEATURE(kUnifiedAutoplay,
+@@ -782,7 +782,7 @@ BASE_FEATURE(kUnifiedAutoplay,
               "UnifiedAutoplay",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -46,21 +66,39 @@ Index: media/base/media_switches.cc
  // Enable vaapi video decoding on linux. This is already enabled by default on
  // chromeos, but needs an experiment on linux.
  BASE_FEATURE(kVaapiVideoDecodeLinux,
-@@ -811,7 +811,7 @@ BASE_FEATURE(kVaapiVp9kSVCHWEncoding,
-              "VaapiVp9kSVCHWEncoding",
-              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -873,7 +873,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding,
+              "VaapiVp9SModeHWEncoding",
+              base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder.
- BASE_FEATURE(kV4L2FlatStatelessVideoDecoder,
-              "V4L2FlatStatelessVideoDecoder",
-@@ -1317,7 +1317,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo
- };
+ // Enables the new V4L2 flat video decoder clients instead of V4L2VideoDecoder.
+ // Owners: frkoenig@ch40m1um.qjz9zk, mcasas@ch40m1um.qjz9zk
+ // Expiry: When flat decoders are supported on all platforms and the legacy
+@@ -998,7 +998,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK,
+ // Live Caption can be used in multiple languages, as opposed to just English.
+ BASE_FEATURE(kLiveCaptionMultiLanguage,
+              "LiveCaptionMultiLanguage",
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
+@@ -1033,7 +1033,7 @@ BASE_FEATURE(kLiveCaptionSystemWideOnChromeOS,
+ // Live Translate translates captions generated by Live Caption.
+ BASE_FEATURE(kLiveTranslate,
+              "LiveTranslate",
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
+@@ -1496,7 +1496,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding,
+              base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  // Spawn utility processes to perform hardware encode acceleration instead of
  // using the GPU process.
- const base::Feature MEDIA_EXPORT kUseOutOfProcessVideoEncoding{
+ BASE_FEATURE(kUseOutOfProcessVideoEncoding,
diff --git a/www/ungoogled-chromium/patches/patch-media_base_media_switches_h b/www/ungoogled-chromium/patches/patch-media_base_media_switches_h
index ec0a99498..c2b006698 100644
--- a/www/ungoogled-chromium/patches/patch-media_base_media_switches_h
+++ b/www/ungoogled-chromium/patches/patch-media_base_media_switches_h
@@ -1,26 +1,35 @@
 Index: media/base/media_switches.h
 --- media/base/media_switches.h.orig
 +++ media/base/media_switches.h
-@@ -301,7 +301,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor
+@@ -315,7 +315,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend);
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForCast);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForScreenShare);
+ #endif  // BUILDFLAG(IS_LINUX)
+@@ -333,7 +333,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamForWebRTC);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream);
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseMediaHistoryStore);
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture);
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux);
-@@ -319,7 +319,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa
+@@ -352,7 +352,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding);
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9kSVCHWEncoding);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding);
  #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatelessVideoDecoder);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatVideoDecoder);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder);
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -439,7 +439,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding);
+@@ -491,7 +491,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding);
  #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/ungoogled-chromium/patches/patch-media_base_scopedfd_helper_h b/www/ungoogled-chromium/patches/patch-media_base_scopedfd_helper_h
deleted file mode 100644
index 5cf2ef5fd..000000000
--- a/www/ungoogled-chromium/patches/patch-media_base_scopedfd_helper_h
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: media/base/scopedfd_helper.h
---- media/base/scopedfd_helper.h.orig
-+++ media/base/scopedfd_helper.h
-@@ -15,7 +15,7 @@ namespace media {
- // but since the only current user is V4L2 we are limiting the scope to OS_LINUX
- // so the binary size does not inflate on non-using systems. Feel free to adapt
- // this and BUILD.gn as our needs evolve.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
- // Return a new vector containing duplicates of |fds|, or PCHECKs in case of an
- // error.
diff --git a/www/ungoogled-chromium/patches/patch-media_base_video_frame_cc b/www/ungoogled-chromium/patches/patch-media_base_video_frame_cc
index 99c78aed5..d175628b3 100644
--- a/www/ungoogled-chromium/patches/patch-media_base_video_frame_cc
+++ b/www/ungoogled-chromium/patches/patch-media_base_video_frame_cc
@@ -19,7 +19,7 @@ Index: media/base/video_frame.cc
        // This is not strictly needed but makes explicit that, at VideoFrame
        // level, DmaBufs are not mappable from userspace.
        storage_type != VideoFrame::STORAGE_DMABUFS &&
-@@ -306,7 +306,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo
+@@ -306,7 +306,7 @@ static std::optional<VideoFrameLayout> GetDefaultLayou
    return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes);
  }
  
@@ -28,7 +28,7 @@ Index: media/base/video_frame.cc
  // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and
  // thus to have several VideoFrames share the same set of DMABUF FDs.
  class VideoFrame::DmabufHolder
-@@ -635,7 +635,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
+@@ -636,7 +636,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
    for (size_t i = 0; i < num_planes; ++i)
      planes[i].stride = gpu_memory_buffer->stride(i);
    uint64_t modifier = gfx::NativePixmapHandle::kNoModifier;
@@ -37,7 +37,7 @@ Index: media/base/video_frame.cc
    if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) {
      const auto gmb_handle = gpu_memory_buffer->CloneHandle();
      if (gmb_handle.is_null() ||
-@@ -681,7 +681,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
+@@ -682,7 +682,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
    return frame;
  }
  
@@ -55,16 +55,16 @@ Index: media/base/video_frame.cc
    DCHECK(frame->dmabuf_fds_);
    // If there are any |dmabuf_fds_| plugged in, we should refer them too.
    wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_;
-@@ -1309,7 +1309,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder(
+@@ -1345,7 +1345,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder(
                          : mailbox_holders_[texture_index];
  }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
-   DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
- 
-@@ -1422,7 +1422,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
+ size_t VideoFrame::NumDmabufFds() const {
+   return dmabuf_fds_->size();
+ }
+@@ -1462,7 +1462,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
        storage_type_(storage_type),
        visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))),
        natural_size_(natural_size),
diff --git a/www/ungoogled-chromium/patches/patch-media_base_video_frame_h b/www/ungoogled-chromium/patches/patch-media_base_video_frame_h
index 3f44c6591..761b3e00f 100644
--- a/www/ungoogled-chromium/patches/patch-media_base_video_frame_h
+++ b/www/ungoogled-chromium/patches/patch-media_base_video_frame_h
@@ -2,7 +2,7 @@ Index: media/base/video_frame.h
 --- media/base/video_frame.h.orig
 +++ media/base/video_frame.h
 @@ -44,7 +44,7 @@
- #include "base/mac/scoped_cftyperef.h"
+ #include "base/apple/scoped_cftyperef.h"
  #endif  // BUILDFLAG(IS_APPLE)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -28,16 +28,16 @@ Index: media/base/video_frame.h
    // Wraps provided dmabufs
    // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
    // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will
-@@ -593,7 +593,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -598,7 +598,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
    // mailbox, the caller must wait for the included sync point.
    const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Returns a vector containing the backing DmaBufs for this frame. The number
-   // of returned DmaBufs will be equal or less than the number of planes of
+   // The number of DmaBufs will be equal or less than the number of planes of
    // the frame. If there are less, this means that the last FD contains the
-@@ -811,7 +811,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+   // remaining planes. Should be > 0 for STORAGE_DMABUFS.
+@@ -816,7 +816,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
    // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER.
    std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_;
  
diff --git a/www/ungoogled-chromium/patches/patch-media_capture_video_fake_video_capture_device_factory_cc b/www/ungoogled-chromium/patches/patch-media_capture_video_fake_video_capture_device_factory_cc
index 28ac6b089..0db73cc27 100644
--- a/www/ungoogled-chromium/patches/patch-media_capture_video_fake_video_capture_device_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-media_capture_video_fake_video_capture_device_factory_cc
@@ -1,7 +1,7 @@
 Index: media/capture/video/fake_video_capture_device_factory.cc
 --- media/capture/video/fake_video_capture_device_factory.cc.orig
 +++ media/capture/video/fake_video_capture_device_factory.cc
-@@ -229,7 +229,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo(
+@@ -230,7 +230,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo(
    int entry_index = 0;
    for (const auto& entry : devices_config_) {
      VideoCaptureApi api =
diff --git a/www/ungoogled-chromium/patches/patch-media_capture_video_linux_fake_v4l2_impl_cc b/www/ungoogled-chromium/patches/patch-media_capture_video_linux_fake_v4l2_impl_cc
index bdabe31d9..4e081df57 100644
--- a/www/ungoogled-chromium/patches/patch-media_capture_video_linux_fake_v4l2_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-media_capture_video_linux_fake_v4l2_impl_cc
@@ -1,7 +1,7 @@
 Index: media/capture/video/linux/fake_v4l2_impl.cc
 --- media/capture/video/linux/fake_v4l2_impl.cc.orig
 +++ media/capture/video/linux/fake_v4l2_impl.cc
-@@ -560,7 +560,7 @@ int FakeV4L2Impl::close(int fd) {
+@@ -562,7 +562,7 @@ int FakeV4L2Impl::close(int fd) {
    return kSuccessReturnValue;
  }
  
diff --git a/www/ungoogled-chromium/patches/patch-media_capture_video_linux_v4l2_capture_delegate_cc b/www/ungoogled-chromium/patches/patch-media_capture_video_linux_v4l2_capture_delegate_cc
index ef71210fb..33006d58f 100644
--- a/www/ungoogled-chromium/patches/patch-media_capture_video_linux_v4l2_capture_delegate_cc
+++ b/www/ungoogled-chromium/patches/patch-media_capture_video_linux_v4l2_capture_delegate_cc
@@ -1,18 +1,18 @@
 Index: media/capture/video/linux/v4l2_capture_delegate.cc
 --- media/capture/video/linux/v4l2_capture_delegate.cc.orig
 +++ media/capture/video/linux/v4l2_capture_delegate.cc
-@@ -4,8 +4,10 @@
- 
+@@ -5,8 +5,10 @@
  #include "media/capture/video/linux/v4l2_capture_delegate.h"
  
+ #include <fcntl.h>
 +#if !BUILDFLAG(IS_BSD)
  #include <linux/version.h>
  #include <linux/videodev2.h>
 +#endif
  #include <poll.h>
- #include <sys/fcntl.h>
  #include <sys/ioctl.h>
-@@ -26,17 +28,19 @@
+ #include <sys/mman.h>
+@@ -27,17 +29,19 @@
  #include "media/capture/video/blob_utils.h"
  #include "media/capture/video/linux/video_capture_device_linux.h"
  
@@ -33,7 +33,22 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc
  
  // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the
  // format is introduced to kernel.
-@@ -260,7 +264,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control
+@@ -47,6 +51,14 @@ using media::mojom::MeteringMode;
+ #define V4L2_PIX_FMT_INVZ v4l2_fourcc('I', 'N', 'V', 'Z')
+ #endif
+ 
++#ifndef V4L2_COLORSPACE_OPRGB
++#define V4L2_COLORSPACE_OPRGB V4L2_COLORSPACE_ADOBERGB
++#endif
++
++#ifndef V4L2_XFER_FUNC_OPRGB
++#define V4L2_XFER_FUNC_OPRGB V4L2_XFER_FUNC_ADOBERGB
++#endif
++
+ namespace media {
+ 
+ namespace {
+@@ -264,7 +276,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control
  // static
  bool V4L2CaptureDelegate::IsControllableControl(
      int control_id,
@@ -42,7 +57,7 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc
    const int special_control_id = GetControllingSpecialControl(control_id);
    if (!special_control_id) {
      // The control is not controlled by a special control thus the control is
-@@ -316,7 +320,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate(
+@@ -320,7 +332,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate(
        is_capturing_(false),
        timeout_count_(0),
        rotation_(rotation) {
@@ -51,7 +66,7 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc
    use_gpu_buffer_ = switches::IsVideoCaptureUseGpuMemoryBufferEnabled();
  #endif  // BUILDFLAG(IS_LINUX)
  }
-@@ -443,7 +447,7 @@ void V4L2CaptureDelegate::AllocateAndStart(
+@@ -447,7 +459,7 @@ void V4L2CaptureDelegate::AllocateAndStart(
  
    client_->OnStarted();
  
@@ -60,7 +75,7 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc
    if (use_gpu_buffer_) {
      v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>(
          std::move(gmb_support_test_));
-@@ -793,7 +797,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting(
+@@ -797,7 +809,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting(
  
  V4L2CaptureDelegate::~V4L2CaptureDelegate() = default;
  
@@ -69,7 +84,7 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc
    int num_retries = 0;
    for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries;
         ++num_retries) {
-@@ -803,7 +807,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* 
+@@ -807,7 +819,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* 
    return num_retries != kMaxIOCtrlRetries;
  }
  
@@ -78,7 +93,7 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc
    return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp));
  }
  
-@@ -814,6 +818,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co
+@@ -818,6 +830,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co
  }
  
  void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() {
@@ -86,7 +101,7 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc
    constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS,
                                        V4L2_CID_AUTO_WHITE_BALANCE,
                                        V4L2_CID_BRIGHTNESS,
-@@ -841,6 +846,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript
+@@ -845,6 +858,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript
                    << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}";
      }
    }
@@ -94,7 +109,7 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc
  }
  
  mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) {
-@@ -1021,7 +1027,11 @@ void V4L2CaptureDelegate::DoCapture() {
+@@ -1025,7 +1039,11 @@ void V4L2CaptureDelegate::DoCapture() {
  
    pollfd device_pfd = {};
    device_pfd.fd = device_fd_.get();
@@ -106,7 +121,7 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc
  
    const int result =
        HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs));
-@@ -1059,6 +1069,7 @@ void V4L2CaptureDelegate::DoCapture() {
+@@ -1063,6 +1081,7 @@ void V4L2CaptureDelegate::DoCapture() {
      timeout_count_ = 0;
    }
  
@@ -114,7 +129,7 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc
    // Dequeue events if the driver has filled in some.
    if (device_pfd.revents & POLLPRI) {
      bool controls_changed = false;
-@@ -1093,6 +1104,7 @@ void V4L2CaptureDelegate::DoCapture() {
+@@ -1097,6 +1116,7 @@ void V4L2CaptureDelegate::DoCapture() {
        client_->OnCaptureConfigurationChanged();
      }
    }
@@ -122,12 +137,21 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc
  
    // Deenqueue, send and reenqueue a buffer if the driver has filled one in.
    if (device_pfd.revents & POLLIN) {
-@@ -1147,7 +1159,7 @@ void V4L2CaptureDelegate::DoCapture() {
-       // matrix = v4l2_format->fmt.pix.ycbcr_enc;
-       // transfer = v4l2_format->fmt.pix.xfer_func;
+@@ -1150,7 +1170,7 @@ void V4L2CaptureDelegate::DoCapture() {
+       // workable on Linux.
+ 
        // See http://crbug.com/959919.
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
        if (use_gpu_buffer_) {
          v4l2_gpu_helper_->OnIncomingCapturedData(
              client_.get(), buffer_tracker->start(),
+@@ -1223,7 +1243,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr
+   client_->OnError(error, from_here, reason);
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ gfx::ColorSpace V4L2CaptureDelegate::BuildColorSpaceFromv4l2() {
+   v4l2_colorspace v4l2_primary = (v4l2_colorspace)video_fmt_.fmt.pix.colorspace;
+   v4l2_quantization v4l2_range =
diff --git a/www/ungoogled-chromium/patches/patch-media_capture_video_linux_v4l2_capture_delegate_h b/www/ungoogled-chromium/patches/patch-media_capture_video_linux_v4l2_capture_delegate_h
index f51c8fcb6..4b6274192 100644
--- a/www/ungoogled-chromium/patches/patch-media_capture_video_linux_v4l2_capture_delegate_h
+++ b/www/ungoogled-chromium/patches/patch-media_capture_video_linux_v4l2_capture_delegate_h
@@ -32,7 +32,16 @@ Index: media/capture/video/linux/v4l2_capture_delegate.h
  
    // Check whether the control is controllable (and not changed automatically).
    bool IsControllableControl(int control_id);
-@@ -157,7 +157,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
+@@ -133,7 +133,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
+                      const base::Location& from_here,
+                      const std::string& reason);
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Systems which describe a "color space" usually map that to one or more of
+   // {primary, matrix, transfer, range}. BuildColorSpaceFromv4l2() will use the
+   // matched value as first priority. Otherwise, if there is no best matching
+@@ -167,7 +167,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
    // Clockwise rotation in degrees. This value should be 0, 90, 180, or 270.
    int rotation_;
  
diff --git a/www/ungoogled-chromium/patches/patch-media_capture_video_linux_video_capture_device_factory_v4l2_cc b/www/ungoogled-chromium/patches/patch-media_capture_video_linux_video_capture_device_factory_v4l2_cc
index bee8b49f4..fd1548db3 100644
--- a/www/ungoogled-chromium/patches/patch-media_capture_video_linux_video_capture_device_factory_v4l2_cc
+++ b/www/ungoogled-chromium/patches/patch-media_capture_video_linux_video_capture_device_factory_v4l2_cc
@@ -1,7 +1,21 @@
 Index: media/capture/video/linux/video_capture_device_factory_v4l2.cc
 --- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig
 +++ media/capture/video/linux/video_capture_device_factory_v4l2.cc
-@@ -75,6 +75,9 @@ class DevVideoFilePathsDeviceProvider
+@@ -38,6 +38,7 @@ bool CompareCaptureDevices(const VideoCaptureDeviceInf
+   return a.descriptor < b.descriptor;
+ }
+ 
++#if !BUILDFLAG(IS_OPENBSD)
+ // USB VID and PID are both 4 bytes long.
+ const size_t kVidPidSize = 4;
+ const size_t kMaxInterfaceNameSize = 256;
+@@ -70,11 +71,15 @@ std::string ExtractFileNameFromDeviceId(const std::str
+   DCHECK(base::StartsWith(device_id, kDevDir, base::CompareCase::SENSITIVE));
+   return device_id.substr(strlen(kDevDir), device_id.length());
+ }
++#endif
+ 
+ class DevVideoFilePathsDeviceProvider
      : public VideoCaptureDeviceFactoryV4L2::DeviceProvider {
   public:
    void GetDeviceIds(std::vector<std::string>* target_container) override {
@@ -11,7 +25,7 @@ Index: media/capture/video/linux/video_capture_device_factory_v4l2.cc
      const base::FilePath path("/dev/");
      base::FileEnumerator enumerator(path, false, base::FileEnumerator::FILES,
                                      "video*");
-@@ -82,9 +85,13 @@ class DevVideoFilePathsDeviceProvider
+@@ -82,9 +87,13 @@ class DevVideoFilePathsDeviceProvider
        const base::FileEnumerator::FileInfo info = enumerator.GetInfo();
        target_container->emplace_back(path.value() + info.GetName().value());
      }
@@ -21,21 +35,33 @@ Index: media/capture/video/linux/video_capture_device_factory_v4l2.cc
    std::string GetDeviceModelId(const std::string& device_id) override {
 +#if BUILDFLAG(IS_OPENBSD)
 +    return std::string();
-+#endif
++#else
      const std::string file_name = ExtractFileNameFromDeviceId(device_id);
      std::string usb_id;
      const std::string vid_path =
-@@ -104,6 +111,9 @@ class DevVideoFilePathsDeviceProvider
+@@ -101,9 +110,13 @@ class DevVideoFilePathsDeviceProvider
+     }
+ 
+     return usb_id;
++#endif
    }
  
    std::string GetDeviceDisplayName(const std::string& device_id) override {
 +#if BUILDFLAG(IS_OPENBSD)
 +    return std::string();
-+#endif
++#else
      const std::string file_name = ExtractFileNameFromDeviceId(device_id);
      const std::string interface_path =
          base::StringPrintf(kInterfacePathTemplate, file_name.c_str());
-@@ -219,7 +229,7 @@ void VideoCaptureDeviceFactoryV4L2::GetDevicesInfo(
+@@ -114,6 +127,7 @@ class DevVideoFilePathsDeviceProvider
+       return std::string();
+     }
+     return display_name;
++#endif
+   }
+ };
+ 
+@@ -219,7 +233,7 @@ void VideoCaptureDeviceFactoryV4L2::GetDevicesInfo(
    std::move(callback).Run(std::move(devices_info));
  }
  
diff --git a/www/ungoogled-chromium/patches/patch-media_capture_video_video_capture_buffer_tracker_factory_impl_cc b/www/ungoogled-chromium/patches/patch-media_capture_video_video_capture_buffer_tracker_factory_impl_cc
index de7d8512b..04f9429c5 100644
--- a/www/ungoogled-chromium/patches/patch-media_capture_video_video_capture_buffer_tracker_factory_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-media_capture_video_video_capture_buffer_tracker_factory_impl_cc
@@ -9,8 +9,8 @@ Index: media/capture/video/video_capture_buffer_tracker_factory_impl.cc
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "media/capture/video/linux/v4l2_gpu_memory_buffer_tracker.h"
  #elif BUILDFLAG(IS_WIN)
- #include "media/capture/video/shared_memory_buffer_tracker.h"
-@@ -43,7 +43,7 @@ VideoCaptureBufferTrackerFactoryImpl::CreateTracker(
+ #include "media/capture/video/win/gpu_memory_buffer_tracker_win.h"
+@@ -42,7 +42,7 @@ VideoCaptureBufferTrackerFactoryImpl::CreateTracker(
        return std::make_unique<GpuMemoryBufferTrackerCros>();
  #elif BUILDFLAG(IS_APPLE)
        return std::make_unique<GpuMemoryBufferTrackerApple>();
diff --git a/www/ungoogled-chromium/patches/patch-media_capture_video_video_capture_device_client_cc b/www/ungoogled-chromium/patches/patch-media_capture_video_video_capture_device_client_cc
index 9dfc76066..008175076 100644
--- a/www/ungoogled-chromium/patches/patch-media_capture_video_video_capture_device_client_cc
+++ b/www/ungoogled-chromium/patches/patch-media_capture_video_video_capture_device_client_cc
@@ -1,7 +1,7 @@
 Index: media/capture/video/video_capture_device_client.cc
 --- media/capture/video/video_capture_device_client.cc.orig
 +++ media/capture/video/video_capture_device_client.cc
-@@ -149,7 +149,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat(
+@@ -151,7 +151,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat(
        CHECK(!is_width_odd && !is_height_odd);
        return {libyuv::FOURCC_UYVY};
      case media::PIXEL_FORMAT_RGB24:
diff --git a/www/ungoogled-chromium/patches/patch-media_cdm_library_cdm_cdm_paths_gni b/www/ungoogled-chromium/patches/patch-media_cdm_library_cdm_cdm_paths_gni
new file mode 100644
index 000000000..fb25afae1
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-media_cdm_library_cdm_cdm_paths_gni
@@ -0,0 +1,12 @@
+Index: media/cdm/library_cdm/cdm_paths.gni
+--- media/cdm/library_cdm/cdm_paths.gni.orig
++++ media/cdm/library_cdm/cdm_paths.gni
+@@ -15,7 +15,7 @@ assert(enable_library_cdms)
+ # Explicitly define what we use to avoid confusion.
+ if (is_chromeos) {
+   component_os = "cros"
+-} else if (is_linux) {
++} else if (is_linux || is_bsd) {
+   component_os = "linux"
+ } else if (is_win) {
+   component_os = "win"
diff --git a/www/ungoogled-chromium/patches/patch-media_gpu_buffer_validation_cc b/www/ungoogled-chromium/patches/patch-media_gpu_buffer_validation_cc
index efd14c88c..e72c2011a 100644
--- a/www/ungoogled-chromium/patches/patch-media_gpu_buffer_validation_cc
+++ b/www/ungoogled-chromium/patches/patch-media_gpu_buffer_validation_cc
@@ -1,30 +1,47 @@
 Index: media/gpu/buffer_validation.cc
 --- media/gpu/buffer_validation.cc.orig
 +++ media/gpu/buffer_validation.cc
-@@ -15,7 +15,7 @@
+@@ -16,7 +16,7 @@
  #include "ui/gfx/geometry/size.h"
  #include "ui/gfx/gpu_memory_buffer.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include <drm_fourcc.h>
  #include <sys/types.h>
  #include <unistd.h>
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -23,7 +23,7 @@
+@@ -29,7 +29,7 @@
  namespace media {
  
+ namespace {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #ifndef I915_FORMAT_MOD_4_TILED_MTL_MC_CCS
+ // TODO(b/271455200): Remove this definition once drm_fourcc.h contains it.
+ /*
+@@ -55,7 +55,7 @@ bool IsIntelMediaCompressedModifier(uint64_t modifier)
+ }  // namespace
+ 
  bool GetFileSize(const int fd, size_t* size) {
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    if (fd < 0) {
      VLOG(1) << "Invalid file descriptor";
      return false;
-@@ -76,7 +76,7 @@ bool VerifyGpuMemoryBufferHandle(
+@@ -109,14 +109,14 @@ bool VerifyGpuMemoryBufferHandle(
      VLOG(1) << "Unsupported: " << pixel_format;
      return false;
    }
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format);
-   if (num_planes != gmb_handle.native_pixmap_handle.planes.size() ||
-       num_planes == 0) {
+   const uint64_t modifier = gmb_handle.native_pixmap_handle.modifier;
+   const bool is_intel_media_compressed_buffer =
+       IsIntelMediaCompressedModifier(modifier);
+   const bool is_intel_media_compression_enabled =
+ #if BUILDFLAG(IS_CHROMEOS)
+       base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       false;
+ #endif
+ 
diff --git a/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_libyuv_image_processor_backend_cc b/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_libyuv_image_processor_backend_cc
new file mode 100644
index 000000000..bfcbfb076
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_libyuv_image_processor_backend_cc
@@ -0,0 +1,30 @@
+Index: media/gpu/chromeos/libyuv_image_processor_backend.cc
+--- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig
++++ media/gpu/chromeos/libyuv_image_processor_backend.cc
+@@ -48,7 +48,7 @@ static constexpr struct {
+ #define CONV(in, out, trans, result) \
+   {Fourcc::in, Fourcc::out, Transform::trans, SupportResult::result}
+     // Conversion.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     CONV(NV12, AR24, kConversion, Supported),
+ #endif
+     CONV(NV12, NV12, kConversion, Supported),
+@@ -436,7 +436,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr
+           fr->GetWritableVisibleData(VideoFrame::kUVPlane)), \
+       fr->stride(VideoFrame::kUVPlane)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #define ARGB_DATA(fr)                                 \
+   fr->GetWritableVisibleData(VideoFrame::kARGBPlane), \
+       fr->stride(VideoFrame::kARGBPlane)
+@@ -597,7 +597,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr
+     }
+   }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (output->format() == PIXEL_FORMAT_ARGB) {
+     if (input_config_.fourcc == Fourcc(Fourcc::NV12)) {
+       return LIBYUV_FUNC(NV12ToARGB, Y_UV_DATA(input),
diff --git a/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_mailbox_video_frame_converter_cc b/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_mailbox_video_frame_converter_cc
new file mode 100644
index 000000000..b9bae9408
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_mailbox_video_frame_converter_cc
@@ -0,0 +1,12 @@
+Index: media/gpu/chromeos/mailbox_video_frame_converter.cc
+--- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig
++++ media/gpu/chromeos/mailbox_video_frame_converter.cc
+@@ -63,7 +63,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe
+                     << static_cast<int>(buffer_format);
+       NOTREACHED_NORETURN();
+   }
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // If format is true multiplanar format, we prefer external sampler on
+   // ChromeOS and Linux.
+   if (format.is_multi_plane()) {
diff --git a/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_native_pixmap_frame_resource_cc b/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_native_pixmap_frame_resource_cc
new file mode 100644
index 000000000..e2aa43de0
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_native_pixmap_frame_resource_cc
@@ -0,0 +1,12 @@
+Index: media/gpu/chromeos/native_pixmap_frame_resource.cc
+--- media/gpu/chromeos/native_pixmap_frame_resource.cc.orig
++++ media/gpu/chromeos/native_pixmap_frame_resource.cc
+@@ -166,7 +166,7 @@ scoped_refptr<NativePixmapFrameResource> NativePixmapF
+   const bool is_intel_media_compression_enabled =
+ #if BUILDFLAG(IS_CHROMEOS)
+       base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       false;
+ #endif
+   CHECK(!is_intel_media_compressed_buffer ||
diff --git a/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_platform_video_frame_utils_cc b/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_platform_video_frame_utils_cc
new file mode 100644
index 000000000..58b39d2a9
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_platform_video_frame_utils_cc
@@ -0,0 +1,30 @@
+Index: media/gpu/chromeos/platform_video_frame_utils.cc
+--- media/gpu/chromeos/platform_video_frame_utils.cc.orig
++++ media/gpu/chromeos/platform_video_frame_utils.cc
+@@ -68,7 +68,7 @@ static std::unique_ptr<ui::GbmDevice> CreateGbmDevice(
+     const base::FilePath dev_path(FILE_PATH_LITERAL(
+         base::StrCat({drm_node_file_prefix, base::NumberToString(i)})));
+ 
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_V4L2_CODEC)
+     const bool is_render_node = base::Contains(drm_node_file_prefix, "render");
+ 
+     // TODO(b/313513760): don't guard base::File::FLAG_WRITE behind
+@@ -196,7 +196,7 @@ class GbmDeviceWrapper {
+     const bool is_intel_media_compression_enabled =
+ #if BUILDFLAG(IS_CHROMEOS)
+         base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+         false;
+ #endif
+     if (is_intel_media_compression_enabled) {
+@@ -347,7 +347,7 @@ scoped_refptr<VideoFrame> CreateVideoFrameFromGpuMemor
+   const bool is_intel_media_compression_enabled =
+ #if BUILDFLAG(IS_CHROMEOS)
+       base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       false;
+ #endif
+ 
diff --git a/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_video_decoder_pipeline_cc b/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_video_decoder_pipeline_cc
index 2efba0859..03e24450c 100644
--- a/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_video_decoder_pipeline_cc
+++ b/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_video_decoder_pipeline_cc
@@ -1,29 +1,30 @@
 Index: media/gpu/chromeos/video_decoder_pipeline.cc
 --- media/gpu/chromeos/video_decoder_pipeline.cc.orig
 +++ media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -1002,14 +1002,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
-     }
+@@ -1038,7 +1038,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
    }
+ #endif
  
 -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_VAAPI)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_VAAPI)
    // Linux should always use a custom allocator (to allocate buffers using
    // libva) and a PlatformVideoFramePool.
    CHECK(allocator.has_value());
-   CHECK(main_frame_pool_->AsPlatformVideoFramePool());
+@@ -1048,7 +1048,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+   // to create NativePixmap-backed frames.
    main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator(
-       *allocator);
+       *allocator, VideoFrame::STORAGE_GPU_MEMORY_BUFFER);
 -#elif BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC)
 +#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_V4L2_CODEC)
    // Linux w/ V4L2 should not use a custom allocator
    // Only tested with video_decode_accelerator_tests
    // TODO(wenst@) Test with full Chromium Browser
-@@ -1140,7 +1140,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1206,7 +1206,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
               << " VideoFrames";
      auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // TODO(nhebert): Change the storage type argument when |allocator| switches
+     // to create NativePixmap-backed frames.
      auxiliary_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator(
-         *allocator);
- #endif
diff --git a/www/ungoogled-chromium/patches/patch-media_gpu_gpu_video_encode_accelerator_factory_cc b/www/ungoogled-chromium/patches/patch-media_gpu_gpu_video_encode_accelerator_factory_cc
index b67812c12..dff1ac319 100644
--- a/www/ungoogled-chromium/patches/patch-media_gpu_gpu_video_encode_accelerator_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-media_gpu_gpu_video_encode_accelerator_factory_cc
@@ -1,7 +1,7 @@
 Index: media/gpu/gpu_video_encode_accelerator_factory.cc
 --- media/gpu/gpu_video_encode_accelerator_factory.cc.orig
 +++ media/gpu/gpu_video_encode_accelerator_factory.cc
-@@ -119,7 +119,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
+@@ -118,7 +118,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
      return vea_factory_functions;
  
  #if BUILDFLAG(USE_VAAPI)
diff --git a/www/ungoogled-chromium/patches/patch-media_gpu_sandbox_hardware_video_decoding_sandbox_hook_linux_cc b/www/ungoogled-chromium/patches/patch-media_gpu_sandbox_hardware_video_decoding_sandbox_hook_linux_cc
index 50c10cce9..d202d9b5f 100644
--- a/www/ungoogled-chromium/patches/patch-media_gpu_sandbox_hardware_video_decoding_sandbox_hook_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-media_gpu_sandbox_hardware_video_decoding_sandbox_hook_linux_cc
@@ -1,7 +1,7 @@
 Index: media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc
 --- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig
 +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc
-@@ -15,7 +15,9 @@
+@@ -16,7 +16,9 @@
  #include "media/gpu/vaapi/vaapi_wrapper.h"
  #endif
  
@@ -11,7 +11,7 @@ Index: media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc
  
  // TODO(b/195769334): the hardware video decoding sandbox is really only useful
  // when building with VA-API or V4L2 (otherwise, we're not really doing hardware
-@@ -31,6 +33,7 @@ using sandbox::syscall_broker::BrokerFilePermission;
+@@ -32,6 +34,7 @@ using sandbox::syscall_broker::BrokerFilePermission;
  namespace media {
  namespace {
  
@@ -19,7 +19,7 @@ Index: media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc
  void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions,
                                bool include_sys_dev_char,
                                bool read_write) {
-@@ -165,6 +168,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2(
+@@ -182,6 +185,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2(
    NOTREACHED_NORETURN();
  #endif  // BUILDFLAG(USE_V4L2_CODEC)
  }
@@ -27,7 +27,7 @@ Index: media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc
  
  }  // namespace
  
-@@ -180,6 +184,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2(
+@@ -197,6 +201,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2(
  //   (at least).
  bool HardwareVideoDecodingPreSandboxHook(
      sandbox::policy::SandboxLinux::Options options) {
@@ -35,10 +35,10 @@ Index: media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc
    using HardwareVideoDecodingProcessPolicy =
        sandbox::policy::HardwareVideoDecodingProcessPolicy;
    using PolicyType =
-@@ -217,6 +222,7 @@ bool HardwareVideoDecodingPreSandboxHook(
+@@ -242,6 +247,7 @@ bool HardwareVideoDecodingPreSandboxHook(
+   // |permissions| is empty?
    sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess(
-       command_set, permissions, sandbox::policy::SandboxLinux::PreSandboxHook(),
-       options);
+       command_set, permissions, options);
 +#endif
    return true;
  }
diff --git a/www/ungoogled-chromium/patches/patch-media_gpu_sandbox_hardware_video_encoding_sandbox_hook_linux_cc b/www/ungoogled-chromium/patches/patch-media_gpu_sandbox_hardware_video_encoding_sandbox_hook_linux_cc
index 89ad2f07f..83baa256b 100644
--- a/www/ungoogled-chromium/patches/patch-media_gpu_sandbox_hardware_video_encoding_sandbox_hook_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-media_gpu_sandbox_hardware_video_encoding_sandbox_hook_linux_cc
@@ -17,7 +17,7 @@ Index: media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc
    sandbox::syscall_broker::BrokerCommandSet command_set;
    std::vector<BrokerFilePermission> permissions;
  
-@@ -121,6 +124,7 @@ bool HardwareVideoEncodingPreSandboxHook(
+@@ -120,6 +123,7 @@ bool HardwareVideoEncodingPreSandboxHook(
        return false;
      }
    }
diff --git a/www/ungoogled-chromium/patches/patch-media_gpu_vaapi_vaapi_video_decoder_cc b/www/ungoogled-chromium/patches/patch-media_gpu_vaapi_vaapi_video_decoder_cc
index 3e2c7d152..9c951fd31 100644
--- a/www/ungoogled-chromium/patches/patch-media_gpu_vaapi_vaapi_video_decoder_cc
+++ b/www/ungoogled-chromium/patches/patch-media_gpu_vaapi_vaapi_video_decoder_cc
@@ -1,12 +1,12 @@
 Index: media/gpu/vaapi/vaapi_video_decoder.cc
 --- media/gpu/vaapi/vaapi_video_decoder.cc.orig
 +++ media/gpu/vaapi/vaapi_video_decoder.cc
-@@ -779,7 +779,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
+@@ -780,7 +780,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
    const gfx::Size decoder_natural_size =
        aspect_ratio_.GetNaturalSize(decoder_visible_rect);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   absl::optional<DmabufVideoFramePool::CreateFrameCB> allocator =
+   std::optional<DmabufVideoFramePool::CreateFrameCB> allocator =
        base::BindRepeating(&AllocateCustomFrameProxy, weak_this_);
    std::vector<ImageProcessor::PixelLayoutCandidate> candidates = {
diff --git a/www/ungoogled-chromium/patches/patch-media_gpu_vaapi_vaapi_wrapper_cc b/www/ungoogled-chromium/patches/patch-media_gpu_vaapi_vaapi_wrapper_cc
index 84d459467..3e02dba70 100644
--- a/www/ungoogled-chromium/patches/patch-media_gpu_vaapi_vaapi_wrapper_cc
+++ b/www/ungoogled-chromium/patches/patch-media_gpu_vaapi_vaapi_wrapper_cc
@@ -1,21 +1,12 @@
 Index: media/gpu/vaapi/vaapi_wrapper.cc
 --- media/gpu/vaapi/vaapi_wrapper.cc.orig
 +++ media/gpu/vaapi/vaapi_wrapper.cc
-@@ -1610,7 +1610,7 @@ VADisplayStateHandle VADisplayStateSingleton::GetHandl
-     return {};
-   }
- 
--#if BUILDFLAG(IS_OZONE) && BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_OZONE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
-   // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on
-   // Linux. See comment in OzonePlatform::PlatformProperties::supports_vaapi
-   // for more details. This will also require revisiting everything that's
-@@ -2454,7 +2454,7 @@ scoped_refptr<VASurface> VaapiWrapper::CreateVASurface
-     return nullptr;
-   }
+@@ -67,7 +67,7 @@
+ using media_gpu_vaapi::kModuleVa_prot;
+ #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // TODO(crbug.com/1326754): enable use DRIME_PRIME_2 API on Linux with the
-   // iHD driver.
-   const bool use_drm_prime_2 = false;
+ #include "base/files/file_util.h"
+ #include "base/strings/string_split.h"
+ #endif
diff --git a/www/ungoogled-chromium/patches/patch-media_media_options_gni b/www/ungoogled-chromium/patches/patch-media_media_options_gni
index f3ca5b540..1c2357f68 100644
--- a/www/ungoogled-chromium/patches/patch-media_media_options_gni
+++ b/www/ungoogled-chromium/patches/patch-media_media_options_gni
@@ -1,7 +1,7 @@
 Index: media/media_options.gni
 --- media/media_options.gni.orig
 +++ media/media_options.gni
-@@ -177,12 +177,15 @@ declare_args() {
+@@ -190,12 +190,15 @@ declare_args() {
    # Enables runtime selection of ALSA library for audio.
    use_alsa = false
  
@@ -18,7 +18,7 @@ Index: media/media_options.gni
        (!is_castos || (target_cpu == "x86" || target_cpu == "x64") ||
         is_cast_audio_only)) {
      use_alsa = true
-@@ -198,6 +201,10 @@ declare_args() {
+@@ -211,6 +214,10 @@ declare_args() {
      if (!use_cras && !is_castos && !is_asan && !is_tsan) {
        use_pulseaudio = true
      }
diff --git a/www/ungoogled-chromium/patches/patch-media_mojo_mojom_stable_stable_video_decoder_types_mojom_traits_cc b/www/ungoogled-chromium/patches/patch-media_mojo_mojom_stable_stable_video_decoder_types_mojom_traits_cc
index f2c4b4607..d9c6d291f 100644
--- a/www/ungoogled-chromium/patches/patch-media_mojo_mojom_stable_stable_video_decoder_types_mojom_traits_cc
+++ b/www/ungoogled-chromium/patches/patch-media_mojo_mojom_stable_stable_video_decoder_types_mojom_traits_cc
@@ -1,7 +1,7 @@
 Index: media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc
 --- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig
 +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc
-@@ -746,7 +746,7 @@ const gfx::GpuMemoryBufferId& StructTraits<
+@@ -837,7 +837,7 @@ const gfx::GpuMemoryBufferId& StructTraits<
    return input.id;
  }
  
@@ -10,7 +10,7 @@ Index: media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc
  // static
  gfx::NativePixmapHandle StructTraits<
      media::stable::mojom::NativeGpuMemoryBufferHandleDataView,
-@@ -767,7 +767,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor
+@@ -858,7 +858,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor
  
    output->type = gfx::NATIVE_PIXMAP;
  
diff --git a/www/ungoogled-chromium/patches/patch-media_mojo_mojom_stable_stable_video_decoder_types_mojom_traits_h b/www/ungoogled-chromium/patches/patch-media_mojo_mojom_stable_stable_video_decoder_types_mojom_traits_h
index 0e03d6640..53f0ace5b 100644
--- a/www/ungoogled-chromium/patches/patch-media_mojo_mojom_stable_stable_video_decoder_types_mojom_traits_h
+++ b/www/ungoogled-chromium/patches/patch-media_mojo_mojom_stable_stable_video_decoder_types_mojom_traits_h
@@ -1,7 +1,7 @@
 Index: media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h
 --- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig
 +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h
-@@ -678,7 +678,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem
+@@ -693,7 +693,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem
    static const gfx::GpuMemoryBufferId& id(
        const gfx::GpuMemoryBufferHandle& input);
  
diff --git a/www/ungoogled-chromium/patches/patch-media_video_fake_gpu_memory_buffer_cc b/www/ungoogled-chromium/patches/patch-media_video_fake_gpu_memory_buffer_cc
index 5d010fede..516fa93a9 100644
--- a/www/ungoogled-chromium/patches/patch-media_video_fake_gpu_memory_buffer_cc
+++ b/www/ungoogled-chromium/patches/patch-media_video_fake_gpu_memory_buffer_cc
@@ -10,7 +10,7 @@ Index: media/video/fake_gpu_memory_buffer.cc
  #include <fcntl.h>
  #include <sys/stat.h>
  #include <sys/types.h>
-@@ -47,7 +47,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB
+@@ -52,7 +52,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB
  
  }  // namespace
  
@@ -19,7 +19,7 @@ Index: media/video/fake_gpu_memory_buffer.cc
  base::ScopedFD GetDummyFD() {
    base::ScopedFD fd(open("/dev/zero", O_RDWR));
    DCHECK(fd.is_valid());
-@@ -77,7 +77,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si
+@@ -82,7 +82,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si
    static base::AtomicSequenceNumber buffer_id_generator;
    handle_.id = gfx::GpuMemoryBufferId(buffer_id_generator.GetNext());
  
@@ -28,12 +28,12 @@ Index: media/video/fake_gpu_memory_buffer.cc
    for (size_t i = 0; i < VideoFrame::NumPlanes(video_pixel_format_); i++) {
      const gfx::Size plane_size_in_bytes =
          VideoFrame::PlaneSize(video_pixel_format_, i, size_);
-@@ -134,7 +134,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH
+@@ -144,7 +144,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH
    gfx::GpuMemoryBufferHandle handle;
    handle.type = gfx::NATIVE_PIXMAP;
    handle.id = handle_.id;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
    handle.native_pixmap_handle =
        gfx::CloneHandleForIPC(handle_.native_pixmap_handle);
  #endif
diff --git a/www/ungoogled-chromium/patches/patch-media_video_gpu_memory_buffer_video_frame_pool_cc b/www/ungoogled-chromium/patches/patch-media_video_gpu_memory_buffer_video_frame_pool_cc
index 257f38575..abec61012 100644
--- a/www/ungoogled-chromium/patches/patch-media_video_gpu_memory_buffer_video_frame_pool_cc
+++ b/www/ungoogled-chromium/patches/patch-media_video_gpu_memory_buffer_video_frame_pool_cc
@@ -1,7 +1,7 @@
 Index: media/video/gpu_memory_buffer_video_frame_pool.cc
 --- media/video/gpu_memory_buffer_video_frame_pool.cc.orig
 +++ media/video/gpu_memory_buffer_video_frame_pool.cc
-@@ -727,7 +727,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
+@@ -803,7 +803,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
    }
  
    bool is_software_backed_video_frame = !video_frame->HasTextures();
@@ -10,8 +10,8 @@ Index: media/video/gpu_memory_buffer_video_frame_pool.cc
    is_software_backed_video_frame &= !video_frame->HasDmaBufs();
  #endif
  
-@@ -1195,7 +1195,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
-     is_webgpu_compatible = (gpu_memory_buffer != nullptr);
+@@ -1285,7 +1285,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
+     }
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -19,7 +19,7 @@ Index: media/video/gpu_memory_buffer_video_frame_pool.cc
      is_webgpu_compatible = (gpu_memory_buffer != nullptr);
      if (is_webgpu_compatible) {
        is_webgpu_compatible &=
-@@ -1214,7 +1214,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
+@@ -1306,7 +1306,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
                         gpu::SHARED_IMAGE_USAGE_DISPLAY_READ |
                         gpu::SHARED_IMAGE_USAGE_SCANOUT;
  
diff --git a/www/ungoogled-chromium/patches/patch-media_video_video_encode_accelerator_adapter_cc b/www/ungoogled-chromium/patches/patch-media_video_video_encode_accelerator_adapter_cc
index 1b36ba142..d2e59e3f1 100644
--- a/www/ungoogled-chromium/patches/patch-media_video_video_encode_accelerator_adapter_cc
+++ b/www/ungoogled-chromium/patches/patch-media_video_video_encode_accelerator_adapter_cc
@@ -1,7 +1,7 @@
 Index: media/video/video_encode_accelerator_adapter.cc
 --- media/video/video_encode_accelerator_adapter.cc.orig
 +++ media/video/video_encode_accelerator_adapter.cc
-@@ -140,7 +140,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig(
+@@ -157,7 +157,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig(
    if (is_rgb)
      config.input_format = PIXEL_FORMAT_I420;
  
@@ -10,7 +10,7 @@ Index: media/video/video_encode_accelerator_adapter.cc
    if (format != PIXEL_FORMAT_I420 ||
        !VideoFrame::IsStorageTypeMappable(storage_type)) {
      // ChromeOS/Linux hardware video encoders supports I420 on-memory
-@@ -465,7 +465,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal
+@@ -482,7 +482,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal
        SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(),
                       supported_rc_modes_, required_encoder_type_);
  
diff --git a/www/ungoogled-chromium/patches/patch-media_webrtc_audio_processor_cc b/www/ungoogled-chromium/patches/patch-media_webrtc_audio_processor_cc
index 3ad87d6fa..21a782b74 100644
--- a/www/ungoogled-chromium/patches/patch-media_webrtc_audio_processor_cc
+++ b/www/ungoogled-chromium/patches/patch-media_webrtc_audio_processor_cc
@@ -1,7 +1,7 @@
 Index: media/webrtc/audio_processor.cc
 --- media/webrtc/audio_processor.cc.orig
 +++ media/webrtc/audio_processor.cc
-@@ -513,7 +513,7 @@ absl::optional<double> AudioProcessor::ProcessData(
+@@ -513,7 +513,7 @@ std::optional<double> AudioProcessor::ProcessData(
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
    DCHECK_LE(volume, 1.0);
  #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
diff --git a/www/ungoogled-chromium/patches/patch-media_webrtc_helpers_cc b/www/ungoogled-chromium/patches/patch-media_webrtc_helpers_cc
index 6b35bff42..499437666 100644
--- a/www/ungoogled-chromium/patches/patch-media_webrtc_helpers_cc
+++ b/www/ungoogled-chromium/patches/patch-media_webrtc_helpers_cc
@@ -1,12 +1,20 @@
 Index: media/webrtc/helpers.cc
 --- media/webrtc/helpers.cc.orig
 +++ media/webrtc/helpers.cc
-@@ -40,7 +40,7 @@ void ConfigAutomaticGainControl(const AudioProcessingS
-     apm_config.gain_controller2.enabled = false;
+@@ -41,14 +41,14 @@ void ConfigAutomaticGainControl(const AudioProcessingS
      return;
    }
+ 
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Use the Hybrid AGC setup, which combines the AGC1 input volume controller
-   // and the AGC2 digital adaptive controller.
+   const bool kInputVolumeAdjustmentOverrideAllowed = true;
+ #elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+   const bool kInputVolumeAdjustmentOverrideAllowed = false;
+ #endif
  
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   // Use AGC2 digital and input volume controller.
+   // TODO(crbug.com/1375239): Remove `kWebRtcAllowInputVolumeAdjustment` safely.
+   if (kInputVolumeAdjustmentOverrideAllowed &&
diff --git a/www/ungoogled-chromium/patches/patch-media_webrtc_helpers_unittests_cc b/www/ungoogled-chromium/patches/patch-media_webrtc_helpers_unittests_cc
index 13aa11ec6..08950213b 100644
--- a/www/ungoogled-chromium/patches/patch-media_webrtc_helpers_unittests_cc
+++ b/www/ungoogled-chromium/patches/patch-media_webrtc_helpers_unittests_cc
@@ -1,25 +1,34 @@
 Index: media/webrtc/helpers_unittests.cc
 --- media/webrtc/helpers_unittests.cc.orig
 +++ media/webrtc/helpers_unittests.cc
-@@ -39,7 +39,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau
-   EXPECT_FALSE(config.pre_amplifier.enabled);
+@@ -40,7 +40,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau
    EXPECT_TRUE(config.echo_canceller.enabled);
  
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   EXPECT_TRUE(config.gain_controller1.enabled);
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   EXPECT_FALSE(config.gain_controller1.enabled);
    EXPECT_TRUE(config.gain_controller2.enabled);
- #elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-@@ -77,7 +77,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest,
-   EXPECT_EQ(config.gain_controller2, kDefaultApmConfig.gain_controller2);
+ #elif BUILDFLAG(IS_CASTOS) || BUILDFLAG(IS_CAST_ANDROID)
+@@ -73,7 +73,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest,
  }
  
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ TEST(CreateWebRtcAudioProcessingModuleTest,
+      InputVolumeAdjustmentEnabledWithAgc2) {
+   ::base::test::ScopedFeatureList feature_list;
+@@ -89,7 +89,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest,
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+         // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ 
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  TEST(CreateWebRtcAudioProcessingModuleTest,
-      InputVolumeAdjustmentEnabledWithHybridAgc) {
+      CanDisableInputVolumeAdjustmentWithAgc2) {
    ::base::test::ScopedFeatureList feature_list;
-@@ -103,7 +103,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest,
+@@ -106,7 +106,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest,
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/patches/patch-mojo_public_c_system_thunks_cc b/www/ungoogled-chromium/patches/patch-mojo_public_c_system_thunks_cc
index b4adbc984..223aa9223 100644
--- a/www/ungoogled-chromium/patches/patch-mojo_public_c_system_thunks_cc
+++ b/www/ungoogled-chromium/patches/patch-mojo_public_c_system_thunks_cc
@@ -1,7 +1,7 @@
 Index: mojo/public/c/system/thunks.cc
 --- mojo/public/c/system/thunks.cc.orig
 +++ mojo/public/c/system/thunks.cc
-@@ -23,7 +23,7 @@
+@@ -25,7 +25,7 @@
  #include "mojo/public/c/system/message_pipe.h"
  
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
@@ -34,6 +34,6 @@ Index: mojo/public/c/system/thunks.cc
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
 -    BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   absl::optional<base::ScopedNativeLibrary> library_;
+   std::optional<base::ScopedNativeLibrary> library_;
  #endif
  };
diff --git a/www/ungoogled-chromium/patches/patch-mojo_public_tools_bindings_mojom_gni b/www/ungoogled-chromium/patches/patch-mojo_public_tools_bindings_mojom_gni
index e1796719f..ef67a5fdf 100644
--- a/www/ungoogled-chromium/patches/patch-mojo_public_tools_bindings_mojom_gni
+++ b/www/ungoogled-chromium/patches/patch-mojo_public_tools_bindings_mojom_gni
@@ -1,7 +1,7 @@
 Index: mojo/public/tools/bindings/mojom.gni
 --- mojo/public/tools/bindings/mojom.gni.orig
 +++ mojo/public/tools/bindings/mojom.gni
-@@ -743,6 +743,16 @@ template("mojom") {
+@@ -748,6 +748,16 @@ template("mojom") {
        enabled_features += [ "is_apple" ]
      }
  
@@ -17,4 +17,4 @@ Index: mojo/public/tools/bindings/mojom.gni
 +
      action(parser_target_name) {
        allow_remote = true
-       custom_processor = "mojom_parser"
+ 
diff --git a/www/ungoogled-chromium/patches/patch-net_BUILD_gn b/www/ungoogled-chromium/patches/patch-net_BUILD_gn
index 6bcaac4c6..7f073117e 100644
--- a/www/ungoogled-chromium/patches/patch-net_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-net_BUILD_gn
@@ -1,7 +1,7 @@
 Index: net/BUILD.gn
 --- net/BUILD.gn.orig
 +++ net/BUILD.gn
-@@ -122,7 +122,7 @@ net_configs = [
+@@ -123,7 +123,7 @@ net_configs = [
    "//build/config/compiler:wexit_time_destructors",
  ]
  
@@ -10,8 +10,8 @@ Index: net/BUILD.gn
    net_configs += [ "//build/config/linux:libresolv" ]
  }
  
-@@ -1244,6 +1244,19 @@ component("net") {
-     deps += [ "//third_party/xdg_shared_mime_info" ]
+@@ -1190,6 +1190,19 @@ component("net") {
+     ]
    }
  
 +  if (is_bsd) {
@@ -30,7 +30,7 @@ Index: net/BUILD.gn
    if (is_mac) {
      sources += [
        "base/network_notification_thread_mac.cc",
-@@ -1399,7 +1412,7 @@ component("net") {
+@@ -1346,7 +1359,7 @@ component("net") {
    }
  
    # Use getifaddrs() on POSIX platforms, except Linux.
@@ -39,7 +39,7 @@ Index: net/BUILD.gn
      sources += [
        "base/network_interfaces_getifaddrs.cc",
        "base/network_interfaces_getifaddrs.h",
-@@ -2893,7 +2906,7 @@ test("net_unittests") {
+@@ -2823,7 +2836,7 @@ test("net_unittests") {
      ]
    }
  
@@ -48,9 +48,9 @@ Index: net/BUILD.gn
      sources += [
        "base/address_tracker_linux_unittest.cc",
        "base/network_interfaces_linux_unittest.cc",
-@@ -2961,6 +2974,10 @@ test("net_unittests") {
-     "//url:buildflags",
-   ]
+@@ -2911,6 +2924,10 @@ test("net_unittests") {
+     ]
+   }
  
 +  if (is_bsd) {
 +    deps += [ "//sandbox/policy" ]
@@ -59,7 +59,7 @@ Index: net/BUILD.gn
    if (enable_websockets) {
      deps += [ "//net/server:tests" ]
    }
-@@ -3043,7 +3060,7 @@ test("net_unittests") {
+@@ -2971,7 +2988,7 @@ test("net_unittests") {
      ]
    }
  
@@ -68,7 +68,7 @@ Index: net/BUILD.gn
      sources += [ "tools/quic/quic_simple_server_test.cc" ]
    }
  
-@@ -3178,7 +3195,7 @@ test("net_unittests") {
+@@ -3107,7 +3124,7 @@ test("net_unittests") {
    }
  
    # Use getifaddrs() on POSIX platforms, except Linux.
diff --git a/www/ungoogled-chromium/patches/patch-net_base_features_cc b/www/ungoogled-chromium/patches/patch-net_base_features_cc
index 622d4cdce..5b72d23da 100644
--- a/www/ungoogled-chromium/patches/patch-net_base_features_cc
+++ b/www/ungoogled-chromium/patches/patch-net_base_features_cc
@@ -1,12 +1,25 @@
 Index: net/base/features.cc
 --- net/base/features.cc.orig
 +++ net/base/features.cc
-@@ -179,7 +179,7 @@ BASE_FEATURE(kCertDualVerificationTrialFeature,
- #if BUILDFLAG(CHROME_ROOT_STORE_OPTIONAL)
- BASE_FEATURE(kChromeRootStoreUsed,
-              "ChromeRootStoreUsed",
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+@@ -28,7 +28,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin,
+ BASE_FEATURE(kAsyncDns,
+              "AsyncDns",
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || \
+-    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
+@@ -506,7 +506,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder,
+              "SpdyHeadersToHttpResponseUseBuilder",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
++#if BUILDFLAG(IS_OPENBSD)
++// No IP_RECVTOS support
+ BASE_FEATURE(kReceiveEcn, "ReceiveEcn", base::FEATURE_DISABLED_BY_DEFAULT);
++#else
++BASE_FEATURE(kReceiveEcn, "ReceiveEcn", base::FEATURE_DISABLED_BY_DEFAULT);
++#endif
+ 
+ // TODO(crbug.com/634470): Remove this feature flag in January 2024 if the new
+ // limit sticks.
diff --git a/www/ungoogled-chromium/patches/patch-net_base_network_change_notifier_cc b/www/ungoogled-chromium/patches/patch-net_base_network_change_notifier_cc
index 51b4d8666..198197b8f 100644
--- a/www/ungoogled-chromium/patches/patch-net_base_network_change_notifier_cc
+++ b/www/ungoogled-chromium/patches/patch-net_base_network_change_notifier_cc
@@ -4,7 +4,7 @@ Index: net/base/network_change_notifier.cc
 @@ -37,7 +37,7 @@
  #include "net/base/network_change_notifier_linux.h"
  #elif BUILDFLAG(IS_APPLE)
- #include "net/base/network_change_notifier_mac.h"
+ #include "net/base/network_change_notifier_apple.h"
 -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
  #include "net/base/network_change_notifier_passive.h"
diff --git a/www/ungoogled-chromium/patches/patch-net_cert_cert_verifier_cc b/www/ungoogled-chromium/patches/patch-net_cert_cert_verifier_cc
deleted file mode 100644
index 8956d4a54..000000000
--- a/www/ungoogled-chromium/patches/patch-net_cert_cert_verifier_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: net/cert/cert_verifier.cc
---- net/cert/cert_verifier.cc.orig
-+++ net/cert/cert_verifier.cc
-@@ -40,7 +40,7 @@ class DefaultCertVerifyProcFactory : public net::CertV
-     return CertVerifyProc::CreateBuiltinWithChromeRootStore(
-         std::move(cert_net_fetcher), impl_params.crl_set,
-         base::OptionalToPtr(impl_params.root_store_data));
--#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     return CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher),
-                                                    impl_params.crl_set);
- #else
diff --git a/www/ungoogled-chromium/patches/patch-net_cert_cert_verify_proc_cc b/www/ungoogled-chromium/patches/patch-net_cert_cert_verify_proc_cc
deleted file mode 100644
index d43379ebf..000000000
--- a/www/ungoogled-chromium/patches/patch-net_cert_cert_verify_proc_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: net/cert/cert_verify_proc.cc
---- net/cert/cert_verify_proc.cc.orig
-+++ net/cert/cert_verify_proc.cc
-@@ -409,7 +409,7 @@ base::Value::Dict CertVerifyParams(
- 
- }  // namespace
- 
--#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
-+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-       BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY))
- // static
- scoped_refptr<CertVerifyProc> CertVerifyProc::CreateSystemVerifyProc(
diff --git a/www/ungoogled-chromium/patches/patch-net_cert_cert_verify_proc_h b/www/ungoogled-chromium/patches/patch-net_cert_cert_verify_proc_h
index 3241f98ca..4f9d4b4aa 100644
--- a/www/ungoogled-chromium/patches/patch-net_cert_cert_verify_proc_h
+++ b/www/ungoogled-chromium/patches/patch-net_cert_cert_verify_proc_h
@@ -1,7 +1,7 @@
 Index: net/cert/cert_verify_proc.h
 --- net/cert/cert_verify_proc.h.orig
 +++ net/cert/cert_verify_proc.h
-@@ -79,7 +79,7 @@ class NET_EXPORT CertVerifyProc
+@@ -174,7 +174,7 @@ class NET_EXPORT CertVerifyProc
      kMaxValue = kChainLengthOne
    };
  
diff --git a/www/ungoogled-chromium/patches/patch-net_cert_cert_verify_proc_unittest_cc b/www/ungoogled-chromium/patches/patch-net_cert_cert_verify_proc_unittest_cc
deleted file mode 100644
index 1778b1cbb..000000000
--- a/www/ungoogled-chromium/patches/patch-net_cert_cert_verify_proc_unittest_cc
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: net/cert/cert_verify_proc_unittest.cc
---- net/cert/cert_verify_proc_unittest.cc.orig
-+++ net/cert/cert_verify_proc_unittest.cc
-@@ -215,7 +215,7 @@ scoped_refptr<CertVerifyProc> CreateCertVerifyProc(
-     case CERT_VERIFY_PROC_IOS:
-       return base::MakeRefCounted<CertVerifyProcIOS>(std::move(crl_set));
- #endif
--#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     case CERT_VERIFY_PROC_BUILTIN:
-       return CreateCertVerifyProcBuiltin(std::move(cert_net_fetcher),
-                                          std::move(crl_set),
-@@ -244,7 +244,7 @@ constexpr CertVerifyProcType kAllCertVerifiers[] = {
-     CERT_VERIFY_PROC_ANDROID,
- #elif BUILDFLAG(IS_IOS)
-     CERT_VERIFY_PROC_IOS,
--#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     CERT_VERIFY_PROC_BUILTIN,
- #endif
- #if BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED)
diff --git a/www/ungoogled-chromium/patches/patch-net_cert_test_root_certs_unittest_cc b/www/ungoogled-chromium/patches/patch-net_cert_test_root_certs_unittest_cc
deleted file mode 100644
index 5daaaf5d3..000000000
--- a/www/ungoogled-chromium/patches/patch-net_cert_test_root_certs_unittest_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: net/cert/test_root_certs_unittest.cc
---- net/cert/test_root_certs_unittest.cc.orig
-+++ net/cert/test_root_certs_unittest.cc
-@@ -46,7 +46,7 @@ scoped_refptr<CertVerifyProc> CreateCertVerifyProc() {
-   return CertVerifyProc::CreateBuiltinWithChromeRootStore(
-       /*cert_net_fetcher=*/nullptr, CRLSet::BuiltinCRLSet().get(),
-       /*root_store_data=*/nullptr);
--#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return CertVerifyProc::CreateBuiltinVerifyProc(/*cert_net_fetcher=*/nullptr,
-                                                  CRLSet::BuiltinCRLSet().get());
- #else
diff --git a/www/ungoogled-chromium/patches/patch-net_dns_BUILD_gn b/www/ungoogled-chromium/patches/patch-net_dns_BUILD_gn
index 75cb6fbe3..0934035cb 100644
--- a/www/ungoogled-chromium/patches/patch-net_dns_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-net_dns_BUILD_gn
@@ -1,7 +1,7 @@
 Index: net/dns/BUILD.gn
 --- net/dns/BUILD.gn.orig
 +++ net/dns/BUILD.gn
-@@ -128,7 +128,7 @@ source_set("dns") {
+@@ -136,7 +136,7 @@ source_set("dns") {
        "dns_config_service_android.cc",
        "dns_config_service_android.h",
      ]
@@ -10,7 +10,7 @@ Index: net/dns/BUILD.gn
      sources += [
        "dns_config_service_linux.cc",
        "dns_config_service_linux.h",
-@@ -169,6 +169,7 @@ source_set("dns") {
+@@ -177,6 +177,7 @@ source_set("dns") {
      ":host_resolver_manager",
      ":mdns_client",
      "//net:net_public_deps",
@@ -18,7 +18,7 @@ Index: net/dns/BUILD.gn
    ]
  
    allow_circular_includes_from = [
-@@ -434,9 +435,9 @@ source_set("tests") {
+@@ -444,9 +445,9 @@ source_set("tests") {
  
    if (is_android) {
      sources += [ "dns_config_service_android_unittest.cc" ]
diff --git a/www/ungoogled-chromium/patches/patch-net_dns_address_info_cc b/www/ungoogled-chromium/patches/patch-net_dns_address_info_cc
index 83f8be9e1..1173f96f6 100644
--- a/www/ungoogled-chromium/patches/patch-net_dns_address_info_cc
+++ b/www/ungoogled-chromium/patches/patch-net_dns_address_info_cc
@@ -1,7 +1,7 @@
 Index: net/dns/address_info.cc
 --- net/dns/address_info.cc.orig
 +++ net/dns/address_info.cc
-@@ -77,8 +77,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get(
+@@ -78,8 +78,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get(
      // error.
      // http://crbug.com/134142
      err = ERR_NAME_NOT_RESOLVED;
diff --git a/www/ungoogled-chromium/patches/patch-net_dns_address_sorter_posix_cc b/www/ungoogled-chromium/patches/patch-net_dns_address_sorter_posix_cc
index 719795ac0..fb8dceba2 100644
--- a/www/ungoogled-chromium/patches/patch-net_dns_address_sorter_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-net_dns_address_sorter_posix_cc
@@ -8,4 +8,4 @@ Index: net/dns/address_sorter_posix.cc
 +#include <netinet6/in6_var.h>
  #endif  // BUILDFLAG(IS_IOS)
  #endif
- 
+ #include <vector>
diff --git a/www/ungoogled-chromium/patches/patch-net_dns_host_resolver_cache_cc b/www/ungoogled-chromium/patches/patch-net_dns_host_resolver_cache_cc
deleted file mode 100644
index bb23a9bed..000000000
--- a/www/ungoogled-chromium/patches/patch-net_dns_host_resolver_cache_cc
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: net/dns/host_resolver_cache.cc
---- net/dns/host_resolver_cache.cc.orig
-+++ net/dns/host_resolver_cache.cc
-@@ -161,7 +161,11 @@ void HostResolverCache::Set(
- 
-   std::string domain_name = result->domain_name();
-   entries_.emplace(
-+#if defined(__clang__) && (__clang_major__ >= 16)
-       Key(std::move(domain_name), network_anonymization_key),
-+#else
-+      Key({std::move(domain_name), network_anonymization_key}),
-+#endif
-       Entry(std::move(result), source, secure, staleness_generation_));
- 
-   if (entries_.size() > max_entries_) {
diff --git a/www/ungoogled-chromium/patches/patch-net_dns_public_BUILD_gn b/www/ungoogled-chromium/patches/patch-net_dns_public_BUILD_gn
index 68a304394..60153412e 100644
--- a/www/ungoogled-chromium/patches/patch-net_dns_public_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-net_dns_public_BUILD_gn
@@ -1,7 +1,7 @@
 Index: net/dns/public/BUILD.gn
 --- net/dns/public/BUILD.gn.orig
 +++ net/dns/public/BUILD.gn
-@@ -76,7 +76,7 @@ source_set("tests") {
+@@ -77,7 +77,7 @@ source_set("tests") {
      "doh_provider_entry_unittest.cc",
    ]
  
diff --git a/www/ungoogled-chromium/patches/patch-net_dns_public_scoped_res_state_h b/www/ungoogled-chromium/patches/patch-net_dns_public_scoped_res_state_h
index ddc8567b2..a6d9567ad 100644
--- a/www/ungoogled-chromium/patches/patch-net_dns_public_scoped_res_state_h
+++ b/www/ungoogled-chromium/patches/patch-net_dns_public_scoped_res_state_h
@@ -8,4 +8,4 @@ Index: net/dns/public/scoped_res_state.h
 +#include <netinet/in.h>
  #include <resolv.h>
  
- #include "build/build_config.h"
+ #include <optional>
diff --git a/www/ungoogled-chromium/patches/patch-net_filter_zstd_source_stream_cc b/www/ungoogled-chromium/patches/patch-net_filter_zstd_source_stream_cc
new file mode 100644
index 000000000..305fb81ff
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-net_filter_zstd_source_stream_cc
@@ -0,0 +1,11 @@
+Index: net/filter/zstd_source_stream.cc
+--- net/filter/zstd_source_stream.cc.orig
++++ net/filter/zstd_source_stream.cc
+@@ -7,6 +7,7 @@
+ #include <algorithm>
+ #include <unordered_map>
+ #include <utility>
++#include <unordered_map>
+ 
+ #define ZSTD_STATIC_LINKING_ONLY
+ 
diff --git a/www/ungoogled-chromium/patches/patch-net_http_http_auth_handler_negotiate_cc b/www/ungoogled-chromium/patches/patch-net_http_http_auth_handler_negotiate_cc
new file mode 100644
index 000000000..2a1f8c1c1
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-net_http_http_auth_handler_negotiate_cc
@@ -0,0 +1,12 @@
+Index: net/http/http_auth_handler_negotiate.cc
+--- net/http/http_auth_handler_negotiate.cc.orig
++++ net/http/http_auth_handler_negotiate.cc
+@@ -120,7 +120,7 @@ int HttpAuthHandlerNegotiate::Factory::CreateAuthHandl
+ #elif BUILDFLAG(IS_POSIX)
+   if (is_unsupported_)
+     return ERR_UNSUPPORTED_AUTH_SCHEME;
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Note: Don't set is_unsupported_ = true here. AllowGssapiLibraryLoad()
+   // might change to true during a session.
+   if (!http_auth_preferences() ||
diff --git a/www/ungoogled-chromium/patches/patch-net_http_http_auth_preferences_cc b/www/ungoogled-chromium/patches/patch-net_http_http_auth_preferences_cc
new file mode 100644
index 000000000..957a7a4a9
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-net_http_http_auth_preferences_cc
@@ -0,0 +1,12 @@
+Index: net/http/http_auth_preferences.cc
+--- net/http/http_auth_preferences.cc.orig
++++ net/http/http_auth_preferences.cc
+@@ -39,7 +39,7 @@ std::string HttpAuthPreferences::AuthAndroidNegotiateA
+ }
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool HttpAuthPreferences::AllowGssapiLibraryLoad() const {
+   return allow_gssapi_library_load_;
+ }
diff --git a/www/ungoogled-chromium/patches/patch-net_http_http_auth_preferences_h b/www/ungoogled-chromium/patches/patch-net_http_http_auth_preferences_h
new file mode 100644
index 000000000..ca4497df4
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-net_http_http_auth_preferences_h
@@ -0,0 +1,30 @@
+Index: net/http/http_auth_preferences.h
+--- net/http/http_auth_preferences.h.orig
++++ net/http/http_auth_preferences.h
+@@ -50,7 +50,7 @@ class NET_EXPORT HttpAuthPreferences {
+ #if BUILDFLAG(IS_ANDROID)
+   virtual std::string AuthAndroidNegotiateAccountType() const;
+ #endif
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   virtual bool AllowGssapiLibraryLoad() const;
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+   virtual bool CanUseDefaultCredentials(
+@@ -86,7 +86,7 @@ class NET_EXPORT HttpAuthPreferences {
+   }
+ #endif  // BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   void set_allow_gssapi_library_load(bool allow_gssapi_library_load) {
+     allow_gssapi_library_load_ = allow_gssapi_library_load;
+   }
+@@ -137,7 +137,7 @@ class NET_EXPORT HttpAuthPreferences {
+   std::string auth_android_negotiate_account_type_;
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   bool allow_gssapi_library_load_ = true;
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+ 
diff --git a/www/ungoogled-chromium/patches/patch-net_proxy_resolution_proxy_config_service_linux_cc b/www/ungoogled-chromium/patches/patch-net_proxy_resolution_proxy_config_service_linux_cc
index 363bee087..b13be5a76 100644
--- a/www/ungoogled-chromium/patches/patch-net_proxy_resolution_proxy_config_service_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-net_proxy_resolution_proxy_config_service_linux_cc
@@ -11,7 +11,7 @@ Index: net/proxy_resolution/proxy_config_service_linux.cc
  #include <unistd.h>
  
  #include <map>
-@@ -504,6 +506,7 @@ bool SettingGetterImplGSettings::CheckVersion(
+@@ -505,6 +507,7 @@ bool SettingGetterImplGSettings::CheckVersion(
  }
  #endif  // defined(USE_GIO)
  
@@ -19,7 +19,7 @@ Index: net/proxy_resolution/proxy_config_service_linux.cc
  // Converts |value| from a decimal string to an int. If there was a failure
  // parsing, returns |default_value|.
  int StringToIntOrDefault(base::StringPiece value, int default_value) {
-@@ -1032,6 +1035,7 @@ class SettingGetterImplKDE : public ProxyConfigService
+@@ -1033,6 +1036,7 @@ class SettingGetterImplKDE : public ProxyConfigService
    // events on.
    scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
  };
@@ -27,7 +27,7 @@ Index: net/proxy_resolution/proxy_config_service_linux.cc
  
  }  // namespace
  
-@@ -1249,9 +1253,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
+@@ -1251,9 +1255,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
      case base::nix::DESKTOP_ENVIRONMENT_KDE4:
      case base::nix::DESKTOP_ENVIRONMENT_KDE5:
      case base::nix::DESKTOP_ENVIRONMENT_KDE6:
diff --git a/www/ungoogled-chromium/patches/patch-net_socket_udp_socket_posix_cc b/www/ungoogled-chromium/patches/patch-net_socket_udp_socket_posix_cc
index 939b5124c..0e02beb83 100644
--- a/www/ungoogled-chromium/patches/patch-net_socket_udp_socket_posix_cc
+++ b/www/ungoogled-chromium/patches/patch-net_socket_udp_socket_posix_cc
@@ -1,7 +1,17 @@
 Index: net/socket/udp_socket_posix.cc
 --- net/socket/udp_socket_posix.cc.orig
 +++ net/socket/udp_socket_posix.cc
-@@ -591,7 +591,7 @@ int UDPSocketPosix::SetDoNotFragment() {
+@@ -592,12 +592,17 @@ int UDPSocketPosix::SetRecvTos() {
+     }
+   }
+ 
++#ifdef IP_RECVTOS
+   int rv = setsockopt(socket_, IPPROTO_IP, IP_RECVTOS, &ecn, sizeof(ecn));
++#else
++  int rv = -1;
++  errno = EOPNOTSUPP;
++#endif
+   return rv == 0 ? OK : MapSystemError(errno);
  }
  
  void UDPSocketPosix::SetMsgConfirm(bool confirm) {
@@ -10,7 +20,7 @@ Index: net/socket/udp_socket_posix.cc
    if (confirm) {
      sendto_flags_ |= MSG_CONFIRM;
    } else {
-@@ -612,7 +612,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
+@@ -618,7 +623,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
    DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
    int value = broadcast ? 1 : 0;
    int rv;
@@ -19,7 +29,7 @@ Index: net/socket/udp_socket_posix.cc
    // SO_REUSEPORT on OSX permits multiple processes to each receive
    // UDP multicast or broadcast datagrams destined for the bound
    // port.
-@@ -925,7 +925,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) 
+@@ -959,7 +964,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) 
  #if BUILDFLAG(IS_CHROMEOS_ASH)
    if (last_error == EINVAL)
      return ERR_ADDRESS_IN_USE;
diff --git a/www/ungoogled-chromium/patches/patch-net_socket_udp_socket_unittest_cc b/www/ungoogled-chromium/patches/patch-net_socket_udp_socket_unittest_cc
index 82762f58d..5b83c8f40 100644
--- a/www/ungoogled-chromium/patches/patch-net_socket_udp_socket_unittest_cc
+++ b/www/ungoogled-chromium/patches/patch-net_socket_udp_socket_unittest_cc
@@ -1,7 +1,7 @@
 Index: net/socket/udp_socket_unittest.cc
 --- net/socket/udp_socket_unittest.cc.orig
 +++ net/socket/udp_socket_unittest.cc
-@@ -345,7 +345,7 @@ TEST_F(UDPSocketTest, PartialRecv) {
+@@ -358,7 +358,7 @@ TEST_F(UDPSocketTest, PartialRecv) {
    EXPECT_EQ(second_packet, received);
  }
  
@@ -10,7 +10,7 @@ Index: net/socket/udp_socket_unittest.cc
  // - MacOS: requires root permissions on OSX 10.7+.
  // - Android: devices attached to testbots don't have default network, so
  // broadcasting to 255.255.255.255 returns error -109 (Address not reachable).
-@@ -656,7 +656,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) {
+@@ -669,7 +669,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) {
      EXPECT_THAT(rv, IsOk());
  
      rv = client.SetDoNotFragment();
@@ -19,7 +19,7 @@ Index: net/socket/udp_socket_unittest.cc
      // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia.
      EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED));
  #elif BUILDFLAG(IS_MAC)
-@@ -684,7 +684,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) {
+@@ -697,7 +697,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) {
      EXPECT_THAT(rv, IsOk());
  
      rv = server.SetDoNotFragment();
@@ -28,7 +28,7 @@ Index: net/socket/udp_socket_unittest.cc
      // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia.
      EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED));
  #elif BUILDFLAG(IS_MAC)
-@@ -749,7 +749,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) {
+@@ -762,7 +762,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) {
  
  // TODO(https://crbug.com/947115): failing on device on iOS 12.2.
  // TODO(https://crbug.com/1227554): flaky on Mac 11.
@@ -37,7 +37,7 @@ Index: net/socket/udp_socket_unittest.cc
  #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress
  #else
  #define MAYBE_SharedMulticastAddress SharedMulticastAddress
-@@ -803,7 +803,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) {
+@@ -816,7 +816,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) {
                                  NetLogSource());
    ASSERT_THAT(client_socket.Connect(send_address), IsOk());
  
diff --git a/www/ungoogled-chromium/patches/patch-net_third_party_quiche_BUILD_gn b/www/ungoogled-chromium/patches/patch-net_third_party_quiche_BUILD_gn
index da273025e..24e9f40c1 100644
--- a/www/ungoogled-chromium/patches/patch-net_third_party_quiche_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-net_third_party_quiche_BUILD_gn
@@ -1,7 +1,7 @@
 Index: net/third_party/quiche/BUILD.gn
 --- net/third_party/quiche/BUILD.gn.orig
 +++ net/third_party/quiche/BUILD.gn
-@@ -28,7 +28,7 @@ import("//build/config/chromeos/ui_mode.gni")
+@@ -29,7 +29,7 @@ import("//net/third_party/quiche/src/build/source_list
  import("//testing/libfuzzer/fuzzer_test.gni")
  import("//third_party/protobuf/proto_library.gni")
  
diff --git a/www/ungoogled-chromium/patches/patch-net_tools_cert_verify_tool_cert_verify_comparision_tool_cc b/www/ungoogled-chromium/patches/patch-net_tools_cert_verify_tool_cert_verify_comparision_tool_cc
index 8f858c7c7..f1501fdb3 100644
--- a/www/ungoogled-chromium/patches/patch-net_tools_cert_verify_tool_cert_verify_comparision_tool_cc
+++ b/www/ungoogled-chromium/patches/patch-net_tools_cert_verify_tool_cert_verify_comparision_tool_cc
@@ -19,7 +19,7 @@ Index: net/tools/cert_verify_tool/cert_verify_comparision_tool.cc
    // On Linux, use a fixed ProxyConfigService, since the default one
    // depends on glib.
    //
-@@ -126,7 +126,7 @@ class CertVerifyImpl {
+@@ -123,7 +123,7 @@ class CertVerifyImpl {
  std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFromName(
      base::StringPiece impl_name,
      scoped_refptr<net::CertNetFetcher> cert_net_fetcher) {
diff --git a/www/ungoogled-chromium/patches/patch-net_tools_cert_verify_tool_cert_verify_tool_cc b/www/ungoogled-chromium/patches/patch-net_tools_cert_verify_tool_cert_verify_tool_cc
index 72f051e0d..02899a582 100644
--- a/www/ungoogled-chromium/patches/patch-net_tools_cert_verify_tool_cert_verify_tool_cc
+++ b/www/ungoogled-chromium/patches/patch-net_tools_cert_verify_tool_cert_verify_tool_cc
@@ -1,16 +1,16 @@
 Index: net/tools/cert_verify_tool/cert_verify_tool.cc
 --- net/tools/cert_verify_tool/cert_verify_tool.cc.orig
 +++ net/tools/cert_verify_tool/cert_verify_tool.cc
-@@ -31,7 +31,7 @@
- #include "net/url_request/url_request_context_builder.h"
- #include "net/url_request/url_request_context_getter.h"
+@@ -33,7 +33,7 @@
+ #include "third_party/boringssl/src/pki/trust_store.h"
+ #include "third_party/boringssl/src/pki/trust_store_collection.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "net/proxy_resolution/proxy_config.h"
  #include "net/proxy_resolution/proxy_config_service_fixed.h"
  #endif
-@@ -61,7 +61,7 @@ void SetUpOnNetworkThread(
+@@ -65,7 +65,7 @@ void SetUpOnNetworkThread(
      base::WaitableEvent* initialization_complete_event) {
    net::URLRequestContextBuilder url_request_context_builder;
    url_request_context_builder.set_user_agent(GetUserAgent());
@@ -19,16 +19,7 @@ Index: net/tools/cert_verify_tool/cert_verify_tool.cc
    // On Linux, use a fixed ProxyConfigService, since the default one
    // depends on glib.
    //
-@@ -223,7 +223,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr
-     scoped_refptr<net::CertNetFetcher> cert_net_fetcher,
-     scoped_refptr<net::CRLSet> crl_set,
-     RootStoreType root_store_type) {
--#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
-+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-       BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY))
-   if (impl_name == "platform") {
-     if (root_store_type != RootStoreType::kSystem) {
-@@ -537,7 +537,7 @@ int main(int argc, char** argv) {
+@@ -571,7 +571,7 @@ int main(int argc, char** argv) {
    std::string impls_str = command_line.GetSwitchValueASCII("impls");
    if (impls_str.empty()) {
      // Default value.
diff --git a/www/ungoogled-chromium/patches/patch-net_url_request_url_request_context_builder_cc b/www/ungoogled-chromium/patches/patch-net_url_request_url_request_context_builder_cc
index aa560bb18..68ea5432d 100644
--- a/www/ungoogled-chromium/patches/patch-net_url_request_url_request_context_builder_cc
+++ b/www/ungoogled-chromium/patches/patch-net_url_request_url_request_context_builder_cc
@@ -1,7 +1,7 @@
 Index: net/url_request/url_request_context_builder.cc
 --- net/url_request/url_request_context_builder.cc.orig
 +++ net/url_request/url_request_context_builder.cc
-@@ -446,7 +446,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -429,7 +429,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
    }
  
    if (!proxy_resolution_service_) {
diff --git a/www/ungoogled-chromium/patches/patch-net_url_request_url_request_context_cc b/www/ungoogled-chromium/patches/patch-net_url_request_url_request_context_cc
index 65e159176..f11aa382b 100644
--- a/www/ungoogled-chromium/patches/patch-net_url_request_url_request_context_cc
+++ b/www/ungoogled-chromium/patches/patch-net_url_request_url_request_context_cc
@@ -1,7 +1,7 @@
 Index: net/url_request/url_request_context.cc
 --- net/url_request/url_request_context.cc.orig
 +++ net/url_request/url_request_context.cc
-@@ -109,7 +109,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge
+@@ -117,7 +117,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.
  #if !BUILDFLAG(IS_WIN) && \
diff --git a/www/ungoogled-chromium/patches/patch-net_url_request_url_request_context_h b/www/ungoogled-chromium/patches/patch-net_url_request_url_request_context_h
index c64d71637..8fcfc9ec2 100644
--- a/www/ungoogled-chromium/patches/patch-net_url_request_url_request_context_h
+++ b/www/ungoogled-chromium/patches/patch-net_url_request_url_request_context_h
@@ -1,7 +1,7 @@
 Index: net/url_request/url_request_context.h
 --- net/url_request/url_request_context.h.orig
 +++ net/url_request/url_request_context.h
-@@ -86,7 +86,7 @@ class NET_EXPORT URLRequestContext final {
+@@ -85,7 +85,7 @@ class NET_EXPORT URLRequestContext final {
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.
  #if !BUILDFLAG(IS_WIN) && \
diff --git a/www/ungoogled-chromium/patches/patch-pdf_pdfium_pdfium_engine_cc b/www/ungoogled-chromium/patches/patch-pdf_pdfium_pdfium_engine_cc
index 9e3252e17..9b02e9ed9 100644
--- a/www/ungoogled-chromium/patches/patch-pdf_pdfium_pdfium_engine_cc
+++ b/www/ungoogled-chromium/patches/patch-pdf_pdfium_pdfium_engine_cc
@@ -1,7 +1,7 @@
 Index: pdf/pdfium/pdfium_engine.cc
 --- pdf/pdfium/pdfium_engine.cc.orig
 +++ pdf/pdfium/pdfium_engine.cc
-@@ -83,7 +83,7 @@
+@@ -85,7 +85,7 @@
  #include "gin/public/cppgc.h"
  #endif
  
diff --git a/www/ungoogled-chromium/patches/patch-printing_mojom_printing_context_mojom_traits_cc b/www/ungoogled-chromium/patches/patch-printing_mojom_printing_context_mojom_traits_cc
index fc8f176be..2c97896cb 100644
--- a/www/ungoogled-chromium/patches/patch-printing_mojom_printing_context_mojom_traits_cc
+++ b/www/ungoogled-chromium/patches/patch-printing_mojom_printing_context_mojom_traits_cc
@@ -1,16 +1,16 @@
 Index: printing/mojom/printing_context_mojom_traits.cc
 --- printing/mojom/printing_context_mojom_traits.cc.orig
 +++ printing/mojom/printing_context_mojom_traits.cc
-@@ -15,7 +15,7 @@
- #include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
- #include "ui/gfx/geometry/size.h"
+@@ -19,7 +19,7 @@
+ #include "base/numerics/safe_conversions.h"
+ #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "mojo/public/mojom/base/values.mojom.h"
  #endif
  
-@@ -150,7 +150,7 @@ bool StructTraits<
+@@ -161,7 +161,7 @@ bool StructTraits<
    }
  
    out->set_pages_per_sheet(data.pages_per_sheet());
@@ -19,3 +19,12 @@ Index: printing/mojom/printing_context_mojom_traits.cc
    DCHECK(out->advanced_settings().empty());
    if (!data.ReadAdvancedSettings(&out->advanced_settings()))
      return false;
+@@ -238,7 +238,7 @@ bool StructTraits<
+     if (system_print_dialog_data.size() != dictionary_entries) {
+       return false;
+     }
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // The dictionary must contain three strings.
+     const base::Value* value = system_print_dialog_data.Find(
+         printing::kLinuxSystemPrintDialogDataPrinter);
diff --git a/www/ungoogled-chromium/patches/patch-printing_mojom_printing_context_mojom_traits_h b/www/ungoogled-chromium/patches/patch-printing_mojom_printing_context_mojom_traits_h
index 7ad0360a8..402dfa15d 100644
--- a/www/ungoogled-chromium/patches/patch-printing_mojom_printing_context_mojom_traits_h
+++ b/www/ungoogled-chromium/patches/patch-printing_mojom_printing_context_mojom_traits_h
@@ -1,7 +1,7 @@
 Index: printing/mojom/printing_context_mojom_traits.h
 --- printing/mojom/printing_context_mojom_traits.h.orig
 +++ printing/mojom/printing_context_mojom_traits.h
-@@ -158,7 +158,7 @@ struct StructTraits<printing::mojom::PrintSettingsData
+@@ -166,7 +166,7 @@ struct StructTraits<printing::mojom::PrintSettingsData
      return s.pages_per_sheet();
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-printing_print_settings_cc b/www/ungoogled-chromium/patches/patch-printing_print_settings_cc
index 40d403bce..c5553222d 100644
--- a/www/ungoogled-chromium/patches/patch-printing_print_settings_cc
+++ b/www/ungoogled-chromium/patches/patch-printing_print_settings_cc
@@ -1,7 +1,7 @@
 Index: printing/print_settings.cc
 --- printing/print_settings.cc.orig
 +++ printing/print_settings.cc
-@@ -309,7 +309,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet
+@@ -320,7 +320,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet
  #endif
    is_modifiable_ = settings.is_modifiable_;
    pages_per_sheet_ = settings.pages_per_sheet_;
@@ -10,7 +10,7 @@ Index: printing/print_settings.cc
    for (const auto& item : settings.advanced_settings_)
      advanced_settings_.emplace(item.first, item.second.Clone());
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -336,7 +336,7 @@ bool PrintSettings::operator==(const PrintSettings& ot
+@@ -350,7 +350,7 @@ bool PrintSettings::operator==(const PrintSettings& ot
  #endif
                    is_modifiable_, requested_custom_margins_in_points_,
                    pages_per_sheet_
@@ -19,7 +19,7 @@ Index: printing/print_settings.cc
                    ,
                    advanced_settings_
  #endif
-@@ -361,7 +361,7 @@ bool PrintSettings::operator==(const PrintSettings& ot
+@@ -374,7 +374,7 @@ bool PrintSettings::operator==(const PrintSettings& ot
                    other.is_modifiable_,
                    other.requested_custom_margins_in_points_,
                    other.pages_per_sheet_
@@ -28,7 +28,7 @@ Index: printing/print_settings.cc
                    ,
                    other.advanced_settings_
  #endif
-@@ -400,7 +400,7 @@ void PrintSettings::Clear() {
+@@ -414,7 +414,7 @@ void PrintSettings::Clear() {
  #endif
    is_modifiable_ = true;
    pages_per_sheet_ = 1;
diff --git a/www/ungoogled-chromium/patches/patch-printing_print_settings_conversion_cc b/www/ungoogled-chromium/patches/patch-printing_print_settings_conversion_cc
index a16e54e16..fb080bcd0 100644
--- a/www/ungoogled-chromium/patches/patch-printing_print_settings_conversion_cc
+++ b/www/ungoogled-chromium/patches/patch-printing_print_settings_conversion_cc
@@ -1,7 +1,7 @@
 Index: printing/print_settings_conversion.cc
 --- printing/print_settings_conversion.cc.orig
 +++ printing/print_settings_conversion.cc
-@@ -277,7 +277,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet
+@@ -285,7 +285,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet
      settings->set_is_modifiable(is_modifiable.value());
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-printing_print_settings_h b/www/ungoogled-chromium/patches/patch-printing_print_settings_h
index 729f28ec6..d43c95e73 100644
--- a/www/ungoogled-chromium/patches/patch-printing_print_settings_h
+++ b/www/ungoogled-chromium/patches/patch-printing_print_settings_h
@@ -1,16 +1,25 @@
 Index: printing/print_settings.h
 --- printing/print_settings.h.orig
 +++ printing/print_settings.h
-@@ -21,7 +21,7 @@
- #include "ui/gfx/geometry/rect.h"
- #include "ui/gfx/geometry/size.h"
+@@ -25,7 +25,7 @@
+ #include "base/values.h"
+ #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include <map>
  
  #include "base/values.h"
-@@ -74,7 +74,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
+@@ -51,7 +51,7 @@ inline constexpr char kMacSystemPrintDialogDataPrintSe
+     "print_settings";
+ #endif  // BUILDFLAG(IS_MAC)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ inline constexpr char kLinuxSystemPrintDialogDataPrinter[] = "printer_name";
+ inline constexpr char kLinuxSystemPrintDialogDataPrintSettings[] =
+     "print_settings";
+@@ -101,7 +101,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
      std::string vendor_id;
    };
  
@@ -19,7 +28,7 @@ Index: printing/print_settings.h
    using AdvancedSettings = std::map<std::string, base::Value>;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -246,7 +246,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
+@@ -276,7 +276,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
      pages_per_sheet_ = pages_per_sheet;
    }
  
@@ -28,7 +37,7 @@ Index: printing/print_settings.h
    AdvancedSettings& advanced_settings() { return advanced_settings_; }
    const AdvancedSettings& advanced_settings() const {
      return advanced_settings_;
-@@ -381,7 +381,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
+@@ -429,7 +429,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
    // Number of pages per sheet.
    int pages_per_sheet_;
  
diff --git a/www/ungoogled-chromium/patches/patch-printing_printing_context_linux_cc b/www/ungoogled-chromium/patches/patch-printing_printing_context_linux_cc
index 95d80b2bb..d5cac9cdc 100644
--- a/www/ungoogled-chromium/patches/patch-printing_printing_context_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-printing_printing_context_linux_cc
@@ -1,8 +1,8 @@
 Index: printing/printing_context_linux.cc
 --- printing/printing_context_linux.cc.orig
 +++ printing/printing_context_linux.cc
-@@ -19,7 +19,7 @@
- #include "printing/units.h"
+@@ -23,7 +23,7 @@
+ #endif
  
  // Avoid using LinuxUi on Fuchsia.
 -#if BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/patches/patch-printing_sandbox_print_backend_sandbox_hook_linux_cc b/www/ungoogled-chromium/patches/patch-printing_sandbox_print_backend_sandbox_hook_linux_cc
index b4e20cfec..f83be0af7 100644
--- a/www/ungoogled-chromium/patches/patch-printing_sandbox_print_backend_sandbox_hook_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-printing_sandbox_print_backend_sandbox_hook_linux_cc
@@ -41,8 +41,8 @@ Index: printing/sandbox/print_backend_sandbox_hook_linux.cc
  #if BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(USE_CUPS)
    // Create the socket connections to the CUPS server before engaging the
    // sandbox, since new connections cannot be made after that.
-@@ -92,6 +101,7 @@ bool PrintBackendPreSandboxHook(
-       sandbox::policy::SandboxLinux::PreSandboxHook(), options);
+@@ -91,6 +100,7 @@ bool PrintBackendPreSandboxHook(
+                                GetPrintBackendFilePermissions(), options);
  
    instance->EngageNamespaceSandboxIfPossible();
 +#endif
diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_base_desktop_environment_options_cc b/www/ungoogled-chromium/patches/patch-remoting_host_base_desktop_environment_options_cc
index 24eefd0e0..51b34234c 100644
--- a/www/ungoogled-chromium/patches/patch-remoting_host_base_desktop_environment_options_cc
+++ b/www/ungoogled-chromium/patches/patch-remoting_host_base_desktop_environment_options_cc
@@ -1,7 +1,7 @@
 Index: remoting/host/base/desktop_environment_options.cc
 --- remoting/host/base/desktop_environment_options.cc.orig
 +++ remoting/host/base/desktop_environment_options.cc
-@@ -119,7 +119,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic
+@@ -124,7 +124,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic
    // TODO(joedow): Determine whether we can migrate additional platforms to
    // using the DesktopCaptureWrapper instead of the DesktopCaptureProxy. Then
    // clean up DesktopCapturerProxy::Core::CreateCapturer().
diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_basic_desktop_environment_cc b/www/ungoogled-chromium/patches/patch-remoting_host_basic_desktop_environment_cc
index f7b313dec..5697bbd83 100644
--- a/www/ungoogled-chromium/patches/patch-remoting_host_basic_desktop_environment_cc
+++ b/www/ungoogled-chromium/patches/patch-remoting_host_basic_desktop_environment_cc
@@ -1,7 +1,7 @@
 Index: remoting/host/basic_desktop_environment.cc
 --- remoting/host/basic_desktop_environment.cc.orig
 +++ remoting/host/basic_desktop_environment.cc
-@@ -195,7 +195,7 @@ BasicDesktopEnvironment::CreateVideoCapturer() {
+@@ -195,7 +195,7 @@ std::unique_ptr<DesktopCapturer> BasicDesktopEnvironme
    scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner;
  #if BUILDFLAG(IS_CHROMEOS_ASH)
    capture_task_runner = ui_task_runner_;
diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_chromoting_host_cc b/www/ungoogled-chromium/patches/patch-remoting_host_chromoting_host_cc
index eb06b4d3a..2a8227309 100644
--- a/www/ungoogled-chromium/patches/patch-remoting_host_chromoting_host_cc
+++ b/www/ungoogled-chromium/patches/patch-remoting_host_chromoting_host_cc
@@ -1,7 +1,7 @@
 Index: remoting/host/chromoting_host.cc
 --- remoting/host/chromoting_host.cc.orig
 +++ remoting/host/chromoting_host.cc
-@@ -128,7 +128,7 @@ void ChromotingHost::Start(const std::string& host_own
+@@ -129,7 +129,7 @@ void ChromotingHost::Start(const std::string& host_own
        &ChromotingHost::OnIncomingSession, base::Unretained(this)));
  }
  
diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_client_session_cc b/www/ungoogled-chromium/patches/patch-remoting_host_client_session_cc
new file mode 100644
index 000000000..99f0dadab
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-remoting_host_client_session_cc
@@ -0,0 +1,12 @@
+Index: remoting/host/client_session.cc
+--- remoting/host/client_session.cc.orig
++++ remoting/host/client_session.cc
+@@ -161,7 +161,7 @@ void ClientSession::NotifyClientResolution(
+   if (desktop_environment_options_.enable_curtaining()) {
+     dpi_vector.set(resolution.x_dpi(), resolution.y_dpi());
+   }
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   dpi_vector.set(resolution.x_dpi(), resolution.y_dpi());
+ #endif
+ 
diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_desktop_capturer_proxy_cc b/www/ungoogled-chromium/patches/patch-remoting_host_desktop_capturer_proxy_cc
index a42386771..814342726 100644
--- a/www/ungoogled-chromium/patches/patch-remoting_host_desktop_capturer_proxy_cc
+++ b/www/ungoogled-chromium/patches/patch-remoting_host_desktop_capturer_proxy_cc
@@ -10,7 +10,7 @@ Index: remoting/host/desktop_capturer_proxy.cc
  #include "base/environment.h"
  #include "base/nix/xdg_util.h"
  #include "remoting/host/linux/wayland_desktop_capturer.h"
-@@ -89,7 +89,7 @@ void DesktopCapturerProxy::Core::CreateCapturer(
+@@ -91,7 +91,7 @@ void DesktopCapturerProxy::Core::CreateCapturer(
  
  #if BUILDFLAG(IS_CHROMEOS_ASH)
    capturer_ = std::make_unique<FrameSinkDesktopCapturer>();
@@ -19,7 +19,7 @@ Index: remoting/host/desktop_capturer_proxy.cc
    static base::nix::SessionType session_type = base::nix::SessionType::kUnset;
    if (session_type == base::nix::SessionType::kUnset) {
      std::unique_ptr<base::Environment> env = base::Environment::Create();
-@@ -293,7 +293,7 @@ void DesktopCapturerProxy::OnMetadata(webrtc::DesktopC
+@@ -298,7 +298,7 @@ void DesktopCapturerProxy::OnMetadata(webrtc::DesktopC
  bool DesktopCapturerProxy::SupportsFrameCallbacks() {
    DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
  
diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_desktop_capturer_wrapper_cc b/www/ungoogled-chromium/patches/patch-remoting_host_desktop_capturer_wrapper_cc
index 993e90d30..337274ded 100644
--- a/www/ungoogled-chromium/patches/patch-remoting_host_desktop_capturer_wrapper_cc
+++ b/www/ungoogled-chromium/patches/patch-remoting_host_desktop_capturer_wrapper_cc
@@ -10,8 +10,8 @@ Index: remoting/host/desktop_capturer_wrapper.cc
  #include "remoting/host/linux/wayland_desktop_capturer.h"
  #include "remoting/host/linux/wayland_utils.h"
  #endif
-@@ -32,7 +32,7 @@ void DesktopCapturerWrapper::CreateCapturer(
-     const webrtc::DesktopCaptureOptions& options) {
+@@ -33,7 +33,7 @@ void DesktopCapturerWrapper::CreateCapturer(
+     SourceId id) {
    DCHECK(!capturer_);
  
 -#if BUILDFLAG(IS_LINUX)
@@ -19,7 +19,7 @@ Index: remoting/host/desktop_capturer_wrapper.cc
    if (IsRunningWayland()) {
      capturer_ = std::make_unique<WaylandDesktopCapturer>(options);
    } else {
-@@ -109,7 +109,7 @@ void DesktopCapturerWrapper::OnCaptureResult(
+@@ -112,7 +112,7 @@ void DesktopCapturerWrapper::OnCaptureResult(
  bool DesktopCapturerWrapper::SupportsFrameCallbacks() {
    DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
  
diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_heartbeat_sender_cc b/www/ungoogled-chromium/patches/patch-remoting_host_heartbeat_sender_cc
deleted file mode 100644
index 650c4e392..000000000
--- a/www/ungoogled-chromium/patches/patch-remoting_host_heartbeat_sender_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: remoting/host/heartbeat_sender.cc
---- remoting/host/heartbeat_sender.cc.orig
-+++ remoting/host/heartbeat_sender.cc
-@@ -111,7 +111,7 @@ const net::BackoffEntry::Policy kBackoffPolicy = {
- std::string GetHostname() {
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag
- // switch of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-   return net::GetHostName();
- #elif BUILDFLAG(IS_WIN)
-   wchar_t buffer[MAX_PATH] = {0};
diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_host_attributes_cc b/www/ungoogled-chromium/patches/patch-remoting_host_host_attributes_cc
index b8d992ce6..a5522efae 100644
--- a/www/ungoogled-chromium/patches/patch-remoting_host_host_attributes_cc
+++ b/www/ungoogled-chromium/patches/patch-remoting_host_host_attributes_cc
@@ -1,7 +1,7 @@
 Index: remoting/host/host_attributes.cc
 --- remoting/host/host_attributes.cc.orig
 +++ remoting/host/host_attributes.cc
-@@ -105,7 +105,7 @@ std::string GetHostAttributes() {
+@@ -104,7 +104,7 @@ std::string GetHostAttributes() {
    if (media::InitializeMediaFoundation()) {
      result.push_back("HWEncoder");
    }
diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_it2me_it2me_host_cc b/www/ungoogled-chromium/patches/patch-remoting_host_it2me_it2me_host_cc
index b931b9549..b1b660cba 100644
--- a/www/ungoogled-chromium/patches/patch-remoting_host_it2me_it2me_host_cc
+++ b/www/ungoogled-chromium/patches/patch-remoting_host_it2me_it2me_host_cc
@@ -1,7 +1,7 @@
 Index: remoting/host/it2me/it2me_host.cc
 --- remoting/host/it2me/it2me_host.cc.orig
 +++ remoting/host/it2me/it2me_host.cc
-@@ -49,7 +49,7 @@
+@@ -52,7 +52,7 @@
  #include "remoting/host/chromeos/features.h"
  #endif
  
@@ -10,7 +10,7 @@ Index: remoting/host/it2me/it2me_host.cc
  #include "remoting/host/linux/wayland_manager.h"
  #include "remoting/host/linux/wayland_utils.h"
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -121,7 +121,7 @@ void It2MeHost::Connect(
+@@ -178,7 +178,7 @@ void It2MeHost::Connect(
  
    OnPolicyUpdate(std::move(policies));
  
@@ -19,7 +19,7 @@ Index: remoting/host/it2me/it2me_host.cc
    if (IsRunningWayland()) {
      WaylandManager::Get()->Init(host_context_->ui_task_runner());
    }
-@@ -261,7 +261,7 @@ void It2MeHost::ConnectOnNetworkThread(
+@@ -338,7 +338,7 @@ void It2MeHost::ConnectOnNetworkThread(
  
    // Set up the desktop environment options.
    DesktopEnvironmentOptions options(DesktopEnvironmentOptions::CreateDefault());
diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_policy_watcher_cc b/www/ungoogled-chromium/patches/patch-remoting_host_policy_watcher_cc
index 03b8caf54..6481c9c58 100644
--- a/www/ungoogled-chromium/patches/patch-remoting_host_policy_watcher_cc
+++ b/www/ungoogled-chromium/patches/patch-remoting_host_policy_watcher_cc
@@ -1,7 +1,7 @@
 Index: remoting/host/policy_watcher.cc
 --- remoting/host/policy_watcher.cc.orig
 +++ remoting/host/policy_watcher.cc
-@@ -184,7 +184,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() 
+@@ -192,7 +192,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() 
               true);
    result.Set(key::kRemoteAccessHostAllowEnterpriseFileTransfer, false);
  #endif
diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_remoting_me2me_host_cc b/www/ungoogled-chromium/patches/patch-remoting_host_remoting_me2me_host_cc
index f2331cc25..43e217439 100644
--- a/www/ungoogled-chromium/patches/patch-remoting_host_remoting_me2me_host_cc
+++ b/www/ungoogled-chromium/patches/patch-remoting_host_remoting_me2me_host_cc
@@ -1,7 +1,7 @@
 Index: remoting/host/remoting_me2me_host.cc
 --- remoting/host/remoting_me2me_host.cc.orig
 +++ remoting/host/remoting_me2me_host.cc
-@@ -126,7 +126,7 @@
+@@ -132,7 +132,7 @@
  #include "remoting/host/mac/permission_utils.h"
  #endif  // BUILDFLAG(IS_APPLE)
  
@@ -10,7 +10,7 @@ Index: remoting/host/remoting_me2me_host.cc
  #if defined(REMOTING_USE_X11)
  #include <gtk/gtk.h>
  #endif  // defined(REMOTING_USE_X11)
-@@ -137,13 +137,13 @@
+@@ -143,13 +143,13 @@
  #endif  // defined(REMOTING_USE_X11)
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
@@ -26,7 +26,7 @@ Index: remoting/host/remoting_me2me_host.cc
  #include "remoting/host/host_utmp_logger.h"
  #endif
  
-@@ -156,7 +156,7 @@
+@@ -162,7 +162,7 @@
  #include "remoting/host/win/session_desktop_environment.h"
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -35,7 +35,7 @@ Index: remoting/host/remoting_me2me_host.cc
  #include "remoting/host/linux/wayland_manager.h"
  #include "remoting/host/linux/wayland_utils.h"
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -186,7 +186,7 @@ const char kApplicationName[] = "chromoting";
+@@ -192,7 +192,7 @@ const char kApplicationName[] = "chromoting";
  const char kStdinConfigPath[] = "-";
  #endif  // !defined(REMOTING_MULTI_PROCESS)
  
@@ -44,7 +44,7 @@ Index: remoting/host/remoting_me2me_host.cc
  // The command line switch used to pass name of the pipe to capture audio on
  // linux.
  const char kAudioPipeSwitchName[] = "audio-pipe-name";
-@@ -397,7 +397,7 @@ class HostProcess : public ConfigWatcher::Delegate,
+@@ -401,7 +401,7 @@ class HostProcess : public ConfigWatcher::Delegate,
  
    std::unique_ptr<ChromotingHostContext> context_;
  
@@ -53,7 +53,7 @@ Index: remoting/host/remoting_me2me_host.cc
    // Watch for certificate changes and kill the host when changes occur
    std::unique_ptr<CertificateWatcher> cert_watcher_;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -466,7 +466,7 @@ class HostProcess : public ConfigWatcher::Delegate,
+@@ -471,7 +471,7 @@ class HostProcess : public ConfigWatcher::Delegate,
  
    std::unique_ptr<HostStatusLogger> host_status_logger_;
    std::unique_ptr<HostEventLogger> host_event_logger_;
@@ -62,7 +62,7 @@ Index: remoting/host/remoting_me2me_host.cc
    std::unique_ptr<HostUTMPLogger> host_utmp_logger_;
  #endif
    std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_;
-@@ -775,7 +775,7 @@ void HostProcess::StartOnNetworkThread() {
+@@ -783,7 +783,7 @@ void HostProcess::StartOnNetworkThread() {
  void HostProcess::ShutdownOnNetworkThread() {
    DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
    config_watcher_.reset();
@@ -71,7 +71,7 @@ Index: remoting/host/remoting_me2me_host.cc
    cert_watcher_.reset();
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  }
-@@ -836,7 +836,7 @@ void HostProcess::CreateAuthenticatorFactory() {
+@@ -849,7 +849,7 @@ void HostProcess::CreateAuthenticatorFactory() {
      DCHECK(third_party_auth_config_.token_url.is_valid());
      DCHECK(third_party_auth_config_.token_validation_url.is_valid());
  
@@ -80,7 +80,7 @@ Index: remoting/host/remoting_me2me_host.cc
      if (!cert_watcher_) {
        cert_watcher_ = std::make_unique<CertificateWatcher>(
            base::BindRepeating(&HostProcess::ShutdownHost,
-@@ -955,13 +955,13 @@ void HostProcess::StartOnUiThread() {
+@@ -974,13 +974,13 @@ void HostProcess::StartOnUiThread() {
        base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
        base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this)));
  
@@ -96,7 +96,7 @@ Index: remoting/host/remoting_me2me_host.cc
    // If an audio pipe is specific on the command-line then initialize
    // AudioCapturerLinux to capture from it.
    base::FilePath audio_pipe_name =
-@@ -1033,7 +1033,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -1052,7 +1052,7 @@ void HostProcess::ShutdownOnUiThread() {
    // It is now safe for the HostProcess to be deleted.
    self_ = nullptr;
  
@@ -105,7 +105,7 @@ Index: remoting/host/remoting_me2me_host.cc
    // Cause the global AudioPipeReader to be freed, otherwise the audio
    // thread will remain in-use and prevent the process from exiting.
    // TODO(wez): DesktopEnvironmentFactory should own the pipe reader.
-@@ -1041,7 +1041,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -1060,7 +1060,7 @@ void HostProcess::ShutdownOnUiThread() {
    AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath());
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
@@ -114,25 +114,25 @@ Index: remoting/host/remoting_me2me_host.cc
    context_->input_task_runner()->PostTask(
        FROM_HERE,
        base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); }));
-@@ -1392,7 +1392,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V
+@@ -1418,7 +1418,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V
    // Returns false: never restart the host after this policy update.
    DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   absl::optional<bool> host_username_match_required =
+   std::optional<bool> host_username_match_required =
        policies.FindBool(policy::key::kRemoteAccessHostMatchUsername);
    if (!host_username_match_required.has_value()) {
-@@ -1801,7 +1801,7 @@ void HostProcess::StartHost() {
-   // won't be advertised if it's missing a registry key or something.
-   desktop_environment_options_.set_enable_remote_open_url(true);
+@@ -1882,7 +1882,7 @@ void HostProcess::StartHost() {
+     corp_host_status_logger_->StartObserving(*session_manager);
+   }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    desktop_environment_options_.set_enable_remote_webauthn(is_googler_);
  #endif
  
-@@ -1834,7 +1834,7 @@ void HostProcess::StartHost() {
+@@ -1915,7 +1915,7 @@ void HostProcess::StartHost() {
    host_status_logger_ = std::make_unique<HostStatusLogger>(
        host_->status_monitor(), log_to_server_.get());
  
@@ -141,7 +141,7 @@ Index: remoting/host/remoting_me2me_host.cc
    const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
    if (cmd_line->HasSwitch(kEnableUtempter)) {
      host_utmp_logger_ =
-@@ -1866,7 +1866,7 @@ void HostProcess::StartHost() {
+@@ -1947,7 +1947,7 @@ void HostProcess::StartHost() {
  
    host_->Start(host_owner_);
  
@@ -150,7 +150,7 @@ Index: remoting/host/remoting_me2me_host.cc
    // For Windows, ChromotingHostServices connections are handled by the daemon
    // process, then the message pipe is forwarded to the network process.
    host_->StartChromotingHostServices();
-@@ -1999,7 +1999,7 @@ int HostProcessMain() {
+@@ -2081,7 +2081,7 @@ int HostProcessMain() {
    HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
    const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
  
@@ -159,7 +159,7 @@ Index: remoting/host/remoting_me2me_host.cc
  #if defined(REMOTING_USE_X11)
    // Initialize Xlib for multi-threaded use, allowing non-Chromium code to
    // use X11 safely (such as the WebRTC capturer, GTK ...)
-@@ -2048,7 +2048,7 @@ int HostProcessMain() {
+@@ -2130,7 +2130,7 @@ int HostProcessMain() {
    std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
        net::NetworkChangeNotifier::CreateIfNeeded());
  
diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_setup_start_host_main_cc b/www/ungoogled-chromium/patches/patch-remoting_host_setup_start_host_main_cc
index 1f65a34e6..b37b7c9fb 100644
--- a/www/ungoogled-chromium/patches/patch-remoting_host_setup_start_host_main_cc
+++ b/www/ungoogled-chromium/patches/patch-remoting_host_setup_start_host_main_cc
@@ -1,7 +1,7 @@
 Index: remoting/host/setup/start_host_main.cc
 --- remoting/host/setup/start_host_main.cc.orig
 +++ remoting/host/setup/start_host_main.cc
-@@ -33,7 +33,7 @@
+@@ -36,7 +36,7 @@
  #include <unistd.h>
  #endif  // BUILDFLAG(IS_POSIX)
  
@@ -10,7 +10,7 @@ Index: remoting/host/setup/start_host_main.cc
  #include "remoting/host/setup/daemon_controller_delegate_linux.h"
  #include "remoting/host/setup/start_host_as_root.h"
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -130,7 +130,7 @@ void OnDone(HostStarter::Result result) {
+@@ -252,7 +252,7 @@ bool InitializeCorpMachineParams(HostStarter::Params& 
  }  // namespace
  
  int StartHostMain(int argc, char** argv) {
@@ -19,9 +19,9 @@ Index: remoting/host/setup/start_host_main.cc
    // Minimize the amount of code that runs as root on Posix systems.
    if (getuid() == 0) {
      return remoting::StartHostAsRoot(argc, argv);
-@@ -173,7 +173,7 @@ int StartHostMain(int argc, char** argv) {
-   // for the account which generated |code|.
-   std::string host_owner = command_line->GetSwitchValueASCII("host-owner");
+@@ -283,7 +283,7 @@ int StartHostMain(int argc, char** argv) {
+ 
+   mojo::core::Init();
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_webauthn_remote_webauthn_caller_security_utils_cc b/www/ungoogled-chromium/patches/patch-remoting_host_webauthn_remote_webauthn_caller_security_utils_cc
index 1f09f8692..ccdda7092 100644
--- a/www/ungoogled-chromium/patches/patch-remoting_host_webauthn_remote_webauthn_caller_security_utils_cc
+++ b/www/ungoogled-chromium/patches/patch-remoting_host_webauthn_remote_webauthn_caller_security_utils_cc
@@ -1,7 +1,7 @@
 Index: remoting/host/webauthn/remote_webauthn_caller_security_utils.cc
 --- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig
 +++ remoting/host/webauthn/remote_webauthn_caller_security_utils.cc
-@@ -9,7 +9,7 @@
+@@ -10,7 +10,7 @@
  #include "base/strings/utf_string_conversions.h"
  #include "build/build_config.h"
  
@@ -10,7 +10,7 @@ Index: remoting/host/webauthn/remote_webauthn_caller_security_utils.cc
  #include "base/containers/fixed_flat_set.h"
  #include "base/files/file_path.h"
  #include "base/process/process_handle.h"
-@@ -37,7 +37,7 @@ namespace {
+@@ -38,7 +38,7 @@ namespace {
  
  // No static variables needed for debug builds.
  
@@ -19,7 +19,7 @@ Index: remoting/host/webauthn/remote_webauthn_caller_security_utils.cc
  
  constexpr auto kAllowedCallerPrograms =
      base::MakeFixedFlatSet<base::FilePath::StringPieceType>({
-@@ -81,7 +81,7 @@ bool IsLaunchedByTrustedProcess() {
+@@ -82,7 +82,7 @@ bool IsLaunchedByTrustedProcess() {
  #if !defined(NDEBUG)
    // Just return true on debug builds for the convenience of development.
    return true;
diff --git a/www/ungoogled-chromium/patches/patch-remoting_protocol_webrtc_video_stream_cc b/www/ungoogled-chromium/patches/patch-remoting_protocol_webrtc_video_stream_cc
index e77c73fc0..a81fc762b 100644
--- a/www/ungoogled-chromium/patches/patch-remoting_protocol_webrtc_video_stream_cc
+++ b/www/ungoogled-chromium/patches/patch-remoting_protocol_webrtc_video_stream_cc
@@ -1,7 +1,7 @@
 Index: remoting/protocol/webrtc_video_stream.cc
 --- remoting/protocol/webrtc_video_stream.cc.orig
 +++ remoting/protocol/webrtc_video_stream.cc
-@@ -260,7 +260,7 @@ WebrtcVideoStream::WebrtcVideoStream(const std::string
+@@ -263,7 +263,7 @@ WebrtcVideoStream::WebrtcVideoStream(const std::string
      : stream_name_(stream_name), session_options_(session_options) {
  // TODO(joedow): Dig into the threading model on other platforms to see if they
  // can also be updated to run on a dedicated thread.
diff --git a/www/ungoogled-chromium/patches/patch-remoting_resources_remoting_strings_grd b/www/ungoogled-chromium/patches/patch-remoting_resources_remoting_strings_grd
deleted file mode 100644
index 4b514669c..000000000
--- a/www/ungoogled-chromium/patches/patch-remoting_resources_remoting_strings_grd
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: remoting/resources/remoting_strings.grd
---- remoting/resources/remoting_strings.grd.orig
-+++ remoting/resources/remoting_strings.grd
-@@ -955,7 +955,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
-       <message name="IDS_URL_FORWARDER_INCORRECTLY_CONFIGURED" desc="Message shown when the Chrome Remote Desktop URL forwarder is incorrectly configured.">
-         <ph name="URL_FORWARDER_NAME">%s<ex>Chrome Remote Desktop URL Forwarder</ex></ph> is not configured correctly. Please choose a different default web browser and then enable URL forwarding again.
-       </message>
--      <if expr="is_linux">
-+      <if expr="is_posix">
-         <message name="IDS_SESSION_DIALOG_MESSAGE" desc="The message to show at the top of the session-selection dialog.">
-           Select a session to launch within your Chrome Remote Desktop environment. (Note that some session types may not support running within Chrome Remote Desktop and on the local console simultaneously.)
-         </message>
-@@ -971,7 +971,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
-         <message name="IDS_SESSION_DIALOG_DEFAULT_SESSION_COMMENT" desc="The comment for the entry to launch the default session.">
-           Launch the default XSession
-         </message>
--      </if> <!-- is_linux -->
-+      </if> <!-- is_posix -->
-     </messages>
-   </release>
- </grit>
diff --git a/www/ungoogled-chromium/patches/patch-sandbox_policy_BUILD_gn b/www/ungoogled-chromium/patches/patch-sandbox_policy_BUILD_gn
index d9afc48ae..81776a0b1 100644
--- a/www/ungoogled-chromium/patches/patch-sandbox_policy_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-sandbox_policy_BUILD_gn
@@ -1,16 +1,16 @@
 Index: sandbox/policy/BUILD.gn
 --- sandbox/policy/BUILD.gn.orig
 +++ sandbox/policy/BUILD.gn
-@@ -35,7 +35,7 @@ component("policy") {
-     "//sandbox/policy/mojom",
-   ]
-   public_deps = [ "//sandbox:common" ]
+@@ -49,7 +49,7 @@ component("policy") {
+       "//third_party/jni_zero",
+     ]
+   }
 -  if (is_linux || is_chromeos) {
 +  if ((is_linux || is_chromeos) && !is_bsd) {
      sources += [
        "linux/bpf_audio_policy_linux.cc",
        "linux/bpf_audio_policy_linux.h",
-@@ -106,6 +106,27 @@ component("policy") {
+@@ -120,6 +120,27 @@ component("policy") {
        "//sandbox/linux:sandbox_services",
        "//sandbox/linux:seccomp_bpf",
        "//sandbox/linux:suid_sandbox_client",
diff --git a/www/ungoogled-chromium/patches/patch-sandbox_policy_features_cc b/www/ungoogled-chromium/patches/patch-sandbox_policy_features_cc
index fcb880002..a03fc1c04 100644
--- a/www/ungoogled-chromium/patches/patch-sandbox_policy_features_cc
+++ b/www/ungoogled-chromium/patches/patch-sandbox_policy_features_cc
@@ -1,7 +1,7 @@
 Index: sandbox/policy/features.cc
 --- sandbox/policy/features.cc.orig
 +++ sandbox/policy/features.cc
-@@ -15,7 +15,11 @@ namespace sandbox::policy::features {
+@@ -20,7 +20,11 @@ namespace sandbox::policy::features {
  // (Only causes an effect when feature kNetworkServiceInProcess is disabled.)
  BASE_FEATURE(kNetworkServiceSandbox,
               "NetworkServiceSandbox",
@@ -13,3 +13,12 @@ Index: sandbox/policy/features.cc
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  // Enables a fine-grained seccomp-BPF syscall filter for the network service.
+@@ -126,7 +130,7 @@ BASE_FEATURE(kForceSpectreVariant2Mitigation,
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // Enabling the kNetworkServiceSandbox feature automatically enables Spectre
+ // variant 2 mitigations in the network service. This can lead to performance
+ // regressions, so enabling this feature will turn off the Spectre Variant 2
diff --git a/www/ungoogled-chromium/patches/patch-sandbox_policy_features_h b/www/ungoogled-chromium/patches/patch-sandbox_policy_features_h
new file mode 100644
index 000000000..4548e4780
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-sandbox_policy_features_h
@@ -0,0 +1,12 @@
+Index: sandbox/policy/features.h
+--- sandbox/policy/features.h.orig
++++ sandbox/policy/features.h
+@@ -43,7 +43,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVar
+ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kForceSpectreVariant2Mitigation);
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(
+     kForceDisableSpectreVariant2MitigationInNetworkService);
+ 
diff --git a/www/ungoogled-chromium/patches/patch-sandbox_policy_mojom_sandbox_mojom b/www/ungoogled-chromium/patches/patch-sandbox_policy_mojom_sandbox_mojom
index 315e7ba61..7e87cc98a 100644
--- a/www/ungoogled-chromium/patches/patch-sandbox_policy_mojom_sandbox_mojom
+++ b/www/ungoogled-chromium/patches/patch-sandbox_policy_mojom_sandbox_mojom
@@ -1,7 +1,7 @@
 Index: sandbox/policy/mojom/sandbox.mojom
 --- sandbox/policy/mojom/sandbox.mojom.orig
 +++ sandbox/policy/mojom/sandbox.mojom
-@@ -72,6 +72,12 @@ enum Sandbox {
+@@ -77,6 +77,12 @@ enum Sandbox {
    [EnableIf=is_fuchsia]
    kVideoCapture,
  
diff --git a/www/ungoogled-chromium/patches/patch-sandbox_policy_openbsd_sandbox_openbsd_cc b/www/ungoogled-chromium/patches/patch-sandbox_policy_openbsd_sandbox_openbsd_cc
index 46626ec32..1843f42a1 100644
--- a/www/ungoogled-chromium/patches/patch-sandbox_policy_openbsd_sandbox_openbsd_cc
+++ b/www/ungoogled-chromium/patches/patch-sandbox_policy_openbsd_sandbox_openbsd_cc
@@ -1,7 +1,7 @@
 Index: sandbox/policy/openbsd/sandbox_openbsd.cc
 --- sandbox/policy/openbsd/sandbox_openbsd.cc.orig
 +++ sandbox/policy/openbsd/sandbox_openbsd.cc
-@@ -0,0 +1,420 @@
+@@ -0,0 +1,424 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -64,7 +64,8 @@ Index: sandbox/policy/openbsd/sandbox_openbsd.cc
 +
 +#include "third_party/boringssl/src/include/openssl/crypto.h"
 +
-+#include "ui/gfx/font_util.h"
++#include <fontconfig/fontconfig.h>
++#include "ui/gfx/linux/fontconfig_util.h"
 +
 +#define MAXTOKENS	3
 +
@@ -147,8 +148,11 @@ Index: sandbox/policy/openbsd/sandbox_openbsd.cc
 +      break;
 +    }
 +    case sandbox::mojom::Sandbox::kRenderer:
-+      gfx::InitializeFonts();
++    {
++      FcConfig* config = gfx::GetGlobalFontConfig();
++      DCHECK(config);
 +      break;
++    }
 +    default:
 +      break;
 +  }
diff --git a/www/ungoogled-chromium/patches/patch-sandbox_policy_sandbox_cc b/www/ungoogled-chromium/patches/patch-sandbox_policy_sandbox_cc
index de6c12b3b..a350e89f4 100644
--- a/www/ungoogled-chromium/patches/patch-sandbox_policy_sandbox_cc
+++ b/www/ungoogled-chromium/patches/patch-sandbox_policy_sandbox_cc
@@ -12,7 +12,7 @@ Index: sandbox/policy/sandbox.cc
  #if BUILDFLAG(IS_MAC)
  #include "sandbox/mac/seatbelt.h"
  #endif  // BUILDFLAG(IS_MAC)
-@@ -31,7 +35,7 @@
+@@ -32,7 +36,7 @@
  namespace sandbox {
  namespace policy {
  
diff --git a/www/ungoogled-chromium/patches/patch-sandbox_policy_sandbox_type_cc b/www/ungoogled-chromium/patches/patch-sandbox_policy_sandbox_type_cc
index 0484ca90c..a8a45b1e5 100644
--- a/www/ungoogled-chromium/patches/patch-sandbox_policy_sandbox_type_cc
+++ b/www/ungoogled-chromium/patches/patch-sandbox_policy_sandbox_type_cc
@@ -10,7 +10,7 @@ Index: sandbox/policy/sandbox_type.cc
      case Sandbox::kVideoCapture:
        return false;
  #endif
-@@ -61,7 +61,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
+@@ -63,7 +63,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
      case Sandbox::kMirroring:
      case Sandbox::kNaClLoader:
  #endif
@@ -19,7 +19,7 @@ Index: sandbox/policy/sandbox_type.cc
      case Sandbox::kHardwareVideoDecoding:
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -71,7 +71,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
+@@ -73,7 +73,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
      case Sandbox::kLibassistant:
  #endif  // BUILDFLAG(ENABLE_CROS_LIBASSISTANT)
  #endif  // // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -28,7 +28,7 @@ Index: sandbox/policy/sandbox_type.cc
      case Sandbox::kZygoteIntermediateSandbox:
      case Sandbox::kHardwareVideoEncoding:
  #endif
-@@ -127,7 +127,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
+@@ -130,7 +130,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
  #endif
      case Sandbox::kPrintCompositor:
      case Sandbox::kAudio:
@@ -37,7 +37,7 @@ Index: sandbox/policy/sandbox_type.cc
      case Sandbox::kVideoCapture:
  #endif
  #if BUILDFLAG(IS_WIN)
-@@ -138,10 +138,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
+@@ -141,10 +141,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
      case Sandbox::kMediaFoundationCdm:
      case Sandbox::kWindowsSystemProxyResolver:
  #endif  // BUILDFLAG(IS_WIN)
@@ -50,7 +50,7 @@ Index: sandbox/policy/sandbox_type.cc
      case Sandbox::kHardwareVideoEncoding:
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -169,7 +169,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
+@@ -172,7 +172,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
      case Sandbox::kNaClLoader:
        break;
  #endif  // BUILDFLAG(IS_MAC)
@@ -60,15 +60,15 @@ Index: sandbox/policy/sandbox_type.cc
        break;
  #endif
 @@ -216,7 +216,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine(
-   if (process_type == switches::kNaClBrokerProcess)
-     return Sandbox::kNoSandbox;
+ #endif
+   }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    // Intermediate process gains a sandbox later.
    if (process_type == switches::kZygoteProcessType)
      return Sandbox::kZygoteIntermediateSandbox;
-@@ -260,7 +260,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
+@@ -262,7 +262,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
        return switches::kUtilitySandbox;
      case Sandbox::kAudio:
        return switches::kAudioSandbox;
@@ -77,7 +77,7 @@ Index: sandbox/policy/sandbox_type.cc
      case Sandbox::kVideoCapture:
        return switches::kVideoCaptureSandbox;
  #endif
-@@ -290,11 +290,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
+@@ -292,11 +292,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
      case Sandbox::kMirroring:
        return switches::kMirroringSandbox;
  #endif
@@ -91,7 +91,7 @@ Index: sandbox/policy/sandbox_type.cc
      case Sandbox::kHardwareVideoEncoding:
        return switches::kHardwareVideoEncodingSandbox;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -314,7 +314,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
+@@ -316,7 +316,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
  #if BUILDFLAG(IS_MAC)
      case Sandbox::kNaClLoader:
  #endif  // BUILDFLAG(IS_MAC)
@@ -100,7 +100,7 @@ Index: sandbox/policy/sandbox_type.cc
      case Sandbox::kZygoteIntermediateSandbox:
  #endif
        NOTREACHED();
-@@ -382,11 +382,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString(
+@@ -388,11 +388,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString(
    if (sandbox_string == switches::kScreenAISandbox)
      return Sandbox::kScreenAI;
  #endif
diff --git a/www/ungoogled-chromium/patches/patch-sandbox_policy_switches_cc b/www/ungoogled-chromium/patches/patch-sandbox_policy_switches_cc
index 38fcf8bfe..f4708af64 100644
--- a/www/ungoogled-chromium/patches/patch-sandbox_policy_switches_cc
+++ b/www/ungoogled-chromium/patches/patch-sandbox_policy_switches_cc
@@ -1,7 +1,7 @@
 Index: sandbox/policy/switches.cc
 --- sandbox/policy/switches.cc.orig
 +++ sandbox/policy/switches.cc
-@@ -53,10 +53,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro
+@@ -54,10 +54,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro
  const char kMirroringSandbox[] = "mirroring";
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -14,7 +14,7 @@ Index: sandbox/policy/switches.cc
  const char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding";
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -95,7 +95,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f
+@@ -96,7 +96,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f
  // Meant to be used as a browser-level switch for testing purposes only.
  const char kNoSandbox[] = "no-sandbox";
  
diff --git a/www/ungoogled-chromium/patches/patch-sandbox_policy_switches_h b/www/ungoogled-chromium/patches/patch-sandbox_policy_switches_h
index f00da9dda..c5f26228a 100644
--- a/www/ungoogled-chromium/patches/patch-sandbox_policy_switches_h
+++ b/www/ungoogled-chromium/patches/patch-sandbox_policy_switches_h
@@ -1,7 +1,7 @@
 Index: sandbox/policy/switches.h
 --- sandbox/policy/switches.h.orig
 +++ sandbox/policy/switches.h
-@@ -56,10 +56,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem
+@@ -57,10 +57,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem
  SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[];
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -14,7 +14,7 @@ Index: sandbox/policy/switches.h
  SANDBOX_POLICY_EXPORT extern const char kHardwareVideoEncodingSandbox[];
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -80,7 +80,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid
+@@ -81,7 +81,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid
  SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[];
  SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[];
  SANDBOX_POLICY_EXPORT extern const char kNoSandbox[];
diff --git a/www/ungoogled-chromium/patches/patch-services_audio_audio_sandbox_hook_linux_cc b/www/ungoogled-chromium/patches/patch-services_audio_audio_sandbox_hook_linux_cc
index 669072a3b..b2b3e0d71 100644
--- a/www/ungoogled-chromium/patches/patch-services_audio_audio_sandbox_hook_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-services_audio_audio_sandbox_hook_linux_cc
@@ -1,7 +1,7 @@
 Index: services/audio/audio_sandbox_hook_linux.cc
 --- services/audio/audio_sandbox_hook_linux.cc.orig
 +++ services/audio/audio_sandbox_hook_linux.cc
-@@ -143,6 +143,7 @@ void AddPulseAudioFilePermissions(
+@@ -144,6 +144,7 @@ void AddPulseAudioFilePermissions(
  }
  #endif
  
@@ -9,7 +9,7 @@ Index: services/audio/audio_sandbox_hook_linux.cc
  std::vector<BrokerFilePermission> GetAudioFilePermissions() {
    std::vector<BrokerFilePermission> permissions{
        BrokerFilePermission::ReadOnly("/dev/urandom"),
-@@ -171,10 +172,12 @@ void LoadAudioLibraries() {
+@@ -172,10 +173,12 @@ void LoadAudioLibraries() {
      }
    }
  }
@@ -22,7 +22,7 @@ Index: services/audio/audio_sandbox_hook_linux.cc
    LoadAudioLibraries();
    auto* instance = sandbox::policy::SandboxLinux::GetInstance();
    instance->StartBrokerProcess(MakeBrokerCommandSet({
-@@ -194,6 +197,7 @@ bool AudioPreSandboxHook(sandbox::policy::SandboxLinux
+@@ -193,6 +196,7 @@ bool AudioPreSandboxHook(sandbox::policy::SandboxLinux
    // TODO(https://crbug.com/850878) enable namespace sandbox. Currently, if
    // enabled, connect() on pulse native socket fails with ENOENT (called from
    // pa_context_connect).
diff --git a/www/ungoogled-chromium/patches/patch-services_cert_verifier_cert_verifier_creation_cc b/www/ungoogled-chromium/patches/patch-services_cert_verifier_cert_verifier_creation_cc
deleted file mode 100644
index 16179b4c2..000000000
--- a/www/ungoogled-chromium/patches/patch-services_cert_verifier_cert_verifier_creation_cc
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: services/cert_verifier/cert_verifier_creation.cc
---- services/cert_verifier/cert_verifier_creation.cc.orig
-+++ services/cert_verifier/cert_verifier_creation.cc
-@@ -13,7 +13,7 @@
- #include "net/cert/multi_threaded_cert_verifier.h"
- #include "net/net_buildflags.h"
- 
--#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "net/cert/cert_verify_proc_builtin.h"
- #include "net/cert/internal/system_trust_store.h"
- #endif
-@@ -112,7 +112,7 @@ class CertVerifyProcFactoryImpl : public net::CertVeri
-             user_slot_restriction_ ? crypto::ScopedPK11Slot(PK11_ReferenceSlot(
-                                          user_slot_restriction_.get()))
-                                    : nullptr));
--#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     return net::CreateCertVerifyProcBuiltin(std::move(cert_net_fetcher),
-                                             std::move(crl_set),
-                                             net::CreateSslSystemTrustStore());
-@@ -212,6 +212,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr
- bool IsUsingCertNetFetcher() {
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ||      \
-     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ||       \
-+    BUILDFLAG(IS_BSD) ||                                   \
-     BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED) || \
-     BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED)
-   return true;
diff --git a/www/ungoogled-chromium/patches/patch-services_device_BUILD_gn b/www/ungoogled-chromium/patches/patch-services_device_BUILD_gn
index 748541376..04a2526c1 100644
--- a/www/ungoogled-chromium/patches/patch-services_device_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-services_device_BUILD_gn
@@ -1,7 +1,7 @@
 Index: services/device/BUILD.gn
 --- services/device/BUILD.gn.orig
 +++ services/device/BUILD.gn
-@@ -16,7 +16,7 @@ if (is_android) {
+@@ -13,7 +13,7 @@ if (is_android) {
  }
  
  is_serial_enabled_platform =
diff --git a/www/ungoogled-chromium/patches/patch-services_device_compute_pressure_cpu_probe_cc b/www/ungoogled-chromium/patches/patch-services_device_compute_pressure_cpu_probe_cc
deleted file mode 100644
index dc325a394..000000000
--- a/www/ungoogled-chromium/patches/patch-services_device_compute_pressure_cpu_probe_cc
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: services/device/compute_pressure/cpu_probe.cc
---- services/device/compute_pressure/cpu_probe.cc.orig
-+++ services/device/compute_pressure/cpu_probe.cc
-@@ -44,6 +44,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create(
- #elif BUILDFLAG(IS_MAC)
-   return CpuProbeMac::Create(sampling_interval, std::move(sampling_callback));
- #else
-+  NOTIMPLEMENTED();
-   return nullptr;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- }
diff --git a/www/ungoogled-chromium/patches/patch-services_device_geolocation_location_arbitrator_cc b/www/ungoogled-chromium/patches/patch-services_device_geolocation_location_arbitrator_cc
index 0493dd6cc..7f8d3cfb4 100644
--- a/www/ungoogled-chromium/patches/patch-services_device_geolocation_location_arbitrator_cc
+++ b/www/ungoogled-chromium/patches/patch-services_device_geolocation_location_arbitrator_cc
@@ -1,7 +1,7 @@
 Index: services/device/geolocation/location_arbitrator.cc
 --- services/device/geolocation/location_arbitrator.cc.orig
 +++ services/device/geolocation/location_arbitrator.cc
-@@ -186,7 +186,7 @@ LocationArbitrator::NewNetworkLocationProvider(
+@@ -196,7 +196,7 @@ LocationArbitrator::NewNetworkLocationProvider(
  
  std::unique_ptr<LocationProvider>
  LocationArbitrator::NewSystemLocationProvider() {
@@ -9,4 +9,4 @@ Index: services/device/geolocation/location_arbitrator.cc
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
    return nullptr;
  #else
-   return device::NewSystemLocationProvider(main_task_runner_,
+   return device::NewSystemLocationProvider(
diff --git a/www/ungoogled-chromium/patches/patch-services_device_hid_BUILD_gn b/www/ungoogled-chromium/patches/patch-services_device_hid_BUILD_gn
index 90702e368..e80f23b06 100644
--- a/www/ungoogled-chromium/patches/patch-services_device_hid_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-services_device_hid_BUILD_gn
@@ -1,7 +1,7 @@
 Index: services/device/hid/BUILD.gn
 --- services/device/hid/BUILD.gn.orig
 +++ services/device/hid/BUILD.gn
-@@ -34,7 +34,26 @@ source_set("hid") {
+@@ -36,7 +36,26 @@ source_set("hid") {
      "//services/device/public/mojom",
    ]
  
diff --git a/www/ungoogled-chromium/patches/patch-services_device_public_cpp_generic_sensor_sensor_reading_h b/www/ungoogled-chromium/patches/patch-services_device_public_cpp_generic_sensor_sensor_reading_h
new file mode 100644
index 000000000..15463a5bd
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-services_device_public_cpp_generic_sensor_sensor_reading_h
@@ -0,0 +1,12 @@
+Index: services/device/public/cpp/generic_sensor/sensor_reading.h
+--- services/device/public/cpp/generic_sensor/sensor_reading.h.orig
++++ services/device/public/cpp/generic_sensor/sensor_reading.h
+@@ -8,6 +8,8 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ 
++#include <cstdint>
++
+ #include <type_traits>
+ 
+ namespace device {
diff --git a/www/ungoogled-chromium/patches/patch-services_device_usb_BUILD_gn b/www/ungoogled-chromium/patches/patch-services_device_usb_BUILD_gn
index c2903fea8..8ff2f09a5 100644
--- a/www/ungoogled-chromium/patches/patch-services_device_usb_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-services_device_usb_BUILD_gn
@@ -1,7 +1,7 @@
 Index: services/device/usb/BUILD.gn
 --- services/device/usb/BUILD.gn.orig
 +++ services/device/usb/BUILD.gn
-@@ -89,15 +89,17 @@ static_library("usb") {
+@@ -92,15 +92,17 @@ static_library("usb") {
      deps += [ "//third_party/re2" ]
    }
  
@@ -28,7 +28,7 @@ Index: services/device/usb/BUILD.gn
  
      # These sources and deps are required for libusb.
      # TODO(https://crbug.com/1096743) Remove these sources.
-@@ -121,6 +123,13 @@ static_library("usb") {
+@@ -124,6 +126,13 @@ static_library("usb") {
      deps += [ "//third_party/libusb" ]
    }
  
@@ -42,7 +42,7 @@ Index: services/device/usb/BUILD.gn
    if (is_linux || is_chromeos) {
      sources += [
        "usb_device_linux.cc",
-@@ -138,7 +147,7 @@ static_library("usb") {
+@@ -141,7 +150,7 @@ static_library("usb") {
      deps += [ "//device/udev_linux" ]
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-services_network_BUILD_gn b/www/ungoogled-chromium/patches/patch-services_network_BUILD_gn
index adf580cdb..b038ec776 100644
--- a/www/ungoogled-chromium/patches/patch-services_network_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-services_network_BUILD_gn
@@ -1,11 +1,11 @@
 Index: services/network/BUILD.gn
 --- services/network/BUILD.gn.orig
 +++ services/network/BUILD.gn
-@@ -385,7 +385,6 @@ if (is_linux || is_chromeos) {
+@@ -410,7 +410,6 @@ if (is_linux || is_chromeos) {
      ]
      deps = [
        "//base:base",
 -      "//sandbox/linux:sandbox_services",
        "//sandbox/policy:policy",
      ]
-   }
+     configs += [ "//build/config/compiler:wexit_time_destructors" ]
diff --git a/www/ungoogled-chromium/patches/patch-services_network_network_context_cc b/www/ungoogled-chromium/patches/patch-services_network_network_context_cc
new file mode 100644
index 000000000..5b3dbaa2f
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-services_network_network_context_cc
@@ -0,0 +1,21 @@
+Index: services/network/network_context.cc
+--- services/network/network_context.cc.orig
++++ services/network/network_context.cc
+@@ -523,7 +523,7 @@ NetworkContext::NetworkContextHttpAuthPreferences::
+ NetworkContext::NetworkContextHttpAuthPreferences::
+     ~NetworkContextHttpAuthPreferences() = default;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad()
+     const {
+   if (network_service_) {
+@@ -2277,7 +2277,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged(
+       http_auth_dynamic_network_service_params->android_negotiate_account_type);
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   http_auth_merged_preferences_.set_allow_gssapi_library_load(
+       http_auth_dynamic_network_service_params->allow_gssapi_library_load);
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/patches/patch-services_network_network_context_h b/www/ungoogled-chromium/patches/patch-services_network_network_context_h
new file mode 100644
index 000000000..ec260b1e4
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-services_network_network_context_h
@@ -0,0 +1,12 @@
+Index: services/network/network_context.h
+--- services/network/network_context.h.orig
++++ services/network/network_context.h
+@@ -670,7 +670,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+    public:
+     explicit NetworkContextHttpAuthPreferences(NetworkService* network_service);
+     ~NetworkContextHttpAuthPreferences() override;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     bool AllowGssapiLibraryLoad() const override;
+ #endif  // BUILDFLAG(IS_LINUX)
+    private:
diff --git a/www/ungoogled-chromium/patches/patch-services_network_network_sandbox_hook_linux_cc b/www/ungoogled-chromium/patches/patch-services_network_network_sandbox_hook_linux_cc
index 12ce24128..1820403ec 100644
--- a/www/ungoogled-chromium/patches/patch-services_network_network_sandbox_hook_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-services_network_network_sandbox_hook_linux_cc
@@ -1,9 +1,9 @@
 Index: services/network/network_sandbox_hook_linux.cc
 --- services/network/network_sandbox_hook_linux.cc.orig
 +++ services/network/network_sandbox_hook_linux.cc
-@@ -14,11 +14,14 @@
+@@ -15,11 +15,14 @@
+ #include "sandbox/linux/syscall_broker/broker_file_permission.h"
  #include "sandbox/policy/features.h"
- #include "third_party/abseil-cpp/absl/types/optional.h"
  
 +#if !BUILDFLAG(IS_BSD)
  using sandbox::syscall_broker::BrokerFilePermission;
@@ -16,7 +16,7 @@ Index: services/network/network_sandbox_hook_linux.cc
  sandbox::syscall_broker::BrokerCommandSet GetNetworkBrokerCommandSet() {
    return MakeBrokerCommandSet({
        sandbox::syscall_broker::COMMAND_ACCESS,
-@@ -102,9 +105,11 @@ void LoadNetworkLibraries() {
+@@ -103,9 +106,11 @@ void LoadNetworkLibraries() {
    }
  }
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -28,10 +28,10 @@ Index: services/network/network_sandbox_hook_linux.cc
  #if BUILDFLAG(IS_CHROMEOS)
    LoadNetworkLibraries();
  #endif
-@@ -117,6 +122,7 @@ bool NetworkPreSandboxHook(std::vector<std::string> ne
+@@ -118,6 +123,7 @@ bool NetworkPreSandboxHook(std::vector<std::string> ne
        GetNetworkBrokerCommandSet(),
        GetNetworkFilePermissions(std::move(network_context_parent_dirs)),
-       sandbox::policy::SandboxLinux::PreSandboxHook(), options);
+       options);
 +#endif
  
    return true;
diff --git a/www/ungoogled-chromium/patches/patch-services_network_network_service_cc b/www/ungoogled-chromium/patches/patch-services_network_network_service_cc
index 45ba69a37..73fc14abc 100644
--- a/www/ungoogled-chromium/patches/patch-services_network_network_service_cc
+++ b/www/ungoogled-chromium/patches/patch-services_network_network_service_cc
@@ -1,7 +1,7 @@
 Index: services/network/network_service.cc
 --- services/network/network_service.cc.orig
 +++ services/network/network_service.cc
-@@ -96,7 +96,7 @@
+@@ -97,7 +97,7 @@
  #include "third_party/boringssl/src/include/openssl/cpu.h"
  #endif
  
@@ -10,3 +10,21 @@ Index: services/network/network_service.cc
      BUILDFLAG(IS_CHROMEOS_LACROS)
  
  #include "components/os_crypt/sync/key_storage_config_linux.h"
+@@ -978,7 +978,7 @@ void NetworkService::SetExplicitlyAllowedPorts(
+   net::SetExplicitlyAllowedPorts(ports);
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void NetworkService::SetGssapiLibraryLoadObserver(
+     mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
+         gssapi_library_load_observer) {
+@@ -1060,7 +1060,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo
+   );
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void NetworkService::OnBeforeGssapiLibraryLoad() {
+   if (gssapi_library_load_observer_.is_bound()) {
+     gssapi_library_load_observer_->OnBeforeGssapiLibraryLoad();
diff --git a/www/ungoogled-chromium/patches/patch-services_network_network_service_h b/www/ungoogled-chromium/patches/patch-services_network_network_service_h
new file mode 100644
index 000000000..681c8d2ce
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-services_network_network_service_h
@@ -0,0 +1,30 @@
+Index: services/network/network_service.h
+--- services/network/network_service.h.orig
++++ services/network/network_service.h
+@@ -229,7 +229,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+       mojo::PendingReceiver<mojom::NetworkServiceTest> receiver) override;
+   void SetFirstPartySets(net::GlobalFirstPartySets sets) override;
+   void SetExplicitlyAllowedPorts(const std::vector<uint16_t>& ports) override;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   void SetGssapiLibraryLoadObserver(
+       mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
+           gssapi_library_load_observer) override;
+@@ -255,7 +255,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+   std::unique_ptr<net::HttpAuthHandlerFactory> CreateHttpAuthHandlerFactory(
+       NetworkContext* network_context);
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // This is called just before a GSSAPI library may be loaded.
+   void OnBeforeGssapiLibraryLoad();
+ #endif  // BUILDFLAG(IS_LINUX)
+@@ -481,7 +481,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+   // leaking stale listeners between tests.
+   std::unique_ptr<net::NetworkChangeNotifier> mock_network_change_notifier_;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   mojo::Remote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer_;
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
diff --git a/www/ungoogled-chromium/patches/patch-services_network_public_cpp_BUILD_gn b/www/ungoogled-chromium/patches/patch-services_network_public_cpp_BUILD_gn
index f5c911f46..2e3c755c6 100644
--- a/www/ungoogled-chromium/patches/patch-services_network_public_cpp_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-services_network_public_cpp_BUILD_gn
@@ -1,7 +1,7 @@
 Index: services/network/public/cpp/BUILD.gn
 --- services/network/public/cpp/BUILD.gn.orig
 +++ services/network/public/cpp/BUILD.gn
-@@ -475,7 +475,7 @@ component("cpp_base") {
+@@ -486,7 +486,7 @@ component("cpp_base") {
      sources += [ "transferable_directory_fuchsia.cc" ]
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-services_network_public_mojom_BUILD_gn b/www/ungoogled-chromium/patches/patch-services_network_public_mojom_BUILD_gn
index 0e2bebdaf..582d0f1c9 100644
--- a/www/ungoogled-chromium/patches/patch-services_network_public_mojom_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-services_network_public_mojom_BUILD_gn
@@ -1,7 +1,7 @@
 Index: services/network/public/mojom/BUILD.gn
 --- services/network/public/mojom/BUILD.gn.orig
 +++ services/network/public/mojom/BUILD.gn
-@@ -515,11 +515,11 @@ mojom("url_loader_base") {
+@@ -522,11 +522,11 @@ mojom("url_loader_base") {
    }
  
    enabled_features = []
@@ -15,7 +15,7 @@ Index: services/network/public/mojom/BUILD.gn
      # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does
      # not include lacros.
      enabled_features += [ "use_network_interface_change_listener" ]
-@@ -1435,7 +1435,7 @@ mojom("mojom") {
+@@ -1457,7 +1457,7 @@ mojom("mojom") {
      }
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-services_on_device_model_on_device_model_service_h b/www/ungoogled-chromium/patches/patch-services_on_device_model_on_device_model_service_h
new file mode 100644
index 000000000..0ccab9f02
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-services_on_device_model_on_device_model_service_h
@@ -0,0 +1,23 @@
+Index: services/on_device_model/on_device_model_service.h
+--- services/on_device_model/on_device_model_service.h.orig
++++ services/on_device_model/on_device_model_service.h
+@@ -20,6 +20,10 @@
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ #endif
+ 
++#if BUILDFLAG(IS_BSD)
++#include "sandbox/policy/sandbox.h"
++#endif
++
+ namespace on_device_model {
+ 
+ class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelService
+@@ -29,7 +33,7 @@ class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelS
+   // These are defined separately in pre_sandbox_init.cc for explicit security
+   // review coverage.
+   [[nodiscard]] static bool PreSandboxInit();
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   static void AddSandboxLinuxOptions(
+       sandbox::policy::SandboxLinux::Options& options);
+ #endif
diff --git a/www/ungoogled-chromium/patches/patch-services_on_device_model_pre_sandbox_init_cc b/www/ungoogled-chromium/patches/patch-services_on_device_model_pre_sandbox_init_cc
new file mode 100644
index 000000000..93e7c27f5
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-services_on_device_model_pre_sandbox_init_cc
@@ -0,0 +1,39 @@
+Index: services/on_device_model/pre_sandbox_init.cc
+--- services/on_device_model/pre_sandbox_init.cc.orig
++++ services/on_device_model/pre_sandbox_init.cc
+@@ -14,7 +14,7 @@
+ #include "services/on_device_model/ml/chrome_ml.h"  // nogncheck
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "gpu/config/gpu_info_collector.h"                    // nogncheck
+ #include "third_party/dawn/include/dawn/dawn_proc.h"          // nogncheck
+ #include "third_party/dawn/include/dawn/native/DawnNative.h"  // nogncheck
+@@ -25,7 +25,7 @@ namespace on_device_model {
+ 
+ namespace {
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ constexpr uint32_t kVendorIdAMD = 0x1002;
+ constexpr uint32_t kVendorIdIntel = 0x8086;
+ constexpr uint32_t kVendorIdNVIDIA = 0x10DE;
+@@ -74,7 +74,7 @@ bool OnDeviceModelService::PreSandboxInit() {
+   }
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // Warm any relevant drivers before attempting to bring up the sandbox. For
+   // good measure we initialize a device instance for any adapter with an
+   // appropriate backend on top of any integrated or discrete GPU.
+@@ -100,7 +100,7 @@ bool OnDeviceModelService::PreSandboxInit() {
+   return true;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // static
+ void OnDeviceModelService::AddSandboxLinuxOptions(
+     sandbox::policy::SandboxLinux::Options& options) {
diff --git a/www/ungoogled-chromium/patches/patch-services_resource_coordinator_memory_instrumentation_queued_request_dispatcher_cc b/www/ungoogled-chromium/patches/patch-services_resource_coordinator_memory_instrumentation_queued_request_dispatcher_cc
index edf49ed5f..9e0541371 100644
--- a/www/ungoogled-chromium/patches/patch-services_resource_coordinator_memory_instrumentation_queued_request_dispatcher_cc
+++ b/www/ungoogled-chromium/patches/patch-services_resource_coordinator_memory_instrumentation_queued_request_dispatcher_cc
@@ -1,7 +1,7 @@
 Index: services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc
 --- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig
 +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc
-@@ -53,7 +53,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO
+@@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO
                                       uint32_t shared_resident_kb) {
    DCHECK(os_dump.platform_private_footprint);
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -10,7 +10,7 @@ Index: services/resource_coordinator/memory_instrumentation/queued_request_dispa
    uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes;
    uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes;
    return (rss_anon_bytes + vm_swap_bytes) / 1024;
-@@ -81,7 +81,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl
+@@ -83,7 +83,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl
    os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable;
    os_dump->private_footprint_kb =
        CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb);
@@ -19,7 +19,7 @@ Index: services/resource_coordinator/memory_instrumentation/queued_request_dispa
    os_dump->private_footprint_swap_kb =
        internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024;
  #endif
-@@ -220,7 +220,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
+@@ -219,7 +219,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
  
  // On most platforms each process can dump data about their own process
  // so ask each process to do so Linux is special see below.
@@ -28,7 +28,7 @@ Index: services/resource_coordinator/memory_instrumentation/queued_request_dispa
      request->pending_responses.insert({client_info.pid, ResponseType::kOSDump});
      client->RequestOSMemoryDump(request->memory_map_option(),
                                  {base::kNullProcessId},
-@@ -235,7 +235,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
+@@ -234,7 +234,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
  
  // In some cases, OS stats can only be dumped from a privileged process to
  // get around to sandboxing/selinux restrictions (see crbug.com/461788).
@@ -37,7 +37,7 @@ Index: services/resource_coordinator/memory_instrumentation/queued_request_dispa
    std::vector<base::ProcessId> pids;
    mojom::ClientProcess* browser_client = nullptr;
    base::ProcessId browser_client_pid = base::kNullProcessId;
-@@ -281,7 +281,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion
+@@ -280,7 +280,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion
      const OsCallback& os_callback) {
  // On Linux, OS stats can only be dumped from a privileged process to
  // get around to sandboxing/selinux restrictions (see crbug.com/461788).
@@ -46,7 +46,7 @@ Index: services/resource_coordinator/memory_instrumentation/queued_request_dispa
    mojom::ClientProcess* browser_client = nullptr;
    base::ProcessId browser_client_pid = 0;
    for (const auto& client_info : clients) {
-@@ -331,7 +331,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest(
+@@ -330,7 +330,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest(
      // each client process provides 1 OS dump, % the case where the client is
      // disconnected mid dump.
      OSMemDumpMap& extra_os_dumps = response.second.os_dumps;
@@ -55,7 +55,7 @@ Index: services/resource_coordinator/memory_instrumentation/queued_request_dispa
      for (auto& kv : extra_os_dumps) {
        auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first;
        DCHECK(results.find(pid) == results.end());
-@@ -392,7 +392,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* 
+@@ -391,7 +391,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* 
      // crash). In the latter case (OS_LINUX) we expect the full map to come
      // from the browser process response.
      OSMemDumpMap& extra_os_dumps = response.second.os_dumps;
diff --git a/www/ungoogled-chromium/patches/patch-services_screen_ai_public_cpp_utilities_cc b/www/ungoogled-chromium/patches/patch-services_screen_ai_public_cpp_utilities_cc
new file mode 100644
index 000000000..b3d3b652f
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-services_screen_ai_public_cpp_utilities_cc
@@ -0,0 +1,30 @@
+Index: services/screen_ai/public/cpp/utilities.cc
+--- services/screen_ai/public/cpp/utilities.cc.orig
++++ services/screen_ai/public/cpp/utilities.cc
+@@ -19,7 +19,7 @@ namespace screen_ai {
+ 
+ namespace {
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ constexpr char kBinaryPathSwitch[] = "screen-ai-binary";
+ #endif
+ 
+@@ -40,7 +40,7 @@ constexpr char kScreenAIDlcRootPath[] =
+ #endif
+ 
+ #if BUILDFLAG(ENABLE_SCREEN_AI_BROWSERTESTS)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ constexpr base::FilePath::CharType kScreenAIResourcePathForTests[] =
+     FILE_PATH_LITERAL("third_party/screen-ai/linux/resources");
+ #elif BUILDFLAG(IS_MAC)
+@@ -127,7 +127,7 @@ base::FilePath GetComponentBinaryPathForTests() {
+ 
+ const char* GetBinaryPathSwitch() {
+   // This is only used on Linux and ChromeOS.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   return kBinaryPathSwitch;
+ #else
+   return nullptr;
diff --git a/www/ungoogled-chromium/patches/patch-services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_cc b/www/ungoogled-chromium/patches/patch-services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_cc
new file mode 100644
index 000000000..f6807a8b1
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_cc
@@ -0,0 +1,19 @@
+Index: services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc
+--- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig
++++ services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc
+@@ -53,6 +53,7 @@ bool ScreenAIPreSandboxHook(base::FilePath binary_path
+     }
+   }
+ 
++#if !BUILDFLAG(IS_BSD)
+   auto* instance = sandbox::policy::SandboxLinux::GetInstance();
+ 
+   std::vector<BrokerFilePermission> permissions{
+@@ -75,6 +76,7 @@ bool ScreenAIPreSandboxHook(base::FilePath binary_path
+                             sandbox::syscall_broker::COMMAND_OPEN}),
+       permissions, options);
+   instance->EngageNamespaceSandboxIfPossible();
++#endif
+ 
+   return true;
+ }
diff --git a/www/ungoogled-chromium/patches/patch-services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_h b/www/ungoogled-chromium/patches/patch-services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_h
new file mode 100644
index 000000000..2d14c7b56
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_h
@@ -0,0 +1,17 @@
+Index: services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h
+--- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig
++++ services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h
+@@ -6,7 +6,13 @@
+ #define SERVICES_SCREEN_AI_SANDBOX_SCREEN_AI_SANDBOX_HOOK_LINUX_H_
+ 
+ #include "base/files/file_path.h"
++#include "build/build_config.h"
++
++#if BUILDFLAG(IS_BSD)
++#include "sandbox/policy/sandbox.h"
++#else
+ #include "sandbox/policy/linux/sandbox_linux.h"
++#endif
+ 
+ namespace screen_ai {
+ 
diff --git a/www/ungoogled-chromium/patches/patch-services_tracing_public_cpp_stack_sampling_tracing_sampler_profiler_cc b/www/ungoogled-chromium/patches/patch-services_tracing_public_cpp_stack_sampling_tracing_sampler_profiler_cc
index 30146be66..abbc92e3d 100644
--- a/www/ungoogled-chromium/patches/patch-services_tracing_public_cpp_stack_sampling_tracing_sampler_profiler_cc
+++ b/www/ungoogled-chromium/patches/patch-services_tracing_public_cpp_stack_sampling_tracing_sampler_profiler_cc
@@ -1,7 +1,7 @@
 Index: services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc
 --- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig
 +++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc
-@@ -37,7 +37,7 @@
+@@ -38,7 +38,7 @@
  #include "third_party/perfetto/protos/perfetto/trace/track_event/process_descriptor.pbzero.h"
  #include "third_party/perfetto/protos/perfetto/trace/track_event/thread_descriptor.pbzero.h"
  
diff --git a/www/ungoogled-chromium/patches/patch-services_video_capture_video_capture_service_impl_cc b/www/ungoogled-chromium/patches/patch-services_video_capture_video_capture_service_impl_cc
index 11c88f393..983a709d1 100644
--- a/www/ungoogled-chromium/patches/patch-services_video_capture_video_capture_service_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-services_video_capture_video_capture_service_impl_cc
@@ -1,39 +1,39 @@
 Index: services/video_capture/video_capture_service_impl.cc
 --- services/video_capture/video_capture_service_impl.cc.orig
 +++ services/video_capture/video_capture_service_impl.cc
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
  #include "services/video_capture/lacros/device_factory_adapter_lacros.h"
  #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
  #include "media/capture/capture_switches.h"
  #include "media/capture/video/video_capture_gpu_channel_host.h"
  #include "services/viz/public/cpp/gpu/context_provider_command_buffer.h"
-@@ -107,7 +107,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext 
+@@ -109,7 +109,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext 
        this};
  };
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
  // Intended usage of this class is to create viz::Gpu in utility process and
  // connect to viz::GpuClient of browser process, which will call to Gpu service.
  // Also, this class holds the viz::ContextProvider to listen and monitor Gpu
-@@ -289,7 +289,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende
-   if (!gpu_dependencies_context_)
+@@ -307,7 +307,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende
      gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>();
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
+-#if BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+   {
+ #else
    if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
-     if (!viz_gpu_context_provider_) {
-       viz_gpu_context_provider_ =
-@@ -385,7 +385,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH
+@@ -421,7 +421,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH
  }
  #endif
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
  void VideoCaptureServiceImpl::SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu) {
    viz_gpu_ = std::move(viz_gpu);
  }
diff --git a/www/ungoogled-chromium/patches/patch-services_video_capture_video_capture_service_impl_h b/www/ungoogled-chromium/patches/patch-services_video_capture_video_capture_service_impl_h
index 9b24f4047..7cc8ed394 100644
--- a/www/ungoogled-chromium/patches/patch-services_video_capture_video_capture_service_impl_h
+++ b/www/ungoogled-chromium/patches/patch-services_video_capture_video_capture_service_impl_h
@@ -1,30 +1,30 @@
 Index: services/video_capture/video_capture_service_impl.h
 --- services/video_capture/video_capture_service_impl.h.orig
 +++ services/video_capture/video_capture_service_impl.h
-@@ -24,7 +24,7 @@
+@@ -26,7 +26,7 @@
  #include "services/video_capture/ash/video_capture_device_factory_ash.h"
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
  #include "services/viz/public/cpp/gpu/gpu.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
- 
-@@ -62,7 +62,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ||
+         // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -70,7 +70,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap
  #if BUILDFLAG(IS_WIN)
    void OnGpuInfoUpdate(const CHROME_LUID& luid) override;
  #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
    void SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-  private:
-@@ -87,7 +87,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ||
+         // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -107,7 +107,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap
        factory_receivers_ash_;
  #endif
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
    class VizGpuContextProvider;
    std::unique_ptr<VizGpuContextProvider> viz_gpu_context_provider_;
    std::unique_ptr<viz::Gpu> viz_gpu_;
diff --git a/www/ungoogled-chromium/patches/patch-skia_ext_SkMemory_new_handler_cpp b/www/ungoogled-chromium/patches/patch-skia_ext_SkMemory_new_handler_cpp
index 0a6a97f04..644952ad6 100644
--- a/www/ungoogled-chromium/patches/patch-skia_ext_SkMemory_new_handler_cpp
+++ b/www/ungoogled-chromium/patches/patch-skia_ext_SkMemory_new_handler_cpp
@@ -1,7 +1,16 @@
 Index: skia/ext/SkMemory_new_handler.cpp
 --- skia/ext/SkMemory_new_handler.cpp.orig
 +++ skia/ext/SkMemory_new_handler.cpp
-@@ -86,7 +86,7 @@ static void* malloc_nothrow(size_t size) {
+@@ -19,7 +19,7 @@
+ #include <windows.h>
+ #elif BUILDFLAG(IS_APPLE)
+ #include <malloc/malloc.h>
+-#else
++#elif !BUILDFLAG(IS_BSD)
+ #include <malloc.h>
+ #endif
+ 
+@@ -92,7 +92,7 @@ static void* malloc_nothrow(size_t size) {
    // TODO(b.kelemen): we should always use UncheckedMalloc but currently it
    // doesn't work as intended everywhere.
    void* result;
diff --git a/www/ungoogled-chromium/patches/patch-skia_ext_font_utils_cc b/www/ungoogled-chromium/patches/patch-skia_ext_font_utils_cc
new file mode 100644
index 000000000..64b15007d
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-skia_ext_font_utils_cc
@@ -0,0 +1,21 @@
+Index: skia/ext/font_utils.cc
+--- skia/ext/font_utils.cc.orig
++++ skia/ext/font_utils.cc
+@@ -19,7 +19,7 @@
+ #include "third_party/skia/include/ports/SkFontMgr_mac_ct.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "third_party/skia/include/ports/SkFontConfigInterface.h"
+ #include "third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h"
+ #endif
+@@ -60,7 +60,7 @@ static sk_sp<SkFontMgr> fontmgr_factory() {
+   return SkFontMgr_New_Android(nullptr);
+ #elif BUILDFLAG(IS_APPLE)
+   return SkFontMgr_New_CoreText(nullptr);
+-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   sk_sp<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal());
+   return fci ? SkFontMgr_New_FCI(std::move(fci)) : nullptr;
+ #elif BUILDFLAG(IS_FUCHSIA)
diff --git a/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_base_config_h b/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_base_config_h
index e9458d59c..e8b3ad342 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_base_config_h
+++ b/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_base_config_h
@@ -1,7 +1,7 @@
 Index: third_party/abseil-cpp/absl/base/config.h
 --- third_party/abseil-cpp/absl/base/config.h.orig
 +++ third_party/abseil-cpp/absl/base/config.h
-@@ -444,7 +444,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
+@@ -448,7 +448,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
  #ifdef ABSL_HAVE_SCHED_YIELD
  #error ABSL_HAVE_SCHED_YIELD cannot be directly set
  #elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \
@@ -10,7 +10,7 @@ Index: third_party/abseil-cpp/absl/base/config.h
  #define ABSL_HAVE_SCHED_YIELD 1
  #endif
  
-@@ -459,7 +459,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
+@@ -463,7 +463,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
  // platforms.
  #ifdef ABSL_HAVE_SEMAPHORE_H
  #error ABSL_HAVE_SEMAPHORE_H cannot be directly set
diff --git a/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_base_internal_raw_logging_cc b/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_base_internal_raw_logging_cc
deleted file mode 100644
index 45016d225..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_base_internal_raw_logging_cc
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: third_party/abseil-cpp/absl/base/internal/raw_logging.cc
---- third_party/abseil-cpp/absl/base/internal/raw_logging.cc.orig
-+++ third_party/abseil-cpp/absl/base/internal/raw_logging.cc
-@@ -56,10 +56,12 @@
- // ABSL_HAVE_SYSCALL_WRITE is defined when the platform provides the syscall
- //   syscall(SYS_write, /*int*/ fd, /*char* */ buf, /*size_t*/ len);
- // for low level operations that want to avoid libc.
--#if (defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && \
-+#if (defined(__linux__) || defined(__FreeBSD__)) && \
-     !defined(__ANDROID__)
- #include <sys/syscall.h>
- #define ABSL_HAVE_SYSCALL_WRITE 1
-+#define ABSL_LOW_LEVEL_WRITE_SUPPORTED 1
-+#elif defined(__OpenBSD__)
- #define ABSL_LOW_LEVEL_WRITE_SUPPORTED 1
- #else
- #undef ABSL_HAVE_SYSCALL_WRITE
diff --git a/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_base_internal_sysinfo_cc b/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_base_internal_sysinfo_cc
index 6a7c04237..10e817474 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_base_internal_sysinfo_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_base_internal_sysinfo_cc
@@ -1,7 +1,7 @@
 Index: third_party/abseil-cpp/absl/base/internal/sysinfo.cc
 --- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig
 +++ third_party/abseil-cpp/absl/base/internal/sysinfo.cc
-@@ -30,10 +30,14 @@
+@@ -30,7 +30,7 @@
  #include <sys/syscall.h>
  #endif
  
@@ -10,14 +10,7 @@ Index: third_party/abseil-cpp/absl/base/internal/sysinfo.cc
  #include <sys/sysctl.h>
  #endif
  
-+#if defined(__FreeBSD__)
-+#include <pthread_np.h>
-+#endif
-+
- #if defined(__myriad2__)
- #include <rtems.h>
- #endif
-@@ -186,6 +190,7 @@ static double GetNominalCPUFrequency() {
+@@ -194,6 +194,7 @@ static double GetNominalCPUFrequency() {
  
  #else
  
@@ -25,7 +18,7 @@ Index: third_party/abseil-cpp/absl/base/internal/sysinfo.cc
  // Helper function for reading a long from a file. Returns true if successful
  // and the memory location pointed to by value is set to the value read.
  static bool ReadLongFromFile(const char *file, long *value) {
-@@ -218,6 +223,7 @@ static bool ReadLongFromFile(const char *file, long *v
+@@ -226,6 +227,7 @@ static bool ReadLongFromFile(const char *file, long *v
    }
    return ret;
  }
@@ -33,7 +26,7 @@ Index: third_party/abseil-cpp/absl/base/internal/sysinfo.cc
  
  #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY)
  
-@@ -317,9 +323,11 @@ static double GetNominalCPUFrequency() {
+@@ -325,9 +327,11 @@ static double GetNominalCPUFrequency() {
    // a new mode (turbo mode). Essentially, those frequencies cannot
    // always be relied upon. The same reasons apply to /proc/cpuinfo as
    // well.
@@ -45,7 +38,7 @@ Index: third_party/abseil-cpp/absl/base/internal/sysinfo.cc
  
  #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY)
    // On these platforms, the TSC frequency is the nominal CPU
-@@ -338,10 +346,12 @@ static double GetNominalCPUFrequency() {
+@@ -346,10 +350,12 @@ static double GetNominalCPUFrequency() {
    // If CPU scaling is in effect, we want to use the *maximum*
    // frequency, not whatever CPU speed some random processor happens
    // to be using now.
@@ -58,7 +51,7 @@ Index: third_party/abseil-cpp/absl/base/internal/sysinfo.cc
  
    return 1.0;
  #endif  // !ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY
-@@ -439,6 +449,18 @@ pid_t GetTID() {
+@@ -459,6 +465,12 @@ pid_t GetTID() {
    static_assert(sizeof(pid_t) == sizeof(thread),
                  "In NaCL int expected to be the same size as a pointer");
    return reinterpret_cast<pid_t>(thread);
@@ -68,12 +61,6 @@ Index: third_party/abseil-cpp/absl/base/internal/sysinfo.cc
 +
 +pid_t GetTID() {
 +  return getthrid();
-+}
-+
-+#elif defined(__FreeBSD__)
-+
-+pid_t GetTID() {
-+  return pthread_getthreadid_np();
  }
  
  #else
diff --git a/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_time_internal_cctz_src_time_zone_format_cc b/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_time_internal_cctz_src_time_zone_format_cc
deleted file mode 100644
index 30fa1e7b5..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_time_internal_cctz_src_time_zone_format_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc
---- third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig
-+++ third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc
-@@ -19,7 +19,7 @@
- #endif
- 
- #if defined(HAS_STRPTIME) && HAS_STRPTIME
--#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__)
-+#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
- #define _XOPEN_SOURCE 500  // Exposes definitions for SUSv2 (UNIX 98).
- #endif
- #endif
diff --git a/www/ungoogled-chromium/patches/patch-third_party_angle_BUILD_gn b/www/ungoogled-chromium/patches/patch-third_party_angle_BUILD_gn
index 9c15a82f3..bdaee0506 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_angle_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-third_party_angle_BUILD_gn
@@ -1,7 +1,7 @@
 Index: third_party/angle/BUILD.gn
 --- third_party/angle/BUILD.gn.orig
 +++ third_party/angle/BUILD.gn
-@@ -321,7 +321,6 @@ config("extra_warnings") {
+@@ -335,7 +335,6 @@ config("extra_warnings") {
        "-Wtautological-type-limit-compare",
        "-Wundefined-reinterpret-cast",
        "-Wunneeded-internal-declaration",
@@ -9,7 +9,7 @@ Index: third_party/angle/BUILD.gn
        "-Wsuggest-destructor-override",
        "-Wsuggest-override",
  
-@@ -492,7 +491,7 @@ template("angle_common_lib") {
+@@ -506,7 +505,7 @@ template("angle_common_lib") {
        all_dependent_configs = [ ":angle_disable_pool_alloc" ]
      }
  
@@ -18,7 +18,7 @@ Index: third_party/angle/BUILD.gn
        libs = [ "dl" ]
      }
  
-@@ -647,6 +646,9 @@ angle_static_library("angle_gpu_info_util") {
+@@ -661,6 +660,9 @@ angle_static_library("angle_gpu_info_util") {
          "Xi",
          "Xext",
        ]
diff --git a/www/ungoogled-chromium/patches/patch-third_party_angle_src_common_system_utils_cpp b/www/ungoogled-chromium/patches/patch-third_party_angle_src_common_system_utils_cpp
new file mode 100644
index 000000000..986648a13
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-third_party_angle_src_common_system_utils_cpp
@@ -0,0 +1,12 @@
+Index: third_party/angle/src/common/system_utils.cpp
+--- third_party/angle/src/common/system_utils.cpp.orig
++++ third_party/angle/src/common/system_utils.cpp
+@@ -25,7 +25,7 @@ namespace angle
+ {
+ std::string GetExecutableName()
+ {
+-#if defined(ANGLE_PLATFORM_ANDROID) && __ANDROID_API__ >= 21
++#if (defined(ANGLE_PLATFORM_ANDROID) && __ANDROID_API__ >= 21) || defined(ANGLE_PLATFORM_BSD)
+     // Support for "getprogname" function in bionic was introduced in L (API level 21)
+     const char *executableName = getprogname();
+     return (executableName) ? std::string(executableName) : "ANGLE";
diff --git a/www/ungoogled-chromium/patches/patch-third_party_angle_src_common_system_utils_linux_cpp b/www/ungoogled-chromium/patches/patch-third_party_angle_src_common_system_utils_linux_cpp
new file mode 100644
index 000000000..a890c0588
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-third_party_angle_src_common_system_utils_linux_cpp
@@ -0,0 +1,36 @@
+Index: third_party/angle/src/common/system_utils_linux.cpp
+--- third_party/angle/src/common/system_utils_linux.cpp.orig
++++ third_party/angle/src/common/system_utils_linux.cpp
+@@ -15,8 +15,13 @@
+ 
+ #include <array>
+ 
++#if ANGLE_PLATFORM_OPENBSD
++#include <pthread_np.h>
++#endif
++
+ namespace angle
+ {
++#if ANGLE_PLATFORM_LINUX
+ std::string GetExecutablePath()
+ {
+     // We cannot use lstat to get the size of /proc/self/exe as it always returns 0
+@@ -32,6 +37,7 @@ std::string GetExecutablePath()
+     path[result] = '\0';
+     return path;
+ }
++#endif
+ 
+ std::string GetExecutableDirectory()
+ {
+@@ -56,6 +62,10 @@ void SetCurrentThreadName(const char *name)
+ {
+     // There's a 15-character (16 including '\0') limit.  If the name is too big (and ERANGE is
+     // returned), just ignore the name.
++#if ANGLE_PLATFORM_OPENBSD
++    pthread_set_name_np(pthread_self(), name);
++#else
+     pthread_setname_np(pthread_self(), name);
++#endif
+ }
+ }  // namespace angle
diff --git a/www/ungoogled-chromium/patches/patch-third_party_angle_src_libANGLE_Display_cpp b/www/ungoogled-chromium/patches/patch-third_party_angle_src_libANGLE_Display_cpp
index fd36680bd..f1efd46e7 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_angle_src_libANGLE_Display_cpp
+++ b/www/ungoogled-chromium/patches/patch-third_party_angle_src_libANGLE_Display_cpp
@@ -9,8 +9,8 @@ Index: third_party/angle/src/libANGLE/Display.cpp
 +#    elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
  #        include "libANGLE/renderer/gl/egl/DisplayEGL.h"
  #        if defined(ANGLE_USE_X11)
- #            include "libANGLE/renderer/gl/glx/DisplayGLX.h"
-@@ -411,7 +411,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+ #            include "libANGLE/renderer/gl/glx/DisplayGLX_api.h"
+@@ -419,7 +419,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
              impl = new rx::DisplayEAGL(state);
              break;
  
@@ -19,16 +19,16 @@ Index: third_party/angle/src/libANGLE/Display.cpp
  #        if defined(ANGLE_USE_GBM)
              if (platformType == 0)
              {
-@@ -452,7 +452,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+@@ -465,7 +465,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
  #if defined(ANGLE_ENABLE_OPENGL)
  #    if defined(ANGLE_PLATFORM_WINDOWS)
              impl = new rx::DisplayWGL(state);
 -#    elif defined(ANGLE_PLATFORM_LINUX)
 +#    elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
  #        if defined(ANGLE_USE_GBM)
-             if (platformType == 0 ||
-                 platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE)
-@@ -501,7 +501,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+             if (platformType == 0)
+             {
+@@ -516,7 +516,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
                  impl = rx::CreateVulkanWin32Display(state);
              }
              break;
@@ -37,7 +37,7 @@ Index: third_party/angle/src/libANGLE/Display.cpp
  #        if defined(ANGLE_USE_GBM)
              if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable())
              {
-@@ -2125,7 +2125,7 @@ static ClientExtensions GenerateClientExtensions()
+@@ -2158,7 +2158,7 @@ static ClientExtensions GenerateClientExtensions()
      extensions.x11Visual = true;
  #endif
  
diff --git a/www/ungoogled-chromium/patches/patch-third_party_angle_src_libANGLE_formatutils_cpp b/www/ungoogled-chromium/patches/patch-third_party_angle_src_libANGLE_formatutils_cpp
index 42644a76f..b9085e15f 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_angle_src_libANGLE_formatutils_cpp
+++ b/www/ungoogled-chromium/patches/patch-third_party_angle_src_libANGLE_formatutils_cpp
@@ -1,7 +1,7 @@
 Index: third_party/angle/src/libANGLE/formatutils.cpp
 --- third_party/angle/src/libANGLE/formatutils.cpp.orig
 +++ third_party/angle/src/libANGLE/formatutils.cpp
-@@ -1473,7 +1473,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa
+@@ -1475,7 +1475,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa
      AddYUVFormat(&map,  GL_G8_B8R8_2PLANE_420_UNORM_ANGLE,            true,   8,   8,  8,   0,  0,  GL_G8_B8R8_2PLANE_420_UNORM_ANGLE,    GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>,          RequireExt<&Extensions::yuvInternalFormatANGLE>,          RequireExt<&Extensions::yuvInternalFormatANGLE>,          NeverSupported, NeverSupported);
      AddYUVFormat(&map,  GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE,           true,   8,   8,  8,   0,  0,  GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE,   GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>,          RequireExt<&Extensions::yuvInternalFormatANGLE>,          RequireExt<&Extensions::yuvInternalFormatANGLE>,          NeverSupported, NeverSupported);
  
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_common_renderer_preferences_renderer_preferences_mojom_traits_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_common_renderer_preferences_renderer_preferences_mojom_traits_cc
index 1e33cd96d..30fceabff 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_common_renderer_preferences_renderer_preferences_mojom_traits_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_common_renderer_preferences_renderer_preferences_mojom_traits_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc
 --- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig
 +++ third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc
-@@ -66,7 +66,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat
+@@ -68,7 +68,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat
  
    out->send_subresource_notification = data.send_subresource_notification();
  
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_public_common_renderer_preferences_renderer_preferences_h b/www/ungoogled-chromium/patches/patch-third_party_blink_public_common_renderer_preferences_renderer_preferences_h
index dde31ec7e..8973c61a3 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_public_common_renderer_preferences_renderer_preferences_h
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_public_common_renderer_preferences_renderer_preferences_h
@@ -1,7 +1,7 @@
 Index: third_party/blink/public/common/renderer_preferences/renderer_preferences.h
 --- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig
 +++ third_party/blink/public/common/renderer_preferences/renderer_preferences.h
-@@ -64,7 +64,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences {
+@@ -65,7 +65,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences {
    UserAgentOverride user_agent_override;
    std::string accept_languages;
    bool send_subresource_notification{false};
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_public_common_renderer_preferences_renderer_preferences_mojom_traits_h b/www/ungoogled-chromium/patches/patch-third_party_blink_public_common_renderer_preferences_renderer_preferences_mojom_traits_h
index 7b505febb..cf65db0c4 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_public_common_renderer_preferences_renderer_preferences_mojom_traits_h
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_public_common_renderer_preferences_renderer_preferences_mojom_traits_h
@@ -1,7 +1,7 @@
 Index: third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h
 --- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig
 +++ third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h
-@@ -162,7 +162,7 @@ struct BLINK_COMMON_EXPORT
+@@ -166,7 +166,7 @@ struct BLINK_COMMON_EXPORT
      return data.send_subresource_notification;
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_public_platform_platform_h b/www/ungoogled-chromium/patches/patch-third_party_blink_public_platform_platform_h
index 4e7d8bfd8..4b7c702d1 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_public_platform_platform_h
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_public_platform_platform_h
@@ -1,7 +1,7 @@
 Index: third_party/blink/public/platform/platform.h
 --- third_party/blink/public/platform/platform.h.orig
 +++ third_party/blink/public/platform/platform.h
-@@ -338,7 +338,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -347,7 +347,7 @@ class BLINK_PLATFORM_EXPORT Platform {
      return nullptr;
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_public_platform_web_vector_h b/www/ungoogled-chromium/patches/patch-third_party_blink_public_platform_web_vector_h
index 077da4bab..d0ddbf485 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_public_platform_web_vector_h
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_public_platform_web_vector_h
@@ -1,7 +1,7 @@
 Index: third_party/blink/public/platform/web_vector.h
 --- third_party/blink/public/platform/web_vector.h.orig
 +++ third_party/blink/public/platform/web_vector.h
-@@ -81,7 +81,7 @@ class WebVector {
+@@ -86,7 +86,7 @@ class WebVector {
    // The vector can be populated using reserve() and emplace_back().
    WebVector() = default;
  
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_controller_blink_initializer_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_controller_blink_initializer_cc
index e830c1862..4cccba979 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_controller_blink_initializer_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_controller_blink_initializer_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/controller/blink_initializer.cc
 --- third_party/blink/renderer/controller/blink_initializer.cc.orig
 +++ third_party/blink/renderer/controller/blink_initializer.cc
-@@ -78,12 +78,12 @@
+@@ -80,12 +80,12 @@
  #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h"
  #endif
  
@@ -16,7 +16,7 @@ Index: third_party/blink/renderer/controller/blink_initializer.cc
  #include "third_party/blink/renderer/controller/highest_pmf_reporter.h"
  #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h"
  #endif
-@@ -231,7 +231,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
+@@ -255,7 +255,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
        main_thread_task_runner);
  #endif
  
@@ -25,7 +25,7 @@ Index: third_party/blink/renderer/controller/blink_initializer.cc
    binders.Add<mojom::blink::MemoryUsageMonitorLinux>(
        ConvertToBaseRepeatingCallback(
            CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)),
-@@ -270,7 +270,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform
+@@ -294,7 +294,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_editing_editing_behavior_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_editing_editing_behavior_cc
index 1c4b3b1fc..40ba8c647 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_editing_editing_behavior_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_editing_editing_behavior_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/core/editing/editing_behavior.cc
 --- third_party/blink/renderer/core/editing/editing_behavior.cc.orig
 +++ third_party/blink/renderer/core/editing/editing_behavior.cc
-@@ -284,7 +284,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb
+@@ -324,7 +324,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb
    // unexpected behaviour
    if (ch < ' ')
      return false;
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_exported_web_view_impl_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_exported_web_view_impl_cc
index 2b8de6b04..b81dadf9d 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_exported_web_view_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_exported_web_view_impl_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/core/exported/web_view_impl.cc
 --- third_party/blink/renderer/core/exported/web_view_impl.cc.orig
 +++ third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -421,7 +421,7 @@ SkFontHinting RendererPreferencesToSkiaHinting(
+@@ -425,7 +425,7 @@ SkFontHinting RendererPreferencesToSkiaHinting(
      const blink::RendererPreferences& prefs) {
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.
@@ -10,7 +10,7 @@ Index: third_party/blink/renderer/core/exported/web_view_impl.cc
    if (!prefs.should_antialias_text) {
      // When anti-aliasing is off, GTK maps all non-zero hinting settings to
      // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight'
-@@ -3318,7 +3318,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
+@@ -3385,7 +3385,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
        renderer_preferences_.use_subpixel_positioning);
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_frame_web_frame_test_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_frame_web_frame_test_cc
index 25b8cfd0f..f024674da 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_frame_web_frame_test_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_frame_web_frame_test_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/core/frame/web_frame_test.cc
 --- third_party/blink/renderer/core/frame/web_frame_test.cc.orig
 +++ third_party/blink/renderer/core/frame/web_frame_test.cc
-@@ -6456,7 +6456,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
+@@ -6469,7 +6469,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
  }
  
  #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -10,7 +10,7 @@ Index: third_party/blink/renderer/core/frame/web_frame_test.cc
  // TODO(crbug.com/1090246): Fix these tests on Fuchsia and re-enable.
  // TODO(crbug.com/1317375): Build these tests on all platforms.
  #define MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved \
-@@ -6865,7 +6865,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc
+@@ -6878,7 +6878,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc
  TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) {
    RunTest("composited_selection_bounds_large_selection_noscroll.html");
  }
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_html_canvas_canvas_async_blob_creator_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_html_canvas_canvas_async_blob_creator_cc
index dee34c582..7f3269f61 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_html_canvas_canvas_async_blob_creator_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_html_canvas_canvas_async_blob_creator_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
 --- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig
 +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
-@@ -45,7 +45,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
+@@ -50,7 +50,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
  
  /* The value is based on user statistics on Nov 2017. */
  #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_html_parser_html_document_parser_fastpath_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_html_parser_html_document_parser_fastpath_cc
deleted file mode 100644
index 62763b7ff..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_html_parser_html_document_parser_fastpath_cc
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
---- third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.orig
-+++ third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
-@@ -169,7 +169,11 @@ class HTMLFastPathParser {
-   using Span = base::span<const Char>;
-   using USpan = base::span<const UChar>;
-   // 32 matches that used by HTMLToken::Attribute.
-+#if defined(__clang__) && (__clang_major__ >= 16)
-   typedef std::conditional<std::is_same_v<Char, UChar>,
-+#else
-+  typedef typename std::conditional<std::is_same_v<Char, UChar>,
-+#endif
-                            UCharLiteralBuffer<32>,
-                            LCharLiteralBuffer<32>>::type LiteralBufferType;
-   typedef UCharLiteralBuffer<32> UCharLiteralBufferType;
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_inspector_inspector_memory_agent_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_inspector_inspector_memory_agent_cc
index 9c3a6791b..72213068c 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_inspector_inspector_memory_agent_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_inspector_inspector_memory_agent_cc
@@ -1,12 +1,12 @@
 Index: third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
 --- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig
 +++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
-@@ -189,7 +189,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t 
+@@ -192,7 +192,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t 
  
  Vector<String> InspectorMemoryAgent::Symbolize(
-     const WebVector<void*>& addresses) {
+     const WebVector<const void*>& addresses) {
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    // TODO(alph): Move symbolization to the client.
-   Vector<void*> addresses_to_symbolize;
-   for (size_t i = 0; i < addresses.size(); i++) {
+   Vector<const void*> addresses_to_symbolize;
+   for (const void* address : addresses) {
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_layout_ng_view_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_layout_view_cc
similarity index 57%
rename from www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_layout_ng_view_cc
rename to www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_layout_view_cc
index 4d00adeed..18a73e6d7 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_layout_ng_view_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_layout_view_cc
@@ -1,17 +1,17 @@
-Index: third_party/blink/renderer/core/layout/ng/layout_ng_view.cc
---- third_party/blink/renderer/core/layout/ng/layout_ng_view.cc.orig
-+++ third_party/blink/renderer/core/layout/ng/layout_ng_view.cc
-@@ -15,7 +15,7 @@
- #include "third_party/blink/renderer/core/svg/svg_document_extensions.h"
- #include "ui/display/screen_info.h"
+Index: third_party/blink/renderer/core/layout/layout_view.cc
+--- third_party/blink/renderer/core/layout/layout_view.cc.orig
++++ third_party/blink/renderer/core/layout/layout_view.cc
+@@ -73,7 +73,7 @@
+ #include "ui/gfx/geometry/quad_f.h"
+ #include "ui/gfx/geometry/size_conversions.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #endif
  
-@@ -53,7 +53,7 @@ void LayoutNGView::UpdateLayout() {
-     fragmentation_context_.Clear();
+@@ -832,7 +832,7 @@ void LayoutView::UpdateLayout() {
+     intrinsic_logical_widths_ = LogicalWidth();
    }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_grid_ng_grid_layout_algorithm_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_grid_ng_grid_layout_algorithm_cc
deleted file mode 100644
index 0edf1a925..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_grid_ng_grid_layout_algorithm_cc
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
---- third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.orig
-+++ third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
-@@ -3431,7 +3431,13 @@ void NGGridLayoutAlgorithm::PlaceGridItems(
-   DCHECK(out_row_break_between);
- 
-   const auto& container_space = ConstraintSpace();
-+#if defined(__clang__) && (__clang_major__ >= 16)
-   const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
-+#else
-+  const auto& [g_i, l_d, t_s] = sizing_tree.TreeRootData();
-+  const auto& grid_items = g_i;
-+  const auto& layout_data = l_d;
-+#endif
- 
-   const auto* cached_layout_subtree = container_space.GridLayoutSubtree();
-   const auto container_writing_direction =
-@@ -3595,7 +3601,13 @@ void NGGridLayoutAlgorithm::PlaceGridItemsForFragmenta
- 
-   // TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true.
-   const auto& constraint_space = ConstraintSpace();
-+#if defined(__clang__) && (__clang_major__ >= 16)
-   const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
-+#else
-+  const auto& [g_i, l_d, t_s] = sizing_tree.TreeRootData();
-+  const auto& grid_items = g_i;
-+  const auto& layout_data = l_d;
-+#endif
- 
-   const auto* cached_layout_subtree = constraint_space.GridLayoutSubtree();
-   const auto container_writing_direction =
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_physical_fragment_rare_data_h b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_physical_fragment_rare_data_h
deleted file mode 100644
index fb605b5f7..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_physical_fragment_rare_data_h
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: third_party/blink/renderer/core/layout/ng/physical_fragment_rare_data.h
---- third_party/blink/renderer/core/layout/ng/physical_fragment_rare_data.h.orig
-+++ third_party/blink/renderer/core/layout/ng/physical_fragment_rare_data.h
-@@ -5,6 +5,7 @@
- #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_PHYSICAL_FRAGMENT_RARE_DATA_H_
- #define THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_PHYSICAL_FRAGMENT_RARE_DATA_H_
- 
-+#include <bit>
- #include <climits>
- 
- #include "third_party/blink/renderer/core/layout/geometry/logical_rect.h"
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_paint_object_paint_properties_sparse_h b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_paint_object_paint_properties_sparse_h
deleted file mode 100644
index 4d927c51f..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_paint_object_paint_properties_sparse_h
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
---- third_party/blink/renderer/core/paint/object_paint_properties_sparse.h.orig
-+++ third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
-@@ -269,8 +269,8 @@ class CORE_EXPORT ObjectPaintPropertiesSparse : public
-       NodeList& nodes,
-       NodeId node_id,
-       const ParentType& parent,
--      NodeType::State&& state,
--      const NodeType::AnimationState& animation_state =
-+      typename NodeType::State&& state,
-+      const typename NodeType::AnimationState& animation_state =
-           NodeType::AnimationState()) {
-     // First, check if we need to add a new node.
-     if (!nodes.HasField(node_id)) {
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_paint_paint_layer_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_paint_paint_layer_cc
index 09c77588b..62627f6c7 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_paint_paint_layer_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_paint_paint_layer_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/core/paint/paint_layer.cc
 --- third_party/blink/renderer/core/paint/paint_layer.cc.orig
 +++ third_party/blink/renderer/core/paint/paint_layer.cc
-@@ -119,7 +119,7 @@ namespace blink {
+@@ -122,7 +122,7 @@ namespace blink {
  
  namespace {
  
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_scroll_scrollbar_theme_aura_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_scroll_scrollbar_theme_aura_cc
index d55ccd5f5..ee1e25599 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_scroll_scrollbar_theme_aura_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_scroll_scrollbar_theme_aura_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
 --- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig
 +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
-@@ -155,7 +155,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const 
+@@ -149,7 +149,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const 
  // is true for at least GTK and QT apps).
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.
@@ -10,7 +10,7 @@ Index: third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
    return false;
  #else
    return true;
-@@ -329,7 +329,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr
+@@ -368,7 +368,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr
                                               const WebMouseEvent& event) {
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_xml_xslt_processor_h b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_xml_xslt_processor_h
new file mode 100644
index 000000000..1e95af7be
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_xml_xslt_processor_h
@@ -0,0 +1,15 @@
+Index: third_party/blink/renderer/core/xml/xslt_processor.h
+--- third_party/blink/renderer/core/xml/xslt_processor.h.orig
++++ third_party/blink/renderer/core/xml/xslt_processor.h
+@@ -77,7 +77,11 @@ class XSLTProcessor final : public ScriptWrappable {
+ 
+   void reset();
+ 
++#if (LIBXML_VERSION >= 21200)
+   static void ParseErrorFunc(void* user_data, const xmlError*);
++#else
++  static void ParseErrorFunc(void* user_data, xmlError*);
++#endif
+   static void GenericErrorFunc(void* user_data, const char* msg, ...);
+ 
+   // Only for libXSLT callbacks
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_xml_xslt_processor_libxslt_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_xml_xslt_processor_libxslt_cc
new file mode 100644
index 000000000..022aaed30
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_xml_xslt_processor_libxslt_cc
@@ -0,0 +1,15 @@
+Index: third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
+--- third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig
++++ third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
+@@ -66,7 +66,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char
+   // It would be nice to do something with this error message.
+ }
+ 
++#if (LIBXML_VERSION >= 21200)
+ void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
++#else
++void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
++#endif
+   FrameConsole* console = static_cast<FrameConsole*>(user_data);
+   if (!console)
+     return;
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_canvas_canvas2d_canvas_style_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_canvas_canvas2d_canvas_style_cc
deleted file mode 100644
index 261d97c99..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_canvas_canvas2d_canvas_style_cc
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
---- third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.orig
-+++ third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
-@@ -76,6 +76,9 @@ bool ParseCanvasColorString(const String& color_string
- 
- void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags,
-                                float global_alpha) const {
-+#if defined(__clang__) && (__clang_major__ < 16)
-+  SkColor4f custom_color = SkColor4f{0.0f, 0.0f, 0.0f, global_alpha};
-+#endif
-   switch (type_) {
-     case kColor:
-       ApplyColorToFlags(flags, global_alpha);
-@@ -83,12 +86,20 @@ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags,
-     case kGradient:
-       GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(),
-                                                        ImageDrawOptions());
-+#if defined(__clang__) && (__clang_major__ >= 16)
-       flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
-+#else
-+      flags.setColor(custom_color);
-+#endif
-       break;
-     case kImagePattern:
-       GetCanvasPattern()->GetPattern()->ApplyToFlags(
-           flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform()));
-+#if defined(__clang__) && (__clang_major__ >= 16)
-       flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
-+#else
-+      flags.setColor(custom_color);
-+#endif
-       break;
-     default:
-       NOTREACHED();
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_media_audio_audio_renderer_mixer_manager_test_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_media_audio_audio_renderer_mixer_manager_test_cc
index 560dceed3..ee6467424 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_media_audio_audio_renderer_mixer_manager_test_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_media_audio_audio_renderer_mixer_manager_test_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc
 --- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig
 +++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc
-@@ -722,7 +722,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten
+@@ -813,7 +813,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten
              mixer->get_output_params_for_testing().sample_rate());
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_ml_webnn_features_gni b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_ml_webnn_features_gni
index d4da4176b..016d28051 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_ml_webnn_features_gni
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_ml_webnn_features_gni
@@ -1,12 +1,12 @@
 Index: third_party/blink/renderer/modules/ml/webnn/features.gni
 --- third_party/blink/renderer/modules/ml/webnn/features.gni.orig
 +++ third_party/blink/renderer/modules/ml/webnn/features.gni
-@@ -7,7 +7,7 @@ declare_args() {
+@@ -6,7 +6,7 @@ import("//build/config/chrome_build.gni")
+ declare_args() {
    # This enables building WebNN with XNNPACK. Currently only available for
-   # Windows and Linux on x64 or x86.
-   build_webnn_with_xnnpack =
--      (is_linux || is_win) && (current_cpu == "x64" || current_cpu == "x86")
-+      !is_bsd && (is_win && (current_cpu == "x64" || current_cpu == "x86"))
- 
-   # This build flag enables WebNN on ChromeOS platform to access hardware
-   # acceleration by using ModelLoader mojo interface.
+   # Windows, macOS and Linux on x64, x86 and arm64.
+-  build_webnn_with_xnnpack = (is_linux || is_win || is_mac) &&
++  build_webnn_with_xnnpack = !is_bsd && (is_linux || is_win || is_mac) &&
+                              (current_cpu == "x64" || current_cpu == "x86" ||
+                               (current_cpu == "arm64" && !is_win))
+ }
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_ml_webnn_ml_graph_xnnpack_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_ml_webnn_ml_graph_xnnpack_cc
index 496027736..ab7d84e7c 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_ml_webnn_ml_graph_xnnpack_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_ml_webnn_ml_graph_xnnpack_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc
 --- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig
 +++ third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc
-@@ -191,7 +191,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount
+@@ -204,7 +204,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount
  
    ~SharedXnnpackContext() {
      base::AutoLock auto_lock(SharedXnnpackContextLock());
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_peerconnection_webrtc_audio_renderer_test_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_peerconnection_webrtc_audio_renderer_test_cc
index 67c80f7ac..c3c61936c 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_peerconnection_webrtc_audio_renderer_test_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_peerconnection_webrtc_audio_renderer_test_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc
 --- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig
 +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc
-@@ -297,7 +297,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar
+@@ -301,7 +301,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar
    SetupRenderer(kDefaultOutputDeviceId);
    renderer_proxy_->Start();
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webaudio_audio_worklet_thread_test_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webaudio_audio_worklet_thread_test_cc
index b63b816c7..a8bb1d506 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webaudio_audio_worklet_thread_test_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webaudio_audio_worklet_thread_test_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc
 --- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig
 +++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc
-@@ -380,7 +380,7 @@ class AudioWorkletThreadPriorityTest
+@@ -463,7 +463,7 @@ class AudioWorkletThreadPriorityTest
  
      // TODO(crbug.com/1022888): The worklet thread priority is always NORMAL
      // on OS_LINUX and OS_CHROMEOS regardless of the thread priority setting.
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgl_webgl_rendering_context_base_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgl_webgl_rendering_context_base_cc
index 6c0a16f3e..2beb62420 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgl_webgl_rendering_context_base_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgl_webgl_rendering_context_base_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 --- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig
 +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -6285,7 +6285,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
+@@ -6356,7 +6356,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
    constexpr bool kAllowZeroCopyImages = true;
  #endif
  
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgpu_gpu_queue_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgpu_gpu_queue_cc
index b437fe8fc..2e1418565 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgpu_gpu_queue_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgpu_gpu_queue_cc
@@ -1,12 +1,12 @@
 Index: third_party/blink/renderer/modules/webgpu/gpu_queue.cc
 --- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig
 +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc
-@@ -698,7 +698,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
+@@ -785,7 +785,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
  // on linux platform.
  // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES
  // backend is failing for unknown reasons.
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    bool forceReadback = true;
- #elif BUILDFLAG(IS_WIN)
-   bool forceReadback =
+ #elif BUILDFLAG(IS_ANDROID)
+   // TODO(crbug.com/dawn/1969): Some Android devices don't fail to copy from
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_BUILD_gn b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_BUILD_gn
index 5af88273d..1e8631cd2 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_BUILD_gn
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/platform/BUILD.gn
 --- third_party/blink/renderer/platform/BUILD.gn.orig
 +++ third_party/blink/renderer/platform/BUILD.gn
-@@ -1926,7 +1926,7 @@ static_library("test_support") {
+@@ -1950,7 +1950,7 @@ static_library("test_support") {
    ]
  
    # fuzzed_data_provider may not work with a custom toolchain.
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_cache_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_cache_cc
index f9e76e29e..91df41987 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_cache_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_cache_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/platform/fonts/font_cache.cc
 --- third_party/blink/renderer/platform/fonts/font_cache.cc.orig
 +++ third_party/blink/renderer/platform/fonts/font_cache.cc
-@@ -72,7 +72,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo
+@@ -73,7 +73,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo
  
  SkFontMgr* FontCache::static_font_manager_ = nullptr;
  
@@ -10,7 +10,7 @@ Index: third_party/blink/renderer/platform/fonts/font_cache.cc
  float FontCache::device_scale_factor_ = 1.0;
  #endif
  
-@@ -118,7 +118,7 @@ FontPlatformData* FontCache::SystemFontPlatformData(
+@@ -124,7 +124,7 @@ const FontPlatformData* FontCache::SystemFontPlatformD
      const FontDescription& font_description) {
    const AtomicString& family = FontCache::SystemFontFamily();
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_cache_h b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_cache_h
index 0b8797ab0..f7d7344b7 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_cache_h
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_cache_h
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/platform/fonts/font_cache.h
 --- third_party/blink/renderer/platform/fonts/font_cache.h.orig
 +++ third_party/blink/renderer/platform/fonts/font_cache.h
-@@ -56,7 +56,7 @@
+@@ -55,7 +55,7 @@
  #include "third_party/skia/include/core/SkFontMgr.h"
  #include "third_party/skia/include/core/SkRefCnt.h"
  
@@ -10,7 +10,7 @@ Index: third_party/blink/renderer/platform/fonts/font_cache.h
  #include "ui/gfx/font_fallback_linux.h"
  #endif
  
-@@ -174,7 +174,7 @@ class PLATFORM_EXPORT FontCache final {
+@@ -163,7 +163,7 @@ class PLATFORM_EXPORT FontCache final {
    static void PrewarmFamily(const AtomicString& family_name) {}
  #endif
  
@@ -19,7 +19,7 @@ Index: third_party/blink/renderer/platform/fonts/font_cache.h
    // These are needed for calling QueryRenderStyleForStrike, since
    // gfx::GetFontRenderParams makes distinctions based on DSF.
    static float DeviceScaleFactor() { return device_scale_factor_; }
-@@ -250,7 +250,7 @@ class PLATFORM_EXPORT FontCache final {
+@@ -239,7 +239,7 @@ class PLATFORM_EXPORT FontCache final {
        const char* locale_family_name);
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -28,7 +28,7 @@ Index: third_party/blink/renderer/platform/fonts/font_cache.h
    static bool GetFontForCharacter(UChar32,
                                    const char* preferred_locale,
                                    gfx::FallbackFontData*);
-@@ -330,7 +330,7 @@ class PLATFORM_EXPORT FontCache final {
+@@ -312,7 +312,7 @@ class PLATFORM_EXPORT FontCache final {
                                     const FontFaceCreationParams&,
                                     std::string& name);
  
@@ -37,7 +37,7 @@ Index: third_party/blink/renderer/platform/fonts/font_cache.h
    static AtomicString GetFamilyNameForCharacter(SkFontMgr*,
                                                  UChar32,
                                                  const FontDescription&,
-@@ -368,7 +368,7 @@ class PLATFORM_EXPORT FontCache final {
+@@ -349,7 +349,7 @@ class PLATFORM_EXPORT FontCache final {
    bool is_test_font_mgr_ = false;
  #endif  // BUILDFLAG(IS_WIN)
  
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_description_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_description_cc
index 2b79893ad..f4883cf26 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_description_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_description_cc
@@ -10,9 +10,9 @@ Index: third_party/blink/renderer/platform/fonts/font_description.cc
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #endif
  
-@@ -274,7 +274,7 @@ FontCacheKey FontDescription::CacheKey(
-       static_cast<unsigned>(fields_.orientation_) << 1 |          // bit 2-3
-       static_cast<unsigned>(fields_.subpixel_text_position_);     // bit 1
+@@ -275,7 +275,7 @@ FontCacheKey FontDescription::CacheKey(
+       static_cast<unsigned>(fields_.orientation_) << 1 |            // bit 2-3
+       static_cast<unsigned>(fields_.subpixel_text_position_);       // bit 1
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_metrics_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_metrics_cc
index 9e870d7ef..6534c1187 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_metrics_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_metrics_cc
@@ -10,7 +10,7 @@ Index: third_party/blink/renderer/platform/fonts/font_metrics.cc
  // This is the largest VDMX table which we'll try to load and parse.
  static const size_t kMaxVDMXTableSize = 1024 * 1024;  // 1 MB
  #endif
-@@ -69,7 +69,7 @@ void FontMetrics::AscentDescentWithHacks(
+@@ -67,7 +67,7 @@ void FontMetrics::AscentDescentWithHacks(
    bool is_vdmx_valid = false;
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -19,12 +19,12 @@ Index: third_party/blink/renderer/platform/fonts/font_metrics.cc
    // Manually digging up VDMX metrics is only applicable when bytecode hinting
    // using FreeType.  With DirectWrite or CoreText, no bytecode hinting is ever
    // done.  This code should be pushed into FreeType (hinted font metrics).
-@@ -117,7 +117,7 @@ void FontMetrics::AscentDescentWithHacks(
-     if (descent < metrics.fDescent) {
-       visual_overflow_inflation_for_descent = 1;
+@@ -111,7 +111,7 @@ void FontMetrics::AscentDescentWithHacks(
+     descent = SkScalarRoundToScalar(metrics.fDescent);
+ 
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
 -    BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-       // When subpixel positioning is enabled, if the descent is rounded down,
-       // the descent part of the glyph may be truncated when displayed in a
-       // 'overflow: hidden' container.  To avoid that, borrow 1 unit from the
+     // When subpixel positioning is enabled, if the descent is rounded down,
+     // the descent part of the glyph may be truncated when displayed in a
+     // 'overflow: hidden' container.  To avoid that, borrow 1 unit from the
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_palette_h b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_palette_h
deleted file mode 100644
index 1c93ceb11..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_palette_h
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: third_party/blink/renderer/platform/fonts/font_palette.h
---- third_party/blink/renderer/platform/fonts/font_palette.h.orig
-+++ third_party/blink/renderer/platform/fonts/font_palette.h
-@@ -96,7 +96,11 @@ class PLATFORM_EXPORT FontPalette : public RefCounted<
-       Color::ColorSpace color_interpolation_space,
-       absl::optional<Color::HueInterpolationMethod> hue_interpolation_method) {
-     return base::AdoptRef(new FontPalette(
-+#if defined(__clang__) && (__clang_major__ >= 16)
-         start, end, NonNormalizedPercentages(start_percentage, end_percentage),
-+#else
-+        start, end, NonNormalizedPercentages(NonNormalizedPercentages{start_percentage, end_percentage}),
-+#endif
-         normalized_percentage, alpha_multiplier, color_interpolation_space,
-         hue_interpolation_method));
-   }
-@@ -170,7 +174,11 @@ class PLATFORM_EXPORT FontPalette : public RefCounted<
-       double normalized_percentage) {
-     double end_percentage = normalized_percentage * 100.0;
-     double start_percentage = 100.0 - end_percentage;
-+#if defined(__clang__) && (__clang_major__ >= 16)
-     return NonNormalizedPercentages(start_percentage, end_percentage);
-+#else
-+    return NonNormalizedPercentages(NonNormalizedPercentages{start_percentage, end_percentage});
-+#endif
-   }
- 
-   double GetAlphaMultiplier() const {
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_palette_interpolation_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_palette_interpolation_cc
deleted file mode 100644
index a50b650c3..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_palette_interpolation_cc
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: third_party/blink/renderer/platform/fonts/palette_interpolation.cc
---- third_party/blink/renderer/platform/fonts/palette_interpolation.cc.orig
-+++ third_party/blink/renderer/platform/fonts/palette_interpolation.cc
-@@ -31,7 +31,12 @@ Vector<FontPalette::FontPaletteOverride> PaletteInterp
-         color_interpolation_space, hue_interpolation_method, start_color,
-         end_color, percentage, alpha_multiplier);
- 
-+#if defined(__clang__) && (__clang_major__ >= 16)
-     FontPalette::FontPaletteOverride result_color_record(i, result_color);
-+#else
-+    FontPalette::FontPaletteOverride fpo = { static_cast<int>(i), result_color };
-+    FontPalette::FontPaletteOverride result_color_record(fpo);
-+#endif
-     result_color_records.push_back(result_color_record);
-   }
-   return result_color_records;
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia_cc
index 30eb2efb4..0fe7b931f 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
 --- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig
 +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
-@@ -64,7 +64,7 @@ AtomicString ToAtomicString(const SkString& str) {
+@@ -65,7 +65,7 @@ AtomicString ToAtomicString(const SkString& str) {
    return AtomicString::FromUTF8(str.c_str(), str.size());
  }
  
@@ -10,7 +10,7 @@ Index: third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
  // This function is called on android or when we are emulating android fonts on
  // linux and the embedder has overriden the default fontManager with
  // WebFontRendering::setSkiaFontMgr.
-@@ -246,7 +246,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon
+@@ -246,7 +246,7 @@ const FontPlatformData* FontCache::CreateFontPlatformD
    std::string name;
  
    sk_sp<SkTypeface> typeface;
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_graphics_video_frame_submitter_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_graphics_video_frame_submitter_cc
index 3ffc231e8..4898b0459 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_graphics_video_frame_submitter_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_graphics_video_frame_submitter_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
 --- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig
 +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
-@@ -356,7 +356,7 @@ void VideoFrameSubmitter::OnBeginFrame(
+@@ -400,7 +400,7 @@ void VideoFrameSubmitter::OnBeginFrame(
        continue;
      auto& feedback =
          timing_details.find(frame_token)->value.presentation_feedback;
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_instrumentation_partition_alloc_memory_dump_provider_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_instrumentation_partition_alloc_memory_dump_provider_cc
index f6463ed61..70811d6fc 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_instrumentation_partition_alloc_memory_dump_provider_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_instrumentation_partition_alloc_memory_dump_provider_cc
@@ -1,7 +1,17 @@
 Index: third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc
 --- third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc.orig
 +++ third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc
-@@ -24,6 +24,7 @@ PartitionAllocMemoryDumpProvider* PartitionAllocMemory
+@@ -14,7 +14,9 @@
+ 
+ namespace blink {
+ 
++#if !BUILDFLAG(IS_BSD)
+ const char kPartitionAllocDumpName[] = "partition_alloc";
++#endif
+ 
+ PartitionAllocMemoryDumpProvider* PartitionAllocMemoryDumpProvider::Instance() {
+   DEFINE_STATIC_LOCAL(PartitionAllocMemoryDumpProvider, instance, ());
+@@ -24,6 +26,7 @@ PartitionAllocMemoryDumpProvider* PartitionAllocMemory
  bool PartitionAllocMemoryDumpProvider::OnMemoryDump(
      const base::trace_event::MemoryDumpArgs& args,
      base::trace_event::ProcessMemoryDump* memory_dump) {
@@ -9,7 +19,7 @@ Index: third_party/blink/renderer/platform/instrumentation/partition_alloc_memor
    using base::trace_event::MemoryDumpLevelOfDetail;
  
    MemoryDumpLevelOfDetail level_of_detail = args.level_of_detail;
-@@ -49,6 +50,7 @@ bool PartitionAllocMemoryDumpProvider::OnMemoryDump(
+@@ -49,6 +52,7 @@ bool PartitionAllocMemoryDumpProvider::OnMemoryDump(
        "size", "bytes", partition_stats_dumper.total_active_bytes());
    memory_dump->AddOwnershipEdge(allocated_objects_dump->guid(),
                                  partitions_dump->guid());
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_peerconnection_rtc_video_encoder_factory_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_peerconnection_rtc_video_encoder_factory_cc
index c96bdb15d..30cec4f9f 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_peerconnection_rtc_video_encoder_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_peerconnection_rtc_video_encoder_factory_cc
@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc
 --- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig
 +++ third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc
-@@ -197,12 +197,12 @@ SupportedFormats GetSupportedFormatsInternal(
+@@ -202,12 +202,12 @@ SupportedFormats GetSupportedFormatsInternal(
        supported_formats.scalability_modes.push_back(profile.scalability_modes);
        supported_formats.sdp_formats.push_back(std::move(*format));
  
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_runtime_enabled_features_json5 b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_runtime_enabled_features_json5
index 54b2ee1b6..26db8e806 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_runtime_enabled_features_json5
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_runtime_enabled_features_json5
@@ -1,36 +1,57 @@
 Index: third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig
 +++ third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2667,7 +2667,7 @@
+@@ -313,7 +313,7 @@
+       name: "AppTitle",
+       status: "experimental",
+       origin_trial_feature_name: "AppTitle",
+-      origin_trial_os: ["win", "mac", "linux", "chromeos"],
++      origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"],
+       base_feature: "WebAppEnableAppTitle",
+     },
+     {
+@@ -1970,7 +1970,7 @@
+       base_feature_status: "enabled",
+       copied_from_base_feature_if: "overridden",
+       origin_trial_feature_name: "FullscreenPopupWindows",
+-      origin_trial_os: ["win", "mac", "linux", "chromeos"],
++      origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"],
+     },
+     {
+       name: "GamepadButtonAxisEvents",
+@@ -2891,7 +2891,7 @@
        name: "PaymentHandlerMinimalHeaderUX",
        origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX",
        origin_trial_allows_third_party: true,
 -      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"],
 +      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"],
+       status: "stable",
      },
      {
-       name: "PaymentInstruments",
-@@ -3663,7 +3663,7 @@
+@@ -3083,7 +3083,7 @@
+     {
+       name: "PrivateNetworkAccessPermissionPrompt",
+       origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt",
+-      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"],
++      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"],
+       status: "stable",
+       public: true,
+       base_feature: "none",
+@@ -3951,7 +3951,7 @@
        name: "UnrestrictedSharedArrayBuffer",
        base_feature: "none",
        origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
 -      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"],
 +      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"],
      },
+     // Enables using policy-controlled feature "usb-unrestricted" to allow
+     // isolated context to access protected USB interface classes and to
+@@ -4111,7 +4111,7 @@
      {
-       name: "URLPatternCompareComponent",
-@@ -3857,12 +3857,12 @@
-       status: "experimental",
-       base_feature: "none",
-       origin_trial_feature_name: "WebAppUrlHandling",
--      origin_trial_os: ["win", "mac", "linux"],
-+      origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"],
-     },
-     {
-       name: "WebAppWindowControlsOverlay",
-       origin_trial_feature_name: "WebAppWindowControlsOverlay",
+       name: "WebAppScopeExtensions",
+       origin_trial_feature_name: "WebAppScopeExtensions",
 -      origin_trial_os: ["win", "mac", "linux", "chromeos"],
 +      origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"],
-       status: "stable",
+       status: "experimental",
        base_feature: "none",
      },
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_video_capture_video_capture_impl_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_video_capture_video_capture_impl_cc
index ee28c6e67..7e03b35fc 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_video_capture_video_capture_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_video_capture_video_capture_impl_cc
@@ -1,12 +1,12 @@
 Index: third_party/blink/renderer/platform/video_capture/video_capture_impl.cc
 --- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig
 +++ third_party/blink/renderer/platform/video_capture/video_capture_impl.cc
-@@ -612,7 +612,7 @@ bool VideoCaptureImpl::VideoFrameBufferPreparer::BindV
+@@ -676,7 +676,7 @@ bool VideoCaptureImpl::BindVideoFrameOnMediaTaskRunner
    }
  
    const unsigned texture_target =
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       // Explicitly set GL_TEXTURE_EXTERNAL_OES as the
+       // Explicitly set GL_TEXTURE_EXTERNAL_OES if necessary:
        // `media::VideoFrame::RequiresExternalSampler()` requires it for NV12
-       // format, while the `ImageTextureTarget()` will return GL_TEXTURE_2D.
+       // format, while `ClientSharedImage::GetTextureTarget(BufferUsage,
diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_wtf_text_text_codec_icu_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_wtf_text_text_codec_icu_cc
new file mode 100644
index 000000000..94bdd3066
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_wtf_text_text_codec_icu_cc
@@ -0,0 +1,19 @@
+Index: third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
+--- third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.orig
++++ third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
+@@ -615,6 +615,7 @@ static void GbkUrlEscapedEntityCallack(
+                               code_point, reason, err);
+ }
+ 
++#if !BUILDFLAG(IS_BSD)
+ static void GbkCallbackSubstitute(const void* context,
+                                   UConverterFromUnicodeArgs* from_unicode_args,
+                                   const UChar* code_units,
+@@ -632,6 +633,7 @@ static void GbkCallbackSubstitute(const void* context,
+   UCNV_FROM_U_CALLBACK_SUBSTITUTE(context, from_unicode_args, code_units,
+                                   length, code_point, reason, err);
+ }
++#endif
+ #endif  // USING_SYSTEM_ICU
+ 
+ static void NotReachedEntityCallback(const void* context,
diff --git a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_util_generate_build_files_py b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_util_generate_build_files_py
index ff1525572..c82ccaf28 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_util_generate_build_files_py
+++ b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_util_generate_build_files_py
@@ -1,7 +1,7 @@
 Index: third_party/boringssl/src/util/generate_build_files.py
 --- third_party/boringssl/src/util/generate_build_files.py.orig
 +++ third_party/boringssl/src/util/generate_build_files.py
-@@ -792,10 +792,10 @@ def main(platforms):
+@@ -807,10 +807,10 @@ def main(platforms):
    ]
  
    # Generate err_data.c
@@ -16,7 +16,7 @@ Index: third_party/boringssl/src/util/generate_build_files.py
    crypto_c_files.append('err_data.c')
    crypto_c_files.sort()
  
-@@ -806,11 +806,11 @@ def main(platforms):
+@@ -821,11 +821,11 @@ def main(platforms):
    crypto_test_files = []
    if EMBED_TEST_DATA:
      # Generate crypto_test_data.cc
diff --git a/www/ungoogled-chromium/patches/patch-third_party_cpuinfo_cpuinfo_gni b/www/ungoogled-chromium/patches/patch-third_party_cpuinfo_cpuinfo_gni
index d61ee2806..64ae090d1 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_cpuinfo_cpuinfo_gni
+++ b/www/ungoogled-chromium/patches/patch-third_party_cpuinfo_cpuinfo_gni
@@ -1,12 +1,12 @@
 Index: third_party/cpuinfo/cpuinfo.gni
 --- third_party/cpuinfo/cpuinfo.gni.orig
 +++ third_party/cpuinfo/cpuinfo.gni
-@@ -7,7 +7,7 @@ use_cpuinfo =
-     current_cpu != "ppc64" && current_cpu != "ppc64le" &&
+@@ -8,7 +8,7 @@ use_cpuinfo =
      current_cpu != "s390" && current_cpu != "s390x" &&
+     current_cpu != "riscv64" &&
      # cpuinfo is not supported on fuchsia.
 -    !is_fuchsia &&
 +    !is_fuchsia && !is_bsd &&
-     # cpuinfo is crashy on the Windows Arm64 chips.
-     !(is_win && current_cpu == "arm64") &&
      # There's a few arm architectures that are not supported by cpuinfo,
+     # especially amongst ChromeOS devices.
+     # See //third_party/cpuinfo/src/src/arm/linux/cp.h.
diff --git a/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_util_misc_uuid_cc b/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_util_misc_uuid_cc
index 2ba170fe1..5622e4c34 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_util_misc_uuid_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_util_misc_uuid_cc
@@ -1,7 +1,7 @@
 Index: third_party/crashpad/crashpad/util/misc/uuid.cc
 --- third_party/crashpad/crashpad/util/misc/uuid.cc.orig
 +++ third_party/crashpad/crashpad/util/misc/uuid.cc
-@@ -101,7 +101,7 @@ bool UUID::InitializeWithNew() {
+@@ -102,7 +102,7 @@ bool UUID::InitializeWithNew() {
    InitializeFromBytes(uuid);
    return true;
  #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_util_posix_close_multiple_cc b/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_util_posix_close_multiple_cc
index b97cb80e9..be843647e 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_util_posix_close_multiple_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_util_posix_close_multiple_cc
@@ -1,7 +1,7 @@
 Index: third_party/crashpad/crashpad/util/posix/close_multiple.cc
 --- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig
 +++ third_party/crashpad/crashpad/util/posix/close_multiple.cc
-@@ -72,7 +72,7 @@ void CloseNowOrOnExec(int fd, bool ebadf_ok) {
+@@ -73,7 +73,7 @@ void CloseNowOrOnExec(int fd, bool ebadf_ok) {
  // This is an advantage over looping over all possible file descriptors, because
  // no attempt needs to be made to close file descriptors that are not open.
  bool CloseMultipleNowOrOnExecUsingFDDir(int min_fd, int preserve_fd) {
diff --git a/www/ungoogled-chromium/patches/patch-third_party_dawn_include_dawn_native_VulkanBackend_h b/www/ungoogled-chromium/patches/patch-third_party_dawn_include_dawn_native_VulkanBackend_h
index 462e82434..c4e6385e0 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_dawn_include_dawn_native_VulkanBackend_h
+++ b/www/ungoogled-chromium/patches/patch-third_party_dawn_include_dawn_native_VulkanBackend_h
@@ -1,7 +1,7 @@
 Index: third_party/dawn/include/dawn/native/VulkanBackend.h
 --- third_party/dawn/include/dawn/native/VulkanBackend.h.orig
 +++ third_party/dawn/include/dawn/native/VulkanBackend.h
-@@ -80,7 +80,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport
+@@ -83,7 +83,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport
  };
  
  // Can't use DAWN_PLATFORM_IS(LINUX) since header included in both Dawn and Chrome
diff --git a/www/ungoogled-chromium/patches/patch-third_party_dawn_src_dawn_common_Platform_h b/www/ungoogled-chromium/patches/patch-third_party_dawn_src_dawn_common_Platform_h
index 9e269d65c..e7b6d32d7 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_dawn_src_dawn_common_Platform_h
+++ b/www/ungoogled-chromium/patches/patch-third_party_dawn_src_dawn_common_Platform_h
@@ -1,7 +1,7 @@
 Index: third_party/dawn/src/dawn/common/Platform.h
 --- third_party/dawn/src/dawn/common/Platform.h.orig
 +++ third_party/dawn/src/dawn/common/Platform.h
-@@ -46,6 +46,11 @@
+@@ -59,6 +59,11 @@
  #error "Unsupported Windows platform."
  #endif
  
diff --git a/www/ungoogled-chromium/patches/patch-third_party_dawn_src_dawn_native_vulkan_BackendVk_cpp b/www/ungoogled-chromium/patches/patch-third_party_dawn_src_dawn_native_vulkan_BackendVk_cpp
index ed2ed0d74..7a9d77149 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_dawn_src_dawn_native_vulkan_BackendVk_cpp
+++ b/www/ungoogled-chromium/patches/patch-third_party_dawn_src_dawn_native_vulkan_BackendVk_cpp
@@ -1,7 +1,7 @@
 Index: third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp
 --- third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig
 +++ third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp
-@@ -42,7 +42,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha
+@@ -56,7 +56,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha
  #endif
  
  #if DAWN_PLATFORM_IS(LINUX)
diff --git a/www/ungoogled-chromium/patches/patch-third_party_distributed_point_functions_BUILD_gn b/www/ungoogled-chromium/patches/patch-third_party_distributed_point_functions_BUILD_gn
deleted file mode 100644
index 31ede5c7f..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_distributed_point_functions_BUILD_gn
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: third_party/distributed_point_functions/BUILD.gn
---- third_party/distributed_point_functions/BUILD.gn.orig
-+++ third_party/distributed_point_functions/BUILD.gn
-@@ -61,6 +61,9 @@ source_set("distributed_point_functions") {
-   configs -= [ "//build/config/compiler:chromium_code" ]
-   configs += [ "//build/config/compiler:no_chromium_code" ]
- 
-+  # XXX clang13 crashes with optimizations
-+  configs += [ "//build/config/compiler:no_optimize" ]
-+
-   public_configs = [ ":distributed_point_functions_includes" ]
- }
- 
diff --git a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_BUILD_gn b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_BUILD_gn
index 4773e0d5d..0c097e7e2 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_BUILD_gn
@@ -1,7 +1,7 @@
 Index: third_party/ffmpeg/BUILD.gn
 --- third_party/ffmpeg/BUILD.gn.orig
 +++ third_party/ffmpeg/BUILD.gn
-@@ -349,7 +349,6 @@ target(link_target_type, "ffmpeg_internal") {
+@@ -343,7 +343,6 @@ target(link_target_type, "ffmpeg_internal") {
        libs += [
          "m",
          "z",
diff --git a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_chromium_scripts_build_ffmpeg_py b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_chromium_scripts_build_ffmpeg_py
index 385967910..10b810277 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_chromium_scripts_build_ffmpeg_py
+++ b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_chromium_scripts_build_ffmpeg_py
@@ -10,113 +10,67 @@ Index: third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
  
  BRANDINGS = [
      'Chrome',
-@@ -45,6 +45,8 @@ ARCH_MAP = {
-     'linux': [
-         'ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64'
-     ],
+@@ -43,6 +43,8 @@ BRANDINGS = [
+ ARCH_MAP = {
+     'android': ['ia32', 'x64', 'arm-neon', 'arm64'],
+     'linux': ['ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64'],
 +    'openbsd': ['x64', 'arm64', 'ia32'],
 +    'freebsd': ['x64', 'arm64', 'ia32'],
      'mac': ['x64', 'arm64'],
      'win': ['ia32', 'x64', 'arm64'],
  }
-@@ -54,6 +56,8 @@ USAGE_END = """
- Valid combinations are android     [%(android)s]
-                        linux       [%(linux)s]
-                        mac         [%(mac)s]
-+                       openbsd     [%(openbsd)s]
-+                       freebsd     [%(freebsd)s]
-                        win         [%(win)s]
- 
- If no target architecture is specified all will be built.
-@@ -126,6 +130,10 @@ def PrintAndCheckCall(argv, *args, **kwargs):
- def DetermineHostOsAndArch():
-   if platform.system() == 'Linux':
-     host_os = 'linux'
-+  if platform.system() == 'OpenBSD':
-+    host_os = 'openbsd'
-+  elif platform.system() == 'FreeBSD':
-+    host_os = 'freebsd'
-   elif platform.system() == 'Darwin':
-     host_os = 'mac'
-   elif platform.system() == 'Windows' or 'CYGWIN_NT' in platform.system():
-@@ -135,7 +143,7 @@ def DetermineHostOsAndArch():
- 
-   if re.match(r'i.86', platform.machine()):
-     host_arch = 'ia32'
--  elif platform.machine() == 'x86_64' or platform.machine() == 'AMD64':
-+  elif platform.machine() == 'x86_64' or platform.machine() == 'AMD64' or platform.machine() == 'amd64':
-     host_arch = 'x64'
-   elif platform.machine() == 'aarch64':
-     host_arch = 'arm64'
-@@ -152,7 +160,7 @@ def DetermineHostOsAndArch():
+@@ -122,7 +124,7 @@ def PrintAndCheckCall(argv, *args, **kwargs):
  
  
  def GetDsoName(target_os, dso_name, dso_version):
--  if target_os in ('linux', 'linux-noasm', 'android'):
-+  if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd'):
-     return 'lib%s.so.%s' % (dso_name, dso_version)
-   elif target_os == 'mac':
-     return 'lib%s.%s.dylib' % (dso_name, dso_version)
-@@ -495,7 +503,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_
-   # removing <sys/sysctl.h> soon, so this is needed to silence a deprecation
-   # #warning which will be converted to an error via -Werror.
-   # There is also no prctl.h
--  if target_os in ['linux', 'linux-noasm']:
-+  if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']:
-     pre_make_rewrites += [
-         (r'(#define HAVE_SYSCTL [01])',
-          r'#define HAVE_SYSCTL 0 /* \1 -- forced to 0 for Fuchsia */'),
-@@ -622,7 +630,7 @@ def main(argv):
-   configure_args = args[2:]
+-    if target_os in ('linux', 'linux-noasm', 'android'):
++    if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd'):
+         return 'lib%s.so.%s' % (dso_name, dso_version)
+     elif target_os == 'mac':
+         return 'lib%s.%s.dylib' % (dso_name, dso_version)
+@@ -474,7 +476,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_
+     # removing <sys/sysctl.h> soon, so this is needed to silence a deprecation
+     # #warning which will be converted to an error via -Werror.
+     # There is also no prctl.h
+-    if target_os in ['linux', 'linux-noasm']:
++    if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']:
+         pre_make_rewrites += [
+             (r'(#define HAVE_SYSCTL [01])',
+              r'#define HAVE_SYSCTL 0 /* \1 -- forced to 0 for Fuchsia */'),
+@@ -597,7 +599,7 @@ def main(argv):
+     configure_args = args[2:]
  
+     if target_os not in ('android', 'linux', 'linux-noasm', 'mac', 'win',
+-                         'all'):
++                         'all', 'openbsd', 'freebsd'):
+         parser.print_help()
+         return 1
  
--  if target_os not in ('android', 'linux', 'linux-noasm', 'mac', 'win', 'all'):
-+  if target_os not in ('android', 'linux', 'linux-noasm', 'mac', 'win', 'all', 'openbsd', 'freebsd'):
-     parser.print_help()
-     return 1
- 
-@@ -744,7 +752,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
-         '--enable-parser=vp3,vp8',
-     ])
- 
--  if target_os in ('linux', 'linux-noasm', 'android'):
-+  if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd'):
-     if target_arch == 'x64':
-       if target_os == 'android':
-         configure_flags['Common'].extend([
-@@ -754,7 +762,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
-         configure_flags['Common'].extend([
-           '--enable-lto',
-           '--arch=x86_64',
--          '--target-os=linux',
-+          '--target-os=' + target_os,
+@@ -710,7 +712,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+             '--optflags="-O2"',
          ])
  
-         if host_arch != 'x64':
-@@ -845,7 +853,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
-               '--extra-cflags=-mfpu=vfpv3-d16',
-           ])
-     elif target_arch == 'arm64':
--      if target_os != 'android':
-+      if target_os != 'android' and target_os != 'openbsd' and target_os != 'freebsd':
-         if host_arch != 'arm64':
-           configure_flags['Common'].extend([
-             '--enable-cross-compile',
-@@ -910,7 +918,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
-             '--disable-mips64r2',
-             '--enable-msa',
-         ])
--      if target_os == 'linux':
-+      if target_os == 'Linux':
-         configure_flags['Common'].extend([
-             '--enable-cross-compile',
-             '--target-os=linux',
-@@ -1061,7 +1069,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
-         'Chrome', configure_flags['Common'] + configure_flags['ChromeAndroid'] +
-         configure_args)
+-    if target_os in ('linux', 'linux-noasm', 'android'):
++    if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd'):
+         if target_arch == 'x64':
+             if target_os == 'android':
+                 configure_flags['Common'].extend([
+@@ -825,9 +827,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
  
--  if target_os in ['linux', 'linux-noasm']:
-+  if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']:
-     # ChromeOS enables MPEG4 which requires error resilience :(
-     chrome_os_flags = (
-         configure_flags['Common'] + configure_flags['Chrome'] +
+                 configure_flags['Common'].extend([
+                     '--target-os=linux',
+-                    '--sysroot=' +
+-                    os.path.join(CHROMIUM_ROOT_DIR,
+-                                 'build/linux/debian_bullseye_arm64-sysroot'),
+                     # See crbug.com/1467681. These could be removed eventually
+                     '--disable-dotprod',
+                     '--disable-i8mm',
+@@ -1031,7 +1030,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+             'Chrome', configure_flags['Common'] +
+             configure_flags['ChromeAndroid'] + configure_args)
+ 
+-    if target_os in ['linux', 'linux-noasm']:
++    if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']:
+         # ChromeOS enables MPEG4 which requires error resilience :(
+         chrome_os_flags = (configure_flags['Common'] +
+                            configure_flags['Chrome'] +
diff --git a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_chromium_scripts_robo_lib_config_py b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_chromium_scripts_robo_lib_config_py
index 15cf06510..10f007012 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_chromium_scripts_robo_lib_config_py
+++ b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_chromium_scripts_robo_lib_config_py
@@ -1,54 +1,56 @@
 Index: third_party/ffmpeg/chromium/scripts/robo_lib/config.py
 --- third_party/ffmpeg/chromium/scripts/robo_lib/config.py.orig
 +++ third_party/ffmpeg/chromium/scripts/robo_lib/config.py
-@@ -35,7 +35,7 @@ class RoboConfiguration:
-     self._patches_commit_title = "Chromium patches file"
-     # Title of the commit with README.chromium
-     self._readme_chromium_commit_title = "README.chromium file"
--    self.EnsureHostInfo()
-+    #self.EnsureHostInfo()
-     self.EnsureChromeSrc()
-     self.EnsureScriptDirectory()
+@@ -51,18 +51,12 @@ class RoboConfiguration:
+         self._llvm_path = os.path.join(self.chrome_src(), "third_party",
+                                        "llvm-build", "Release+Asserts", "bin")
  
-@@ -47,18 +47,15 @@ class RoboConfiguration:
-     self._llvm_path = os.path.join(self.chrome_src(), "third_party",
-             "llvm-build", "Release+Asserts", "bin")
+-        self.EnsurePathContainsLLVM()
+-        self.EnsureNoMakeInfo()
+         self.EnsureFFmpegHome()
+         self.EnsureASANConfig()
+-        self.ComputeBranchName()
+         if not quiet:
+             shell.log(f"Using chrome src: {self.chrome_src()}")
+             shell.log(f"Using script dir: {self._script_directory}")
+             shell.log(f"Using ffmpeg home:{self.ffmpeg_home()}")
+-            shell.log(f"On branch: {self.branch_name()}")
+-            if self.sushi_branch_name():
+-                shell.log(f"On sushi branch: {self.sushi_branch_name()}")
  
--    self.EnsurePathContainsLLVM()
--    self.EnsureNoMakeInfo()
-+    #self.EnsurePathContainsLLVM()
-+    #self.EnsureNoMakeInfo()
-     self.EnsureFFmpegHome()
-     self.EnsureASANConfig()
--    self.ComputeBranchName()
-+    #self.ComputeBranchName()
-     if not quiet:
-       shell.log(f"Using chrome src: {self.chrome_src()}")
-       shell.log(f"Using script dir: {self._script_directory}")
-       shell.log(f"Using ffmpeg home:{self.ffmpeg_home()}")
--      shell.log(f"On branch: {self.branch_name()}")
--      if self.sushi_branch_name():
--        shell.log(f"On sushi branch: {self.sushi_branch_name()}")
+         # Filename that we'll ask generate_gn.py to write git commands to.
+         # TODO: Should this use script_directory, or stay with ffmpeg?  As long as
+@@ -155,9 +149,9 @@ class RoboConfiguration:
  
-     # Filename that we'll ask generate_gn.py to write git commands to.
-     # TODO: Should this use script_directory, or stay with ffmpeg?  As long as
-@@ -149,7 +146,7 @@ class RoboConfiguration:
-     """Ensure that the host architecture and platform are set."""
-     kernel, host, os, *rest = shell.output_or_error(["uname", "-a"]).split()
-     assert kernel in ("Linux", "linux")
--    assert "x86_64" in rest
-+    assert ("x86_64", "amd64") in rest
-     self._host_operating_system = "linux"
-     self._host_architecture = "x64"
+         if re.match(r"i.86", platform.machine()):
+             self._host_architecture = "ia32"
+-        elif platform.machine() == "x86_64" or platform.machine() == "AMD64":
++        elif platform.machine() == "x86_64" or platform.machine() == "AMD64" or platform.machine() == "amd64":
+             self._host_architecture = "x64"
+-        elif platform.machine() == "aarch64":
++        elif platform.machine() == "aarch64" or platform.machine() == "arm64":
+             self._host_architecture = "arm64"
+         elif platform.machine() == "mips32":
+             self._host_architecture = "mipsel"
+@@ -192,6 +186,10 @@ class RoboConfiguration:
+         elif platform.system() == "Windows" or "CYGWIN_NT" in platform.system(
+         ):
+             self._host_operating_system = "win"
++        elif platform.system() == "OpenBSD":
++            self._host_operating_system = "openbsd"
++        elif platform.system() == "FreeBSD":
++            self._host_operating_system = "freebsd"
+         else:
+             raise ValueError(f"Unsupported platform: {platform.system()}")
  
-@@ -165,8 +162,8 @@ class RoboConfiguration:
-     wd = os.getcwd()
-     # Walk up the tree until we find src/AUTHORS
-     while wd != "/":
--      if os.path.isfile(os.path.join(wd, "src", "AUTHORS")):
--        self._chrome_src = os.path.join(wd, "src")
-+      if os.path.isfile(os.path.join(wd, "third_party", "DEPS")):
-+        self._chrome_src = wd
-         return
-       wd = os.path.dirname(wd)
-     raise Exception("could not find src/AUTHORS in any parent of the wd")
+@@ -200,8 +198,8 @@ class RoboConfiguration:
+         wd = os.getcwd()
+         # Walk up the tree until we find src/AUTHORS
+         while wd != "/":
+-            if os.path.isfile(os.path.join(wd, "src", "AUTHORS")):
+-                self._chrome_src = os.path.join(wd, "src")
++            if os.path.isfile(os.path.join(wd, "third_party", "DEPS")):
++                self._chrome_src = wd
+                 return
+             wd = os.path.dirname(wd)
+         raise Exception("could not find src/AUTHORS in any parent of the wd")
diff --git a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_configure b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_configure
deleted file mode 100644
index c40eec1bc..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_configure
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: third_party/ffmpeg/configure
---- third_party/ffmpeg/configure.orig
-+++ third_party/ffmpeg/configure
-@@ -5613,6 +5613,7 @@ case $target_os in
-         disable symver
-         ;;
-     freebsd)
-+        enable section_data_rel_ro
-         ;;
-     bsd/os)
-         add_extralibs -lpoll -lgnugetopt
diff --git a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_libavcodec_x86_fft_asm b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_libavcodec_x86_fft_asm
deleted file mode 100644
index cc5ddec6c..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_libavcodec_x86_fft_asm
+++ /dev/null
@@ -1,109 +0,0 @@
-Index: third_party/ffmpeg/libavcodec/x86/fft.asm
---- third_party/ffmpeg/libavcodec/x86/fft.asm.orig
-+++ third_party/ffmpeg/libavcodec/x86/fft.asm
-@@ -296,6 +296,7 @@ INIT_YMM avx
- %if HAVE_AVX_EXTERNAL
- align 16
- fft8_avx:
-+    _CET_ENDBR
-     mova      m0, Z(0)
-     mova      m1, Z(1)
-     T8_AVX    m0, m1, m2, m3, m4
-@@ -306,6 +307,7 @@ fft8_avx:
- 
- align 16
- fft16_avx:
-+    _CET_ENDBR
-     mova       m2, Z(2)
-     mova       m3, Z(3)
-     T4_SSE     m2, m3, m7
-@@ -343,6 +345,7 @@ fft16_avx:
- 
- align 16
- fft32_avx:
-+    _CET_ENDBR
-     call fft16_avx
- 
-     mova m0, Z(4)
-@@ -367,6 +370,7 @@ fft32_avx:
-     ret
- 
- fft32_interleave_avx:
-+    _CET_ENDBR
-     call fft32_avx
-     mov r2d, 32
- .deint_loop:
-@@ -390,6 +394,7 @@ INIT_XMM sse
- align 16
- fft4_avx:
- fft4_sse:
-+    _CET_ENDBR
-     mova     m0, Z(0)
-     mova     m1, Z(1)
-     T4_SSE   m0, m1, m2
-@@ -399,6 +404,7 @@ fft4_sse:
- 
- align 16
- fft8_sse:
-+    _CET_ENDBR
-     mova     m0, Z(0)
-     mova     m1, Z(1)
-     T4_SSE   m0, m1, m2
-@@ -413,6 +419,7 @@ fft8_sse:
- 
- align 16
- fft16_sse:
-+    _CET_ENDBR
-     mova     m0, Z(0)
-     mova     m1, Z(1)
-     T4_SSE   m0, m1, m2
-@@ -441,6 +448,7 @@ fft16_sse:
- %macro DECL_PASS 2+ ; name, payload
- align 16
- %1:
-+    _CET_ENDBR
- DEFINE_ARGS zc, w, n, o1, o3
-     lea o3q, [nq*3]
-     lea o1q, [nq*8]
-@@ -457,10 +465,6 @@ DEFINE_ARGS zc, w, n, o1, o3
- %macro FFT_DISPATCH 2; clobbers 5 GPRs, 8 XMMs
-     lea r2, [dispatch_tab%1]
-     mov r2, [r2 + (%2q-2)*gprsize]
--%ifdef PIC
--    lea r3, [$$]
--    add r2, r3
--%endif
-     call r2
- %endmacro ; FFT_DISPATCH
- 
-@@ -585,11 +589,7 @@ cglobal imdct_calc, 3,5,3
-     jl      .loop
-     RET
- 
--%ifdef PIC
--%define SECTION_REL - $$
--%else
- %define SECTION_REL
--%endif
- 
- %macro DECL_FFT 1-2 ; nbits, suffix
- %ifidn %0, 1
-@@ -613,6 +613,7 @@ cglobal imdct_calc, 3,5,3
- 
- align 16
- fft %+ n %+ fullsuffix:
-+    _CET_ENDBR
-     call fft %+ n2 %+ SUFFIX
-     add r0, n*4 - (n&(-2<<%1))
-     call fft %+ n4 %+ SUFFIX
-@@ -627,8 +628,10 @@ fft %+ n %+ fullsuffix:
- %endrep
- %undef n
- 
-+[SECTION .data.rel.ro write]
- align 8
- dispatch_tab %+ fullsuffix: pointer list_of_fft
-+__?SECT?__
- %endmacro ; DECL_FFT
- 
- %if HAVE_AVX_EXTERNAL
diff --git a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_libavutil_x86_x86inc_asm b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_libavutil_x86_x86inc_asm
index 3cb2292cd..d3c4f22f0 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_libavutil_x86_x86inc_asm
+++ b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_libavutil_x86_x86inc_asm
@@ -14,7 +14,7 @@ Index: third_party/ffmpeg/libavutil/x86/x86inc.asm
  %define WIN64  0
  %define UNIX64 0
  %if ARCH_X86_64
-@@ -768,6 +774,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg,
+@@ -778,6 +784,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg,
      %endif
      align function_align
      %2:
diff --git a/www/ungoogled-chromium/patches/patch-third_party_fontconfig_include_config_h b/www/ungoogled-chromium/patches/patch-third_party_fontconfig_include_config_h
index c5de6596e..eee3b75ea 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_fontconfig_include_config_h
+++ b/www/ungoogled-chromium/patches/patch-third_party_fontconfig_include_config_h
@@ -1,90 +1,50 @@
 Index: third_party/fontconfig/include/config.h
 --- third_party/fontconfig/include/config.h.orig
 +++ third_party/fontconfig/include/config.h
-@@ -18,13 +18,13 @@
- #define ENABLE_NLS 1
+@@ -13,7 +13,7 @@
  
- /* Additional font directories */
--#define FC_ADD_FONTS "yes"
-+#define FC_ADD_FONTS "/usr/local/share/fonts"
+ #define FC_CACHEDIR "/var/cache/fontconfig"
  
- /* Architecture prefix to use for cache file names */
- /* #undef FC_ARCHITECTURE */
+-#define FC_DEFAULT_FONTS "\t<dir>/usr/share/fonts</dir>\n\t<dir>/usr/local/share/fonts</dir>\n"
++#define FC_DEFAULT_FONTS "\t<dir>/usr/X11R6/lib/X11/fonts</dir>"
  
- /* System font directory */
--#define FC_DEFAULT_FONTS "<dir>/usr/share/fonts</dir>"
-+#define FC_DEFAULT_FONTS "<dir>/usr/X11R6/lib/X11/fonts</dir>"
+ #define FC_FONTPATH ""
  
- /* The type of len parameter of the gperf hash/lookup function */
- #define FC_GPERF_SIZE_T size_t
-@@ -99,7 +99,7 @@
- #define HAVE_GETPAGESIZE 1
+@@ -66,7 +66,7 @@
  
- /* Define to 1 if you have the `getprogname' function. */
--/* #undef HAVE_GETPROGNAME */
-+#define HAVE_GETPROGNAME 1
+ #define HAVE_MMAP 1
  
- /* Define if the GNU gettext() function is already present or preinstalled. */
- #define HAVE_GETTEXT 1
-@@ -141,7 +141,7 @@
- /* #undef HAVE_NDIR_H */
- 
- /* Define to 1 if you have the 'posix_fadvise' function. */
 -#define HAVE_POSIX_FADVISE 1
 +#define HAVE_POSIX_FADVISE 0
  
- /* Have POSIX threads */
  #define HAVE_PTHREAD 1
-@@ -156,11 +156,14 @@
+ 
+@@ -74,10 +74,13 @@
+ 
  #define HAVE_RANDOM 1
  
- /* Define to 1 if you have the `random_r' function. */
 -#define HAVE_RANDOM_R 1
 +/* #undef HAVE_RANDOM_R */
  
- /* Define to 1 if you have the `rand_r' function. */
  #define HAVE_RAND_R 1
  
 +/* Define to 1 if you have the `arc4_random' function. */
 +#define HAVE_ARC4RANDOM 1
 +
- /* Define to 1 if you have the `readlink' function. */
  #define HAVE_READLINK 1
  
-@@ -204,7 +207,7 @@
- #define HAVE_STRUCT_STATFS_F_FLAGS 1
+ #define HAVE_STDATOMIC_PRIMITIVES 1
+@@ -92,11 +95,11 @@
  
- /* Define to 1 if `f_fstypename' is a member of `struct statfs'. */
--/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */
-+#define HAVE_STRUCT_STATFS_F_FSTYPENAME 1
- 
- /* Define to 1 if `f_basetype' is a member of `struct statvfs'. */
- /* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */
-@@ -230,7 +233,7 @@
  #define HAVE_SYS_PARAM_H 1
  
- /* Define to 1 if you have the <sys/statfs.h> header file. */
 -#define HAVE_SYS_STATFS_H 1
 +/* #undef HAVE_SYS_STATFS_H */
  
- /* Define to 1 if you have the <sys/statvfs.h> header file. */
  #define HAVE_SYS_STATVFS_H 1
-@@ -242,7 +245,7 @@
- #define HAVE_SYS_TYPES_H 1
  
- /* Define to 1 if you have the <sys/vfs.h> header file. */
 -#define HAVE_SYS_VFS_H 1
 +/* #undef HAVE_SYS_VFS_H */
  
- /* Define to 1 if you have the <unistd.h> header file. */
  #define HAVE_UNISTD_H 1
-@@ -265,7 +268,8 @@
- /* Define to 1 if you have the `_mktemp_s' function. */
- /* #undef HAVE__MKTEMP_S */
  
--/* Define to the sub-directory where libtool stores uninstalled libraries. */
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
- #define LT_OBJDIR ".libs/"
- 
- /* Name of package */
diff --git a/www/ungoogled-chromium/patches/patch-third_party_leveldatabase_env_chromium_cc b/www/ungoogled-chromium/patches/patch-third_party_leveldatabase_env_chromium_cc
index ded989b61..294246bf5 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_leveldatabase_env_chromium_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_leveldatabase_env_chromium_cc
@@ -1,7 +1,7 @@
 Index: third_party/leveldatabase/env_chromium.cc
 --- third_party/leveldatabase/env_chromium.cc.orig
 +++ third_party/leveldatabase/env_chromium.cc
-@@ -320,7 +320,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std::
+@@ -326,7 +326,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std::
  
  Status ChromiumWritableFile::SyncParent() {
    TRACE_EVENT0("leveldb", "SyncParent");
diff --git a/www/ungoogled-chromium/patches/patch-third_party_libaom_source_libaom_aom_ports_aarch64_cpudetect_c b/www/ungoogled-chromium/patches/patch-third_party_libaom_source_libaom_aom_ports_aarch64_cpudetect_c
index 679f631f9..aeeb4b8a9 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_libaom_source_libaom_aom_ports_aarch64_cpudetect_c
+++ b/www/ungoogled-chromium/patches/patch-third_party_libaom_source_libaom_aom_ports_aarch64_cpudetect_c
@@ -1,26 +1,16 @@
 Index: third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c
 --- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig
 +++ third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c
-@@ -85,13 +85,35 @@ static int arm_get_cpu_caps(void) {
+@@ -99,9 +99,45 @@ static int arm_get_cpu_caps(void) {
    return flags;
  }
  
--#elif defined(ANDROID_USE_CPU_FEATURES_LIB)
-+#elif defined(ANDROID_USE_CPU_FEATURES_LIB) || defined(__FreeBSD__)
- 
- static int arm_get_cpu_caps(void) {
-   int flags = 0;
- #if HAVE_NEON
-   flags |= HAS_NEON;  // Neon is mandatory in Armv8.0-A.
- #endif  // HAVE_NEON
-+  return flags;
-+}
-+
+-#elif defined(__linux__)  // end defined(AOM_USE_ANDROID_CPU_FEATURES)
 +#elif defined(__OpenBSD__)
 +#include <sys/sysctl.h>
 +#include <machine/cpu.h>
 +#include <machine/armreg.h>
-+
+ 
 +static int arm_get_cpu_caps(void) {
 +  int flags = 0;
 +  int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 };
@@ -35,6 +25,26 @@ Index: third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c
 +  if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_CRC32_BASE)
 +    flags |= HAS_ARM_CRC32;
 +
-   return flags;
- }
++  return flags;
++}
++
++#elif defined(__linux__) || defined(__FreeBSD__)  // end defined(AOM_USE_ANDROID_CPU_FEATURES)
++
+ #include <sys/auxv.h>
++
++#if defined(__FreeBSD__)
++static unsigned long getauxval(unsigned long type)
++{
++    /* Only AT_HWCAP* return unsigned long */
++    if (type != AT_HWCAP && type != AT_HWCAP2) {
++        return 0;
++    }
++
++    unsigned long ret = 0;
++    elf_aux_info(type, &ret, sizeof(ret));
++    return ret;
++}
++#endif
  
+ // Define hwcap values ourselves: building with an old auxv header where these
+ // hwcap values are not defined should not prevent features from being enabled.
diff --git a/www/ungoogled-chromium/patches/patch-third_party_libc++_src_src_chrono_cpp b/www/ungoogled-chromium/patches/patch-third_party_libc++_src_src_chrono_cpp
new file mode 100644
index 000000000..51eb74483
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-third_party_libc++_src_src_chrono_cpp
@@ -0,0 +1,12 @@
+Index: third_party/libc++/src/src/chrono.cpp
+--- third_party/libc++/src/src/chrono.cpp.orig
++++ third_party/libc++/src/src/chrono.cpp
+@@ -31,7 +31,7 @@
+ #  include <sys/time.h> // for gettimeofday and timeval
+ #endif
+ 
+-#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0)
++#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) || defined(__OpenBSD__) || defined(__FreeBSD__)
+ #  define _LIBCPP_HAS_CLOCK_GETTIME
+ #endif
+ 
diff --git a/www/ungoogled-chromium/patches/patch-third_party_libc++_src_src_filesystem_filesystem_clock_cpp b/www/ungoogled-chromium/patches/patch-third_party_libc++_src_src_filesystem_filesystem_clock_cpp
new file mode 100644
index 000000000..9b22d4ac5
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-third_party_libc++_src_src_filesystem_filesystem_clock_cpp
@@ -0,0 +1,12 @@
+Index: third_party/libc++/src/src/filesystem/filesystem_clock.cpp
+--- third_party/libc++/src/src/filesystem/filesystem_clock.cpp.orig
++++ third_party/libc++/src/src/filesystem/filesystem_clock.cpp
+@@ -29,7 +29,7 @@
+ #  include <sys/time.h> // for gettimeofday and timeval
+ #endif
+ 
+-#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0)
++#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) || defined(__OpenBSD__) || defined(__FreeBSD__)
+ #  define _LIBCPP_HAS_CLOCK_GETTIME
+ #endif
+ 
diff --git a/www/ungoogled-chromium/patches/patch-third_party_libc++abi_src_src_cxa_guard_impl_h b/www/ungoogled-chromium/patches/patch-third_party_libc++abi_src_src_cxa_guard_impl_h
new file mode 100644
index 000000000..9d8a357f2
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-third_party_libc++abi_src_src_cxa_guard_impl_h
@@ -0,0 +1,25 @@
+Index: third_party/libc++abi/src/src/cxa_guard_impl.h
+--- third_party/libc++abi/src/src/cxa_guard_impl.h.orig
++++ third_party/libc++abi/src/src/cxa_guard_impl.h
+@@ -411,7 +411,20 @@ struct InitByteGlobalMutex { (private)
+ //                         Futex Implementation
+ //===----------------------------------------------------------------------===//
+ 
+-#if defined(SYS_futex)
++#ifdef __OpenBSD__
++#include <sys/futex.h>
++
++void PlatformFutexWait(int* addr, int expect) {
++  constexpr int WAIT = 0;
++  futex((volatile uint32_t *)addr, WAIT, expect, NULL, NULL);
++  __tsan_acquire(addr);
++}
++void PlatformFutexWake(int* addr) {
++  constexpr int WAKE = 1;
++  __tsan_release(addr);
++  futex((volatile uint32_t *)addr, WAKE, INT_MAX, NULL, NULL);
++}
++#elif defined(SYS_futex)
+ void PlatformFutexWait(int* addr, int expect) {
+   constexpr int WAIT = 0;
+   syscall(SYS_futex, addr, WAIT, expect, 0);
diff --git a/www/ungoogled-chromium/patches/patch-third_party_libsync_src_sync_c b/www/ungoogled-chromium/patches/patch-third_party_libsync_src_sync_c
index 7483391f4..6e0481023 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_libsync_src_sync_c
+++ b/www/ungoogled-chromium/patches/patch-third_party_libsync_src_sync_c
@@ -1,17 +1,17 @@
 Index: third_party/libsync/src/sync.c
 --- third_party/libsync/src/sync.c.orig
 +++ third_party/libsync/src/sync.c
-@@ -17,7 +17,9 @@
+@@ -17,8 +17,8 @@
   */
  
  #include <fcntl.h>
-+#if !defined(__OpenBSD__)
- #include <malloc.h>
-+#endif
+-#include <malloc.h>
  #include <stdint.h>
++#include <stdlib.h>
  #include <string.h>
  #include <errno.h>
-@@ -29,6 +31,12 @@
+ #include <poll.h>
+@@ -29,6 +29,12 @@
  
  #include <sync/sync.h>
  
diff --git a/www/ungoogled-chromium/patches/patch-third_party_libusb_src_libusb_libusb_h b/www/ungoogled-chromium/patches/patch-third_party_libusb_src_libusb_libusb_h
new file mode 100644
index 000000000..4bd15d9cf
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-third_party_libusb_src_libusb_libusb_h
@@ -0,0 +1,12 @@
+Index: third_party/libusb/src/libusb/libusb.h
+--- third_party/libusb/src/libusb/libusb.h.orig
++++ third_party/libusb/src/libusb/libusb.h
+@@ -60,7 +60,7 @@ typedef unsigned __int32  uint32_t;
+ #include <sys/types.h>
+ #endif
+ 
+-#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__)
++#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+ #include <sys/time.h>
+ #endif
+ 
diff --git a/www/ungoogled-chromium/patches/patch-third_party_libvpx_source_libvpx_vpx_ports_aarch64_cpudetect_c b/www/ungoogled-chromium/patches/patch-third_party_libvpx_source_libvpx_vpx_ports_aarch64_cpudetect_c
new file mode 100644
index 000000000..0bf4586f9
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-third_party_libvpx_source_libvpx_vpx_ports_aarch64_cpudetect_c
@@ -0,0 +1,28 @@
+Index: third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c
+--- third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c.orig
++++ third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c
+@@ -91,9 +91,23 @@ static int arm_get_cpu_caps(void) {
+   return flags;
+ }
+ 
+-#elif defined(__linux__)  // end defined(VPX_USE_ANDROID_CPU_FEATURES)
++#elif defined(__linux__) || defined(__FreeBSD__)  // end defined(VPX_USE_ANDROID_CPU_FEATURES)
+ 
+ #include <sys/auxv.h>
++
++#if defined(__FreeBSD__)
++static unsigned long getauxval(unsigned long type)
++{
++    /* Only AT_HWCAP* return unsigned long */
++    if (type != AT_HWCAP && type != AT_HWCAP2) {
++        return 0;
++    }
++
++    unsigned long ret = 0;
++    elf_aux_info(type, &ret, sizeof(ret));
++    return ret;
++}
++#endif
+ 
+ // Define hwcap values ourselves: building with an old auxv header where these
+ // hwcap values are not defined should not prevent features from being enabled.
diff --git a/www/ungoogled-chromium/patches/patch-third_party_libxml_linux_config_h b/www/ungoogled-chromium/patches/patch-third_party_libxml_linux_config_h
deleted file mode 100644
index b2757f6b5..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_libxml_linux_config_h
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: third_party/libxml/linux/config.h
---- third_party/libxml/linux/config.h.orig
-+++ third_party/libxml/linux/config.h
-@@ -69,6 +69,9 @@
- /* Define to 1 if you have the <pthread.h> header file. */
- #define HAVE_PTHREAD_H /**/
- 
-+/* Define to 1 if you have the `arc4random' function. */
-+#define HAVE_ARC4RANDOM 1
-+
- /* Define to 1 if you have the `rand_r' function. */
- 
- 
diff --git a/www/ungoogled-chromium/patches/patch-third_party_libxml_src_dict_c b/www/ungoogled-chromium/patches/patch-third_party_libxml_src_dict_c
deleted file mode 100644
index 048d9e533..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_libxml_src_dict_c
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: third_party/libxml/src/dict.c
---- third_party/libxml/src/dict.c.orig
-+++ third_party/libxml/src/dict.c
-@@ -133,7 +133,7 @@ struct _xmlDict {
- static xmlMutex xmlDictMutex;
- 
- #ifdef DICT_RANDOMIZATION
--#ifdef HAVE_RAND_R
-+#if defined(HAVE_RAND_R) && !defined(HAVE_ARC4RANDOM)
- /*
-  * Internal data for random function, protected by xmlDictMutex
-  */
-@@ -160,7 +160,7 @@ int xmlInitializeDict(void) {
- int __xmlInitializeDict(void) {
-     xmlInitMutex(&xmlDictMutex);
- 
--#ifdef DICT_RANDOMIZATION
-+#if defined(DICT_RANDOMIZATION) && !defined(HAVE_ARC4RANDOM)
- #ifdef HAVE_RAND_R
-     rand_seed = time(NULL);
-     rand_r(& rand_seed);
-@@ -175,13 +175,17 @@ int __xmlInitializeDict(void) {
- int __xmlRandom(void) {
-     int ret;
- 
-+#ifdef HAVE_ARC4RANDOM
-+    ret = arc4random();
-+#else
-     xmlMutexLock(&xmlDictMutex);
--#ifdef HAVE_RAND_R
-+#  ifdef HAVE_RAND_R
-     ret = rand_r(& rand_seed);
--#else
-+#  else
-     ret = rand();
--#endif
-+#  endif
-     xmlMutexUnlock(&xmlDictMutex);
-+#endif
-     return(ret);
- }
- #endif
diff --git a/www/ungoogled-chromium/patches/patch-third_party_maldoca_src_maldoca_base_get_runfiles_dir_cc b/www/ungoogled-chromium/patches/patch-third_party_maldoca_src_maldoca_base_get_runfiles_dir_cc
index 871639744..9432b5f91 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_maldoca_src_maldoca_base_get_runfiles_dir_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_maldoca_src_maldoca_base_get_runfiles_dir_cc
@@ -1,7 +1,7 @@
 Index: third_party/maldoca/src/maldoca/base/get_runfiles_dir.cc
 --- third_party/maldoca/src/maldoca/base/get_runfiles_dir.cc.orig
 +++ third_party/maldoca/src/maldoca/base/get_runfiles_dir.cc
-@@ -24,11 +24,6 @@
+@@ -25,11 +25,6 @@
  #error "__APPLE__ not supported."
  #endif
  
@@ -13,7 +13,7 @@ Index: third_party/maldoca/src/maldoca/base/get_runfiles_dir.cc
  #if defined(_WIN32)
  #include <windows.h>
  #define PATH_MAX MAX_PATH
-@@ -50,8 +45,6 @@ std::string GetExecutablePath() {
+@@ -51,8 +46,6 @@ std::string GetExecutablePath() {
    char exe_path[PATH_MAX] = {0};
  #ifdef __APPLE__
  #error "__APPLE__ not supported.";
@@ -22,7 +22,7 @@ Index: third_party/maldoca/src/maldoca/base/get_runfiles_dir.cc
  #elif defined(_WIN32)
    HMODULE hModule = GetModuleHandleW(NULL);
    WCHAR wc_file_path[MAX_PATH] = {0};
-@@ -97,8 +90,6 @@ std::string GetExecutablePath() {
+@@ -98,8 +91,6 @@ std::string GetExecutablePath() {
  absl::Status IsDirectory(const std::string& name) {
  #ifdef __APPLE__
  #error "__APPLE__ not supported.";
diff --git a/www/ungoogled-chromium/patches/patch-third_party_material_color_utilities_src_cpp_palettes_tones_cc b/www/ungoogled-chromium/patches/patch-third_party_material_color_utilities_src_cpp_palettes_tones_cc
index da4a78067..bab2164ff 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_material_color_utilities_src_cpp_palettes_tones_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_material_color_utilities_src_cpp_palettes_tones_cc
@@ -9,4 +9,4 @@ Index: third_party/material_color_utilities/src/cpp/palettes/tones.cc
 +
  #include "cpp/palettes/tones.h"
  
- #include "cpp/cam/cam.h"
+ #include <cmath>
diff --git a/www/ungoogled-chromium/patches/patch-third_party_node_node_gni b/www/ungoogled-chromium/patches/patch-third_party_node_node_gni
new file mode 100644
index 000000000..638b1c4a4
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-third_party_node_node_gni
@@ -0,0 +1,12 @@
+Index: third_party/node/node.gni
+--- third_party/node/node.gni.orig
++++ third_party/node/node.gni
+@@ -19,7 +19,7 @@ template("node") {
+ 
+     # When use_remoteexec=true or use_siso=true, node actions run on remote
+     # Linux worker. So it should include linux node binary in inputs.
+-    if (is_linux || is_chromeos || use_remoteexec || use_siso) {
++    if ((is_linux || is_chromeos || use_remoteexec || use_siso) && !is_bsd) {
+       inputs += [
+         "//third_party/node/linux/node-linux-x64.tar.gz.sha1",
+         "//third_party/node/linux/node-linux-x64/bin/node",
diff --git a/www/ungoogled-chromium/patches/patch-third_party_pdfium_core_fxge_linux_fx_linux_impl_cpp b/www/ungoogled-chromium/patches/patch-third_party_pdfium_core_fxge_linux_fx_linux_impl_cpp
index 7d0e13b00..c71d4f6dd 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_pdfium_core_fxge_linux_fx_linux_impl_cpp
+++ b/www/ungoogled-chromium/patches/patch-third_party_pdfium_core_fxge_linux_fx_linux_impl_cpp
@@ -1,16 +1,16 @@
 Index: third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp
 --- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig
 +++ third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp
-@@ -18,7 +18,7 @@
- #include "third_party/base/check.h"
+@@ -17,7 +17,7 @@
+ #include "core/fxge/fx_font.h"
+ #include "core/fxge/systemfontinfo_iface.h"
  
- #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_FUCHSIA) && \
--    !defined(OS_ASMJS)
-+    !defined(OS_ASMJS) && !BUILDFLAG(IS_BSD)
+-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_ASMJS)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_ASMJS) && !BUILDFLAG(IS_BSD)
  #error "Included on the wrong platform"
  #endif
  
-@@ -166,9 +166,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf
+@@ -165,9 +165,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf
    std::unique_ptr<SystemFontInfoIface> CreateDefaultSystemFontInfo() override {
      auto pInfo = std::make_unique<CFX_LinuxFontInfo>();
      if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) {
diff --git a/www/ungoogled-chromium/patches/patch-third_party_pdfium_pdfium_gni b/www/ungoogled-chromium/patches/patch-third_party_pdfium_pdfium_gni
index aaadaa427..c8f2ee0bd 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_pdfium_pdfium_gni
+++ b/www/ungoogled-chromium/patches/patch-third_party_pdfium_pdfium_gni
@@ -1,7 +1,7 @@
 Index: third_party/pdfium/pdfium.gni
 --- third_party/pdfium/pdfium.gni.orig
 +++ third_party/pdfium/pdfium.gni
-@@ -46,7 +46,7 @@ declare_args() {
+@@ -42,7 +42,7 @@ declare_args() {
    # PDFium will use PartitionAlloc partitions to separate strings, scalars,
    # etc. from other allocations. However, the use of PartitionAlloc for new or
    # malloc is controlled by args in build_overrides/partition_alloc.gni.
diff --git a/www/ungoogled-chromium/patches/patch-third_party_pdfium_third_party_base_compiler_specific_h b/www/ungoogled-chromium/patches/patch-third_party_pdfium_third_party_base_compiler_specific_h
deleted file mode 100644
index 236c53be1..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_pdfium_third_party_base_compiler_specific_h
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: third_party/pdfium/third_party/base/compiler_specific.h
---- third_party/pdfium/third_party/base/compiler_specific.h.orig
-+++ third_party/pdfium/third_party/base/compiler_specific.h
-@@ -17,7 +17,7 @@
- // Annotate a function indicating it should not be inlined.
- // Use like:
- //   NOINLINE void DoStuff() { ... }
--#if defined(__clang__) && HAS_ATTRIBUTE(noinline)
-+#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(noinline)
- #define NOINLINE [[clang::noinline]]
- #elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline)
- #define NOINLINE __attribute__((noinline))
diff --git a/www/ungoogled-chromium/patches/patch-third_party_perfetto_include_perfetto_base_time_h b/www/ungoogled-chromium/patches/patch-third_party_perfetto_include_perfetto_base_time_h
index 42b5ba107..58f999296 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_perfetto_include_perfetto_base_time_h
+++ b/www/ungoogled-chromium/patches/patch-third_party_perfetto_include_perfetto_base_time_h
@@ -1,7 +1,7 @@
 Index: third_party/perfetto/include/perfetto/base/time.h
 --- third_party/perfetto/include/perfetto/base/time.h.orig
 +++ third_party/perfetto/include/perfetto/base/time.h
-@@ -157,6 +157,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) {
+@@ -193,6 +193,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) {
  // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time
  // during suspend (when supported).
  inline TimeNanos GetBootTimeNs() {
@@ -11,7 +11,7 @@ Index: third_party/perfetto/include/perfetto/base/time.h
    // Determine if CLOCK_BOOTTIME is available on the first call.
    static const clockid_t kBootTimeClockSource = [] {
      struct timespec ts = {};
-@@ -164,6 +167,7 @@ inline TimeNanos GetBootTimeNs() {
+@@ -200,6 +203,7 @@ inline TimeNanos GetBootTimeNs() {
      return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource;
    }();
    return GetTimeInternalNs(kBootTimeClockSource);
@@ -19,7 +19,7 @@ Index: third_party/perfetto/include/perfetto/base/time.h
  }
  
  inline TimeNanos GetWallTimeNs() {
-@@ -171,7 +175,13 @@ inline TimeNanos GetWallTimeNs() {
+@@ -207,7 +211,13 @@ inline TimeNanos GetWallTimeNs() {
  }
  
  inline TimeNanos GetWallTimeRawNs() {
diff --git a/www/ungoogled-chromium/patches/patch-third_party_perfetto_include_perfetto_ext_base_thread_utils_h b/www/ungoogled-chromium/patches/patch-third_party_perfetto_include_perfetto_ext_base_thread_utils_h
index 2d6426e61..6aa664ed7 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_perfetto_include_perfetto_ext_base_thread_utils_h
+++ b/www/ungoogled-chromium/patches/patch-third_party_perfetto_include_perfetto_ext_base_thread_utils_h
@@ -1,7 +1,7 @@
 Index: third_party/perfetto/include/perfetto/ext/base/thread_utils.h
 --- third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig
 +++ third_party/perfetto/include/perfetto/ext/base/thread_utils.h
-@@ -40,9 +40,10 @@
+@@ -41,9 +41,10 @@
  namespace perfetto {
  namespace base {
  
diff --git a/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_base_string_utils_cc b/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_base_string_utils_cc
index fc1d2bfb0..559564879 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_base_string_utils_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_base_string_utils_cc
@@ -1,7 +1,7 @@
 Index: third_party/perfetto/src/base/string_utils.cc
 --- third_party/perfetto/src/base/string_utils.cc.orig
 +++ third_party/perfetto/src/base/string_utils.cc
-@@ -36,9 +36,10 @@ namespace base {
+@@ -38,9 +38,10 @@ namespace base {
  
  // Locale-independant as possible version of strtod.
  double StrToD(const char* nptr, char** endptr) {
diff --git a/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_trace_processor_db_storage_numeric_storage_cc b/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_trace_processor_db_storage_numeric_storage_cc
deleted file mode 100644
index e9da27fca..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_trace_processor_db_storage_numeric_storage_cc
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc
---- third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc.orig
-+++ third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc
-@@ -245,8 +245,13 @@ BitVector NumericStorage::LinearSearch(FilterOp op,
-   } else if (const auto* i32 = std::get_if<int32_t>(&*val)) {
-     auto* start = static_cast<const int32_t*>(data_) + range.start;
-     TypedLinearSearch(*i32, start, op, builder);
-+#if defined(__OpenBSD__) && defined(__i386__)
-+  } else if (const auto* db = std::get_if<long double>(&*val)) {
-+    auto* start = static_cast<const long double*>(data_) + range.start;
-+#else
-   } else if (const auto* db = std::get_if<double>(&*val)) {
-     auto* start = static_cast<const double*>(data_) + range.start;
-+#endif
-     TypedLinearSearch(*db, start, op, builder);
-   } else {
-     PERFETTO_DFATAL("Invalid");
diff --git a/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_tracing_core_clock_snapshots_cc b/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_tracing_core_clock_snapshots_cc
new file mode 100644
index 000000000..889041bef
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_tracing_core_clock_snapshots_cc
@@ -0,0 +1,13 @@
+Index: third_party/perfetto/src/tracing/core/clock_snapshots.cc
+--- third_party/perfetto/src/tracing/core/clock_snapshots.cc.orig
++++ third_party/perfetto/src/tracing/core/clock_snapshots.cc
+@@ -26,7 +26,8 @@ ClockSnapshotVector CaptureClockSnapshots() {
+   ClockSnapshotVector snapshot_data;
+ #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \
+     !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) &&   \
+-    !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL)
++    !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) &&  \
++    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
+   struct {
+     clockid_t id;
+     protos::pbzero::BuiltinClock type;
diff --git a/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_tracing_core_tracing_service_impl_cc b/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_tracing_core_tracing_service_impl_cc
deleted file mode 100644
index db59e0d03..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_tracing_core_tracing_service_impl_cc
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: third_party/perfetto/src/tracing/core/tracing_service_impl.cc
---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig
-+++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc
-@@ -3203,7 +3203,8 @@ bool TracingServiceImpl::SnapshotClocks(
- 
- #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \
-     !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) &&   \
--    !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL)
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
-   struct {
-     clockid_t id;
-     protos::pbzero::BuiltinClock type;
diff --git a/www/ungoogled-chromium/patches/patch-third_party_skia_src_base_SkContainers_cpp b/www/ungoogled-chromium/patches/patch-third_party_skia_src_ports_SkMemory_malloc_cpp
similarity index 63%
rename from www/ungoogled-chromium/patches/patch-third_party_skia_src_base_SkContainers_cpp
rename to www/ungoogled-chromium/patches/patch-third_party_skia_src_ports_SkMemory_malloc_cpp
index 05531cc5f..e645e5241 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_skia_src_base_SkContainers_cpp
+++ b/www/ungoogled-chromium/patches/patch-third_party_skia_src_ports_SkMemory_malloc_cpp
@@ -1,7 +1,7 @@
-Index: third_party/skia/src/base/SkContainers.cpp
---- third_party/skia/src/base/SkContainers.cpp.orig
-+++ third_party/skia/src/base/SkContainers.cpp
-@@ -14,7 +14,7 @@
+Index: third_party/skia/src/ports/SkMemory_malloc.cpp
+--- third_party/skia/src/ports/SkMemory_malloc.cpp.orig
++++ third_party/skia/src/ports/SkMemory_malloc.cpp
+@@ -15,7 +15,7 @@
  
  #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
  #include <malloc/malloc.h>
@@ -10,12 +10,12 @@ Index: third_party/skia/src/base/SkContainers.cpp
  #include <malloc.h>
  #elif defined(SK_BUILD_FOR_WIN)
  #include <malloc.h>
-@@ -38,7 +38,7 @@ SkSpan<std::byte> complete_size(void* ptr, size_t size
+@@ -126,7 +126,7 @@ size_t sk_malloc_size(void* addr, size_t size) {
      #elif defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 17
-         completeSize = malloc_usable_size(ptr);
+         completeSize = malloc_usable_size(addr);
          SkASSERT(completeSize >= size);
 -    #elif defined(SK_BUILD_FOR_UNIX)
 +    #elif defined(SK_BUILD_FOR_UNIX) && !defined(__OpenBSD__)
-         completeSize = malloc_usable_size(ptr);
+         completeSize = malloc_usable_size(addr);
          SkASSERT(completeSize >= size);
      #elif defined(SK_BUILD_FOR_WIN)
diff --git a/www/ungoogled-chromium/patches/patch-third_party_speech-dispatcher_libspeechd_version_h b/www/ungoogled-chromium/patches/patch-third_party_speech-dispatcher_libspeechd_version_h
new file mode 100644
index 000000000..35aabf4bd
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-third_party_speech-dispatcher_libspeechd_version_h
@@ -0,0 +1,33 @@
+Index: third_party/speech-dispatcher/libspeechd_version.h
+--- third_party/speech-dispatcher/libspeechd_version.h.orig
++++ third_party/speech-dispatcher/libspeechd_version.h
+@@ -0,0 +1,29 @@
++/*
++ * libspeechd_version.h - Shared library for easy access to Speech Dispatcher functions (header)
++ *
++ * Copyright (C) 2001, 2002, 2003, 2004 Brailcom, o.p.s.
++ *
++ * This is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; either version 2.1, or (at your option)
++ * any later version.
++ *
++ * This software is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
++ *
++ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.5 2024/04/23 07:27:06 robert Exp $
++ */
++
++#ifndef _LIBSPEECHD_VERSION_H
++#define _LIBSPEECHD_VERSION_H
++
++#define LIBSPEECHD_MAJOR_VERSION 0
++#define LIBSPEECHD_MINOR_VERSION 11
++#define LIBSPEECHD_MICRO_VERSION 5
++
++#endif /* ifndef _LIBSPEECHD_VERSION_H */
diff --git a/www/ungoogled-chromium/patches/patch-third_party_speech-dispatcher_speechd_types_h b/www/ungoogled-chromium/patches/patch-third_party_speech-dispatcher_speechd_types_h
new file mode 100644
index 000000000..0ed7053c5
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-third_party_speech-dispatcher_speechd_types_h
@@ -0,0 +1,143 @@
+Index: third_party/speech-dispatcher/speechd_types.h
+--- third_party/speech-dispatcher/speechd_types.h.orig
++++ third_party/speech-dispatcher/speechd_types.h
+@@ -119,4 +119,139 @@ typedef struct {
+ 	SPDVoice voice;
+ } SPDMsgSettings;
+ 
++/* TEMP_FAILURE_RETRY seems to be available only on Linux. For systems that
++ * don't have this macro we provide our own version. This code was taken from
++ * file "/usr/include/unistd.h" from Debian package "libc6-dev"
++ * version 2.3.2.ds1-20. */
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression) \
++	(__extension__ \
++	 ({ long int __result; \
++		do __result = (long int) (expression); \
++		while (__result == -1L && errno == EINTR); \
++		__result; }))
++#endif
++
++#endif /* not ifndef SPEECHD_TYPES */
++
++/*
++ * speechd_types.h - types for Speech Dispatcher
++ *
++ * Copyright (C) 2001, 2002, 2003 Brailcom, o.p.s.
++ *
++ * This is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; either version 2.1, or (at your option)
++ * any later version.
++ *
++ * This software is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
++ */
++
++#ifndef SPEECHD_TYPES_H
++#define SPEECHD_TYPES_H
++
++typedef enum {
++	SPD_PUNCT_ALL = 0,
++	SPD_PUNCT_NONE = 1,
++	SPD_PUNCT_SOME = 2,
++	SPD_PUNCT_MOST = 3
++} SPDPunctuation;
++
++typedef enum {
++	SPD_CAP_NONE = 0,
++	SPD_CAP_SPELL = 1,
++	SPD_CAP_ICON = 2
++} SPDCapitalLetters;
++
++typedef enum {
++	SPD_SPELL_OFF = 0,
++	SPD_SPELL_ON = 1
++} SPDSpelling;
++
++typedef enum {
++	SPD_MALE1 = 1,
++	SPD_MALE2 = 2,
++	SPD_MALE3 = 3,
++	SPD_FEMALE1 = 4,
++	SPD_FEMALE2 = 5,
++	SPD_FEMALE3 = 6,
++	SPD_CHILD_MALE = 7,
++	SPD_CHILD_FEMALE = 8,
++	SPD_UNSPECIFIED = -1
++} SPDVoiceType;
++
++typedef struct {
++	char *name;		/* Name of the voice (id) */
++	char *language;		/* 2/3-letter ISO language code,
++				 * possibly followed by 2/3-letter ISO region code,
++				 * e.g. en-US */
++	char *variant;		/* a not-well defined string describing dialect etc. */
++} SPDVoice;
++
++typedef enum {
++	SPD_DATA_TEXT = 0,
++	SPD_DATA_SSML = 1
++} SPDDataMode;
++
++typedef enum {
++	SPD_IMPORTANT = 1,
++	SPD_MESSAGE = 2,
++	SPD_TEXT = 3,
++	SPD_NOTIFICATION = 4,
++	SPD_PROGRESS = 5
++} SPDPriority;
++
++typedef enum {
++	SPD_BEGIN = 1,
++	SPD_END = 2,
++	SPD_INDEX_MARKS = 4,
++	SPD_CANCEL = 8,
++	SPD_PAUSE = 16,
++	SPD_RESUME = 32,
++
++	SPD_ALL = 0x3f
++} SPDNotification;
++
++typedef enum {
++	SPD_EVENT_BEGIN,
++	SPD_EVENT_END,
++	SPD_EVENT_INDEX_MARK,
++	SPD_EVENT_CANCEL,
++	SPD_EVENT_PAUSE,
++	SPD_EVENT_RESUME
++} SPDNotificationType;
++
++typedef enum {
++	SORT_BY_TIME = 0,
++	SORT_BY_ALPHABET = 1
++} ESort;
++
++typedef enum {
++	SPD_MSGTYPE_TEXT = 0,
++	SPD_MSGTYPE_SOUND_ICON = 1,
++	SPD_MSGTYPE_CHAR = 2,
++	SPD_MSGTYPE_KEY = 3,
++	SPD_MSGTYPE_SPELL = 99
++} SPDMessageType;
++
++typedef struct {
++	signed int rate;
++	signed int pitch;
++	signed int pitch_range;
++	signed int volume;
++
++	SPDPunctuation punctuation_mode;
++	SPDSpelling spelling_mode;
++	SPDCapitalLetters cap_let_recogn;
++
++	SPDVoiceType voice_type;
++	SPDVoice voice;
++} SPDMsgSettings;
++
+ #endif /* not ifndef SPEECHD_TYPES */
diff --git a/www/ungoogled-chromium/patches/patch-third_party_sqlite_src_amalgamation_sqlite3_c b/www/ungoogled-chromium/patches/patch-third_party_sqlite_src_amalgamation_sqlite3_c
index 103c90c90..cb6d759d7 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_sqlite_src_amalgamation_sqlite3_c
+++ b/www/ungoogled-chromium/patches/patch-third_party_sqlite_src_amalgamation_sqlite3_c
@@ -1,7 +1,7 @@
 Index: third_party/sqlite/src/amalgamation/sqlite3.c
 --- third_party/sqlite/src/amalgamation/sqlite3.c.orig
 +++ third_party/sqlite/src/amalgamation/sqlite3.c
-@@ -43843,7 +43843,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -44768,7 +44768,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
    memset(zBuf, 0, nBuf);
    randomnessPid = osGetpid(0);
  #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS)
@@ -14,7 +14,7 @@ Index: third_party/sqlite/src/amalgamation/sqlite3.c
      int fd, got;
      fd = robust_open("/dev/urandom", O_RDONLY, 0);
      if( fd<0 ){
-@@ -43858,6 +43863,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -44783,6 +44788,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
        robust_close(0, fd, __LINE__);
      }
    }
diff --git a/www/ungoogled-chromium/patches/patch-third_party_test_fonts_fontconfig_fontconfig_util_linux_cc b/www/ungoogled-chromium/patches/patch-third_party_test_fonts_fontconfig_fontconfig_util_linux_cc
index fef3b69b0..2dc1d3cdb 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_test_fonts_fontconfig_fontconfig_util_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_test_fonts_fontconfig_fontconfig_util_linux_cc
@@ -10,7 +10,7 @@ Index: third_party/test_fonts/fontconfig/fontconfig_util_linux.cc
  #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h"
  
  #include <fontconfig/fontconfig.h>
-@@ -15,11 +17,15 @@
+@@ -16,11 +18,15 @@
  namespace test_fonts {
  
  std::string GetSysrootDir() {
diff --git a/www/ungoogled-chromium/patches/patch-third_party_tflite_features_gni b/www/ungoogled-chromium/patches/patch-third_party_tflite_features_gni
index 334636b39..e18f03599 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_tflite_features_gni
+++ b/www/ungoogled-chromium/patches/patch-third_party_tflite_features_gni
@@ -1,12 +1,15 @@
 Index: third_party/tflite/features.gni
 --- third_party/tflite/features.gni.orig
 +++ third_party/tflite/features.gni
-@@ -7,7 +7,7 @@ import("//build/config/chrome_build.gni")
- declare_args() {
+@@ -8,9 +8,9 @@ declare_args() {
    # This enables building TFLite with XNNPACK. Currently only available for
-   # Linux or Windows on x64.
--  build_tflite_with_xnnpack = (is_win || is_linux) && current_cpu == "x64"
-+  build_tflite_with_xnnpack = ((is_win || is_linux) && current_cpu == "x64") && !is_bsd
+   # Linux or macOS arm64/x64 and Windows x64 targets.
+   build_tflite_with_xnnpack =
+-      ((is_linux || is_mac) &&
++      (((is_linux || is_mac) &&
+        (current_cpu == "arm64" || current_cpu == "x64")) ||
+-      (is_win && current_cpu == "x64")
++      (is_win && current_cpu == "x64")) && !is_bsd
  
    # Turns on TFLITE_WITH_RUY, using ruy as the gemm backend instead of gemmlowp.
    build_tflite_with_ruy = true
diff --git a/www/ungoogled-chromium/patches/patch-third_party_unrar_src_crypt_cpp b/www/ungoogled-chromium/patches/patch-third_party_unrar_src_crypt_cpp
index e8a3af4e9..9f3bde064 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_unrar_src_crypt_cpp
+++ b/www/ungoogled-chromium/patches/patch-third_party_unrar_src_crypt_cpp
@@ -1,7 +1,7 @@
 Index: third_party/unrar/src/crypt.cpp
 --- third_party/unrar/src/crypt.cpp.orig
 +++ third_party/unrar/src/crypt.cpp
-@@ -120,6 +120,8 @@ void GetRnd(byte *RndBuf,size_t BufSize)
+@@ -117,6 +117,8 @@ void GetRnd(byte *RndBuf,size_t BufSize)
      Success=CryptGenRandom(hProvider, (DWORD)BufSize, RndBuf) == TRUE;
      CryptReleaseContext(hProvider, 0);
    }
diff --git a/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-loader_src_BUILD_gn b/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-loader_src_BUILD_gn
index 5a6337cc4..78e554aa8 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-loader_src_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-loader_src_BUILD_gn
@@ -9,4 +9,4 @@ Index: third_party/vulkan-deps/vulkan-loader/src/BUILD.gn
 +      "FALLBACK_DATA_DIRS=\"/usr/X11R6/share:/usr/local/share:/usr/share\"",
      ]
    }
-   if (!vulkan_loader_shared) {
+   if (is_apple && !vulkan_loader_shared) {
diff --git a/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-loader_src_loader_vk_loader_platform_h b/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-loader_src_loader_vk_loader_platform_h
index 44ee21c5b..c9c762c2b 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-loader_src_loader_vk_loader_platform_h
+++ b/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-loader_src_loader_vk_loader_platform_h
@@ -1,7 +1,7 @@
 Index: third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h
 --- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig
 +++ third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h
-@@ -303,7 +303,15 @@ static inline char *loader_platform_executable_path(ch
+@@ -327,7 +327,15 @@ static inline char *loader_platform_executable_path(ch
  
      return buffer;
  }
@@ -16,5 +16,5 @@ Index: third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h
 +}
 +#elif defined(__Fuchsia__)
  static inline char *loader_platform_executable_path(char *buffer, size_t size) { return NULL; }
- #elif defined(__QNXNTO__)
+ #elif defined(__QNX__)
  
diff --git a/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl_instance_device_cpp b/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl_instance_device_cpp
deleted file mode 100644
index 99be84a72..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl_instance_device_cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp
---- third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp.orig
-+++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp
-@@ -26,12 +26,12 @@ bool StatelessValidation::ValidateApiVersion(uint32_t 
-             skip |= LogError(instance, "VUID-VkApplicationInfo-apiVersion-04010",
-                              "Invalid CreateInstance->pCreateInfo->pApplicationInfo.apiVersion number (0x%08x). "
-                              "Using VK_API_VERSION_%" PRIu32 "_%" PRIu32 ".",
--                             api_version, effective_api_version.major(), effective_api_version.minor());
-+                             api_version, effective_api_version.vk_major(), effective_api_version.vk_minor());
-         } else {
-             skip |= LogWarning(instance, kVUIDUndefined,
-                                "Unrecognized CreateInstance->pCreateInfo->pApplicationInfo.apiVersion number (0x%08x). "
-                                "Assuming VK_API_VERSION_%" PRIu32 "_%" PRIu32 ".",
--                               api_version, effective_api_version.major(), effective_api_version.minor());
-+                               api_version, effective_api_version.vk_major(), effective_api_version.vk_minor());
-         }
-     }
-     return skip;
diff --git a/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk_layer_utils_h b/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk_layer_utils_h
deleted file mode 100644
index b3ec327d6..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk_layer_utils_h
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_utils.h
---- third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_utils.h.orig
-+++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_utils.h
-@@ -69,7 +69,7 @@ static inline std::string StringAPIVersion(APIVersion 
-     if (!version.valid()) {
-         return "<unrecognized>";
-     }
--    version_name << version.major() << "." << version.minor() << "." << version.patch() << " (0x" << std::setfill('0')
-+    version_name << version.vk_major() << "." << version.vk_minor() << "." << version.vk_patch() << " (0x" << std::setfill('0')
-                  << std::setw(8) << std::hex << version.value() << ")";
-     return version_name.str();
- }
diff --git a/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk_extension_helper_h b/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk_extension_helper_h
deleted file mode 100644
index 7f502aab3..000000000
--- a/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk_extension_helper_h
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h
---- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h.orig
-+++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h
-@@ -87,9 +87,9 @@ class APIVersion {
- 
-     bool valid() const { return api_version_ != VVL_UNRECOGNIZED_API_VERSION; }
-     uint32_t value() const { return api_version_; }
--    uint32_t major() const { return VK_API_VERSION_MAJOR(api_version_); }
--    uint32_t minor() const { return VK_API_VERSION_MINOR(api_version_); }
--    uint32_t patch() const { return VK_API_VERSION_PATCH(api_version_); }
-+    uint32_t vk_major() const { return VK_API_VERSION_MAJOR(api_version_); }
-+    uint32_t vk_minor() const { return VK_API_VERSION_MINOR(api_version_); }
-+    uint32_t vk_patch() const { return VK_API_VERSION_PATCH(api_version_); }
- 
-     bool operator<(APIVersion api_version) const { return api_version_ < api_version.api_version_; }
-     bool operator<=(APIVersion api_version) const { return api_version_ <= api_version.api_version_; }
diff --git a/www/ungoogled-chromium/patches/patch-third_party_vulkan_memory_allocator_include_vk_mem_alloc_h b/www/ungoogled-chromium/patches/patch-third_party_vulkan_memory_allocator_include_vk_mem_alloc_h
index 3fe26f94d..6819679c5 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_vulkan_memory_allocator_include_vk_mem_alloc_h
+++ b/www/ungoogled-chromium/patches/patch-third_party_vulkan_memory_allocator_include_vk_mem_alloc_h
@@ -1,12 +1,12 @@
 Index: third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
 --- third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig
 +++ third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-@@ -2503,7 +2503,7 @@ void *vma_aligned_alloc(size_t alignment, size_t size)
- 
-     return memalign(alignment, size);
- }
--#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC))
-+#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) || defined(__OpenBSD__) || defined(__FreeBSD__)
- #include <cstdlib>
- 
- #if defined(__APPLE__)
+@@ -2760,7 +2760,7 @@ void* vma_aligned_alloc(size_t alignment, size_t size)
+ 
+     return memalign(alignment, size);
+ }
+-#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC))
++#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) || defined(__OpenBSD__) || defined(__FreeBSD__)
+ #include <cstdlib>
+ 
+ #if defined(__APPLE__)
diff --git a/www/ungoogled-chromium/patches/patch-third_party_webrtc_BUILD_gn b/www/ungoogled-chromium/patches/patch-third_party_webrtc_BUILD_gn
index f527b1ef4..d798cca01 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_webrtc_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-third_party_webrtc_BUILD_gn
@@ -1,7 +1,7 @@
 Index: third_party/webrtc/BUILD.gn
 --- third_party/webrtc/BUILD.gn.orig
 +++ third_party/webrtc/BUILD.gn
-@@ -216,6 +216,9 @@ config("common_inherited_config") {
+@@ -217,6 +217,9 @@ config("common_inherited_config") {
    if (is_linux || is_chromeos) {
      defines += [ "WEBRTC_LINUX" ]
    }
diff --git a/www/ungoogled-chromium/patches/patch-third_party_webrtc_modules_audio_device_BUILD_gn b/www/ungoogled-chromium/patches/patch-third_party_webrtc_modules_audio_device_BUILD_gn
index 37046e1ae..7bbe098ad 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_webrtc_modules_audio_device_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-third_party_webrtc_modules_audio_device_BUILD_gn
@@ -1,7 +1,7 @@
 Index: third_party/webrtc/modules/audio_device/BUILD.gn
 --- third_party/webrtc/modules/audio_device/BUILD.gn.orig
 +++ third_party/webrtc/modules/audio_device/BUILD.gn
-@@ -349,7 +349,7 @@ rtc_library("audio_device_impl") {
+@@ -348,7 +348,7 @@ rtc_library("audio_device_impl") {
      if (rtc_use_dummy_audio_file_devices) {
        defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ]
      } else {
diff --git a/www/ungoogled-chromium/patches/patch-third_party_webrtc_modules_desktop_capture_linux_x11_x_server_pixel_buffer_cc b/www/ungoogled-chromium/patches/patch-third_party_webrtc_modules_desktop_capture_linux_x11_x_server_pixel_buffer_cc
index 132fd93df..23e6c7271 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_webrtc_modules_desktop_capture_linux_x11_x_server_pixel_buffer_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_webrtc_modules_desktop_capture_linux_x11_x_server_pixel_buffer_cc
@@ -1,16 +1,24 @@
 Index: third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc
 --- third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig
 +++ third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc
-@@ -203,6 +203,12 @@ bool XServerPixelBuffer::Init(XAtomCache* cache, Windo
+@@ -201,6 +201,12 @@ bool XServerPixelBuffer::Init(XAtomCache* cache, Windo
+ }
+ 
  void XServerPixelBuffer::InitShm(const XWindowAttributes& attributes) {
-   Visual* default_visual = attributes.visual;
-   int default_depth = attributes.depth;
 +#if defined(__OpenBSD__)
 +// pledge(2)
 +  RTC_LOG(LS_WARNING) << "Unable to use shmget(2) while using pledge(2). "
 +                         "Performance may be degraded.";
 +  return;
-+#endif
++#else
+   Visual* default_visual = attributes.visual;
+   int default_depth = attributes.depth;
  
-   int major, minor;
-   Bool have_pixmaps;
+@@ -261,6 +267,7 @@ void XServerPixelBuffer::InitShm(const XWindowAttribut
+   RTC_LOG(LS_VERBOSE) << "Using X shared memory extension v" << major << "."
+                       << minor << " with" << (have_pixmaps ? "" : "out")
+                       << " pixmaps.";
++#endif
+ }
+ 
+ bool XServerPixelBuffer::InitPixmaps(int depth) {
diff --git a/www/ungoogled-chromium/patches/patch-third_party_webrtc_rtc_base_physical_socket_server_cc b/www/ungoogled-chromium/patches/patch-third_party_webrtc_rtc_base_physical_socket_server_cc
index 58674b982..6a9fc6c68 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_webrtc_rtc_base_physical_socket_server_cc
+++ b/www/ungoogled-chromium/patches/patch-third_party_webrtc_rtc_base_physical_socket_server_cc
@@ -1,7 +1,7 @@
 Index: third_party/webrtc/rtc_base/physical_socket_server.cc
 --- third_party/webrtc/rtc_base/physical_socket_server.cc.orig
 +++ third_party/webrtc/rtc_base/physical_socket_server.cc
-@@ -56,7 +56,7 @@
+@@ -54,7 +54,7 @@
  #include "rtc_base/time_utils.h"
  #include "system_wrappers/include/field_trial.h"
  
@@ -10,7 +10,7 @@ Index: third_party/webrtc/rtc_base/physical_socket_server.cc
  #include <linux/sockios.h>
  #endif
  
-@@ -75,7 +75,7 @@ typedef void* SockOptArg;
+@@ -74,7 +74,7 @@ typedef void* SockOptArg;
  
  #endif  // WEBRTC_POSIX
  
@@ -19,7 +19,7 @@ Index: third_party/webrtc/rtc_base/physical_socket_server.cc
  
  int64_t GetSocketRecvTimestamp(int socket) {
    struct timeval tv_ioctl;
-@@ -310,7 +310,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) 
+@@ -336,7 +336,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) 
      return -1;
    }
    if (opt == OPT_DONTFRAGMENT) {
@@ -28,7 +28,7 @@ Index: third_party/webrtc/rtc_base/physical_socket_server.cc
      *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
  #endif
    } else if (opt == OPT_DSCP) {
-@@ -328,7 +328,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
+@@ -365,7 +365,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
    if (TranslateOption(opt, &slevel, &sopt) == -1)
      return -1;
    if (opt == OPT_DONTFRAGMENT) {
@@ -37,7 +37,7 @@ Index: third_party/webrtc/rtc_base/physical_socket_server.cc
      value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
  #endif
    } else if (opt == OPT_DSCP) {
-@@ -356,7 +356,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
+@@ -396,7 +396,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
  int PhysicalSocket::Send(const void* pv, size_t cb) {
    int sent = DoSend(
        s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb),
@@ -46,7 +46,7 @@ Index: third_party/webrtc/rtc_base/physical_socket_server.cc
        // Suppress SIGPIPE. Without this, attempting to send on a socket whose
        // other end is closed will result in a SIGPIPE signal being raised to
        // our process, which by default will terminate the process, which we
-@@ -385,7 +385,7 @@ int PhysicalSocket::SendTo(const void* buffer,
+@@ -425,7 +425,7 @@ int PhysicalSocket::SendTo(const void* buffer,
    size_t len = addr.ToSockAddrStorage(&saddr);
    int sent =
        DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length),
@@ -55,7 +55,7 @@ Index: third_party/webrtc/rtc_base/physical_socket_server.cc
                 // Suppress SIGPIPE. See above for explanation.
                 MSG_NOSIGNAL,
  #else
-@@ -643,7 +643,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -718,7 +718,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        *slevel = IPPROTO_IP;
        *sopt = IP_DONTFRAGMENT;
        break;
@@ -64,3 +64,52 @@ Index: third_party/webrtc/rtc_base/physical_socket_server.cc
        RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported.";
        return -1;
  #elif defined(WEBRTC_POSIX)
+@@ -767,7 +767,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+       return -1;
+ #endif
+     case OPT_RECV_ECN:
+-#if defined(WEBRTC_POSIX)
++#if defined(WEBRTC_POSIX) && defined(IP_RECVTOS) 
+       if (family_ == AF_INET6) {
+         *slevel = IPPROTO_IPV6;
+         *sopt = IPV6_RECVTCLASS;
+@@ -787,10 +787,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+       *sopt = SO_KEEPALIVE;
+       break;
+     case OPT_TCP_KEEPCNT:
++#if !defined(TCP_KEEPCNT)
++      RTC_LOG(LS_WARNING) << "Socket::OPT_TCP_KEEPCNT not supported.";
++      return -1;
++#else
+       *slevel = IPPROTO_TCP;
+       *sopt = TCP_KEEPCNT;
+       break;
++#endif
+     case OPT_TCP_KEEPIDLE:
++#if !defined(TCP_KEEPALIVE)
++      RTC_LOG(LS_WARNING) << "Socket::OPT_TCP_KEEPALIVE not supported.";
++      return -1;
++#else
+       *slevel = IPPROTO_TCP;
+ #if !defined(WEBRTC_MAC)
+       *sopt = TCP_KEEPIDLE;
+@@ -798,12 +807,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+       *sopt = TCP_KEEPALIVE;
+ #endif
+       break;
++#endif
+     case OPT_TCP_KEEPINTVL:
++#if !defined(TCP_KEEPALIVE)
++      RTC_LOG(LS_WARNING) << "Socket::OPT_TCP_KEEPINTVL not supported.";
++      return -1;
++#else
+       *slevel = IPPROTO_TCP;
+       *sopt = TCP_KEEPINTVL;
+       break;
++#endif
+     case OPT_TCP_USER_TIMEOUT:
+-#if defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
++#if (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)) && defined(TCP_USER_TIMEOUT)
+       *slevel = IPPROTO_TCP;
+       *sopt = TCP_USER_TIMEOUT;
+       break;
diff --git a/www/ungoogled-chromium/patches/patch-third_party_webrtc_rtc_base_physical_socket_server_h b/www/ungoogled-chromium/patches/patch-third_party_webrtc_rtc_base_physical_socket_server_h
index 146f4bb55..8f4e14302 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_webrtc_rtc_base_physical_socket_server_h
+++ b/www/ungoogled-chromium/patches/patch-third_party_webrtc_rtc_base_physical_socket_server_h
@@ -1,12 +1,12 @@
 Index: third_party/webrtc/rtc_base/physical_socket_server.h
 --- third_party/webrtc/rtc_base/physical_socket_server.h.orig
 +++ third_party/webrtc/rtc_base/physical_socket_server.h
-@@ -14,7 +14,7 @@
- #include "api/units/time_delta.h"
+@@ -18,7 +18,7 @@
+ #include "rtc_base/third_party/sigslot/sigslot.h"
  
  #if defined(WEBRTC_POSIX)
 -#if defined(WEBRTC_LINUX)
 +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
  // On Linux, use epoll.
  #include <sys/epoll.h>
- #define WEBRTC_USE_EPOLL 1
+ 
diff --git a/www/ungoogled-chromium/patches/patch-third_party_widevine_cdm_widevine_gni b/www/ungoogled-chromium/patches/patch-third_party_widevine_cdm_widevine_gni
new file mode 100644
index 000000000..be127d073
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-third_party_widevine_cdm_widevine_gni
@@ -0,0 +1,12 @@
+Index: third_party/widevine/cdm/widevine.gni
+--- third_party/widevine/cdm/widevine.gni.orig
++++ third_party/widevine/cdm/widevine.gni
+@@ -28,6 +28,8 @@ library_widevine_cdm_available =
+     (is_chromeos &&
+      (target_cpu == "x64" || target_cpu == "arm" || target_cpu == "arm64")) ||
+     (target_os == "linux" && target_cpu == "x64") ||
++    (target_os == "openbsd" && target_cpu == "x64") ||
++    (target_os == "freebsd" && target_cpu == "x64") ||
+     (target_os == "mac" && (target_cpu == "x64" || target_cpu == "arm64")) ||
+     (target_os == "win" &&
+      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64"))
diff --git a/www/ungoogled-chromium/patches/patch-third_party_zlib_BUILD_gn b/www/ungoogled-chromium/patches/patch-third_party_zlib_BUILD_gn
index 5f11bb946..392db4a0b 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_zlib_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-third_party_zlib_BUILD_gn
@@ -1,7 +1,7 @@
 Index: third_party/zlib/BUILD.gn
 --- third_party/zlib/BUILD.gn.orig
 +++ third_party/zlib/BUILD.gn
-@@ -127,7 +127,7 @@ if (use_arm_neon_optimizations) {
+@@ -128,7 +128,7 @@ if (use_arm_neon_optimizations) {
      defines = [ "CRC32_ARMV8_CRC32" ]
      if (is_android) {
        defines += [ "ARMV8_OS_ANDROID" ]
@@ -10,7 +10,7 @@ Index: third_party/zlib/BUILD.gn
        defines += [ "ARMV8_OS_LINUX" ]
      } else if (is_mac) {
        defines += [ "ARMV8_OS_MACOS" ]
-@@ -137,6 +137,10 @@ if (use_arm_neon_optimizations) {
+@@ -138,6 +138,10 @@ if (use_arm_neon_optimizations) {
        defines += [ "ARMV8_OS_FUCHSIA" ]
      } else if (is_win) {
        defines += [ "ARMV8_OS_WINDOWS" ]
@@ -21,7 +21,7 @@ Index: third_party/zlib/BUILD.gn
      } else {
        assert(false, "Unsupported ARM OS")
      }
-@@ -408,7 +412,7 @@ static_library("minizip") {
+@@ -407,7 +411,7 @@ static_library("minizip") {
      ]
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-third_party_zlib_cpu_features_c b/www/ungoogled-chromium/patches/patch-third_party_zlib_cpu_features_c
index e5739ca6f..0f0dd0dee 100644
--- a/www/ungoogled-chromium/patches/patch-third_party_zlib_cpu_features_c
+++ b/www/ungoogled-chromium/patches/patch-third_party_zlib_cpu_features_c
@@ -1,17 +1,17 @@
 Index: third_party/zlib/cpu_features.c
 --- third_party/zlib/cpu_features.c.orig
 +++ third_party/zlib/cpu_features.c
-@@ -35,7 +35,8 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0;
- 
+@@ -39,7 +39,8 @@ int ZLIB_INTERNAL riscv_cpu_enable_vclmul = 0;
  #ifndef CPU_NO_SIMD
  
--#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS)
-+#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) || \
+ #if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || \
+-    defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS)
++    defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) || \
 +    defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD)
  #include <pthread.h>
  #endif
  
-@@ -52,6 +53,10 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0;
+@@ -56,6 +57,10 @@ int ZLIB_INTERNAL riscv_cpu_enable_vclmul = 0;
  #include <windows.h>
  #elif defined(ARMV8_OS_IOS)
  #include <sys/sysctl.h>
@@ -22,17 +22,17 @@ Index: third_party/zlib/cpu_features.c
  #elif !defined(_MSC_VER)
  #include <pthread.h>
  #else
-@@ -62,7 +67,8 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0;
- static void _cpu_check_features(void);
- #endif
- 
--#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS)
-+#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) || \
-+    defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD)
+@@ -69,7 +74,8 @@ static void _cpu_check_features(void);
+ #if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || \
+     defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || \
+     defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) || \
+-    defined(RISCV_RVV)
++    defined(RISCV_RVV) || defined(ARMV8_OS_OPENBSD) || \
++    defined(ARMV8_OS_FREEBSD)
  #if !defined(ARMV8_OS_MACOS)
  // _cpu_check_features() doesn't need to do anything on mac/arm since all
  // features are known at build time, so don't call it.
-@@ -115,6 +121,17 @@ static void _cpu_check_features(void)
+@@ -122,6 +128,17 @@ static void _cpu_check_features(void)
      unsigned long features = getauxval(AT_HWCAP2);
      arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32);
      arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL);
diff --git a/www/ungoogled-chromium/patches/patch-tools_gn_bootstrap_bootstrap_py b/www/ungoogled-chromium/patches/patch-tools_gn_bootstrap_bootstrap_py
new file mode 100644
index 000000000..1d61971ae
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-tools_gn_bootstrap_bootstrap_py
@@ -0,0 +1,12 @@
+Index: tools/gn/bootstrap/bootstrap.py
+--- tools/gn/bootstrap/bootstrap.py.orig
++++ tools/gn/bootstrap/bootstrap.py
+@@ -122,7 +122,7 @@ def main(argv):
+ 
+   shutil.copy2(
+       os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir)
+-  cmd = [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn']
++  cmd = [ninja_binary, '-C', gn_build_dir, 'gn']
+   if options.jobs:
+     cmd += ['-j', str(options.jobs)]
+   subprocess.check_call(cmd)
diff --git a/www/ungoogled-chromium/patches/patch-tools_gn_build_gen_py b/www/ungoogled-chromium/patches/patch-tools_gn_build_gen_py
index ffd1a0cf3..04a952c7f 100644
--- a/www/ungoogled-chromium/patches/patch-tools_gn_build_gen_py
+++ b/www/ungoogled-chromium/patches/patch-tools_gn_build_gen_py
@@ -14,7 +14,7 @@ Index: tools/gn/build/gen.py
    def is_posix(self):
      return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd', 'serenity']
  
-@@ -288,7 +294,7 @@ def WriteGenericNinja(path, static_libraries, executab
+@@ -304,7 +310,7 @@ def WriteGenericNinja(path, static_libraries, executab
        'linux': 'build_linux.ninja.template',
        'freebsd': 'build_linux.ninja.template',
        'aix': 'build_aix.ninja.template',
@@ -23,7 +23,7 @@ Index: tools/gn/build/gen.py
        'haiku': 'build_haiku.ninja.template',
        'solaris': 'build_linux.ninja.template',
        'netbsd': 'build_linux.ninja.template',
-@@ -512,6 +518,9 @@ def WriteGNNinja(path, platform, host, options, args_l
+@@ -539,6 +545,9 @@ def WriteGNNinja(path, platform, host, options, args_l
  
      if platform.is_posix() and not platform.is_haiku():
        ldflags.append('-pthread')
diff --git a/www/ungoogled-chromium/patches/patch-tools_grit_grit_node_base_py b/www/ungoogled-chromium/patches/patch-tools_grit_grit_node_base_py
new file mode 100644
index 000000000..0a342ce61
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-tools_grit_grit_node_base_py
@@ -0,0 +1,13 @@
+Index: tools/grit/grit/node/base.py
+--- tools/grit/grit/node/base.py.orig
++++ tools/grit/grit/node/base.py
+@@ -498,7 +498,8 @@ class Node:
+         value = defs
+ 
+       elif name == 'is_linux':
+-        value = target_platform == 'linux'
++        value = (target_platform == 'linux'
++                 or 'bsd' in target_platform)
+       elif name == 'is_chromeos':
+         value = target_platform == 'chromeos'
+       elif name == 'is_macosx':
diff --git a/www/ungoogled-chromium/patches/patch-tools_json_schema_compiler_feature_compiler_py b/www/ungoogled-chromium/patches/patch-tools_json_schema_compiler_feature_compiler_py
index 96d8c3e33..3442ac653 100644
--- a/www/ungoogled-chromium/patches/patch-tools_json_schema_compiler_feature_compiler_py
+++ b/www/ungoogled-chromium/patches/patch-tools_json_schema_compiler_feature_compiler_py
@@ -1,7 +1,7 @@
 Index: tools/json_schema_compiler/feature_compiler.py
 --- tools/json_schema_compiler/feature_compiler.py.orig
 +++ tools/json_schema_compiler/feature_compiler.py
-@@ -272,6 +272,8 @@ FEATURE_GRAMMAR = ({
+@@ -276,6 +276,8 @@ FEATURE_GRAMMAR = ({
                  'linux': 'Feature::LINUX_PLATFORM',
                  'mac': 'Feature::MACOSX_PLATFORM',
                  'win': 'Feature::WIN_PLATFORM',
diff --git a/www/ungoogled-chromium/patches/patch-tools_memory_partition_allocator_inspect_utils_h b/www/ungoogled-chromium/patches/patch-tools_memory_partition_allocator_inspect_utils_h
index 2362c02fe..8b0bdc37b 100644
--- a/www/ungoogled-chromium/patches/patch-tools_memory_partition_allocator_inspect_utils_h
+++ b/www/ungoogled-chromium/patches/patch-tools_memory_partition_allocator_inspect_utils_h
@@ -1,7 +1,7 @@
 Index: tools/memory/partition_allocator/inspect_utils.h
 --- tools/memory/partition_allocator/inspect_utils.h.orig
 +++ tools/memory/partition_allocator/inspect_utils.h
-@@ -60,7 +60,7 @@ class RemoteProcessMemoryReader {
+@@ -61,7 +61,7 @@ class RemoteProcessMemoryReader {
    const pid_t pid_;
    bool is_valid_;
  
diff --git a/www/ungoogled-chromium/patches/patch-tools_perf_chrome_telemetry_build_BUILD_gn b/www/ungoogled-chromium/patches/patch-tools_perf_chrome_telemetry_build_BUILD_gn
index fdfd1d9ed..530093bba 100644
--- a/www/ungoogled-chromium/patches/patch-tools_perf_chrome_telemetry_build_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-tools_perf_chrome_telemetry_build_BUILD_gn
@@ -10,7 +10,7 @@ Index: tools/perf/chrome_telemetry_build/BUILD.gn
      data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
  
      # CrOS currently has issues with the locally compiled version of
-@@ -172,7 +172,7 @@ group("telemetry_chrome_test_without_chrome") {
+@@ -178,7 +178,7 @@ group("telemetry_chrome_test_without_chrome") {
    ]
  
    # Cr-Fuchsia doesn't support breakpad.
diff --git a/www/ungoogled-chromium/patches/patch-tools_protoc_wrapper_protoc_wrapper_py b/www/ungoogled-chromium/patches/patch-tools_protoc_wrapper_protoc_wrapper_py
index 66719fb87..07703b443 100644
--- a/www/ungoogled-chromium/patches/patch-tools_protoc_wrapper_protoc_wrapper_py
+++ b/www/ungoogled-chromium/patches/patch-tools_protoc_wrapper_protoc_wrapper_py
@@ -1,7 +1,7 @@
 Index: tools/protoc_wrapper/protoc_wrapper.py
 --- tools/protoc_wrapper/protoc_wrapper.py.orig
 +++ tools/protoc_wrapper/protoc_wrapper.py
-@@ -175,15 +175,19 @@ def main(argv):
+@@ -179,15 +179,19 @@ def main(argv):
      if not options.exclude_imports:
        protoc_cmd += ["--include_imports"]
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_aura_screen_ozone_cc b/www/ungoogled-chromium/patches/patch-ui_aura_screen_ozone_cc
index b3a0dcfc5..36ee1973b 100644
--- a/www/ungoogled-chromium/patches/patch-ui_aura_screen_ozone_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_aura_screen_ozone_cc
@@ -1,7 +1,7 @@
 Index: ui/aura/screen_ozone.cc
 --- ui/aura/screen_ozone.cc.orig
 +++ ui/aura/screen_ozone.cc
-@@ -110,7 +110,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons
+@@ -106,7 +106,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons
    return platform_screen_->GetPrimaryDisplay();
  }
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_aura_screen_ozone_h b/www/ungoogled-chromium/patches/patch-ui_aura_screen_ozone_h
index d8a89cbd5..590d8eda9 100644
--- a/www/ungoogled-chromium/patches/patch-ui_aura_screen_ozone_h
+++ b/www/ungoogled-chromium/patches/patch-ui_aura_screen_ozone_h
@@ -1,7 +1,7 @@
 Index: ui/aura/screen_ozone.h
 --- ui/aura/screen_ozone.h.orig
 +++ ui/aura/screen_ozone.h
-@@ -46,7 +46,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen
+@@ -44,7 +44,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen
    display::Display GetDisplayMatching(
        const gfx::Rect& match_rect) const override;
    display::Display GetPrimaryDisplay() const override;
@@ -10,7 +10,7 @@ Index: ui/aura/screen_ozone.h
    std::unique_ptr<display::Screen::ScreenSaverSuspender> SuspendScreenSaver()
        override;
  #endif  // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-@@ -73,7 +73,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen
+@@ -71,7 +71,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen
    ui::PlatformScreen* platform_screen() { return platform_screen_.get(); }
  
   private:
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_clipboard_clipboard_constants_cc b/www/ungoogled-chromium/patches/patch-ui_base_clipboard_clipboard_constants_cc
index 71e2e3867..8a13c86d7 100644
--- a/www/ungoogled-chromium/patches/patch-ui_base_clipboard_clipboard_constants_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_base_clipboard_clipboard_constants_cc
@@ -1,7 +1,7 @@
 Index: ui/base/clipboard/clipboard_constants.cc
 --- ui/base/clipboard/clipboard_constants.cc.orig
 +++ ui/base/clipboard/clipboard_constants.cc
-@@ -24,7 +24,7 @@ const char kMimeTypeOctetStream[] = "application/octet
+@@ -25,7 +25,7 @@ const char kMimeTypeOctetStream[] = "application/octet
  // Used for window dragging on some platforms.
  const char kMimeTypeWindowDrag[] = "chromium/x-window-drag";
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_clipboard_clipboard_constants_h b/www/ungoogled-chromium/patches/patch-ui_base_clipboard_clipboard_constants_h
index 177f81bb6..21a47ff24 100644
--- a/www/ungoogled-chromium/patches/patch-ui_base_clipboard_clipboard_constants_h
+++ b/www/ungoogled-chromium/patches/patch-ui_base_clipboard_clipboard_constants_h
@@ -1,7 +1,7 @@
 Index: ui/base/clipboard/clipboard_constants.h
 --- ui/base/clipboard/clipboard_constants.h.orig
 +++ ui/base/clipboard/clipboard_constants.h
-@@ -47,7 +47,7 @@ extern const char kMimeTypeDataTransferEndpoint[];
+@@ -48,7 +48,7 @@ extern const char kMimeTypeDataTransferEndpoint[];
  
  // ----- LINUX & CHROMEOS & FUCHSIA MIME TYPES -----
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_clipboard_clipboard_non_backed_cc b/www/ungoogled-chromium/patches/patch-ui_base_clipboard_clipboard_non_backed_cc
new file mode 100644
index 000000000..ce9314649
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_base_clipboard_clipboard_non_backed_cc
@@ -0,0 +1,12 @@
+Index: ui/base/clipboard/clipboard_non_backed.cc
+--- ui/base/clipboard/clipboard_non_backed.cc.orig
++++ ui/base/clipboard/clipboard_non_backed.cc
+@@ -460,7 +460,7 @@ ClipboardNonBacked::ClipboardNonBacked() {
+   // so create internal clipboards for platform supported clipboard buffers.
+   constexpr ClipboardBuffer kClipboardBuffers[] = {
+     ClipboardBuffer::kCopyPaste,
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+     ClipboardBuffer::kSelection,
+ #endif
+ #if BUILDFLAG(IS_MAC)
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_cursor_cursor_factory_cc b/www/ungoogled-chromium/patches/patch-ui_base_cursor_cursor_factory_cc
index 7f6509540..4645bcf0d 100644
--- a/www/ungoogled-chromium/patches/patch-ui_base_cursor_cursor_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_base_cursor_cursor_factory_cc
@@ -1,7 +1,7 @@
 Index: ui/base/cursor/cursor_factory.cc
 --- ui/base/cursor/cursor_factory.cc.orig
 +++ ui/base/cursor/cursor_factory.cc
-@@ -98,7 +98,7 @@ void CursorFactory::ObserveThemeChanges() {
+@@ -97,7 +97,7 @@ void CursorFactory::ObserveThemeChanges() {
    NOTIMPLEMENTED();
  }
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_dragdrop_os_exchange_data_provider_non_backed_cc b/www/ungoogled-chromium/patches/patch-ui_base_dragdrop_os_exchange_data_provider_non_backed_cc
index 7c5051a1f..a48615b4c 100644
--- a/www/ungoogled-chromium/patches/patch-ui_base_dragdrop_os_exchange_data_provider_non_backed_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_base_dragdrop_os_exchange_data_provider_non_backed_cc
@@ -1,10 +1,10 @@
 Index: ui/base/dragdrop/os_exchange_data_provider_non_backed.cc
 --- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig
 +++ ui/base/dragdrop/os_exchange_data_provider_non_backed.cc
-@@ -94,7 +94,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData(
- }
+@@ -99,7 +99,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData(
  
- bool OSExchangeDataProviderNonBacked::GetString(std::u16string* data) const {
+ std::optional<std::u16string> OSExchangeDataProviderNonBacked::GetString()
+     const {
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    if (HasFile()) {
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_ime_fake_text_input_client_cc b/www/ungoogled-chromium/patches/patch-ui_base_ime_fake_text_input_client_cc
index 34e3c7be5..bc1789007 100644
--- a/www/ungoogled-chromium/patches/patch-ui_base_ime_fake_text_input_client_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_base_ime_fake_text_input_client_cc
@@ -1,7 +1,7 @@
 Index: ui/base/ime/fake_text_input_client.cc
 --- ui/base/ime/fake_text_input_client.cc.orig
 +++ ui/base/ime/fake_text_input_client.cc
-@@ -171,7 +171,7 @@ bool FakeTextInputClient::ShouldDoLearning() {
+@@ -205,7 +205,7 @@ bool FakeTextInputClient::ShouldDoLearning() {
    return false;
  }
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_ime_fake_text_input_client_h b/www/ungoogled-chromium/patches/patch-ui_base_ime_fake_text_input_client_h
index 1a7ecc5be..70bbf9a39 100644
--- a/www/ungoogled-chromium/patches/patch-ui_base_ime_fake_text_input_client_h
+++ b/www/ungoogled-chromium/patches/patch-ui_base_ime_fake_text_input_client_h
@@ -1,7 +1,7 @@
 Index: ui/base/ime/fake_text_input_client.h
 --- ui/base/ime/fake_text_input_client.h.orig
 +++ ui/base/ime/fake_text_input_client.h
-@@ -74,7 +74,7 @@ class FakeTextInputClient : public TextInputClient {
+@@ -96,7 +96,7 @@ class FakeTextInputClient : public TextInputClient {
    void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override;
    ukm::SourceId GetClientSourceForMetrics() const override;
    bool ShouldDoLearning() override;
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_ime_init_input_method_initializer_cc b/www/ungoogled-chromium/patches/patch-ui_base_ime_init_input_method_initializer_cc
new file mode 100644
index 000000000..b56749f93
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_base_ime_init_input_method_initializer_cc
@@ -0,0 +1,30 @@
+Index: ui/base/ime/init/input_method_initializer.cc
+--- ui/base/ime/init/input_method_initializer.cc.orig
++++ ui/base/ime/init/input_method_initializer.cc
+@@ -10,7 +10,7 @@
+ #include "build/chromeos_buildflags.h"
+ 
+ #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \
+-    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+ #include "ui/base/ime/linux/fake_input_method_context.h"
+ #include "ui/base/ime/linux/linux_input_method_context_factory.h"
+ #elif BUILDFLAG(IS_WIN)
+@@ -43,7 +43,7 @@ void RestartInputMethod() {
+ }
+ 
+ void InitializeInputMethodForTesting() {
+-#if defined(USE_AURA) && BUILDFLAG(IS_LINUX)
++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
+   GetInputMethodContextFactoryForTest() =
+       base::BindRepeating([](LinuxInputMethodContextDelegate* delegate)
+                               -> std::unique_ptr<LinuxInputMethodContext> {
+@@ -56,7 +56,7 @@ void InitializeInputMethodForTesting() {
+ 
+ void ShutdownInputMethodForTesting() {
+ #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \
+-    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+   // The function owns the factory (as a static variable that's returned by
+   // reference), so setting this to an empty factory will free the old one.
+   GetInputMethodContextFactoryForTest() = LinuxInputMethodContextFactory();
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_test_ui_controls_h b/www/ungoogled-chromium/patches/patch-ui_base_test_ui_controls_h
new file mode 100644
index 000000000..6ef8a78d4
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_base_test_ui_controls_h
@@ -0,0 +1,12 @@
+Index: ui/base/test/ui_controls.h
+--- ui/base/test/ui_controls.h.orig
++++ ui/base/test/ui_controls.h
+@@ -186,7 +186,7 @@ bool SendTouchEventsNotifyWhenDone(int action,
+                                    base::OnceClosure task);
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Forces the platform implementation to use screen coordinates, even if they're
+ // not really available, the next time that ui_controls::SendMouseMove() or
+ // ui_controls::SendMouseMoveNotifyWhenDone() is called, or some other method
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_ui_base_features_cc b/www/ungoogled-chromium/patches/patch-ui_base_ui_base_features_cc
index 925788ffd..a96b9b7bc 100644
--- a/www/ungoogled-chromium/patches/patch-ui_base_ui_base_features_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_base_ui_base_features_cc
@@ -1,16 +1,7 @@
 Index: ui/base/ui_base_features.cc
 --- ui/base/ui_base_features.cc.orig
 +++ ui/base/ui_base_features.cc
-@@ -113,7 +113,7 @@ BASE_FEATURE(kAlwaysConfirmComposition,
-              base::FEATURE_ENABLED_BY_DEFAULT);
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
- 
--#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kRedundantImeCompositionClearing,
-              "RedundantImeCompositionClearing",
-              base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -212,7 +212,7 @@ BASE_FEATURE(kExperimentalFlingAnimation,
+@@ -228,7 +228,7 @@ BASE_FEATURE(kExperimentalFlingAnimation,
               "ExperimentalFlingAnimation",
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -19,21 +10,12 @@ Index: ui/base/ui_base_features.cc
      (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
       !BUILDFLAG(IS_CHROMEOS_LACROS))
               base::FEATURE_ENABLED_BY_DEFAULT
-@@ -319,7 +319,7 @@ bool IsForcedColorsEnabled() {
- // milestones.
+@@ -327,7 +327,7 @@ bool IsForcedColorsEnabled() {
  BASE_FEATURE(kEyeDropper,
               "EyeDropper",
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -531,7 +531,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() {
-   return level;
- }
- 
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- BASE_FEATURE(kWebUiSystemFont,
-              "WebUiSystemFont",
-              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_ui_base_features_h b/www/ungoogled-chromium/patches/patch-ui_base_ui_base_features_h
deleted file mode 100644
index ec1f8f3d2..000000000
--- a/www/ungoogled-chromium/patches/patch-ui_base_ui_base_features_h
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: ui/base/ui_base_features.h
---- ui/base/ui_base_features.h.orig
-+++ ui/base/ui_base_features.h
-@@ -133,7 +133,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
- BASE_DECLARE_FEATURE(kAlwaysConfirmComposition);
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
- 
--#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(UI_BASE_FEATURES)
- BASE_DECLARE_FEATURE(kRedundantImeCompositionClearing);
- #endif  // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-@@ -266,7 +266,7 @@ enum class ChromeRefresh2023Level {
- COMPONENT_EXPORT(UI_BASE_FEATURES)
- ChromeRefresh2023Level GetChromeRefresh2023Level();
- 
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(UI_BASE_FEATURES) BASE_DECLARE_FEATURE(kWebUiSystemFont);
- #endif
- 
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_ui_base_switches_cc b/www/ungoogled-chromium/patches/patch-ui_base_ui_base_switches_cc
new file mode 100644
index 000000000..4c8a5f722
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_base_ui_base_switches_cc
@@ -0,0 +1,19 @@
+Index: ui/base/ui_base_switches.cc
+--- ui/base/ui_base_switches.cc.orig
++++ ui/base/ui_base_switches.cc
+@@ -31,13 +31,13 @@ const char kShowMacOverlayBorders[] = "show-mac-overla
+ const char kEnableResourcesFileSharing[] = "enable-resources-file-sharing";
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // Specifies system font family name. Improves determenism when rendering
+ // pages in headless mode.
+ const char kSystemFontFamily[] = "system-font-family";
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Specify the toolkit used to construct the Linux GUI.
+ const char kUiToolkitFlag[] = "ui-toolkit";
+ #endif
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_ui_base_switches_h b/www/ungoogled-chromium/patches/patch-ui_base_ui_base_switches_h
new file mode 100644
index 000000000..1bdf50241
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_base_ui_base_switches_h
@@ -0,0 +1,17 @@
+Index: ui/base/ui_base_switches.h
+--- ui/base/ui_base_switches.h.orig
++++ ui/base/ui_base_switches.h
+@@ -27,11 +27,11 @@ COMPONENT_EXPORT(UI_BASE) extern const char kShowMacOv
+ COMPONENT_EXPORT(UI_BASE) extern const char kEnableResourcesFileSharing[];
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(UI_BASE) extern const char kSystemFontFamily[];
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(UI_BASE) extern const char kUiToolkitFlag[];
+ #endif
+ 
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_ui_base_types_h b/www/ungoogled-chromium/patches/patch-ui_base_ui_base_types_h
deleted file mode 100644
index 2eb5787d8..000000000
--- a/www/ungoogled-chromium/patches/patch-ui_base_ui_base_types_h
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ui/base/ui_base_types.h
---- ui/base/ui_base_types.h.orig
-+++ ui/base/ui_base_types.h
-@@ -32,7 +32,7 @@ enum WindowShowState {
-   SHOW_STATE_END = 6  // The end of show state enum.
- };
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- // Specifies which edges of the window are tiled.
- //
- // Wayland can notify the application if certain edge of the window is
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_webui_web_ui_util_cc b/www/ungoogled-chromium/patches/patch-ui_base_webui_web_ui_util_cc
index b9df7454f..859347454 100644
--- a/www/ungoogled-chromium/patches/patch-ui_base_webui_web_ui_util_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_base_webui_web_ui_util_cc
@@ -5,12 +5,12 @@ Index: ui/base/webui/web_ui_util.cc
  constexpr float kMaxScaleFactor = 1000.0f;
  
  std::string GetFontFamilyMd() {
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(features::kWebUiSystemFont)) {
-     return GetFontFamily();
-   }
-@@ -219,7 +219,7 @@ std::string GetFontFamily() {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return "Roboto, " + GetFontFamily();
+ #else
+   return GetFontFamily();
+@@ -217,7 +217,7 @@ std::string GetFontFamily() {
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_x_x11_cursor_factory_cc b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_cursor_factory_cc
index 4dcfb0e88..c113d3f0b 100644
--- a/www/ungoogled-chromium/patches/patch-ui_base_x_x11_cursor_factory_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_cursor_factory_cc
@@ -10,7 +10,7 @@ Index: ui/base/x/x11_cursor_factory.cc
  #include "ui/linux/linux_ui.h"
  #endif
  
-@@ -62,7 +62,7 @@ scoped_refptr<PlatformCursor> X11CursorFactory::Create
+@@ -70,7 +70,7 @@ scoped_refptr<PlatformCursor> X11CursorFactory::Create
  }
  
  void X11CursorFactory::ObserveThemeChanges() {
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_x_x11_cursor_factory_h b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_cursor_factory_h
index ec58d913e..5d2e9f76b 100644
--- a/www/ungoogled-chromium/patches/patch-ui_base_x_x11_cursor_factory_h
+++ b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_cursor_factory_h
@@ -10,9 +10,9 @@ Index: ui/base/x/x11_cursor_factory.h
  class LinuxUi;
  #endif
  
-@@ -60,7 +60,7 @@ class COMPONENT_EXPORT(UI_BASE_X) X11CursorFactory
- 
-   std::map<mojom::CursorType, scoped_refptr<X11Cursor>> default_cursors_;
+@@ -62,7 +62,7 @@ class COMPONENT_EXPORT(UI_BASE_X) X11CursorFactory
+   // initializing `cursor_loader_` will modify `default_cursors_`.
+   std::unique_ptr<XCursorLoader> cursor_loader_;
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_x_x11_cursor_loader_cc b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_cursor_loader_cc
index c9147f176..8f0348914 100644
--- a/www/ungoogled-chromium/patches/patch-ui_base_x_x11_cursor_loader_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_cursor_loader_cc
@@ -1,16 +1,16 @@
 Index: ui/base/x/x11_cursor_loader.cc
 --- ui/base/x/x11_cursor_loader.cc.orig
 +++ ui/base/x/x11_cursor_loader.cc
-@@ -32,7 +32,7 @@
+@@ -31,7 +31,7 @@
+ #include "ui/gfx/x/connection.h"
  #include "ui/gfx/x/xproto.h"
- #include "ui/gfx/x/xproto_util.h"
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "ui/linux/linux_ui.h"
  #endif
  
-@@ -138,7 +138,11 @@ std::string CursorPathFromLibXcursor() {
+@@ -137,7 +137,11 @@ std::string CursorPathFromLibXcursor() {
      void operator()(void* ptr) const { dlclose(ptr); }
    };
  
@@ -22,7 +22,7 @@ Index: ui/base/x/x11_cursor_loader.cc
    if (!lib)
      return "";
  
-@@ -249,7 +253,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile(
+@@ -248,7 +252,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile(
      const std::string& rm_xcursor_theme) {
    constexpr const char kDefaultTheme[] = "default";
    std::string themes[] = {
@@ -31,9 +31,9 @@ Index: ui/base/x/x11_cursor_loader.cc
      // The toolkit theme has the highest priority.
      LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName()
                          : std::string(),
-@@ -443,7 +447,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const
-   if (base::StringToInt(GetEnv(kXcursorSizeEnv), &size) && size > 0)
+@@ -440,7 +444,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const
      return size;
+   }
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_x_x11_display_manager_cc b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_display_manager_cc
new file mode 100644
index 000000000..de528397c
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_display_manager_cc
@@ -0,0 +1,21 @@
+Index: ui/base/x/x11_display_manager.cc
+--- ui/base/x/x11_display_manager.cc.orig
++++ ui/base/x/x11_display_manager.cc
+@@ -16,7 +16,7 @@
+ #include "ui/gfx/x/randr.h"
+ #include "ui/gfx/x/xproto.h"
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/linux/linux_ui.h"
+ #endif
+ 
+@@ -92,7 +92,7 @@ void XDisplayManager::FetchDisplayList() {
+           ? display::Display::GetForcedDeviceScaleFactor()
+           : 1.0f};
+   const auto* display_config = &empty_display_config;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (const auto* linux_ui = ui::LinuxUi::instance()) {
+     display_config = &linux_ui->display_config();
+   }
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_x_x11_display_util_cc b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_display_util_cc
new file mode 100644
index 000000000..3e8460089
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_display_util_cc
@@ -0,0 +1,368 @@
+revert 37e4cda28fd3d7a5f4f7ffb1057a3604dba683db
+
+Index: ui/base/x/x11_display_util.cc
+--- ui/base/x/x11_display_util.cc.orig
++++ ui/base/x/x11_display_util.cc
+@@ -14,7 +14,6 @@
+ 
+ #include "base/bits.h"
+ #include "base/command_line.h"
+-#include "base/containers/flat_map.h"
+ #include "base/logging.h"
+ #include "base/numerics/clamped_math.h"
+ #include "base/ranges/algorithm.h"
+@@ -28,7 +27,6 @@
+ #include "ui/gfx/geometry/rect.h"
+ #include "ui/gfx/geometry/rect_conversions.h"
+ #include "ui/gfx/geometry/rect_f.h"
+-#include "ui/gfx/switches.h"
+ #include "ui/gfx/x/atom_cache.h"
+ #include "ui/gfx/x/connection.h"
+ #include "ui/gfx/x/randr.h"
+@@ -43,89 +41,42 @@ constexpr std::pair<uint32_t, uint32_t> kMinVersionXra
+ 
+ constexpr const char kRandrEdidProperty[] = "EDID";
+ 
+-std::map<x11::RandR::Output, size_t> GetMonitors(
+-    const x11::Response<x11::RandR::GetMonitorsReply>& reply) {
+-  std::map<x11::RandR::Output, size_t> output_to_monitor;
+-  if (!reply) {
+-    return output_to_monitor;
+-  }
+-  for (size_t monitor = 0; monitor < reply->monitors.size(); monitor++) {
+-    for (x11::RandR::Output output : reply->monitors[monitor].outputs) {
+-      output_to_monitor[output] = monitor;
++std::map<x11::RandR::Output, int> GetMonitors(
++    std::pair<uint32_t, uint32_t> version,
++    x11::RandR* randr,
++    x11::Window window) {
++  std::map<x11::RandR::Output, int> output_to_monitor;
++  if (version >= std::pair<uint32_t, uint32_t>{1, 5}) {
++    if (auto reply = randr->GetMonitors({window}).Sync()) {
++      for (size_t monitor = 0; monitor < reply->monitors.size(); monitor++) {
++        for (x11::RandR::Output output : reply->monitors[monitor].outputs) {
++          output_to_monitor[output] = monitor;
++        }
++      }
+     }
+   }
+   return output_to_monitor;
+ }
+ 
+-x11::Future<x11::GetPropertyReply> GetWorkAreaFuture(
+-    x11::Connection* connection) {
+-  return connection->GetProperty({
+-      .window = connection->default_root(),
+-      .property = connection->GetAtom("_NET_WORKAREA"),
+-      .long_length = 4,
+-  });
+-}
+-
+-gfx::Rect GetWorkAreaSync(x11::Future<x11::GetPropertyReply> future) {
+-  auto response = future.Sync();
+-  if (!response || response->format != 32 || response->value_len != 4) {
+-    return gfx::Rect();
+-  }
+-  const uint32_t* value = response->value->front_as<uint32_t>();
+-  return gfx::Rect(value[0], value[1], value[2], value[3]);
+-}
+-
+-x11::Future<x11::GetPropertyReply> GetIccProfileFuture(
+-    x11::Connection* connection,
+-    size_t monitor) {
+-  std::string atom_name = monitor == 0
+-                              ? "_ICC_PROFILE"
+-                              : base::StringPrintf("_ICC_PROFILE_%zu", monitor);
+-  auto future = connection->GetProperty({
+-      .window = connection->default_root(),
+-      .property = x11::GetAtom(atom_name.c_str()),
+-      .long_length = std::numeric_limits<uint32_t>::max(),
+-  });
+-  future.IgnoreError();
+-  return future;
+-}
+-
+-gfx::ICCProfile GetIccProfileSync(x11::Future<x11::GetPropertyReply> future) {
+-  auto response = future.Sync();
+-  if (!response || !response->value->size()) {
+-    return gfx::ICCProfile();
+-  }
+-  return gfx::ICCProfile::FromData(response->value->data(),
+-                                   response->value->size());
+-}
+-
+-x11::Future<x11::RandR::GetOutputPropertyReply> GetEdidFuture(
+-    x11::Connection* connection,
+-    x11::RandR::Output output) {
+-  auto future = connection->randr().GetOutputProperty({
+-      .output = output,
+-      .property = x11::GetAtom(kRandrEdidProperty),
+-      .long_length = 128,
+-  });
+-  future.IgnoreError();
+-  return future;
+-}
+-
+ // Sets the work area on a list of displays.  The work area for each display
+ // must already be initialized to the display bounds.  At most one display out
+ // of |displays| will be affected.
+ void ClipWorkArea(std::vector<display::Display>* displays,
+-                  size_t primary_display_index,
+-                  const gfx::Rect& net_workarea) {
+-  if (net_workarea.IsEmpty()) {
++                  size_t primary_display_index) {
++  x11::Window x_root_window = ui::GetX11RootWindow();
++
++  std::vector<int32_t> value;
++  if (!x11::Connection::Get()->GetArrayProperty(
++          x_root_window, x11::GetAtom("_NET_WORKAREA"), &value) ||
++      value.size() < 4) {
+     return;
+   }
+-
+   auto get_work_area = [&](const display::Display& display) {
+     float scale = display::Display::HasForceDeviceScaleFactor()
+                       ? display::Display::GetForcedDeviceScaleFactor()
+                       : display.device_scale_factor();
+-    return gfx::ScaleToEnclosingRect(net_workarea, 1.0f / scale);
++    return gfx::ScaleToEnclosingRect(
++        gfx::Rect(value[0], value[1], value[2], value[3]), 1.0f / scale);
+   };
+ 
+   // If the work area entirely contains exactly one display, assume it's meant
+@@ -207,9 +158,14 @@ int DefaultBitsPerComponent() {
+   return visual.bits_per_rgb_value;
+ }
+ 
+-// Get the EDID data from the `output` and stores to `edid`.
+-std::vector<uint8_t> GetEdidProperty(
+-    x11::Response<x11::RandR::GetOutputPropertyReply> response) {
++// Get the EDID data from the |output| and stores to |edid|.
++std::vector<uint8_t> GetEDIDProperty(x11::RandR* randr,
++                                     x11::RandR::Output output) {
++  auto future = randr->GetOutputProperty(x11::RandR::GetOutputPropertyRequest{
++      .output = output,
++      .property = x11::GetAtom(kRandrEdidProperty),
++      .long_length = 128});
++  auto response = future.Sync();
+   std::vector<uint8_t> edid;
+   if (response && response->format == 8 && response->type != x11::Atom::None) {
+     edid = std::move(response->data);
+@@ -261,8 +217,7 @@ gfx::PointF DisplayOriginPxToDip(const display::Displa
+ std::vector<display::Display> GetFallbackDisplayList(
+     float scale,
+     size_t* primary_display_index_out) {
+-  auto* connection = x11::Connection::Get();
+-  const auto& screen = connection->default_screen();
++  const auto& screen = x11::Connection::Get()->default_screen();
+   gfx::Size physical_size(screen.width_in_millimeters,
+                           screen.height_in_millimeters);
+ 
+@@ -289,9 +244,7 @@ std::vector<display::Display> GetFallbackDisplayList(
+   std::vector<display::Display> displays{gfx_display};
+   *primary_display_index_out = 0;
+ 
+-  ClipWorkArea(&displays, *primary_display_index_out,
+-               GetWorkAreaSync(GetWorkAreaFuture(connection)));
+-
++  ClipWorkArea(&displays, *primary_display_index_out);
+   return displays;
+ }
+ 
+@@ -307,16 +260,7 @@ std::vector<display::Display> BuildDisplaysFromXRandRI
+   auto x_root_window = ui::GetX11RootWindow();
+   std::vector<display::Display> displays;
+ 
+-  auto resources_future = randr.GetScreenResourcesCurrent({x_root_window});
+-  auto output_primary_future = randr.GetOutputPrimary({x_root_window});
+-  x11::Future<x11::RandR::GetMonitorsReply> monitors_future;
+-  if (connection->randr_version() >= std::pair<uint32_t, uint32_t>{1, 5}) {
+-    monitors_future = randr.GetMonitors(x_root_window);
+-  }
+-  auto work_area_future = GetWorkAreaFuture(connection);
+-  connection->Flush();
+-
+-  auto resources = resources_future.Sync();
++  auto resources = randr.GetScreenResourcesCurrent({x_root_window}).Sync();
+   if (!resources) {
+     LOG(ERROR) << "XRandR returned no displays; falling back to root window";
+     return GetFallbackDisplayList(primary_scale, primary_display_index_out);
+@@ -325,65 +269,21 @@ std::vector<display::Display> BuildDisplaysFromXRandRI
+   const int depth = connection->default_screen().root_depth;
+   const int bits_per_component = DefaultBitsPerComponent();
+ 
+-  auto output_primary = output_primary_future.Sync();
++  std::map<x11::RandR::Output, int> output_to_monitor =
++      GetMonitors(connection->randr_version(), &randr, x_root_window);
++  auto output_primary = randr.GetOutputPrimary({x_root_window}).Sync();
+   if (!output_primary) {
+     return GetFallbackDisplayList(primary_scale, primary_display_index_out);
+   }
+   x11::RandR::Output primary_display_id = output_primary->output;
+ 
+-  const auto monitors_reply = monitors_future.Sync();
+-  const auto output_to_monitor = GetMonitors(monitors_reply);
+-  const size_t n_iccs =
+-      monitors_reply ? std::max<size_t>(1, monitors_reply->monitors.size()) : 1;
+-
+   int explicit_primary_display_index = -1;
+   int monitor_order_primary_display_index = -1;
+ 
+-  std::vector<x11::Future<x11::RandR::GetCrtcInfoReply>> crtc_futures{};
+-  crtc_futures.reserve(resources->crtcs.size());
+-  for (auto crtc : resources->crtcs) {
+-    crtc_futures.push_back(
+-        randr.GetCrtcInfo({crtc, resources->config_timestamp}));
+-  }
+-  connection->Flush();
+-
+-  std::vector<x11::Future<x11::GetPropertyReply>> icc_futures{n_iccs};
+-  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless)) {
+-    for (size_t monitor = 0; monitor < n_iccs; ++monitor) {
+-      icc_futures[monitor] = GetIccProfileFuture(connection, monitor);
+-    }
+-    connection->Flush();
+-  }
+-
+-  std::vector<x11::Future<x11::RandR::GetOutputInfoReply>> output_futures{};
+-  output_futures.reserve(resources->outputs.size());
+-  for (auto output : resources->outputs) {
+-    output_futures.push_back(
+-        randr.GetOutputInfo({output, resources->config_timestamp}));
+-  }
+-  connection->Flush();
+-
+-  std::vector<x11::Future<x11::RandR::GetOutputPropertyReply>> edid_futures{};
+-  edid_futures.reserve(resources->outputs.size());
+-  for (auto output : resources->outputs) {
+-    edid_futures.push_back(GetEdidFuture(connection, output));
+-  }
+-  connection->Flush();
+-
+-  base::flat_map<x11::RandR::Crtc, x11::RandR::GetCrtcInfoResponse> crtcs;
+-  for (size_t i = 0; i < resources->crtcs.size(); ++i) {
+-    crtcs.emplace(resources->crtcs[i], crtc_futures[i].Sync());
+-  }
+-
+-  std::vector<gfx::ICCProfile> iccs;
+-  iccs.reserve(n_iccs);
+-  for (auto& future : icc_futures) {
+-    iccs.push_back(GetIccProfileSync(std::move(future)));
+-  }
+-
+   for (size_t i = 0; i < resources->outputs.size(); i++) {
+     x11::RandR::Output output_id = resources->outputs[i];
+-    auto output_info = output_futures[i].Sync();
++    auto output_info =
++        randr.GetOutputInfo({output_id, resources->config_timestamp}).Sync();
+     if (!output_info) {
+       continue;
+     }
+@@ -398,16 +298,15 @@ std::vector<display::Display> BuildDisplaysFromXRandRI
+       continue;
+     }
+ 
+-    auto crtc_it = crtcs.find(output_info->crtc);
+-    if (crtc_it == crtcs.end()) {
+-      continue;
+-    }
+-    const auto& crtc = crtc_it->second;
++    auto crtc =
++        randr.GetCrtcInfo({output_info->crtc, resources->config_timestamp})
++            .Sync();
+     if (!crtc) {
+       continue;
+     }
+ 
+-    display::EdidParser edid_parser(GetEdidProperty(edid_futures[i].Sync()));
++    display::EdidParser edid_parser(
++        GetEDIDProperty(&randr, static_cast<x11::RandR::Output>(output_id)));
+     auto output_32 = static_cast<uint32_t>(output_id);
+     int64_t display_id =
+         output_32 > 0xff ? 0 : edid_parser.GetIndexBasedDisplayId(output_32);
+@@ -462,9 +361,8 @@ std::vector<display::Display> BuildDisplaysFromXRandRI
+     }
+ 
+     if (!display::HasForceDisplayColorProfile()) {
+-      const size_t monitor =
+-          monitor_iter == output_to_monitor.end() ? 0 : monitor_iter->second;
+-      const auto& icc_profile = iccs[monitor < iccs.size() ? monitor : 0];
++      gfx::ICCProfile icc_profile = ui::GetICCProfileForMonitor(
++          monitor_iter == output_to_monitor.end() ? 0 : monitor_iter->second);
+       gfx::ColorSpace color_space = icc_profile.GetPrimariesOnlyColorSpace();
+ 
+       // Most folks do not have an ICC profile set up, but we still want to
+@@ -509,24 +407,63 @@ std::vector<display::Display> BuildDisplaysFromXRandRI
+     ConvertDisplayBoundsToDips(&displays, *primary_display_index_out);
+   }
+ 
+-  ClipWorkArea(&displays, *primary_display_index_out,
+-               GetWorkAreaSync(std::move(work_area_future)));
++  ClipWorkArea(&displays, *primary_display_index_out);
+   return displays;
+ }
+ 
+ base::TimeDelta GetPrimaryDisplayRefreshIntervalFromXrandr() {
+   constexpr base::TimeDelta kDefaultInterval = base::Seconds(1. / 60);
+-
+-  size_t primary_display_index = 0;
+-  auto displays = BuildDisplaysFromXRandRInfo(display::DisplayConfig(),
+-                                              &primary_display_index);
+-  CHECK_LT(primary_display_index, displays.size());
+-
++  x11::RandR randr = x11::Connection::Get()->randr();
++  auto root = ui::GetX11RootWindow();
++  auto resources = randr.GetScreenResourcesCurrent({root}).Sync();
++  if (!resources) {
++    return kDefaultInterval;
++  }
+   // TODO(crbug.com/726842): It might make sense here to pick the output that
+   // the window is on. On the other hand, if compositing is enabled, all drawing
+   // might be synced to the primary output anyway. Needs investigation.
+-  auto frequency = displays[primary_display_index].display_frequency();
+-  return frequency > 0 ? base::Seconds(1. / frequency) : kDefaultInterval;
++  auto output_primary = randr.GetOutputPrimary({root}).Sync();
++  if (!output_primary) {
++    return kDefaultInterval;
++  }
++  x11::RandR::Output primary_output = output_primary->output;
++  bool disconnected_primary = false;
++  for (size_t i = 0; i < resources->outputs.size(); i++) {
++    if (!disconnected_primary && resources->outputs[i] != primary_output) {
++      continue;
++    }
++
++    auto output_info =
++        randr.GetOutputInfo({primary_output, resources->config_timestamp})
++            .Sync();
++    if (!output_info) {
++      continue;
++    }
++
++    if (output_info->connection != x11::RandR::RandRConnection::Connected) {
++      // If the primary monitor is disconnected, then start over and choose the
++      // first connected monitor instead.
++      if (!disconnected_primary) {
++        disconnected_primary = true;
++        i = -1;
++      }
++      continue;
++    }
++    auto crtc =
++        randr.GetCrtcInfo({output_info->crtc, resources->config_timestamp})
++            .Sync();
++    if (!crtc) {
++      continue;
++    }
++    float refresh_rate =
++        GetRefreshRateFromXRRModeInfo(resources->modes, crtc->mode);
++    if (refresh_rate == 0) {
++      continue;
++    }
++
++    return base::Seconds(1. / refresh_rate);
++  }
++  return kDefaultInterval;
+ }
+ 
+ int RangeDistance(int min1, int max1, int min2, int max2) {
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_x_x11_shm_image_pool_cc b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_shm_image_pool_cc
index 12691c500..5de5d0bab 100644
--- a/www/ungoogled-chromium/patches/patch-ui_base_x_x11_shm_image_pool_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_shm_image_pool_cc
@@ -24,17 +24,35 @@ Index: ui/base/x/x11_shm_image_pool.cc
  }
  
  std::size_t MaxShmSegmentSize() {
-@@ -65,6 +70,9 @@ bool IsRemoteHost(const std::string& name) {
+@@ -57,14 +62,19 @@ std::size_t MaxShmSegmentSize() {
  }
  
+ #if !BUILDFLAG(IS_CHROMEOS_ASH)
++#if !BUILDFLAG(IS_BSD)
+ bool IsRemoteHost(const std::string& name) {
+   if (name.empty())
+     return false;
+ 
+   return !net::HostStringIsLocalhost(name);
+ }
++#endif
+ 
  bool ShouldUseMitShm(x11::Connection* connection) {
 +#if BUILDFLAG(IS_BSD)
 +  return false;
-+#endif
++#else
    // MIT-SHM may be available on remote connetions, but it will be unusable.  Do
    // a best-effort check to see if the host is remote to disable the SHM
    // codepath.  It may be possible in contrived cases for there to be a
-@@ -183,7 +191,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size
+@@ -93,6 +103,7 @@ bool ShouldUseMitShm(x11::Connection* connection) {
+     return false;
+ 
+   return true;
++#endif
+ }
+ #endif
+ 
+@@ -183,7 +194,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size
          shmctl(state.shmid, IPC_RMID, nullptr);
          return false;
        }
@@ -43,7 +61,7 @@ Index: ui/base/x/x11_shm_image_pool.cc
        // On Linux, a shmid can still be attached after IPC_RMID if otherwise
        // kept alive.  Detach before XShmAttach to prevent a memory leak in case
        // the process dies.
-@@ -202,7 +210,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size
+@@ -202,7 +213,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size
          return false;
        state.shmseg = shmseg;
        state.shmem_attached_to_server = true;
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_x_x11_util_cc b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_util_cc
new file mode 100644
index 000000000..a0d200dba
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_util_cc
@@ -0,0 +1,26 @@
+revert 37e4cda28fd3d7a5f4f7ffb1057a3604dba683db
+
+Index: ui/base/x/x11_util.cc
+--- ui/base/x/x11_util.cc.orig
++++ ui/base/x/x11_util.cc
+@@ -699,4 +699,20 @@ gfx::ImageSkia GetNativeWindowIcon(intptr_t target_win
+   return gfx::ImageSkia::CreateFrom1xBitmap(result);
+ }
+ 
++gfx::ICCProfile GetICCProfileForMonitor(int monitor) {
++  gfx::ICCProfile icc_profile;
++  if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless)) {
++    return icc_profile;
++  }
++  std::string atom_name = monitor == 0
++                              ? "_ICC_PROFILE"
++                              : base::StringPrintf("_ICC_PROFILE_%d", monitor);
++  scoped_refptr<base::RefCountedMemory> data;
++  if (GetRawBytesOfProperty(GetX11RootWindow(), x11::GetAtom(atom_name.c_str()),
++                            &data, nullptr)) {
++    icc_profile = gfx::ICCProfile::FromData(data->data(), data->size());
++  }
++  return icc_profile;
++}
++
+ }  // namespace ui
diff --git a/www/ungoogled-chromium/patches/patch-ui_base_x_x11_util_h b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_util_h
new file mode 100644
index 000000000..65d629bb3
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_util_h
@@ -0,0 +1,16 @@
+revert 37e4cda28fd3d7a5f4f7ffb1057a3604dba683db
+
+Index: ui/base/x/x11_util.h
+--- ui/base/x/x11_util.h.orig
++++ ui/base/x/x11_util.h
+@@ -256,6 +256,10 @@ COMPONENT_EXPORT(UI_BASE_X) bool IsVulkanSurfaceSuppor
+ COMPONENT_EXPORT(UI_BASE_X)
+ gfx::ImageSkia GetNativeWindowIcon(intptr_t target_window_id);
+ 
++// Returns the ICCProfile corresponding to |monitor| using XGetWindowProperty.
++COMPONENT_EXPORT(UI_BASE_X)
++gfx::ICCProfile GetICCProfileForMonitor(int monitor);
++
+ }  // namespace ui
+ 
+ #endif  // UI_BASE_X_X11_UTIL_H_
diff --git a/www/ungoogled-chromium/patches/patch-ui_color_color_id_h b/www/ungoogled-chromium/patches/patch-ui_color_color_id_h
index 0dee66dea..07ddc0381 100644
--- a/www/ungoogled-chromium/patches/patch-ui_color_color_id_h
+++ b/www/ungoogled-chromium/patches/patch-ui_color_color_id_h
@@ -1,7 +1,7 @@
 Index: ui/color/color_id.h
 --- ui/color/color_id.h.orig
 +++ ui/color/color_id.h
-@@ -543,7 +543,7 @@
+@@ -611,7 +611,7 @@
    E_CPONLY(kColorNativeColor6) \
    E_CPONLY(kColorNativeBaseColor) \
    E_CPONLY(kColorNativeSecondaryColor)
diff --git a/www/ungoogled-chromium/patches/patch-ui_color_color_provider_utils_cc b/www/ungoogled-chromium/patches/patch-ui_color_color_provider_utils_cc
index 2e3962197..d54b96139 100644
--- a/www/ungoogled-chromium/patches/patch-ui_color_color_provider_utils_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_color_color_provider_utils_cc
@@ -1,7 +1,7 @@
 Index: ui/color/color_provider_utils.cc
 --- ui/color/color_provider_utils.cc.orig
 +++ ui/color/color_provider_utils.cc
-@@ -103,7 +103,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst
+@@ -200,7 +200,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst
    switch (system_theme) {
      case ui::SystemTheme::kDefault:
        return "kDefault";
diff --git a/www/ungoogled-chromium/patches/patch-ui_compositor_compositor_cc b/www/ungoogled-chromium/patches/patch-ui_compositor_compositor_cc
index cd76ac4d7..7464bf301 100644
--- a/www/ungoogled-chromium/patches/patch-ui_compositor_compositor_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_compositor_compositor_cc
@@ -1,12 +1,12 @@
 Index: ui/compositor/compositor.cc
 --- ui/compositor/compositor.cc.orig
 +++ ui/compositor/compositor.cc
-@@ -896,7 +896,7 @@ void Compositor::OnResume() {
+@@ -910,7 +910,7 @@ void Compositor::OnResume() {
+     obs.ResetIfActive();
+ }
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
  void Compositor::OnCompleteSwapWithNewSize(const gfx::Size& size) {
    for (auto& observer : observer_list_)
      observer.OnCompositingCompleteSwapWithNewSize(this, size);
diff --git a/www/ungoogled-chromium/patches/patch-ui_compositor_compositor_h b/www/ungoogled-chromium/patches/patch-ui_compositor_compositor_h
index 0a0fc999b..4cfa2b062 100644
--- a/www/ungoogled-chromium/patches/patch-ui_compositor_compositor_h
+++ b/www/ungoogled-chromium/patches/patch-ui_compositor_compositor_h
@@ -1,12 +1,12 @@
 Index: ui/compositor/compositor.h
 --- ui/compositor/compositor.h.orig
 +++ ui/compositor/compositor.h
-@@ -458,7 +458,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
+@@ -455,7 +455,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
+   // base::PowerSuspendObserver:
+   void OnResume() override;
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
    void OnCompleteSwapWithNewSize(const gfx::Size& size);
- #endif
+ #endif  // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_compositor_compositor_observer_h b/www/ungoogled-chromium/patches/patch-ui_compositor_compositor_observer_h
index 28038f2f3..efbfcd062 100644
--- a/www/ungoogled-chromium/patches/patch-ui_compositor_compositor_observer_h
+++ b/www/ungoogled-chromium/patches/patch-ui_compositor_compositor_observer_h
@@ -1,12 +1,12 @@
 Index: ui/compositor/compositor_observer.h
 --- ui/compositor/compositor_observer.h.orig
 +++ ui/compositor/compositor_observer.h
-@@ -48,7 +48,7 @@ class COMPOSITOR_EXPORT CompositorObserver {
+@@ -46,7 +46,7 @@ class COMPOSITOR_EXPORT CompositorObserver {
+   // Called when a child of the compositor is resizing.
+   virtual void OnCompositingChildResizing(Compositor* compositor) {}
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
    // Called when a swap with new size is completed.
    virtual void OnCompositingCompleteSwapWithNewSize(ui::Compositor* compositor,
                                                      const gfx::Size& size) {}
diff --git a/www/ungoogled-chromium/patches/patch-ui_display_screen_h b/www/ungoogled-chromium/patches/patch-ui_display_screen_h
index 4738fdc65..c2f4ff416 100644
--- a/www/ungoogled-chromium/patches/patch-ui_display_screen_h
+++ b/www/ungoogled-chromium/patches/patch-ui_display_screen_h
@@ -10,7 +10,7 @@ Index: ui/display/screen.h
    // Object which suspends the platform-specific screensaver for the duration of
    // its existence.
    class ScreenSaverSuspender {
-@@ -232,7 +232,7 @@ class DISPLAY_EXPORT Screen {
+@@ -231,7 +231,7 @@ class DISPLAY_EXPORT Screen {
    int64_t display_id_for_new_windows_;
    int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId;
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_events_devices_x11_device_data_manager_x11_cc b/www/ungoogled-chromium/patches/patch-ui_events_devices_x11_device_data_manager_x11_cc
index c2f3a8363..d29a04c70 100644
--- a/www/ungoogled-chromium/patches/patch-ui_events_devices_x11_device_data_manager_x11_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_events_devices_x11_device_data_manager_x11_cc
@@ -1,7 +1,7 @@
 Index: ui/events/devices/x11/device_data_manager_x11.cc
 --- ui/events/devices/x11/device_data_manager_x11.cc.orig
 +++ ui/events/devices/x11/device_data_manager_x11.cc
-@@ -876,6 +876,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK
+@@ -844,6 +844,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK
  }
  
  void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) {
diff --git a/www/ungoogled-chromium/patches/patch-ui_events_event_cc b/www/ungoogled-chromium/patches/patch-ui_events_event_cc
index 45d7468d1..ca545038b 100644
--- a/www/ungoogled-chromium/patches/patch-ui_events_event_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_events_event_cc
@@ -1,7 +1,7 @@
 Index: ui/events/event.cc
 --- ui/events/event.cc.orig
 +++ ui/events/event.cc
-@@ -427,7 +427,7 @@ std::string LocatedEvent::ToString() const {
+@@ -438,7 +438,7 @@ std::string LocatedEvent::ToString() const {
  MouseEvent::MouseEvent(const PlatformEvent& native_event)
      : LocatedEvent(native_event),
        changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)),
@@ -10,7 +10,7 @@ Index: ui/events/event.cc
        movement_(GetMouseMovementFromNative(native_event)),
  #endif
        pointer_details_(GetMousePointerDetailsFromNative(native_event)) {
-@@ -676,7 +676,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const 
+@@ -688,7 +688,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const 
    return std::make_unique<MouseWheelEvent>(*this);
  }
  
@@ -19,9 +19,9 @@ Index: ui/events/event.cc
  // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on
  // Linux.
  // static
-@@ -936,7 +936,7 @@ void KeyEvent::InitializeNative() {
+@@ -948,7 +948,7 @@ void KeyEvent::InitializeNative() {
    if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent()))
-     set_flags(flags() | EF_IS_REPEAT);
+     SetFlags(flags() | EF_IS_REPEAT);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/patches/patch-ui_events_gesture_detection_motion_event_generic_h b/www/ungoogled-chromium/patches/patch-ui_events_gesture_detection_motion_event_generic_h
deleted file mode 100644
index a44add7d2..000000000
--- a/www/ungoogled-chromium/patches/patch-ui_events_gesture_detection_motion_event_generic_h
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: ui/events/gesture_detection/motion_event_generic.h
---- ui/events/gesture_detection/motion_event_generic.h.orig
-+++ ui/events/gesture_detection/motion_event_generic.h
-@@ -7,6 +7,7 @@
- 
- #include <stddef.h>
- #include <stdint.h>
-+#include <vector>
- 
- #include "base/time/time.h"
- #include "third_party/abseil-cpp/absl/container/inlined_vector.h"
diff --git a/www/ungoogled-chromium/patches/patch-ui_events_keycodes_dom_keycode_converter_cc b/www/ungoogled-chromium/patches/patch-ui_events_keycodes_dom_keycode_converter_cc
index abfc7d8d5..1c997e87d 100644
--- a/www/ungoogled-chromium/patches/patch-ui_events_keycodes_dom_keycode_converter_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_events_keycodes_dom_keycode_converter_cc
@@ -19,16 +19,16 @@ Index: ui/events/keycodes/dom/keycode_converter.cc
  #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \
    { usb, xkb, code }
  #elif BUILDFLAG(IS_APPLE)
-@@ -58,7 +58,7 @@ struct DomKeyMapEntry {
- #undef DOM_KEY_MAP
+@@ -63,7 +63,7 @@ struct DomKeyMapEntry {
  #undef DOM_KEY_UNI
+ #undef DOM_KEY_MAP_DECLARATION_END
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD)
  
  // The offset between XKB Keycode and evdev code.
  constexpr int kXkbKeycodeOffset = 8;
-@@ -139,7 +139,7 @@ int KeycodeConverter::DomCodeToNativeKeycode(DomCode c
+@@ -184,7 +184,7 @@ int KeycodeConverter::DomCodeToNativeKeycode(DomCode c
    return UsbKeycodeToNativeKeycode(static_cast<uint32_t>(code));
  }
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_events_keycodes_dom_keycode_converter_h b/www/ungoogled-chromium/patches/patch-ui_events_keycodes_dom_keycode_converter_h
index 1d4d87564..b487f71f8 100644
--- a/www/ungoogled-chromium/patches/patch-ui_events_keycodes_dom_keycode_converter_h
+++ b/www/ungoogled-chromium/patches/patch-ui_events_keycodes_dom_keycode_converter_h
@@ -1,7 +1,7 @@
 Index: ui/events/keycodes/dom/keycode_converter.h
 --- ui/events/keycodes/dom/keycode_converter.h.orig
 +++ ui/events/keycodes/dom/keycode_converter.h
-@@ -64,7 +64,7 @@ class KeycodeConverter {
+@@ -63,7 +63,7 @@ class KeycodeConverter {
    // Convert a DomCode into a native keycode.
    static int DomCodeToNativeKeycode(DomCode code);
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_BUILD_gn b/www/ungoogled-chromium/patches/patch-ui_gfx_BUILD_gn
index ed2b80700..29cb956e7 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_BUILD_gn
@@ -1,7 +1,7 @@
 Index: ui/gfx/BUILD.gn
 --- ui/gfx/BUILD.gn.orig
 +++ ui/gfx/BUILD.gn
-@@ -644,7 +644,7 @@ source_set("memory_buffer_sources") {
+@@ -664,7 +664,7 @@ source_set("memory_buffer_sources") {
      deps += [ "//build/config/linux/libdrm" ]
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_canvas_skia_cc b/www/ungoogled-chromium/patches/patch-ui_gfx_canvas_skia_cc
index 9e07579a0..44dcdf53d 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_canvas_skia_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_canvas_skia_cc
@@ -1,7 +1,7 @@
 Index: ui/gfx/canvas_skia.cc
 --- ui/gfx/canvas_skia.cc.orig
 +++ ui/gfx/canvas_skia.cc
-@@ -212,7 +212,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str
+@@ -213,7 +213,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str
      Range range = StripAcceleratorChars(flags, &adjusted_text);
      bool elide_text = ((flags & NO_ELLIPSIS) == 0);
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_codec_png_codec_cc b/www/ungoogled-chromium/patches/patch-ui_gfx_codec_png_codec_cc
index 470619a52..817af40f8 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_codec_png_codec_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_codec_png_codec_cc
@@ -1,8 +1,8 @@
 Index: ui/gfx/codec/png_codec.cc
 --- ui/gfx/codec/png_codec.cc.orig
 +++ ui/gfx/codec/png_codec.cc
-@@ -11,7 +11,7 @@
- #include "base/memory/raw_ptr_exclusion.h"
+@@ -12,7 +12,7 @@
+ #include "base/metrics/histogram_macros.h"
  #include "base/notreached.h"
  #include "base/strings/string_util.h"
 -#include "third_party/libpng/png.h"
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_font_fallback_linux_cc b/www/ungoogled-chromium/patches/patch-ui_gfx_font_fallback_linux_cc
index 29e8dd8a1..067e90493 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_font_fallback_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_font_fallback_linux_cc
@@ -1,7 +1,7 @@
 Index: ui/gfx/font_fallback_linux.cc
 --- ui/gfx/font_fallback_linux.cc.orig
 +++ ui/gfx/font_fallback_linux.cc
-@@ -26,6 +26,8 @@
+@@ -27,6 +27,8 @@
  #include "ui/gfx/linux/fontconfig_util.h"
  #include "ui/gfx/platform_font.h"
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_font_render_params_h b/www/ungoogled-chromium/patches/patch-ui_gfx_font_render_params_h
index 94aa2dcac..b6c8e5b50 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_font_render_params_h
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_font_render_params_h
@@ -1,16 +1,16 @@
 Index: ui/gfx/font_render_params.h
 --- ui/gfx/font_render_params.h.orig
 +++ ui/gfx/font_render_params.h
-@@ -109,7 +109,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams(
+@@ -115,7 +115,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams(
      const FontRenderParamsQuery& query,
      std::string* family_out);
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  // Clears GetFontRenderParams()'s cache. Intended to be called by tests that are
  // changing Fontconfig's configuration.
  GFX_EXPORT void ClearFontRenderParamsCacheForTest();
-@@ -119,7 +119,7 @@ GFX_EXPORT void ClearFontRenderParamsCacheForTest();
+@@ -125,7 +125,7 @@ GFX_EXPORT void ClearFontRenderParamsCacheForTest();
  GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor();
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_font_render_params_linux_cc b/www/ungoogled-chromium/patches/patch-ui_gfx_font_render_params_linux_cc
index 3d4c2f7b9..a55ddd63a 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_font_render_params_linux_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_font_render_params_linux_cc
@@ -16,6 +16,6 @@ Index: ui/gfx/font_render_params_linux.cc
    FontRenderParams params;
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (const auto* linux_ui = ui::LinuxUi::instance())
+   if (auto* linux_ui = ui::LinuxUi::instance()) {
      params = linux_ui->GetDefaultFontRenderParams();
- #endif
+   }
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_font_util_cc b/www/ungoogled-chromium/patches/patch-ui_gfx_font_util_cc
index 491f77c31..b9b05e5f6 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_font_util_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_font_util_cc
@@ -16,6 +16,6 @@ Index: ui/gfx/font_util.cc
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Ensures the config is created on this thread.
-   FcConfig* config = GetGlobalFontConfig();
-   DCHECK(config);
+   // Early initialize FontConfig.
+   InitializeGlobalFontConfigAsync();
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_gpu_memory_buffer_h b/www/ungoogled-chromium/patches/patch-ui_gfx_gpu_memory_buffer_h
index 8f6d9f09d..ed8142666 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_gpu_memory_buffer_h
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_gpu_memory_buffer_h
@@ -10,7 +10,7 @@ Index: ui/gfx/gpu_memory_buffer.h
  #include "ui/gfx/native_pixmap_handle.h"
  #elif BUILDFLAG(IS_APPLE)
  #include "ui/gfx/mac/io_surface.h"
-@@ -75,7 +75,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
+@@ -76,7 +76,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
    base::UnsafeSharedMemoryRegion region;
    uint32_t offset = 0;
    uint32_t stride = 0;
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_linux_client_native_pixmap_dmabuf_cc b/www/ungoogled-chromium/patches/patch-ui_gfx_linux_client_native_pixmap_dmabuf_cc
deleted file mode 100644
index 7f2297840..000000000
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_linux_client_native_pixmap_dmabuf_cc
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: ui/gfx/linux/client_native_pixmap_dmabuf.cc
---- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig
-+++ ui/gfx/linux/client_native_pixmap_dmabuf.cc
-@@ -5,7 +5,9 @@
- #include "ui/gfx/linux/client_native_pixmap_dmabuf.h"
- 
- #include <fcntl.h>
-+#if !defined(__OpenBSD__) && !defined(__FreeBSD__)
- #include <linux/version.h>
-+#endif
- #include <stddef.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
-@@ -27,11 +29,7 @@
- #include "ui/gfx/buffer_format_util.h"
- #include "ui/gfx/switches.h"
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
--#include <linux/dma-buf.h>
--#else
--#include <linux/types.h>
--
-+#if defined(__OpenBSD__) || defined(__FreeBSD__)
- struct dma_buf_sync {
-   __u64 flags;
- };
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_linux_dmabuf_uapi_h b/www/ungoogled-chromium/patches/patch-ui_gfx_linux_dmabuf_uapi_h
new file mode 100644
index 000000000..dff87abba
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_linux_dmabuf_uapi_h
@@ -0,0 +1,37 @@
+Index: ui/gfx/linux/dmabuf_uapi.h
+--- ui/gfx/linux/dmabuf_uapi.h.orig
++++ ui/gfx/linux/dmabuf_uapi.h
+@@ -5,12 +5,11 @@
+ #ifndef UI_GFX_LINUX_DMABUF_UAPI_H_
+ #define UI_GFX_LINUX_DMABUF_UAPI_H_
+ 
+-#include <linux/version.h>
++#include <sys/types.h>
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+-#include <linux/dma-buf.h>
+-#else
+-#include <linux/types.h>
++typedef int32_t  __s32;
++typedef uint32_t __u32;
++typedef uint64_t __u64;
+ 
+ struct dma_buf_sync {
+   __u64 flags;
+@@ -26,9 +25,7 @@ constexpr __u64 DMA_BUF_SYNC_END = 1 << 2;
+ constexpr char DMA_BUF_BASE = 'b';
+ constexpr unsigned long DMA_BUF_IOCTL_SYNC =
+     _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync);
+-#endif
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
+ struct dma_buf_export_sync_file {
+   __u32 flags;
+   __s32 fd;
+@@ -43,6 +40,5 @@ constexpr unsigned long DMA_BUF_IOCTL_EXPORT_SYNC_FILE
+     _IOWR(DMA_BUF_BASE, 2, struct dma_buf_export_sync_file);
+ constexpr unsigned long DMA_BUF_IOCTL_IMPORT_SYNC_FILE =
+     _IOW(DMA_BUF_BASE, 3, struct dma_buf_import_sync_file);
+-#endif
+ 
+ #endif  // UI_GFX_LINUX_DMABUF_UAPI_H_
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_linux_gbm_wrapper_cc b/www/ungoogled-chromium/patches/patch-ui_gfx_linux_gbm_wrapper_cc
new file mode 100644
index 000000000..5c2db9714
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_linux_gbm_wrapper_cc
@@ -0,0 +1,12 @@
+Index: ui/gfx/linux/gbm_wrapper.cc
+--- ui/gfx/linux/gbm_wrapper.cc.orig
++++ ui/gfx/linux/gbm_wrapper.cc
+@@ -313,7 +313,7 @@ class Device final : public ui::GbmDevice {
+     // of 1x1 BOs which are destroyed before creating the final BO creation used
+     // to instantiate the returned GbmBuffer.
+     gfx::Size size_for_verification =
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+         gfx::Size(1, 1);
+ #else
+         requested_size;
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_mojom_native_handle_types_mojom_traits_h b/www/ungoogled-chromium/patches/patch-ui_gfx_mojom_native_handle_types_mojom_traits_h
index 6ce7f9aaf..13da6e736 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_mojom_native_handle_types_mojom_traits_h
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_mojom_native_handle_types_mojom_traits_h
@@ -1,8 +1,8 @@
 Index: ui/gfx/mojom/native_handle_types_mojom_traits.h
 --- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig
 +++ ui/gfx/mojom/native_handle_types_mojom_traits.h
-@@ -15,7 +15,7 @@
- #include "third_party/abseil-cpp/absl/types/optional.h"
+@@ -16,7 +16,7 @@
+ #include "mojo/public/cpp/system/platform_handle.h"
  #include "ui/gfx/mojom/native_handle_types.mojom-shared.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
@@ -10,7 +10,7 @@ Index: ui/gfx/mojom/native_handle_types_mojom_traits.h
  #include "ui/gfx/native_pixmap_handle.h"
  #endif
  
-@@ -25,7 +25,7 @@
+@@ -26,7 +26,7 @@
  
  namespace mojo {
  
@@ -19,7 +19,7 @@ Index: ui/gfx/mojom/native_handle_types_mojom_traits.h
  template <>
  struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS)
      StructTraits<gfx::mojom::NativePixmapPlaneDataView,
-@@ -53,13 +53,13 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED
+@@ -54,13 +54,13 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED
      return pixmap_handle.planes;
    }
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_native_widget_types_h b/www/ungoogled-chromium/patches/patch-ui_gfx_native_widget_types_h
index dc3c39892..fd71f742e 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_native_widget_types_h
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_native_widget_types_h
@@ -1,7 +1,7 @@
 Index: ui/gfx/native_widget_types.h
 --- ui/gfx/native_widget_types.h.orig
 +++ ui/gfx/native_widget_types.h
-@@ -103,7 +103,7 @@ class SkBitmap;
+@@ -104,7 +104,7 @@ class SkBitmap;
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -10,7 +10,7 @@ Index: ui/gfx/native_widget_types.h
  extern "C" {
  struct _AtkObject;
  using AtkObject = struct _AtkObject;
-@@ -221,7 +221,7 @@ using NativeViewAccessible = struct objc_object*;
+@@ -220,7 +220,7 @@ using NativeViewAccessible = struct objc_object*;
  #endif
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_platform_font_skia_cc b/www/ungoogled-chromium/patches/patch-ui_gfx_platform_font_skia_cc
index 48a956fb9..b841c7f75 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_platform_font_skia_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_platform_font_skia_cc
@@ -1,7 +1,7 @@
 Index: ui/gfx/platform_font_skia.cc
 --- ui/gfx/platform_font_skia.cc.orig
 +++ ui/gfx/platform_font_skia.cc
-@@ -28,7 +28,7 @@
+@@ -30,7 +30,7 @@
  #include "ui/gfx/system_fonts_win.h"
  #endif
  
@@ -10,7 +10,7 @@ Index: ui/gfx/platform_font_skia.cc
  #include "ui/linux/linux_ui.h"
  #endif
  
-@@ -166,7 +166,7 @@ void PlatformFontSkia::EnsuresDefaultFontIsInitialized
+@@ -168,7 +168,7 @@ void PlatformFontSkia::EnsuresDefaultFontIsInitialized
    weight = system_font.GetWeight();
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -18,4 +18,4 @@ Index: ui/gfx/platform_font_skia.cc
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // On Linux, LinuxUi is used to query the native toolkit (e.g.
    // GTK) for the default UI font.
-   if (const auto* linux_ui = ui::LinuxUi::instance()) {
+   if (auto* linux_ui = ui::LinuxUi::instance()) {
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_switches_cc b/www/ungoogled-chromium/patches/patch-ui_gfx_switches_cc
index 9af87bc95..cd0c2e156 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_switches_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_switches_cc
@@ -1,7 +1,7 @@
 Index: ui/gfx/switches.cc
 --- ui/gfx/switches.cc.orig
 +++ ui/gfx/switches.cc
-@@ -28,7 +28,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe
+@@ -32,7 +32,7 @@ const char kForcePrefersNoReducedMotion[] = "force-pre
  // Run in headless mode, i.e., without a UI or display server dependencies.
  const char kHeadless[] = "headless";
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_switches_h b/www/ungoogled-chromium/patches/patch-ui_gfx_switches_h
index 991f8c371..bef1063da 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_switches_h
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_switches_h
@@ -1,8 +1,8 @@
 Index: ui/gfx/switches.h
 --- ui/gfx/switches.h.orig
 +++ ui/gfx/switches.h
-@@ -18,7 +18,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu
- GFX_SWITCHES_EXPORT extern const char kForcePrefersReducedMotion[];
+@@ -19,7 +19,7 @@ GFX_SWITCHES_EXPORT extern const char kForcePrefersRed
+ GFX_SWITCHES_EXPORT extern const char kForcePrefersNoReducedMotion[];
  GFX_SWITCHES_EXPORT extern const char kHeadless[];
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_x_generated_protos_dri3_cc b/www/ungoogled-chromium/patches/patch-ui_gfx_x_generated_protos_dri3_cc
index 1de4cd313..735f314a9 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_x_generated_protos_dri3_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_x_generated_protos_dri3_cc
@@ -1,7 +1,7 @@
 Index: ui/gfx/x/generated_protos/dri3.cc
 --- ui/gfx/x/generated_protos/dri3.cc.orig
 +++ ui/gfx/x/generated_protos/dri3.cc
-@@ -44,6 +44,8 @@
+@@ -27,6 +27,8 @@
  #include <xcb/xcb.h>
  #include <xcb/xcbext.h>
  
@@ -9,4 +9,4 @@ Index: ui/gfx/x/generated_protos/dri3.cc
 +
  #include "base/logging.h"
  #include "base/posix/eintr_wrapper.h"
- #include "ui/gfx/x/xproto_internal.h"
+ #include "ui/gfx/x/connection.h"
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_x_generated_protos_shm_cc b/www/ungoogled-chromium/patches/patch-ui_gfx_x_generated_protos_shm_cc
index 76d95952c..9c8e9f984 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_x_generated_protos_shm_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_x_generated_protos_shm_cc
@@ -1,7 +1,7 @@
 Index: ui/gfx/x/generated_protos/shm.cc
 --- ui/gfx/x/generated_protos/shm.cc.orig
 +++ ui/gfx/x/generated_protos/shm.cc
-@@ -44,6 +44,8 @@
+@@ -27,6 +27,8 @@
  #include <xcb/xcb.h>
  #include <xcb/xcbext.h>
  
@@ -9,4 +9,4 @@ Index: ui/gfx/x/generated_protos/shm.cc
 +
  #include "base/logging.h"
  #include "base/posix/eintr_wrapper.h"
- #include "ui/gfx/x/xproto_internal.h"
+ #include "ui/gfx/x/connection.h"
diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_x_xlib_support_cc b/www/ungoogled-chromium/patches/patch-ui_gfx_x_xlib_support_cc
index cca036765..d6248554a 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gfx_x_xlib_support_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_gfx_x_xlib_support_cc
@@ -1,9 +1,9 @@
 Index: ui/gfx/x/xlib_support.cc
 --- ui/gfx/x/xlib_support.cc.orig
 +++ ui/gfx/x/xlib_support.cc
-@@ -38,10 +38,18 @@ void InitXlib() {
-   if (xlib_loader->loaded())
+@@ -39,10 +39,18 @@ void InitXlib() {
      return;
+   }
  
 +#if BUILDFLAG(IS_BSD)
 +  CHECK(xlib_loader->Load("libX11.so"));
diff --git a/www/ungoogled-chromium/patches/patch-ui_gl_BUILD_gn b/www/ungoogled-chromium/patches/patch-ui_gl_BUILD_gn
index 48e0ee0c5..8ebec351f 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gl_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-ui_gl_BUILD_gn
@@ -1,7 +1,7 @@
 Index: ui/gl/BUILD.gn
 --- ui/gl/BUILD.gn.orig
 +++ ui/gl/BUILD.gn
-@@ -151,8 +151,6 @@ component("gl") {
+@@ -153,8 +153,6 @@ component("gl") {
      defines += [ "GPU_ENABLE_SERVICE_LOGGING" ]
    }
  
@@ -10,7 +10,7 @@ Index: ui/gl/BUILD.gn
    all_dependent_configs = [ ":gl_config" ]
  
    public_configs = [ "//third_party/khronos:khronos_headers" ]
-@@ -169,7 +167,6 @@ component("gl") {
+@@ -172,7 +170,6 @@ component("gl") {
    ]
    public_deps = [
      "//base",
@@ -18,7 +18,7 @@ Index: ui/gl/BUILD.gn
      "//ui/events/platform",
      "//ui/gfx",
      "//ui/gfx/geometry",
-@@ -373,7 +370,6 @@ component("gl") {
+@@ -379,7 +376,6 @@ component("gl") {
      data_deps += [
        "//third_party/angle:libEGL",
        "//third_party/angle:libGLESv2",
@@ -26,7 +26,7 @@ Index: ui/gl/BUILD.gn
      ]
      if (enable_swiftshader) {
        data_deps += [
-@@ -574,7 +570,6 @@ test("gl_unittests") {
+@@ -579,7 +575,6 @@ test("gl_unittests") {
  
    data_deps = [
      "//testing/buildbot/filters:gl_unittests_filters",
diff --git a/www/ungoogled-chromium/patches/patch-ui_gl_gl_context_cc b/www/ungoogled-chromium/patches/patch-ui_gl_gl_context_cc
index 91863537d..9d337dc4a 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gl_gl_context_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_gl_gl_context_cc
@@ -1,7 +1,7 @@
 Index: ui/gl/gl_context.cc
 --- ui/gl/gl_context.cc.orig
 +++ ui/gl/gl_context.cc
-@@ -443,7 +443,7 @@ bool GLContext::MakeVirtuallyCurrent(
+@@ -472,7 +472,7 @@ bool GLContext::MakeVirtuallyCurrent(
    DCHECK(virtual_context->IsCurrent(surface));
  
    if (switched_real_contexts || virtual_context != current_virtual_context_) {
diff --git a/www/ungoogled-chromium/patches/patch-ui_gl_gl_implementation_cc b/www/ungoogled-chromium/patches/patch-ui_gl_gl_implementation_cc
index 2aca61e4b..a9cb5a3d0 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gl_gl_implementation_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_gl_gl_implementation_cc
@@ -1,7 +1,7 @@
 Index: ui/gl/gl_implementation.cc
 --- ui/gl/gl_implementation.cc.orig
 +++ ui/gl/gl_implementation.cc
-@@ -281,7 +281,7 @@ GetRequestedGLImplementationFromCommandLine(
+@@ -276,7 +276,7 @@ GetRequestedGLImplementationFromCommandLine(
    *fallback_to_software_gl = false;
    bool overrideUseSoftwareGL =
        command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests);
diff --git a/www/ungoogled-chromium/patches/patch-ui_gl_gl_switches_cc b/www/ungoogled-chromium/patches/patch-ui_gl_gl_switches_cc
index d9aa3169a..14cf289a7 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gl_gl_switches_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_gl_gl_switches_cc
@@ -5,17 +5,26 @@ Index: ui/gl/gl_switches.cc
  #include "base/android/build_info.h"
  #endif
  
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include <vulkan/vulkan_core.h>
  #include "third_party/angle/src/gpu_info_util/SystemInfo.h"  // nogncheck
  #endif
-@@ -289,7 +289,7 @@ bool IsDefaultANGLEVulkan() {
+@@ -298,7 +298,7 @@ bool IsDefaultANGLEVulkan() {
        base::android::SDK_VERSION_Q)
      return false;
  #endif  // BUILDFLAG(IS_ANDROID)
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    angle::SystemInfo system_info;
    if (!angle::GetSystemInfoVulkan(&system_info))
      return false;
+@@ -310,7 +310,7 @@ bool IsDefaultANGLEVulkan() {
+ 
+   const auto& active_gpu = system_info.gpus[system_info.activeGPUIndex];
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Vulkan 1.1 is required.
+   if (active_gpu.driverApiVersion < VK_VERSION_1_1)
+     return false;
diff --git a/www/ungoogled-chromium/patches/patch-ui_gtk_gtk_ui_cc b/www/ungoogled-chromium/patches/patch-ui_gtk_gtk_ui_cc
deleted file mode 100644
index dceadeb32..000000000
--- a/www/ungoogled-chromium/patches/patch-ui_gtk_gtk_ui_cc
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: ui/gtk/gtk_ui.cc
---- ui/gtk/gtk_ui.cc.orig
-+++ ui/gtk/gtk_ui.cc
-@@ -955,11 +955,19 @@ ui::DisplayConfig GtkUi::GetDisplayConfig() const {
-     GdkRectangle geometry;
-     gdk_monitor_get_geometry(monitor, &geometry);
-     int monitor_scale = std::max(1, gdk_monitor_get_scale_factor(monitor));
-+#if defined(__clang__) && (__clang_major__ >= 16)
-     config.display_geometries.emplace_back(
-         gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y,
-                   monitor_scale * geometry.width,
-                   monitor_scale * geometry.height),
-         monitor_scale * font_scale);
-+#else
-+    config.display_geometries.emplace_back() = {
-+        gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y,
-+                  monitor_scale * geometry.width,
-+                  monitor_scale * geometry.height),
-+        static_cast<float>(monitor_scale * font_scale)};
-+#endif
-   }
-   return config;
- }
diff --git a/www/ungoogled-chromium/patches/patch-ui_gtk_printing_print_dialog_gtk_cc b/www/ungoogled-chromium/patches/patch-ui_gtk_printing_print_dialog_gtk_cc
index 17131e47a..7062a8d32 100644
--- a/www/ungoogled-chromium/patches/patch-ui_gtk_printing_print_dialog_gtk_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_gtk_printing_print_dialog_gtk_cc
@@ -1,7 +1,7 @@
 Index: ui/gtk/printing/print_dialog_gtk.cc
 --- ui/gtk/printing/print_dialog_gtk.cc.orig
 +++ ui/gtk/printing/print_dialog_gtk.cc
-@@ -403,7 +403,7 @@ void PrintDialogGtk::ShowDialog(
+@@ -433,7 +433,7 @@ void PrintDialogGtk::ShowDialog(
    GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
        GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET |
        GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE |
diff --git a/www/ungoogled-chromium/patches/patch-ui_message_center_views_message_popup_view_cc b/www/ungoogled-chromium/patches/patch-ui_message_center_views_message_popup_view_cc
index d7814f494..1fab0f5b2 100644
--- a/www/ungoogled-chromium/patches/patch-ui_message_center_views_message_popup_view_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_message_center_views_message_popup_view_cc
@@ -1,7 +1,7 @@
 Index: ui/message_center/views/message_popup_view.cc
 --- ui/message_center/views/message_popup_view.cc.orig
 +++ ui/message_center/views/message_popup_view.cc
-@@ -118,7 +118,7 @@ void MessagePopupView::Show() {
+@@ -135,7 +135,7 @@ void MessagePopupView::Show() {
    params.z_order = ui::ZOrderLevel::kFloatingWindow;
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-ui_native_theme_native_theme_base_cc b/www/ungoogled-chromium/patches/patch-ui_native_theme_native_theme_base_cc
index 05c883c29..a6f3e82f8 100644
--- a/www/ungoogled-chromium/patches/patch-ui_native_theme_native_theme_base_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_native_theme_native_theme_base_cc
@@ -1,12 +1,12 @@
 Index: ui/native_theme/native_theme_base.cc
 --- ui/native_theme/native_theme_base.cc.orig
 +++ ui/native_theme/native_theme_base.cc
-@@ -274,7 +274,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
+@@ -235,7 +235,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
        break;
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
      case kFrameTopArea:
-       PaintFrameTopArea(canvas, state, rect, extra.frame_top_area,
-                         color_scheme);
+       PaintFrameTopArea(canvas, state, rect,
+                         absl::get<FrameTopAreaExtraParams>(extra),
diff --git a/www/ungoogled-chromium/patches/patch-ui_native_theme_native_theme_features_cc b/www/ungoogled-chromium/patches/patch-ui_native_theme_native_theme_features_cc
new file mode 100644
index 000000000..e60fd7205
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_native_theme_native_theme_features_cc
@@ -0,0 +1,21 @@
+Index: ui/native_theme/native_theme_features.cc
+--- ui/native_theme/native_theme_features.cc.orig
++++ ui/native_theme/native_theme_features.cc
+@@ -54,7 +54,7 @@ bool IsOverlayScrollbarEnabled() {
+ 
+ bool IsFluentScrollbarEnabled() {
+ // Fluent scrollbars are only used for some OSes due to UI design guidelines.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return base::FeatureList::IsEnabled(features::kFluentScrollbar) ||
+          IsFluentOverlayScrollbarEnabled();
+ #else
+@@ -63,7 +63,7 @@ bool IsFluentScrollbarEnabled() {
+ }
+ bool IsFluentOverlayScrollbarEnabled() {
+ // Fluent scrollbars are only used for some OSes due to UI design guidelines.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return base::FeatureList::IsEnabled(features::kFluentOverlayScrollbar);
+ #else
+   return false;
diff --git a/www/ungoogled-chromium/patches/patch-ui_native_theme_native_theme_h b/www/ungoogled-chromium/patches/patch-ui_native_theme_native_theme_h
index d190df5e8..01dc2cc40 100644
--- a/www/ungoogled-chromium/patches/patch-ui_native_theme_native_theme_h
+++ b/www/ungoogled-chromium/patches/patch-ui_native_theme_native_theme_h
@@ -1,7 +1,7 @@
 Index: ui/native_theme/native_theme.h
 --- ui/native_theme/native_theme.h.orig
 +++ ui/native_theme/native_theme.h
-@@ -60,7 +60,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -62,7 +62,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
      kCheckbox,
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_headless_ozone_platform_headless_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_headless_ozone_platform_headless_cc
index b0e5048f7..06b08c698 100644
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_headless_ozone_platform_headless_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_headless_ozone_platform_headless_cc
@@ -1,7 +1,7 @@
 Index: ui/ozone/platform/headless/ozone_platform_headless.cc
 --- ui/ozone/platform/headless/ozone_platform_headless.cc.orig
 +++ ui/ozone/platform/headless/ozone_platform_headless.cc
-@@ -102,7 +102,7 @@ class OzonePlatformHeadless : public OzonePlatform {
+@@ -103,7 +103,7 @@ class OzonePlatformHeadless : public OzonePlatform {
    }
  
  // Desktop Linux, not CastOS.
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_headless_vulkan_implementation_headless_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_headless_vulkan_implementation_headless_cc
index f99f0e63b..6ae5e4da6 100644
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_headless_vulkan_implementation_headless_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_headless_vulkan_implementation_headless_cc
@@ -1,7 +1,25 @@
 Index: ui/ozone/platform/headless/vulkan_implementation_headless.cc
 --- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig
 +++ ui/ozone/platform/headless/vulkan_implementation_headless.cc
-@@ -141,7 +141,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory
+@@ -118,7 +118,7 @@ VulkanImplementationHeadless::ExportVkFenceToGpuFence(
+ 
+ VkExternalSemaphoreHandleTypeFlagBits
+ VulkanImplementationHeadless::GetExternalSemaphoreHandleType() {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT;
+ #else
+   return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT;
+@@ -128,7 +128,7 @@ VulkanImplementationHeadless::GetExternalSemaphoreHand
+ bool VulkanImplementationHeadless::CanImportGpuMemoryBuffer(
+     gpu::VulkanDeviceQueue* device_queue,
+     gfx::GpuMemoryBufferType memory_buffer_type) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   const auto& enabled_extensions = device_queue->enabled_extensions();
+   return gfx::HasExtension(enabled_extensions,
+                            VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME) &&
+@@ -151,7 +151,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory
        VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT |
        VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
    auto tiling = VK_IMAGE_TILING_OPTIMAL;
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_common_wayland_util_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_common_wayland_util_cc
new file mode 100644
index 000000000..e0323aa58
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_common_wayland_util_cc
@@ -0,0 +1,12 @@
+Index: ui/ozone/platform/wayland/common/wayland_util.cc
+--- ui/ozone/platform/wayland/common/wayland_util.cc.orig
++++ ui/ozone/platform/wayland/common/wayland_util.cc
+@@ -337,7 +337,7 @@ void TransformToWlArray(
+ }
+ 
+ base::TimeTicks EventMillisecondsToTimeTicks(uint32_t milliseconds) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // TODO(crbug.com/1499638): `milliseconds` comes from Weston that
+   // uses timestamp from libinput, which is different from TimeTicks.
+   // Use EventTimeForNow(), for now.
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_emulate_wayland_input_emulate_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_emulate_wayland_input_emulate_cc
new file mode 100644
index 000000000..4a2055196
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_emulate_wayland_input_emulate_cc
@@ -0,0 +1,12 @@
+Index: ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc
+--- ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc.orig
++++ ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc
+@@ -284,7 +284,7 @@ void WaylandInputEmulate::EmulateUpdateDisplay(const s
+ }
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void WaylandInputEmulate::ForceUseScreenCoordinatesOnce() {
+   force_use_screen_coordinates_once_ = true;
+ }
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_emulate_wayland_input_emulate_h b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_emulate_wayland_input_emulate_h
new file mode 100644
index 000000000..2742f38f0
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_emulate_wayland_input_emulate_h
@@ -0,0 +1,12 @@
+Index: ui/ozone/platform/wayland/emulate/wayland_input_emulate.h
+--- ui/ozone/platform/wayland/emulate/wayland_input_emulate.h.orig
++++ ui/ozone/platform/wayland/emulate/wayland_input_emulate.h
+@@ -68,7 +68,7 @@ class WaylandInputEmulate : public wl::WaylandProxy::D
+                             uint32_t request_id);
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   void ForceUseScreenCoordinatesOnce();
+ #endif
+ 
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_connection_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_connection_cc
new file mode 100644
index 000000000..d2221abfd
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_connection_cc
@@ -0,0 +1,12 @@
+Index: ui/ozone/platform/wayland/host/wayland_connection.cc
+--- ui/ozone/platform/wayland/host/wayland_connection.cc.orig
++++ ui/ozone/platform/wayland/host/wayland_connection.cc
+@@ -539,7 +539,7 @@ bool WaylandConnection::ShouldUseOverlayDelegation() c
+   // isn't present on any non-exo Wayland compositors.
+   bool should_use_overlay_delegation =
+       IsWaylandOverlayDelegationEnabled() && !fractional_scale_manager_v1();
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Overlay delegation also requires a single-pixel-buffer protocol, which
+   // allows creation of non-backed solid color buffers. Even though only video
+   // overlays can be supported on Linux, these color buffers are still needed
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_input_method_context_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_input_method_context_cc
new file mode 100644
index 000000000..bdebd2af1
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_input_method_context_cc
@@ -0,0 +1,12 @@
+Index: ui/ozone/platform/wayland/host/wayland_input_method_context.cc
+--- ui/ozone/platform/wayland/host/wayland_input_method_context.cc.orig
++++ ui/ozone/platform/wayland/host/wayland_input_method_context.cc
+@@ -54,7 +54,7 @@ namespace {
+ // Only enable the preedit string for sequence mode (i.e. when using dead keys
+ // or the Compose key) on Linux ozone/wayland (see b/220370007).
+ constexpr CharacterComposer::PreeditStringMode kPreeditStringMode =
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     CharacterComposer::PreeditStringMode::kAlwaysEnabled;
+ #else
+     CharacterComposer::PreeditStringMode::kHexModeOnly;
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_toplevel_window_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_toplevel_window_cc
index 5aac0801c..aebd522de 100644
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_toplevel_window_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_toplevel_window_cc
@@ -1,12 +1,12 @@
 Index: ui/ozone/platform/wayland/host/wayland_toplevel_window.cc
 --- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig
 +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc
-@@ -548,7 +548,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur
+@@ -606,7 +606,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur
    const bool did_active_change = is_active_ != window_states.is_activated;
    is_active_ = window_states.is_activated;
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // The tiled state affects the window geometry, so apply it here.
    if (window_states.tiled_edges != tiled_state_) {
      // This configure changes the decoration insets.  We should adjust the
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_toplevel_window_h b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_toplevel_window_h
index 7fa6eeb4d..b652301e0 100644
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_toplevel_window_h
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_toplevel_window_h
@@ -1,12 +1,12 @@
 Index: ui/ozone/platform/wayland/host/wayland_toplevel_window.h
 --- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig
 +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h
-@@ -256,7 +256,7 @@ class WaylandToplevelWindow : public WaylandWindow,
-   // Contains the previous state of the window.
-   PlatformWindowState previous_state_ = PlatformWindowState::kUnknown;
+@@ -265,7 +265,7 @@ class WaylandToplevelWindow : public WaylandWindow,
+   // The display ID to switch to in case the state is `kFullscreen`.
+   int64_t fullscreen_display_id_ = display::kInvalidDisplayId;
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Contains the current state of the tiled edges.
    WindowTiledEdges tiled_state_;
  #endif
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_window_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_window_cc
index 5d8452c6a..e95015c4b 100644
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_window_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_window_cc
@@ -1,7 +1,7 @@
 Index: ui/ozone/platform/wayland/host/wayland_window.cc
 --- ui/ozone/platform/wayland/host/wayland_window.cc.orig
 +++ ui/ozone/platform/wayland/host/wayland_window.cc
-@@ -233,7 +233,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused
+@@ -245,7 +245,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused
    // Whenever the window gets the pointer focus back, the cursor shape must be
    // updated. Otherwise, it is invalidated upon wl_pointer::leave and is not
    // restored by the Wayland compositor.
@@ -10,7 +10,7 @@ Index: ui/ozone/platform/wayland/host/wayland_window.cc
    if (focused && async_cursor_) {
      async_cursor_->AddCursorLoadedCallback(
          base::BindOnce(&WaylandWindow::OnCursorLoaded,
-@@ -490,7 +490,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const {
+@@ -506,7 +506,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const {
  void WaylandWindow::SetCursor(scoped_refptr<PlatformCursor> platform_cursor) {
    DCHECK(platform_cursor);
  
@@ -19,7 +19,16 @@ Index: ui/ozone/platform/wayland/host/wayland_window.cc
    auto async_cursor = WaylandAsyncCursor::FromPlatformCursor(platform_cursor);
  
    if (async_cursor_ == async_cursor) {
-@@ -1070,12 +1070,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi
+@@ -716,7 +716,7 @@ std::string WaylandWindow::WindowStates::ToString() co
+   } else {
+     base::TrimString(states, " ", &states);
+   }
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   states += "; tiled_edges: ";
+   std::string tiled = "";
+   if (tiled_edges.left) {
+@@ -1185,12 +1185,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi
          cursor->bitmaps(), hotspot_in_dips,
          std::ceil(cursor->cursor_image_scale_factor()));
    }
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_window_h b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_window_h
index a0c0cbe19..eed78e58f 100644
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_window_h
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_window_h
@@ -1,7 +1,7 @@
 Index: ui/ozone/platform/wayland/host/wayland_window.h
 --- ui/ozone/platform/wayland/host/wayland_window.h.orig
 +++ ui/ozone/platform/wayland/host/wayland_window.h
-@@ -38,7 +38,7 @@
+@@ -40,7 +40,7 @@
  #include "ui/platform_window/platform_window_init_properties.h"
  #include "ui/platform_window/wm/wm_drag_handler.h"
  
@@ -10,16 +10,16 @@ Index: ui/ozone/platform/wayland/host/wayland_window.h
  #include "ui/ozone/platform/wayland/host/wayland_async_cursor.h"
  #endif
  
-@@ -240,7 +240,7 @@ class WaylandWindow : public PlatformWindow,
+@@ -251,7 +251,7 @@ class WaylandWindow : public PlatformWindow,
      bool is_snapped_primary = false;
      bool is_snapped_secondary = false;
      bool is_floated = false;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      WindowTiledEdges tiled_edges;
  #endif
-   };
-@@ -487,7 +487,7 @@ class WaylandWindow : public PlatformWindow,
+ 
+@@ -510,7 +510,7 @@ class WaylandWindow : public PlatformWindow,
  
    void UpdateCursorShape(scoped_refptr<BitmapCursor> cursor);
  
@@ -28,7 +28,7 @@ Index: ui/ozone/platform/wayland/host/wayland_window.h
    void OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor,
                        scoped_refptr<BitmapCursor> bitmap_cursor);
  #endif
-@@ -546,7 +546,7 @@ class WaylandWindow : public PlatformWindow,
+@@ -571,7 +571,7 @@ class WaylandWindow : public PlatformWindow,
  
    wl::Object<zaura_surface> aura_surface_;
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_xdg_toplevel_wrapper_impl_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_xdg_toplevel_wrapper_impl_cc
index a13c96273..02209a3b5 100644
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_xdg_toplevel_wrapper_impl_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_xdg_toplevel_wrapper_impl_cc
@@ -1,12 +1,12 @@
 Index: ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc
 --- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig
 +++ ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc
-@@ -284,7 +284,7 @@ void XDGToplevelWrapperImpl::ConfigureTopLevel(
-           CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED),
-   };
+@@ -316,7 +316,7 @@ void XDGToplevelWrapperImpl::OnToplevelConfigure(void*
+   window_states.is_activated =
+       CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED);
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-   if (xdg_toplevel_get_version(xdg_toplevel) >=
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (xdg_toplevel_get_version(toplevel) >=
        XDG_TOPLEVEL_STATE_TILED_LEFT_SINCE_VERSION) {
      // All four tiled states have the same since version, so it is enough to
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_zwp_text_input_wrapper_v1_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_zwp_text_input_wrapper_v1_cc
index 4f2bb2bd7..356eb310c 100644
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_zwp_text_input_wrapper_v1_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_zwp_text_input_wrapper_v1_cc
@@ -1,7 +1,7 @@
 Index: ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc
 --- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig
 +++ ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc
-@@ -225,6 +225,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText(
+@@ -226,6 +226,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText(
    // so if it exceeds 16 bits, it may be broken.
    static constexpr size_t kSizeLimit = 60000;
    if (HasAdvancedSurroundingTextSupport() && text.length() > kSizeLimit) {
@@ -12,7 +12,7 @@ Index: ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc
      base::ScopedFD memfd(memfd_create("surrounding_text", MFD_CLOEXEC));
      if (!memfd.get()) {
        PLOG(ERROR) << "Failed to create memfd";
-@@ -237,6 +241,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText(
+@@ -238,6 +242,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText(
      zcr_extended_text_input_v1_set_large_surrounding_text(
          extended_obj_.get(), memfd.get(), text.length(),
          selection_range.start(), selection_range.end());
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_ozone_platform_wayland_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_ozone_platform_wayland_cc
index 0459bc6f3..92883a16d 100644
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_ozone_platform_wayland_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_ozone_platform_wayland_cc
@@ -1,7 +1,7 @@
 Index: ui/ozone/platform/wayland/ozone_platform_wayland.cc
 --- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig
 +++ ui/ozone/platform/wayland/ozone_platform_wayland.cc
-@@ -66,13 +66,13 @@
+@@ -67,13 +67,13 @@
  #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
  #endif
  
@@ -17,7 +17,7 @@ Index: ui/ozone/platform/wayland/ozone_platform_wayland.cc
  #include "ui/ozone/platform/wayland/host/linux_ui_delegate_wayland.h"
  #endif
  
-@@ -246,7 +246,7 @@ class OzonePlatformWayland : public OzonePlatform,
+@@ -268,7 +268,7 @@ class OzonePlatformWayland : public OzonePlatform,
  
      buffer_manager_connector_ = std::make_unique<WaylandBufferManagerConnector>(
          connection_->buffer_manager_host());
@@ -26,7 +26,7 @@ Index: ui/ozone/platform/wayland/ozone_platform_wayland.cc
      cursor_factory_ = std::make_unique<WaylandCursorFactory>(connection_.get());
  #else
      cursor_factory_ = std::make_unique<BitmapCursorFactory>();
-@@ -256,7 +256,7 @@ class OzonePlatformWayland : public OzonePlatform,
+@@ -278,7 +278,7 @@ class OzonePlatformWayland : public OzonePlatform,
  
      supported_buffer_formats_ =
          connection_->buffer_manager_host()->GetSupportedBufferFormats();
@@ -35,7 +35,16 @@ Index: ui/ozone/platform/wayland/ozone_platform_wayland.cc
      linux_ui_delegate_ =
          std::make_unique<LinuxUiDelegateWayland>(connection_.get());
  #endif
-@@ -489,7 +489,7 @@ class OzonePlatformWayland : public OzonePlatform,
+@@ -344,7 +344,7 @@ class OzonePlatformWayland : public OzonePlatform,
+       properties->supports_global_screen_coordinates =
+           kDefaultScreenCoordinateEnabled;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       // TODO(crbug.com/40800718): Revisit (and maybe remove) once proper
+       // support, probably backed by org.freedesktop.portal.Screenshot.PickColor
+       // API is implemented. Note: this is restricted to Linux Desktop as Lacros
+@@ -532,7 +532,7 @@ class OzonePlatformWayland : public OzonePlatform,
    DrmRenderNodePathFinder path_finder_;
  #endif
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_ozone_platform_x11_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_ozone_platform_x11_cc
deleted file mode 100644
index fe98e2582..000000000
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_ozone_platform_x11_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ui/ozone/platform/x11/ozone_platform_x11.cc
---- ui/ozone/platform/x11/ozone_platform_x11.cc.orig
-+++ ui/ozone/platform/x11/ozone_platform_x11.cc
-@@ -197,7 +197,7 @@ class OzonePlatformX11 : public OzonePlatform,
-       properties->supports_global_application_menus = true;
-       properties->app_modal_dialogs_use_event_blocker = true;
-       properties->fetch_buffer_formats_for_gmb_on_gpu = true;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       properties->supports_vaapi = true;
- #endif
- 
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_vulkan_implementation_x11_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_vulkan_implementation_x11_cc
index 572590d2b..bf33ae9d3 100644
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_vulkan_implementation_x11_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_vulkan_implementation_x11_cc
@@ -1,7 +1,7 @@
 Index: ui/ozone/platform/x11/vulkan_implementation_x11.cc
 --- ui/ozone/platform/x11/vulkan_implementation_x11.cc.orig
 +++ ui/ozone/platform/x11/vulkan_implementation_x11.cc
-@@ -58,7 +58,11 @@ bool VulkanImplementationX11::InitializeVulkanInstance
+@@ -59,7 +59,11 @@ bool VulkanImplementationX11::InitializeVulkanInstance
  
      path = path.Append("libvk_swiftshader.so");
    } else {
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_screen_ozone_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_screen_ozone_cc
index 24398c405..3fef96f6b 100644
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_screen_ozone_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_screen_ozone_cc
@@ -1,12 +1,30 @@
 Index: ui/ozone/platform/x11/x11_screen_ozone.cc
 --- ui/ozone/platform/x11/x11_screen_ozone.cc.orig
 +++ ui/ozone/platform/x11/x11_screen_ozone.cc
-@@ -235,7 +235,7 @@ base::Value::List X11ScreenOzone::GetGpuExtraInfo(
-   return result;
+@@ -22,7 +22,7 @@
+ #include "ui/ozone/platform/x11/x11_window.h"
+ #include "ui/ozone/platform/x11/x11_window_manager.h"
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/linux/linux_ui.h"
+ #endif
+ 
+@@ -97,7 +97,7 @@ X11ScreenOzone::X11ScreenOzone()
+       window_manager_(X11WindowManager::GetInstance()),
+       x11_display_manager_(std::make_unique<XDisplayManager>(this)) {
+   DCHECK(window_manager_);
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (auto* linux_ui = ui::LinuxUi::instance()) {
+     display_scale_factor_observer_.Observe(linux_ui);
+   }
+@@ -260,7 +260,7 @@ void X11ScreenOzone::OnEvent(const x11::Event& xev) {
+   x11_display_manager_->OnEvent(xev);
  }
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void X11ScreenOzone::SetDisplayConfig(const DisplayConfig& display_config) {
-   display_config_ = &display_config;
-   // See DesktopScreenLinux, which sets the |device_scale_factor| before |this|
+ void X11ScreenOzone::OnDeviceScaleFactorChanged() {
+   x11_display_manager_->DispatchDelayedDisplayListUpdate();
+ }
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_screen_ozone_h b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_screen_ozone_h
index 6ffc43667..1e5513e31 100644
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_screen_ozone_h
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_screen_ozone_h
@@ -1,12 +1,39 @@
 Index: ui/ozone/platform/x11/x11_screen_ozone.h
 --- ui/ozone/platform/x11/x11_screen_ozone.h.orig
 +++ ui/ozone/platform/x11/x11_screen_ozone.h
-@@ -61,7 +61,7 @@ class X11ScreenOzone : public PlatformScreen,
-   std::string GetCurrentWorkspace() override;
-   base::Value::List GetGpuExtraInfo(
-       const gfx::GpuExtraInfo& gpu_extra_info) override;
+@@ -16,7 +16,7 @@
+ #include "ui/gfx/x/event.h"
+ #include "ui/ozone/public/platform_screen.h"
+ 
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   void SetDisplayConfig(const DisplayConfig& display_config) override;
+ #include "ui/linux/device_scale_factor_observer.h"
+ #include "ui/linux/linux_ui.h"
  #endif
+@@ -29,7 +29,7 @@ class X11WindowManager;
+ class X11ScreenOzone : public PlatformScreen,
+                        public x11::EventObserver,
+                        public XDisplayManager::Delegate
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     ,
+                        public DeviceScaleFactorObserver
+ #endif
+@@ -97,7 +97,7 @@ class X11ScreenOzone : public PlatformScreen,
+   // ui::XDisplayManager::Delegate:
+   void OnXDisplayListUpdated() override;
  
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // DeviceScaleFactorObserver:
+   void OnDeviceScaleFactorChanged() override;
+ #endif
+@@ -109,7 +109,7 @@ class X11ScreenOzone : public PlatformScreen,
+   // Indicates that |this| is initialized.
+   bool initialized_ = false;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   base::ScopedObservation<ui::LinuxUi, DeviceScaleFactorObserver>
+       display_scale_factor_observer_{this};
+ #endif
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_window_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_window_cc
new file mode 100644
index 000000000..d6e63bb1c
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_window_cc
@@ -0,0 +1,12 @@
+Index: ui/ozone/platform/x11/x11_window.cc
+--- ui/ozone/platform/x11/x11_window.cc.orig
++++ ui/ozone/platform/x11/x11_window.cc
+@@ -1501,7 +1501,7 @@ void X11Window::OnXWindowStateChanged() {
+   WindowTiledEdges tiled_state = GetTiledState();
+   if (tiled_state != tiled_state_) {
+     tiled_state_ = tiled_state;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     platform_window_delegate_->OnWindowTiledStateChanged(tiled_state);
+ #endif
+   }
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_public_ozone_platform_h b/www/ungoogled-chromium/patches/patch-ui_ozone_public_ozone_platform_h
deleted file mode 100644
index 1c7243cf2..000000000
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_public_ozone_platform_h
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ui/ozone/public/ozone_platform.h
---- ui/ozone/public/ozone_platform.h.orig
-+++ ui/ozone/public/ozone_platform.h
-@@ -143,7 +143,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
-     // back via gpu extra info.
-     bool fetch_buffer_formats_for_gmb_on_gpu = false;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on
-     // Linux. At the moment, VA-API Linux implementation supports only X11
-     // backend. This implementation must be refactored to support Ozone
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_public_platform_screen_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_public_platform_screen_cc
deleted file mode 100644
index 916cf5da1..000000000
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_public_platform_screen_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ui/ozone/public/platform_screen.cc
---- ui/ozone/public/platform_screen.cc.orig
-+++ ui/ozone/public/platform_screen.cc
-@@ -61,7 +61,7 @@ display::TabletState PlatformScreen::GetTabletState() 
- }
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void PlatformScreen::SetDisplayConfig(const DisplayConfig& display_config) {}
- #endif
- 
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_public_platform_screen_h b/www/ungoogled-chromium/patches/patch-ui_ozone_public_platform_screen_h
deleted file mode 100644
index 120e1a8d1..000000000
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_public_platform_screen_h
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: ui/ozone/public/platform_screen.h
---- ui/ozone/public/platform_screen.h.orig
-+++ ui/ozone/public/platform_screen.h
-@@ -15,7 +15,7 @@
- #include "ui/gfx/gpu_extra_info.h"
- #include "ui/gfx/native_widget_types.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/linux/linux_ui.h"
- #endif
- 
-@@ -136,7 +136,7 @@ class COMPONENT_EXPORT(OZONE_BASE) PlatformScreen {
-   virtual base::Value::List GetGpuExtraInfo(
-       const gfx::GpuExtraInfo& gpu_extra_info);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Sets device scale factor received from external sources such as toolkits.
-   virtual void SetDisplayConfig(const DisplayConfig& display_config);
- #endif
diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_test_mock_platform_window_delegate_h b/www/ungoogled-chromium/patches/patch-ui_ozone_test_mock_platform_window_delegate_h
index 87ba51df8..9eea34b14 100644
--- a/www/ungoogled-chromium/patches/patch-ui_ozone_test_mock_platform_window_delegate_h
+++ b/www/ungoogled-chromium/patches/patch-ui_ozone_test_mock_platform_window_delegate_h
@@ -1,12 +1,12 @@
 Index: ui/ozone/test/mock_platform_window_delegate.h
 --- ui/ozone/test/mock_platform_window_delegate.h.orig
 +++ ui/ozone/test/mock_platform_window_delegate.h
-@@ -32,7 +32,7 @@ class MockPlatformWindowDelegate : public PlatformWind
+@@ -33,7 +33,7 @@ class MockPlatformWindowDelegate : public PlatformWind
    MOCK_METHOD2(OnWindowStateChanged,
                 void(PlatformWindowState old_state,
                      PlatformWindowState new_state));
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    MOCK_METHOD1(OnWindowTiledStateChanged,
                 void(WindowTiledEdges new_tiled_edges));
  #endif
diff --git a/www/ungoogled-chromium/patches/patch-ui_platform_window_platform_window_delegate_cc b/www/ungoogled-chromium/patches/patch-ui_platform_window_platform_window_delegate_cc
index 6f7552021..8d0a93528 100644
--- a/www/ungoogled-chromium/patches/patch-ui_platform_window_platform_window_delegate_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_platform_window_platform_window_delegate_cc
@@ -1,12 +1,12 @@
 Index: ui/platform_window/platform_window_delegate.cc
 --- ui/platform_window/platform_window_delegate.cc.orig
 +++ ui/platform_window/platform_window_delegate.cc
-@@ -36,7 +36,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def
+@@ -48,7 +48,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def
  
  PlatformWindowDelegate::~PlatformWindowDelegate() = default;
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void PlatformWindowDelegate::OnWindowTiledStateChanged(
      WindowTiledEdges new_tiled_edges) {}
  #endif
diff --git a/www/ungoogled-chromium/patches/patch-ui_platform_window_platform_window_delegate_h b/www/ungoogled-chromium/patches/patch-ui_platform_window_platform_window_delegate_h
index 9c6b48b6d..6e55ddf3c 100644
--- a/www/ungoogled-chromium/patches/patch-ui_platform_window_platform_window_delegate_h
+++ b/www/ungoogled-chromium/patches/patch-ui_platform_window_platform_window_delegate_h
@@ -1,12 +1,12 @@
 Index: ui/platform_window/platform_window_delegate.h
 --- ui/platform_window/platform_window_delegate.h.orig
 +++ ui/platform_window/platform_window_delegate.h
-@@ -134,7 +134,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
+@@ -166,7 +166,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
    virtual void OnWindowStateChanged(PlatformWindowState old_state,
                                      PlatformWindowState new_state) = 0;
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Notifies the delegate that the tiled state of the window edges has changed.
    virtual void OnWindowTiledStateChanged(WindowTiledEdges new_tiled_edges);
  #endif
diff --git a/www/ungoogled-chromium/patches/patch-ui_platform_window_platform_window_init_properties_h b/www/ungoogled-chromium/patches/patch-ui_platform_window_platform_window_init_properties_h
index b4fffe306..84a8432f6 100644
--- a/www/ungoogled-chromium/patches/patch-ui_platform_window_platform_window_init_properties_h
+++ b/www/ungoogled-chromium/patches/patch-ui_platform_window_platform_window_init_properties_h
@@ -10,7 +10,7 @@ Index: ui/platform_window/platform_window_init_properties.h
  class X11ExtensionDelegate;
  #endif
  
-@@ -118,7 +118,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo
+@@ -121,7 +121,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo
  
    PlatformWindowShadowType shadow_type = PlatformWindowShadowType::kDefault;
  
@@ -18,4 +18,4 @@ Index: ui/platform_window/platform_window_init_properties.h
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    bool prefer_dark_theme = false;
    raw_ptr<gfx::ImageSkia> icon = nullptr;
-   absl::optional<SkColor> background_color;
+   std::optional<SkColor> background_color;
diff --git a/www/ungoogled-chromium/patches/patch-ui_qt_BUILD_gn b/www/ungoogled-chromium/patches/patch-ui_qt_BUILD_gn
new file mode 100644
index 000000000..b510da1cf
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_qt_BUILD_gn
@@ -0,0 +1,12 @@
+Index: ui/qt/BUILD.gn
+--- ui/qt/BUILD.gn.orig
++++ ui/qt/BUILD.gn
+@@ -20,7 +20,7 @@ config("qt_internal_config") {
+ 
+   # It's OK to depend on the system libstdc++ since it's a dependency of QT, so
+   # it will get loaded into the process anyway.
+-  libs = [ "stdc++" ]
++  # libs = [ "stdc++" ]
+ 
+   configs = [
+     "//build/config/linux:runtime_library",
diff --git a/www/ungoogled-chromium/patches/patch-ui_strings_app_locale_settings_grd b/www/ungoogled-chromium/patches/patch-ui_strings_app_locale_settings_grd
deleted file mode 100644
index b95946e2f..000000000
--- a/www/ungoogled-chromium/patches/patch-ui_strings_app_locale_settings_grd
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ui/strings/app_locale_settings.grd
---- ui/strings/app_locale_settings.grd.orig
-+++ ui/strings/app_locale_settings.grd
-@@ -218,7 +218,7 @@
-           75%
-         </message>
-       </if>
--      <if expr="is_linux or is_android or is_bsd or is_fuchsia">
-+      <if expr="is_posix or is_android or is_bsd or is_fuchsia">
-         <!-- The font used in Web UI (e.g. History). Note that these are only
-              backups. We try to use the system font if possible. -->
-         <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_controls_textfield_textfield_cc b/www/ungoogled-chromium/patches/patch-ui_views_controls_textfield_textfield_cc
index 34c267203..8dadb82cd 100644
--- a/www/ungoogled-chromium/patches/patch-ui_views_controls_textfield_textfield_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_views_controls_textfield_textfield_cc
@@ -1,16 +1,16 @@
 Index: ui/views/controls/textfield/textfield.cc
 --- ui/views/controls/textfield/textfield.cc.orig
 +++ ui/views/controls/textfield/textfield.cc
-@@ -78,7 +78,7 @@
+@@ -85,7 +85,7 @@
  #include "base/win/win_util.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
+ #include "ui/base/ime/text_input_flags.h"
  #include "ui/linux/linux_ui.h"
- #endif
-@@ -172,7 +172,7 @@ bool IsControlKeyModifier(int flags) {
+@@ -183,7 +183,7 @@ bool IsControlKeyModifier(int flags) {
  // Control-modified key combination, but we cannot extend it to other platforms
  // as Control has different meanings and behaviors.
  // https://crrev.com/2580483002/#msg46
@@ -19,7 +19,7 @@ Index: ui/views/controls/textfield/textfield.cc
    return flags & ui::EF_CONTROL_DOWN;
  #else
    return false;
-@@ -741,7 +741,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
+@@ -742,7 +742,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
    if (!textfield)
      return handled;
  
@@ -28,7 +28,7 @@ Index: ui/views/controls/textfield/textfield.cc
    auto* linux_ui = ui::LinuxUi::instance();
    std::vector<ui::TextEditCommandAuraLinux> commands;
    if (!handled && linux_ui &&
-@@ -923,7 +923,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
+@@ -925,7 +925,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
  }
  
  bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
@@ -37,7 +37,7 @@ Index: ui/views/controls/textfield/textfield.cc
    // Skip any accelerator handling that conflicts with custom keybindings.
    auto* linux_ui = ui::LinuxUi::instance();
    std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -1928,7 +1928,7 @@ bool Textfield::ShouldDoLearning() {
+@@ -1978,7 +1978,7 @@ bool Textfield::ShouldDoLearning() {
    return false;
  }
  
@@ -46,7 +46,7 @@ Index: ui/views/controls/textfield/textfield.cc
  // TODO(https://crbug.com/952355): Implement this method to support Korean IME
  // reconversion feature on native text fields (e.g. find bar).
  bool Textfield::SetCompositionFromExistingText(
-@@ -2441,14 +2441,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
+@@ -2482,14 +2482,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
  #endif
          return ui::TextEditCommand::DELETE_BACKWARD;
        }
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_controls_textfield_textfield_h b/www/ungoogled-chromium/patches/patch-ui_views_controls_textfield_textfield_h
index 5f7c79a7f..a3d36daa9 100644
--- a/www/ungoogled-chromium/patches/patch-ui_views_controls_textfield_textfield_h
+++ b/www/ungoogled-chromium/patches/patch-ui_views_controls_textfield_textfield_h
@@ -1,8 +1,8 @@
 Index: ui/views/controls/textfield/textfield.h
 --- ui/views/controls/textfield/textfield.h.orig
 +++ ui/views/controls/textfield/textfield.h
-@@ -43,7 +43,7 @@
- #include "ui/views/view.h"
+@@ -47,7 +47,7 @@
+ #include "ui/views/view_observer.h"
  #include "ui/views/word_lookup_client.h"
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -10,7 +10,7 @@ Index: ui/views/controls/textfield/textfield.h
  #include <vector>
  #endif
  
-@@ -451,7 +451,7 @@ class VIEWS_EXPORT Textfield : public View,
+@@ -461,7 +461,7 @@ class VIEWS_EXPORT Textfield : public View,
    // Set whether the text should be used to improve typing suggestions.
    void SetShouldDoLearning(bool value) { should_do_learning_ = value; }
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_corewm_tooltip_aura_cc b/www/ungoogled-chromium/patches/patch-ui_views_corewm_tooltip_aura_cc
index 5c5d28069..a57b34977 100644
--- a/www/ungoogled-chromium/patches/patch-ui_views_corewm_tooltip_aura_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_views_corewm_tooltip_aura_cc
@@ -1,7 +1,7 @@
 Index: ui/views/corewm/tooltip_aura.cc
 --- ui/views/corewm/tooltip_aura.cc.orig
 +++ ui/views/corewm/tooltip_aura.cc
-@@ -38,7 +38,7 @@ namespace {
+@@ -36,7 +36,7 @@ namespace {
  bool CanUseTranslucentTooltipWidget() {
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_focus_focus_manager_cc b/www/ungoogled-chromium/patches/patch-ui_views_focus_focus_manager_cc
index e5a709cc9..8acbb73af 100644
--- a/www/ungoogled-chromium/patches/patch-ui_views_focus_focus_manager_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_views_focus_focus_manager_cc
@@ -1,7 +1,7 @@
 Index: ui/views/focus/focus_manager.cc
 --- ui/views/focus/focus_manager.cc.orig
 +++ ui/views/focus/focus_manager.cc
-@@ -577,7 +577,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
+@@ -579,7 +579,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -10,7 +10,7 @@ Index: ui/views/focus/focus_manager.cc
    // Processing an accelerator can delete things. Because we
    // need these objects afterwards on Linux, save widget_ as weak pointer and
    // save the close_on_deactivate property value of widget_delegate in a
-@@ -594,7 +594,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
+@@ -596,7 +596,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_style_platform_style_cc b/www/ungoogled-chromium/patches/patch-ui_views_style_platform_style_cc
index 0217057e1..de765a55e 100644
--- a/www/ungoogled-chromium/patches/patch-ui_views_style_platform_style_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_views_style_platform_style_cc
@@ -19,12 +19,12 @@ Index: ui/views/style/platform_style.cc
      false;
  #else
      true;
-@@ -58,7 +58,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen =
- 
+@@ -59,7 +59,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen =
  // static
- std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) {
+ std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(
+     ScrollBar::Orientation orientation) {
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return std::make_unique<OverlayScrollBar>(is_horizontal);
+   return std::make_unique<OverlayScrollBar>(orientation);
  #else
-   return std::make_unique<ScrollBarViews>(is_horizontal);
+   return std::make_unique<ScrollBarViews>(orientation);
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_test_ui_controls_factory_desktop_aura_ozone_cc b/www/ungoogled-chromium/patches/patch-ui_views_test_ui_controls_factory_desktop_aura_ozone_cc
new file mode 100644
index 000000000..acf137478
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_views_test_ui_controls_factory_desktop_aura_ozone_cc
@@ -0,0 +1,12 @@
+Index: ui/views/test/ui_controls_factory_desktop_aura_ozone.cc
+--- ui/views/test/ui_controls_factory_desktop_aura_ozone.cc.orig
++++ ui/views/test/ui_controls_factory_desktop_aura_ozone.cc
+@@ -296,7 +296,7 @@ void UpdateDisplaySync(const std::string& display_spec
+ }
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // static
+ void ForceUseScreenCoordinatesOnce() {
+   g_ozone_ui_controls_test_helper->ForceUseScreenCoordinatesOnce();
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_views_delegate_h b/www/ungoogled-chromium/patches/patch-ui_views_views_delegate_h
index b03308442..fd6cb7eb5 100644
--- a/www/ungoogled-chromium/patches/patch-ui_views_views_delegate_h
+++ b/www/ungoogled-chromium/patches/patch-ui_views_views_delegate_h
@@ -1,7 +1,7 @@
 Index: ui/views/views_delegate.h
 --- ui/views/views_delegate.h.orig
 +++ ui/views/views_delegate.h
-@@ -139,7 +139,7 @@ class VIEWS_EXPORT ViewsDelegate {
+@@ -146,7 +146,7 @@ class VIEWS_EXPORT ViewsDelegate {
    // environment.
    virtual bool IsWindowInMetro(gfx::NativeWindow window) const;
  #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_drag_drop_client_ozone_cc b/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_drag_drop_client_ozone_cc
index 422f07849..53e96a216 100644
--- a/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_drag_drop_client_ozone_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_drag_drop_client_ozone_cc
@@ -1,8 +1,8 @@
 Index: ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc
 --- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig
 +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc
-@@ -194,7 +194,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd
-   return drag_operation_;
+@@ -196,7 +196,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd
+   return selected_operation_;
  }
  
 -#if BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_drag_drop_client_ozone_h b/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_drag_drop_client_ozone_h
index 4a1876c5f..f82b13825 100644
--- a/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_drag_drop_client_ozone_h
+++ b/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_drag_drop_client_ozone_h
@@ -1,7 +1,7 @@
 Index: ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h
 --- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig
 +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h
-@@ -66,7 +66,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone
+@@ -65,7 +65,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone
      // The offset of |drag_widget_| relative to the mouse position.
      gfx::Vector2d offset;
  
@@ -10,7 +10,7 @@ Index: ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h
      // The last received drag location.  The drag widget is moved asynchronously
      // so its position is updated when the UI thread has time for that.  When
      // the first change to the location happens, a call to UpdateDragWidget()
-@@ -87,7 +87,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone
+@@ -86,7 +86,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone
        const gfx::Point& root_location,
        int allowed_operations,
        ui::mojom::DragEventSource source) override;
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_screen_ozone_cc b/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_screen_ozone_cc
deleted file mode 100644
index 1748c44bc..000000000
--- a/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_screen_ozone_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ui/views/widget/desktop_aura/desktop_screen_ozone.cc
---- ui/views/widget/desktop_aura/desktop_screen_ozone.cc.orig
-+++ ui/views/widget/desktop_aura/desktop_screen_ozone.cc
-@@ -25,7 +25,7 @@ gfx::NativeWindow DesktopScreenOzone::GetNativeWindowF
-       widget);
- }
- 
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- std::unique_ptr<display::Screen> CreateDesktopScreen() {
-   auto screen = std::make_unique<DesktopScreenOzone>();
-   screen->Initialize();
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_window_tree_host_platform_cc b/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_window_tree_host_platform_cc
index a717c03b1..b470706ac 100644
--- a/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_window_tree_host_platform_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_window_tree_host_platform_cc
@@ -1,7 +1,7 @@
 Index: ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-@@ -43,7 +43,7 @@
+@@ -47,7 +47,7 @@
  #include "ui/wm/core/window_util.h"
  #include "ui/wm/public/window_move_client.h"
  
@@ -10,7 +10,7 @@ Index: ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
  #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h"
  #endif
  
-@@ -264,7 +264,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget:
+@@ -272,7 +272,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget:
    if (params.type == Widget::InitParams::TYPE_WINDOW)
      GetContentWindow()->SetProperty(aura::client::kAnimationsDisabledKey, true);
  
@@ -19,7 +19,7 @@ Index: ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
    const bool requires_accelerated_widget = params.requires_accelerated_widget;
  #else
    const bool requires_accelerated_widget = false;
-@@ -345,7 +345,7 @@ std::unique_ptr<aura::client::DragDropClient>
+@@ -356,7 +356,7 @@ std::unique_ptr<aura::client::DragDropClient>
  DesktopWindowTreeHostPlatform::CreateDragDropClient() {
    ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window()));
    std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client =
@@ -28,7 +28,7 @@ Index: ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
        std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler);
  #else
        std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler);
-@@ -1072,7 +1072,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg
+@@ -1117,7 +1117,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg
  // DesktopWindowTreeHost:
  
  // Linux subclasses this host and adds some Linux specific bits.
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_window_tree_host_platform_impl_interactive_uitest_cc b/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_window_tree_host_platform_impl_interactive_uitest_cc
index 845c44c6a..f8ab8741e 100644
--- a/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_window_tree_host_platform_impl_interactive_uitest_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_views_widget_desktop_aura_desktop_window_tree_host_platform_impl_interactive_uitest_cc
@@ -1,7 +1,7 @@
 Index: ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc.orig
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc
-@@ -21,7 +21,7 @@
+@@ -23,7 +23,7 @@
  #include "ui/views/widget/widget_delegate.h"
  #include "ui/views/window/native_frame_view.h"
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_widget_root_view_cc b/www/ungoogled-chromium/patches/patch-ui_views_widget_root_view_cc
new file mode 100644
index 000000000..53b785e99
--- /dev/null
+++ b/www/ungoogled-chromium/patches/patch-ui_views_widget_root_view_cc
@@ -0,0 +1,12 @@
+Index: ui/views/widget/root_view.cc
+--- ui/views/widget/root_view.cc.orig
++++ ui/views/widget/root_view.cc
+@@ -127,7 +127,7 @@ class AnnounceTextView : public View {
+ #if BUILDFLAG(IS_CHROMEOS)
+     // On ChromeOS, kAlert role can invoke an unnecessary event on reparenting.
+     node_data->role = ax::mojom::Role::kStaticText;
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // TODO(crbug.com/1024898): Use live regions (do not use alerts).
+     // May require setting kLiveStatus, kContainerLiveStatus to "polite".
+     node_data->role = ax::mojom::Role::kAlert;
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_widget_widget_cc b/www/ungoogled-chromium/patches/patch-ui_views_widget_widget_cc
index 8da695bb6..cdc7e6429 100644
--- a/www/ungoogled-chromium/patches/patch-ui_views_widget_widget_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_views_widget_widget_cc
@@ -10,7 +10,7 @@ Index: ui/views/widget/widget.cc
  #include "ui/linux/linux_ui.h"
  #endif
  
-@@ -2026,7 +2026,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const 
+@@ -2106,7 +2106,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const 
    if (parent_)
      return parent_->GetNativeTheme();
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_widget_widget_h b/www/ungoogled-chromium/patches/patch-ui_views_widget_widget_h
index e76df3e06..0acc4e8d0 100644
--- a/www/ungoogled-chromium/patches/patch-ui_views_widget_widget_h
+++ b/www/ungoogled-chromium/patches/patch-ui_views_widget_widget_h
@@ -1,7 +1,7 @@
 Index: ui/views/widget/widget.h
 --- ui/views/widget/widget.h.orig
 +++ ui/views/widget/widget.h
-@@ -410,7 +410,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid
+@@ -427,7 +427,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid
      // If set, the widget was created in headless mode.
      bool headless_mode = false;
  
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_window_dialog_delegate_cc b/www/ungoogled-chromium/patches/patch-ui_views_window_dialog_delegate_cc
index d94227b6a..a418631ea 100644
--- a/www/ungoogled-chromium/patches/patch-ui_views_window_dialog_delegate_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_views_window_dialog_delegate_cc
@@ -1,7 +1,7 @@
 Index: ui/views/window/dialog_delegate.cc
 --- ui/views/window/dialog_delegate.cc.orig
 +++ ui/views/window/dialog_delegate.cc
-@@ -83,7 +83,7 @@ Widget* DialogDelegate::CreateDialogWidget(
+@@ -79,7 +79,7 @@ Widget* DialogDelegate::CreateDialogWidget(
  
  // static
  bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) {
diff --git a/www/ungoogled-chromium/patches/patch-ui_views_window_frame_background_cc b/www/ungoogled-chromium/patches/patch-ui_views_window_frame_background_cc
index f75ef3632..251882d55 100644
--- a/www/ungoogled-chromium/patches/patch-ui_views_window_frame_background_cc
+++ b/www/ungoogled-chromium/patches/patch-ui_views_window_frame_background_cc
@@ -8,5 +8,5 @@ Index: ui/views/window/frame_background.cc
 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
      BUILDFLAG(ENABLE_DESKTOP_AURA)
-   ui::NativeTheme::ExtraParams params;
-   params.frame_top_area.use_custom_frame = use_custom_frame_;
+   ui::NativeTheme::FrameTopAreaExtraParams frame_top_area;
+   frame_top_area.use_custom_frame = use_custom_frame_;
diff --git a/www/ungoogled-chromium/patches/patch-v8_BUILD_gn b/www/ungoogled-chromium/patches/patch-v8_BUILD_gn
index bed988da8..33c9ae4e4 100644
--- a/www/ungoogled-chromium/patches/patch-v8_BUILD_gn
+++ b/www/ungoogled-chromium/patches/patch-v8_BUILD_gn
@@ -1,7 +1,7 @@
 Index: v8/BUILD.gn
 --- v8/BUILD.gn.orig
 +++ v8/BUILD.gn
-@@ -1404,6 +1404,14 @@ config("toolchain") {
+@@ -1455,6 +1455,14 @@ config("toolchain") {
    } else if (target_os == "chromeos") {
      defines += [ "V8_HAVE_TARGET_OS" ]
      defines += [ "V8_TARGET_OS_CHROMEOS" ]
@@ -16,19 +16,7 @@ Index: v8/BUILD.gn
    }
  
    # TODO(infra): Support v8_enable_prof on Windows.
-@@ -2331,6 +2339,11 @@ template("run_mksnapshot") {
-         "--turbo-log-builtins-count-input",
-         v8_log_builtins_block_count_input,
-       ]
-+      if (v8_current_cpu == "x86") {
-+        args -= [
-+          "--abort-on-bad-builtin-profile-data",
-+        ]
-+      }
-     }
- 
-     if (v8_enable_builtins_profiling) {
-@@ -2353,6 +2366,12 @@ template("run_mksnapshot") {
+@@ -2442,6 +2450,12 @@ template("run_mksnapshot") {
        if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) {
          args += [ "--reorder-builtins" ]
        }
@@ -41,7 +29,7 @@ Index: v8/BUILD.gn
      }
  
      # This is needed to distinguish between generating code for the simulator
-@@ -6081,7 +6100,7 @@ v8_component("v8_libbase") {
+@@ -6448,7 +6462,7 @@ v8_component("v8_libbase") {
      }
    }
  
@@ -50,7 +38,7 @@ Index: v8/BUILD.gn
      sources += [
        "src/base/debug/stack_trace_posix.cc",
        "src/base/platform/platform-linux.cc",
-@@ -6092,6 +6111,18 @@ v8_component("v8_libbase") {
+@@ -6459,6 +6473,18 @@ v8_component("v8_libbase") {
        "dl",
        "rt",
      ]
diff --git a/www/ungoogled-chromium/patches/patch-v8_include_v8-internal_h b/www/ungoogled-chromium/patches/patch-v8_include_v8-internal_h
index 27da62185..a0b5623b9 100644
--- a/www/ungoogled-chromium/patches/patch-v8_include_v8-internal_h
+++ b/www/ungoogled-chromium/patches/patch-v8_include_v8-internal_h
@@ -1,12 +1,12 @@
 Index: v8/include/v8-internal.h
 --- v8/include/v8-internal.h.orig
 +++ v8/include/v8-internal.h
-@@ -172,7 +172,7 @@ using SandboxedPointer_t = Address;
+@@ -175,7 +175,7 @@ using SandboxedPointer_t = Address;
  #ifdef V8_ENABLE_SANDBOX
  
  // Size of the sandbox, excluding the guard regions surrounding it.
--#ifdef V8_TARGET_OS_ANDROID
-+#if defined(V8_TARGET_OS_ANDROID) || defined(V8_TARGET_OS_OPENBSD)
+-#if defined(V8_TARGET_OS_ANDROID)
++#if (defined(V8_TARGET_OS_ANDROID) || defined(V8_TARGET_OS_OPENBSD))
  // On Android, most 64-bit devices seem to be configured with only 39 bits of
  // virtual address space for userspace. As such, limit the sandbox to 128GB (a
  // quarter of the total available address space).
diff --git a/www/ungoogled-chromium/patches/patch-v8_include_v8config_h b/www/ungoogled-chromium/patches/patch-v8_include_v8config_h
index 19d73f29c..65f86c78d 100644
--- a/www/ungoogled-chromium/patches/patch-v8_include_v8config_h
+++ b/www/ungoogled-chromium/patches/patch-v8_include_v8config_h
@@ -1,7 +1,7 @@
 Index: v8/include/v8config.h
 --- v8/include/v8config.h.orig
 +++ v8/include/v8config.h
-@@ -184,6 +184,8 @@ path. Add it with -I<path> to the command line
+@@ -185,6 +185,8 @@ path. Add it with -I<path> to the command line
    && !defined(V8_TARGET_OS_FUCHSIA) \
    && !defined(V8_TARGET_OS_IOS) \
    && !defined(V8_TARGET_OS_LINUX) \
@@ -10,7 +10,7 @@ Index: v8/include/v8config.h
    && !defined(V8_TARGET_OS_MACOS) \
    && !defined(V8_TARGET_OS_WIN) \
    && !defined(V8_TARGET_OS_CHROMEOS)
-@@ -196,6 +198,8 @@ path. Add it with -I<path> to the command line
+@@ -197,6 +199,8 @@ path. Add it with -I<path> to the command line
    || defined(V8_TARGET_OS_FUCHSIA) \
    || defined(V8_TARGET_OS_IOS) \
    || defined(V8_TARGET_OS_LINUX) \
@@ -19,7 +19,7 @@ Index: v8/include/v8config.h
    || defined(V8_TARGET_OS_MACOS) \
    || defined(V8_TARGET_OS_WIN) \
    || defined(V8_TARGET_OS_CHROMEOS)
-@@ -217,6 +221,16 @@ path. Add it with -I<path> to the command line
+@@ -218,6 +222,16 @@ path. Add it with -I<path> to the command line
  
  #ifdef V8_OS_LINUX
  # define V8_TARGET_OS_LINUX
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_api_api_cc b/www/ungoogled-chromium/patches/patch-v8_src_api_api_cc
index aea7ca428..c031ca5a1 100644
--- a/www/ungoogled-chromium/patches/patch-v8_src_api_api_cc
+++ b/www/ungoogled-chromium/patches/patch-v8_src_api_api_cc
@@ -1,7 +1,7 @@
 Index: v8/src/api/api.cc
 --- v8/src/api/api.cc.orig
 +++ v8/src/api/api.cc
-@@ -141,7 +141,7 @@
+@@ -144,7 +144,7 @@
  #include "src/wasm/wasm-serialization.h"
  #endif  // V8_ENABLE_WEBASSEMBLY
  
@@ -10,7 +10,7 @@ Index: v8/src/api/api.cc
  #include <signal.h>
  #include <unistd.h>
  
-@@ -6336,7 +6336,7 @@ bool v8::V8::Initialize(const int build_config) {
+@@ -6396,7 +6396,7 @@ bool v8::V8::Initialize(const int build_config) {
    return true;
  }
  
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_base_platform_platform-posix_cc b/www/ungoogled-chromium/patches/patch-v8_src_base_platform_platform-posix_cc
index 6e1fb4d1f..1f9b5cca4 100644
--- a/www/ungoogled-chromium/patches/patch-v8_src_base_platform_platform-posix_cc
+++ b/www/ungoogled-chromium/patches/patch-v8_src_base_platform_platform-posix_cc
@@ -1,7 +1,7 @@
 Index: v8/src/base/platform/platform-posix.cc
 --- v8/src/base/platform/platform-posix.cc.orig
 +++ v8/src/base/platform/platform-posix.cc
-@@ -55,7 +55,7 @@
+@@ -54,7 +54,7 @@
  #if V8_OS_DARWIN
  #include <mach/mach.h>
  #include <malloc/malloc.h>
@@ -10,7 +10,7 @@ Index: v8/src/base/platform/platform-posix.cc
  #include <malloc.h>
  #endif
  
-@@ -73,7 +73,7 @@
+@@ -72,7 +72,7 @@
  #include <sys/syscall.h>
  #endif
  
@@ -19,7 +19,7 @@ Index: v8/src/base/platform/platform-posix.cc
  #define MAP_ANONYMOUS MAP_ANON
  #endif
  
-@@ -305,8 +305,15 @@ void OS::SetRandomMmapSeed(int64_t seed) {
+@@ -303,8 +303,15 @@ void OS::SetRandomMmapSeed(int64_t seed) {
    }
  }
  
@@ -35,7 +35,7 @@ Index: v8/src/base/platform/platform-posix.cc
    uintptr_t raw_addr;
    {
      MutexGuard guard(rng_mutex.Pointer());
-@@ -401,6 +408,7 @@ void* OS::GetRandomMmapAddr() {
+@@ -399,6 +406,7 @@ void* OS::GetRandomMmapAddr() {
  #endif
    return reinterpret_cast<void*>(raw_addr);
  }
@@ -43,7 +43,7 @@ Index: v8/src/base/platform/platform-posix.cc
  
  // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files.
  #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA
-@@ -674,7 +682,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor
+@@ -672,7 +680,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor
  
  // static
  bool OS::HasLazyCommits() {
@@ -52,7 +52,7 @@ Index: v8/src/base/platform/platform-posix.cc
    return true;
  #else
    // TODO(bbudge) Return true for all POSIX platforms.
-@@ -1281,7 +1289,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void*
+@@ -1304,7 +1312,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void*
  // keep this version in POSIX as most Linux-compatible derivatives will
  // support it. MacOS and FreeBSD are different here.
  #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_DARWIN) && !defined(_AIX) && \
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_baseline_x64_baseline-assembler-x64-inl_h b/www/ungoogled-chromium/patches/patch-v8_src_baseline_x64_baseline-assembler-x64-inl_h
deleted file mode 100644
index 5f6dc96db..000000000
--- a/www/ungoogled-chromium/patches/patch-v8_src_baseline_x64_baseline-assembler-x64-inl_h
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: v8/src/baseline/x64/baseline-assembler-x64-inl.h
---- v8/src/baseline/x64/baseline-assembler-x64-inl.h.orig
-+++ v8/src/baseline/x64/baseline-assembler-x64-inl.h
-@@ -73,9 +73,7 @@ MemOperand BaselineAssembler::FeedbackVectorOperand() 
- 
- void BaselineAssembler::Bind(Label* label) { __ bind(label); }
- 
--void BaselineAssembler::JumpTarget() {
--  // NOP on x64.
--}
-+void BaselineAssembler::JumpTarget() { __ endbr64(); }
- 
- void BaselineAssembler::Jump(Label* target, Label::Distance distance) {
-   __ jmp(target, distance);
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_builtins_x64_builtins-x64_cc b/www/ungoogled-chromium/patches/patch-v8_src_builtins_x64_builtins-x64_cc
deleted file mode 100644
index da812bd46..000000000
--- a/www/ungoogled-chromium/patches/patch-v8_src_builtins_x64_builtins-x64_cc
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: v8/src/builtins/x64/builtins-x64.cc
---- v8/src/builtins/x64/builtins-x64.cc.orig
-+++ v8/src/builtins/x64/builtins-x64.cc
-@@ -44,6 +44,8 @@ namespace internal {
- #define __ ACCESS_MASM(masm)
- 
- void Builtins::Generate_Adaptor(MacroAssembler* masm, Address address) {
-+  __ CodeEntry();
-+
-   __ LoadAddress(kJavaScriptCallExtraArg1Register,
-                  ExternalReference::Create(address));
-   __ Jump(BUILTIN_CODE(masm->isolate(), AdaptorWithBuiltinExitFrame),
-@@ -430,7 +432,7 @@ void Generate_JSEntryVariant(MacroAssembler* masm, Sta
-   // Jump to a faked try block that does the invoke, with a faked catch
-   // block that sets the pending exception.
-   __ jmp(&invoke);
--  __ bind(&handler_entry);
-+  __ BindExceptionHandler(&handler_entry);
- 
-   // Store the current pc as the handler offset. It's used later to create the
-   // handler table.
-@@ -4015,6 +4017,8 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm
-     RestoreParentSuspender(masm, rbx, rcx);
-   }
-   __ bind(&suspend);
-+
-+  __ endbr64();
-   // No need to process the return value if the stack is suspended, there is a
-   // single 'externref' value (the promise) which doesn't require conversion.
- 
-@@ -4281,6 +4285,9 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm
-   // thrown exception.
-   if (stack_switch) {
-     int catch_handler = __ pc_offset();
-+
-+    __ endbr64();
-+
-     // Restore rsp to free the reserved stack slots for the sections.
-     __ leaq(rsp, MemOperand(rbp, kLastSpillOffset));
- 
-@@ -4567,6 +4574,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma
-   LoadJumpBuffer(masm, jmpbuf, true);
-   __ Trap();
-   __ bind(&resume);
-+  __ endbr64();
-   __ LeaveFrame(StackFrame::STACK_SWITCH);
-   __ ret(0);
- }
-@@ -4711,6 +4719,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w
-   }
-   __ Trap();
-   __ bind(&suspend);
-+  __ endbr64();
-   __ LeaveFrame(StackFrame::STACK_SWITCH);
-   // Pop receiver + parameter.
-   __ ret(2 * kSystemPointerSize);
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_assembler-x64_cc b/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_assembler-x64_cc
deleted file mode 100644
index f668c08df..000000000
--- a/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_assembler-x64_cc
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: v8/src/codegen/x64/assembler-x64.cc
---- v8/src/codegen/x64/assembler-x64.cc.orig
-+++ v8/src/codegen/x64/assembler-x64.cc
-@@ -1316,6 +1316,14 @@ void Assembler::hlt() {
-   emit(0xF4);
- }
- 
-+void Assembler::endbr64() {
-+  EnsureSpace ensure_space(this);
-+  emit(0xF3);
-+  emit(0x0f);
-+  emit(0x1e);
-+  emit(0xfa);
-+}
-+
- void Assembler::emit_idiv(Register src, int size) {
-   EnsureSpace ensure_space(this);
-   emit_rex(src, size);
-@@ -1583,16 +1591,22 @@ void Assembler::jmp(Handle<Code> target, RelocInfo::Mo
-   emitl(code_target_index);
- }
- 
--void Assembler::jmp(Register target) {
-+void Assembler::jmp(Register target, bool notrack) {
-   EnsureSpace ensure_space(this);
-+  if (notrack) {
-+    emit(0x3e);
-+  }
-   // Opcode FF/4 r64.
-   emit_optional_rex_32(target);
-   emit(0xFF);
-   emit_modrm(0x4, target);
- }
- 
--void Assembler::jmp(Operand src) {
-+void Assembler::jmp(Operand src, bool notrack) {
-   EnsureSpace ensure_space(this);
-+  if (notrack) {
-+    emit(0x3e);
-+  }
-   // Opcode FF/4 m64.
-   emit_optional_rex_32(src);
-   emit(0xFF);
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_assembler-x64_h b/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_assembler-x64_h
deleted file mode 100644
index ffbf4ead5..000000000
--- a/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_assembler-x64_h
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: v8/src/codegen/x64/assembler-x64.h
---- v8/src/codegen/x64/assembler-x64.h.orig
-+++ v8/src/codegen/x64/assembler-x64.h
-@@ -860,6 +860,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa
-   void ret(int imm16);
-   void ud2();
-   void setcc(Condition cc, Register reg);
-+  void endbr64();
- 
-   void pblendw(XMMRegister dst, Operand src, uint8_t mask);
-   void pblendw(XMMRegister dst, XMMRegister src, uint8_t mask);
-@@ -917,8 +918,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa
-   void jmp(Handle<Code> target, RelocInfo::Mode rmode);
- 
-   // Jump near absolute indirect (r64)
--  void jmp(Register adr);
--  void jmp(Operand src);
-+  void jmp(Register adr, bool notrack = false);
-+  void jmp(Operand src, bool notrack = false);
- 
-   // Unconditional jump relative to the current address. Low-level routine,
-   // use with caution!
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_macro-assembler-x64_cc b/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_macro-assembler-x64_cc
deleted file mode 100644
index e357d434f..000000000
--- a/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_macro-assembler-x64_cc
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: v8/src/codegen/x64/macro-assembler-x64.cc
---- v8/src/codegen/x64/macro-assembler-x64.cc.orig
-+++ v8/src/codegen/x64/macro-assembler-x64.cc
-@@ -51,6 +51,8 @@ Operand StackArgumentsAccessor::GetArgumentOperand(int
-   return Operand(rsp, kPCOnStackSize + index * kSystemPointerSize);
- }
- 
-+void MacroAssembler::CodeEntry() { endbr64(); }
-+
- void MacroAssembler::Load(Register destination, ExternalReference source) {
-   if (root_array_available_ && options().enable_root_relative_access) {
-     intptr_t delta = RootRegisterOffsetForExternalReference(isolate(), source);
-@@ -2046,7 +2048,7 @@ void MacroAssembler::Switch(Register scratch, Register
-   cmpq(reg, Immediate(num_labels));
-   j(above_equal, &fallthrough);
-   leaq(table, MemOperand(&jump_table));
--  jmp(MemOperand(table, reg, times_8, 0));
-+  jmp(MemOperand(table, reg, times_8, 0), /*notrack=*/true);
-   // Emit the jump table inline, under the assumption that it's not too big.
-   Align(kSystemPointerSize);
-   bind(&jump_table);
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_macro-assembler-x64_h b/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_macro-assembler-x64_h
deleted file mode 100644
index e77c96cdb..000000000
--- a/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_macro-assembler-x64_h
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: v8/src/codegen/x64/macro-assembler-x64.h
---- v8/src/codegen/x64/macro-assembler-x64.h.orig
-+++ v8/src/codegen/x64/macro-assembler-x64.h
-@@ -642,11 +642,14 @@ class V8_EXPORT_PRIVATE MacroAssembler
- 
-   // Define a function entrypoint. This doesn't emit any code for this
-   // architecture, as control-flow integrity is not supported for it.
--  void CodeEntry() {}
-+  void CodeEntry();
-   // Define an exception handler.
--  void ExceptionHandler() {}
-+  void ExceptionHandler() { CodeEntry(); }
-   // Define an exception handler and bind a label.
--  void BindExceptionHandler(Label* label) { bind(label); }
-+  void BindExceptionHandler(Label* label) {
-+    bind(label);
-+    CodeEntry();
-+  }
- 
-   // ---------------------------------------------------------------------------
-   // Pointer compression support
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_compiler_backend_x64_code-generator-x64_cc b/www/ungoogled-chromium/patches/patch-v8_src_compiler_backend_x64_code-generator-x64_cc
deleted file mode 100644
index fd6b5e8f2..000000000
--- a/www/ungoogled-chromium/patches/patch-v8_src_compiler_backend_x64_code-generator-x64_cc
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: v8/src/compiler/backend/x64/code-generator-x64.cc
---- v8/src/compiler/backend/x64/code-generator-x64.cc.orig
-+++ v8/src/compiler/backend/x64/code-generator-x64.cc
-@@ -6795,11 +6795,11 @@ void CodeGenerator::AssembleArchTableSwitch(Instructio
-     // target = table + (target - table)
-     __ addq(input, kScratchRegister);
-     // Jump to the target.
--    __ jmp(input);
-+    __ jmp(input, /*notrack=*/true);
-   } else {
-     // For non builtins, the value in the table is 'target_address' (8 bytes)
-     // jmp [table + index*8]
--    __ jmp(Operand(kScratchRegister, input, times_8, 0));
-+    __ jmp(Operand(kScratchRegister, input, times_8, 0), /*notrack=*/true);
-   }
- }
- 
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_deoptimizer_x64_deoptimizer-x64_cc b/www/ungoogled-chromium/patches/patch-v8_src_deoptimizer_x64_deoptimizer-x64_cc
deleted file mode 100644
index c59712565..000000000
--- a/www/ungoogled-chromium/patches/patch-v8_src_deoptimizer_x64_deoptimizer-x64_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: v8/src/deoptimizer/x64/deoptimizer-x64.cc
---- v8/src/deoptimizer/x64/deoptimizer-x64.cc.orig
-+++ v8/src/deoptimizer/x64/deoptimizer-x64.cc
-@@ -21,7 +21,7 @@ ASSERT_OFFSET(Builtin::kDeoptimizationEntry_Lazy);
- #undef ASSERT_OFFSET
- 
- const int Deoptimizer::kEagerDeoptExitSize = 4;
--const int Deoptimizer::kLazyDeoptExitSize = 4;
-+const int Deoptimizer::kLazyDeoptExitSize = 8;
- 
- Float32 RegisterValues::GetFloatRegister(unsigned n) const {
-   return Float32::FromBits(
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_diagnostics_perf-jit_cc b/www/ungoogled-chromium/patches/patch-v8_src_diagnostics_perf-jit_cc
index 569e8b870..e543decb6 100644
--- a/www/ungoogled-chromium/patches/patch-v8_src_diagnostics_perf-jit_cc
+++ b/www/ungoogled-chromium/patches/patch-v8_src_diagnostics_perf-jit_cc
@@ -1,8 +1,8 @@
 Index: v8/src/diagnostics/perf-jit.cc
 --- v8/src/diagnostics/perf-jit.cc.orig
 +++ v8/src/diagnostics/perf-jit.cc
-@@ -30,7 +30,7 @@
- #include "src/common/assert-scope.h"
+@@ -31,7 +31,7 @@
+ #include "src/flags/flags.h"
  
  // Only compile the {LinuxPerfJitLogger} on Linux.
 -#if V8_OS_LINUX
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_execution_isolate_cc b/www/ungoogled-chromium/patches/patch-v8_src_execution_isolate_cc
index e2ee51929..968db4ff6 100644
--- a/www/ungoogled-chromium/patches/patch-v8_src_execution_isolate_cc
+++ b/www/ungoogled-chromium/patches/patch-v8_src_execution_isolate_cc
@@ -1,7 +1,7 @@
 Index: v8/src/execution/isolate.cc
 --- v8/src/execution/isolate.cc.orig
 +++ v8/src/execution/isolate.cc
-@@ -147,6 +147,10 @@
+@@ -153,6 +153,10 @@
  #include "src/execution/simulator-base.h"
  #endif
  
@@ -12,14 +12,16 @@ Index: v8/src/execution/isolate.cc
  extern "C" const uint8_t v8_Default_embedded_blob_code_[];
  extern "C" uint32_t v8_Default_embedded_blob_code_size_;
  extern "C" const uint8_t v8_Default_embedded_blob_data_[];
-@@ -4021,6 +4025,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
+@@ -4232,6 +4236,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
    uint32_t code_size = DefaultEmbeddedBlobCodeSize();
    const uint8_t* data = DefaultEmbeddedBlobData();
    uint32_t data_size = DefaultEmbeddedBlobDataSize();
 +
 +#if defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32)
-+  mprotect(reinterpret_cast<void *>(const_cast<uint8_t *>(code)),
-+          code_size, PROT_READ | PROT_EXEC);
++  if (code_size > 0) {
++    mprotect(reinterpret_cast<void *>(const_cast<uint8_t *>(code)),
++            code_size, PROT_READ | PROT_EXEC);
++  }
 +#endif
  
    if (StickyEmbeddedBlobCode() != nullptr) {
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_flags_flags_cc b/www/ungoogled-chromium/patches/patch-v8_src_flags_flags_cc
index 69093f49f..14ee6a6db 100644
--- a/www/ungoogled-chromium/patches/patch-v8_src_flags_flags_cc
+++ b/www/ungoogled-chromium/patches/patch-v8_src_flags_flags_cc
@@ -1,8 +1,8 @@
 Index: v8/src/flags/flags.cc
 --- v8/src/flags/flags.cc.orig
 +++ v8/src/flags/flags.cc
-@@ -12,6 +12,10 @@
- #include <iomanip>
+@@ -15,6 +15,10 @@
+ #include <set>
  #include <sstream>
  
 +#if V8_OS_OPENBSD
@@ -10,9 +10,9 @@ Index: v8/src/flags/flags.cc
 +#endif
 +
  #include "src/base/functional.h"
- #include "src/base/logging.h"
+ #include "src/base/lazy-instance.h"
  #include "src/base/platform/platform.h"
-@@ -31,7 +35,11 @@
+@@ -34,7 +38,11 @@
  namespace v8::internal {
  
  // Define {v8_flags}, declared in flags.h.
@@ -24,7 +24,7 @@ Index: v8/src/flags/flags.cc
  
  // {v8_flags} needs to be aligned to a memory page, and the size needs to be a
  // multiple of a page size. This is required for memory-protection of the memory
-@@ -824,6 +832,10 @@ void FlagList::FreezeFlags() {
+@@ -789,6 +797,10 @@ void FlagList::FreezeFlags() {
    // Note that for string flags we only protect the pointer itself, but not the
    // string storage. TODO(12887): Fix this.
    base::OS::SetDataReadOnly(&v8_flags, sizeof(v8_flags));
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_maglev_x64_maglev-assembler-x64-inl_h b/www/ungoogled-chromium/patches/patch-v8_src_maglev_x64_maglev-assembler-x64-inl_h
deleted file mode 100644
index 9d0d8f27d..000000000
--- a/www/ungoogled-chromium/patches/patch-v8_src_maglev_x64_maglev-assembler-x64-inl_h
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: v8/src/maglev/x64/maglev-assembler-x64-inl.h
---- v8/src/maglev/x64/maglev-assembler-x64-inl.h.orig
-+++ v8/src/maglev/x64/maglev-assembler-x64-inl.h
-@@ -229,7 +229,10 @@ void MaglevAssembler::PushReverse(T... vals) {
-   detail::PushAllHelper<T...>::PushReverse(this, vals...);
- }
- 
--inline void MaglevAssembler::BindJumpTarget(Label* label) { bind(label); }
-+inline void MaglevAssembler::BindJumpTarget(Label* label) {
-+  bind(label);
-+  endbr64();
-+}
- 
- inline void MaglevAssembler::BindBlock(BasicBlock* block) {
-   bind(block->label());
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_maglev_x64_maglev-assembler-x64_cc b/www/ungoogled-chromium/patches/patch-v8_src_maglev_x64_maglev-assembler-x64_cc
deleted file mode 100644
index b06d6720b..000000000
--- a/www/ungoogled-chromium/patches/patch-v8_src_maglev_x64_maglev-assembler-x64_cc
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: v8/src/maglev/x64/maglev-assembler-x64.cc
---- v8/src/maglev/x64/maglev-assembler-x64.cc.orig
-+++ v8/src/maglev/x64/maglev-assembler-x64.cc
-@@ -433,10 +433,12 @@ void MaglevAssembler::OSRPrologue(Graph* graph) {
- void MaglevAssembler::Prologue(Graph* graph) {
-   DCHECK(!graph->is_osr());
- 
-+  CodeEntry();
-+
-   BailoutIfDeoptimized(rbx);
- 
-   if (graph->has_recursive_calls()) {
--    bind(code_gen_state()->entry_label());
-+    BindJumpTarget(code_gen_state()->entry_label());
-   }
- 
-   // Tiering support.
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_regexp_x64_regexp-macro-assembler-x64_cc b/www/ungoogled-chromium/patches/patch-v8_src_regexp_x64_regexp-macro-assembler-x64_cc
deleted file mode 100644
index 71ea8060f..000000000
--- a/www/ungoogled-chromium/patches/patch-v8_src_regexp_x64_regexp-macro-assembler-x64_cc
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: v8/src/regexp/x64/regexp-macro-assembler-x64.cc
---- v8/src/regexp/x64/regexp-macro-assembler-x64.cc.orig
-+++ v8/src/regexp/x64/regexp-macro-assembler-x64.cc
-@@ -110,6 +110,7 @@ RegExpMacroAssemblerX64::RegExpMacroAssemblerX64(Isola
-       backtrack_label_(),
-       exit_label_() {
-   DCHECK_EQ(0, registers_to_save % 2);
-+  __ CodeEntry();
-   __ jmp(&entry_label_);   // We'll write the entry code when we know more.
-   __ bind(&start_label_);  // And then continue from here.
- }
-@@ -714,6 +715,11 @@ bool RegExpMacroAssemblerX64::CheckSpecialClassRanges(
-       // Match any character.
-       return true;
-   }
-+}
-+
-+void RegExpMacroAssemblerX64::BindJumpTarget(Label* label) {
-+  Bind(label);
-+  __ CodeEntry();
- }
- 
- void RegExpMacroAssemblerX64::Fail() {
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_regexp_x64_regexp-macro-assembler-x64_h b/www/ungoogled-chromium/patches/patch-v8_src_regexp_x64_regexp-macro-assembler-x64_h
deleted file mode 100644
index 1040b8d4f..000000000
--- a/www/ungoogled-chromium/patches/patch-v8_src_regexp_x64_regexp-macro-assembler-x64_h
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: v8/src/regexp/x64/regexp-macro-assembler-x64.h
---- v8/src/regexp/x64/regexp-macro-assembler-x64.h.orig
-+++ v8/src/regexp/x64/regexp-macro-assembler-x64.h
-@@ -59,6 +59,9 @@ class V8_EXPORT_PRIVATE RegExpMacroAssemblerX64
-   void CheckPosition(int cp_offset, Label* on_outside_input) override;
-   bool CheckSpecialClassRanges(StandardCharacterSet type,
-                                Label* on_no_match) override;
-+
-+  void BindJumpTarget(Label* label) override;
-+
-   void Fail() override;
-   Handle<HeapObject> GetCode(Handle<String> source) override;
-   void GoTo(Label* label) override;
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base_cc b/www/ungoogled-chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base_cc
index 6a1c0eb6d..cab8c59ac 100644
--- a/www/ungoogled-chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base_cc
+++ b/www/ungoogled-chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base_cc
@@ -1,7 +1,7 @@
 Index: v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc
 --- v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig
 +++ v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc
-@@ -142,6 +142,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) {
+@@ -143,6 +143,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) {
      return EmbeddedTargetOs::kWin;
    } else if (string == "starboard") {
      return EmbeddedTargetOs::kStarboard;
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_trap-handler_handler-inside-posix_cc b/www/ungoogled-chromium/patches/patch-v8_src_trap-handler_handler-inside-posix_cc
index 9a0664b07..5d54ed4d6 100644
--- a/www/ungoogled-chromium/patches/patch-v8_src_trap-handler_handler-inside-posix_cc
+++ b/www/ungoogled-chromium/patches/patch-v8_src_trap-handler_handler-inside-posix_cc
@@ -1,7 +1,7 @@
 Index: v8/src/trap-handler/handler-inside-posix.cc
 --- v8/src/trap-handler/handler-inside-posix.cc.orig
 +++ v8/src/trap-handler/handler-inside-posix.cc
-@@ -59,6 +59,8 @@ namespace trap_handler {
+@@ -61,6 +61,8 @@ namespace trap_handler {
  #define CONTEXT_REG(reg, REG) &uc->uc_mcontext->__ss.__##reg
  #elif V8_OS_FREEBSD
  #define CONTEXT_REG(reg, REG) &uc->uc_mcontext.mc_##reg
@@ -10,7 +10,7 @@ Index: v8/src/trap-handler/handler-inside-posix.cc
  #else
  #error "Unsupported platform."
  #endif
-@@ -68,8 +70,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) {
+@@ -80,8 +82,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) {
    // si_code at its default of 0 for signals that don’t originate in hardware.
    // The other conditions are only relevant for Linux.
    return info->si_code > 0 && info->si_code != SI_USER &&
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32_h b/www/ungoogled-chromium/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl_h
similarity index 83%
rename from www/ungoogled-chromium/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32_h
rename to www/ungoogled-chromium/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl_h
index 3a918cef0..483ed9080 100644
--- a/www/ungoogled-chromium/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32_h
+++ b/www/ungoogled-chromium/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl_h
@@ -1,7 +1,7 @@
-Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig
-+++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
-@@ -491,7 +491,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst
+Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h
+--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig
++++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h
+@@ -510,7 +510,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst
  }
  
  void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
@@ -10,7 +10,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
                              LoadType type, uint32_t* protected_load_pc,
                              bool /* is_load_mem */, bool /* i64_offset */,
                              bool needs_shift) {
-@@ -571,7 +571,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis
+@@ -587,7 +587,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis
  }
  
  void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
@@ -19,7 +19,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
                               StoreType type, LiftoffRegList pinned,
                               uint32_t* protected_store_pc,
                               bool /* is_store_mem */, bool /* i64_offset */) {
-@@ -651,7 +651,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist
+@@ -663,7 +663,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist
  }
  
  void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr,
@@ -28,7 +28,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
                                    LoadType type, LiftoffRegList /* pinned */,
                                    bool /* i64_offset */) {
    if (type.value() != LoadType::kI64Load) {
-@@ -671,7 +671,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst,
+@@ -681,7 +681,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst,
  }
  
  void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg,
@@ -36,8 +36,8 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
 +                                   uintptr_t offset_imm, LiftoffRegister src,
                                     StoreType type, LiftoffRegList pinned,
                                     bool /* i64_offset */) {
-   DCHECK_NE(offset_reg, no_reg);
-@@ -741,7 +741,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
+   DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max());
+@@ -751,7 +751,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
  
  inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop,
                                         Register dst_addr, Register offset_reg,
@@ -46,7 +46,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
                                         LiftoffRegister value,
                                         LiftoffRegister result, StoreType type) {
    DCHECK_EQ(value, result);
-@@ -808,7 +808,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble
+@@ -819,7 +819,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble
  }
  
  inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr,
@@ -55,7 +55,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
                            LiftoffRegister value, LiftoffRegister result,
                            StoreType type) {
    DCHECK_EQ(value, result);
-@@ -920,7 +920,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino
+@@ -934,7 +934,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino
  }
  
  inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr,
@@ -64,7 +64,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
                            LiftoffRegister value, LiftoffRegister result) {
    // We need {ebx} here, which is the root register. As the root register it
    // needs special treatment. As we use {ebx} directly in the code below, we
-@@ -1012,7 +1012,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino
+@@ -1030,7 +1030,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino
  }  // namespace liftoff
  
  void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
@@ -73,7 +73,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1026,7 +1026,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re
+@@ -1044,7 +1044,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg,
@@ -82,7 +82,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1039,7 +1039,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re
+@@ -1057,7 +1057,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg,
@@ -91,7 +91,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1053,7 +1053,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re
+@@ -1071,7 +1071,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg,
@@ -100,7 +100,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
                                  LiftoffRegister result, StoreType type,
                                  bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1067,7 +1067,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg
+@@ -1085,7 +1085,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg
  }
  
  void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg,
@@ -109,7 +109,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1081,7 +1081,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re
+@@ -1099,7 +1099,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
@@ -118,7 +118,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
                                        LiftoffRegister value,
                                        LiftoffRegister result, StoreType type,
                                        bool /* i64_offset */) {
-@@ -1096,7 +1096,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add
+@@ -1114,7 +1114,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add
  }
  
  void LiftoffAssembler::AtomicCompareExchange(
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_wasm_jump-table-assembler_cc b/www/ungoogled-chromium/patches/patch-v8_src_wasm_jump-table-assembler_cc
deleted file mode 100644
index 4abc49a00..000000000
--- a/www/ungoogled-chromium/patches/patch-v8_src_wasm_jump-table-assembler_cc
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: v8/src/wasm/jump-table-assembler.cc
---- v8/src/wasm/jump-table-assembler.cc.orig
-+++ v8/src/wasm/jump-table-assembler.cc
-@@ -52,15 +52,21 @@ void JumpTableAssembler::InitializeJumpsToLazyCompileT
- #if V8_TARGET_ARCH_X64
- void JumpTableAssembler::EmitLazyCompileJumpSlot(uint32_t func_index,
-                                                  Address lazy_compile_target) {
-+  intptr_t displacement =
-+      static_cast<intptr_t>(reinterpret_cast<uint8_t*>(lazy_compile_target) -
-+                            (pc_ + 9) - kNearJmpInstrSize);
-+  if (!is_int32(displacement)) return;
-+  CodeEntry();  // 4 bytes
-   // Use a push, because mov to an extended register takes 6 bytes.
--  pushq_imm32(func_index);            // 5 bytes
--  EmitJumpSlot(lazy_compile_target);  // 5 bytes
-+  pushq_imm32(func_index);                     // 5 bytes
-+  near_jmp(displacement, RelocInfo::NO_INFO);  // 5 bytes
- }
- 
- bool JumpTableAssembler::EmitJumpSlot(Address target) {
-   intptr_t displacement = static_cast<intptr_t>(
--      reinterpret_cast<uint8_t*>(target) - pc_ - kNearJmpInstrSize);
-+      reinterpret_cast<uint8_t*>(target) - (pc_ + 4) - kNearJmpInstrSize);
-   if (!is_int32(displacement)) return false;
-+  CodeEntry();                                 // 4 bytes
-   near_jmp(displacement, RelocInfo::NO_INFO);  // 5 bytes
-   return true;
- }
-@@ -68,11 +74,12 @@ bool JumpTableAssembler::EmitJumpSlot(Address target) 
- void JumpTableAssembler::EmitFarJumpSlot(Address target) {
-   Label data;
-   int start_offset = pc_offset();
-+  CodeEntry();          // 4 bytes
-   jmp(Operand(&data));  // 6 bytes
--  Nop(2);               // 2 bytes
-+  Nop(6);               // 6 bytes
-   // The data must be properly aligned, so it can be patched atomically (see
-   // {PatchFarJumpSlot}).
--  DCHECK_EQ(start_offset + kSystemPointerSize, pc_offset());
-+  DCHECK_EQ(start_offset + kFarJumpTableSlotOffset, pc_offset());
-   USE(start_offset);
-   bind(&data);
-   dq(target);  // 8 bytes
-@@ -83,7 +90,7 @@ void JumpTableAssembler::PatchFarJumpSlot(Address slot
-   // The slot needs to be pointer-size aligned so we can atomically update it.
-   DCHECK(IsAligned(slot, kSystemPointerSize));
-   // Offset of the target is at 8 bytes, see {EmitFarJumpSlot}.
--  reinterpret_cast<std::atomic<Address>*>(slot + kSystemPointerSize)
-+  reinterpret_cast<std::atomic<Address>*>(slot + kFarJumpTableSlotOffset)
-       ->store(target, std::memory_order_relaxed);
-   // The update is atomic because the address is properly aligned.
-   // Because of cache coherence, the data update will eventually be seen by all
diff --git a/www/ungoogled-chromium/patches/patch-v8_src_wasm_jump-table-assembler_h b/www/ungoogled-chromium/patches/patch-v8_src_wasm_jump-table-assembler_h
deleted file mode 100644
index b010ea355..000000000
--- a/www/ungoogled-chromium/patches/patch-v8_src_wasm_jump-table-assembler_h
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: v8/src/wasm/jump-table-assembler.h
---- v8/src/wasm/jump-table-assembler.h.orig
-+++ v8/src/wasm/jump-table-assembler.h
-@@ -185,9 +185,10 @@ class V8_EXPORT_PRIVATE JumpTableAssembler : public Ma
- // boundaries. The jump table line size has been chosen to satisfy this.
- #if V8_TARGET_ARCH_X64
-   static constexpr int kJumpTableLineSize = 64;
--  static constexpr int kJumpTableSlotSize = 5;
--  static constexpr int kFarJumpTableSlotSize = 16;
--  static constexpr int kLazyCompileTableSlotSize = 10;
-+  static constexpr int kJumpTableSlotSize = 5 + 4;
-+  static constexpr int kFarJumpTableSlotOffset = 2 * kSystemPointerSize;
-+  static constexpr int kFarJumpTableSlotSize = 16 + 8;
-+  static constexpr int kLazyCompileTableSlotSize = 10 + 4;
- #elif V8_TARGET_ARCH_IA32
-   static constexpr int kJumpTableLineSize = 64;
-   static constexpr int kJumpTableSlotSize = 5;
diff --git a/www/ungoogled-chromium/patches/patch-weblayer_browser_browser_main_parts_impl_cc b/www/ungoogled-chromium/patches/patch-weblayer_browser_browser_main_parts_impl_cc
deleted file mode 100644
index 68ebf9c9e..000000000
--- a/www/ungoogled-chromium/patches/patch-weblayer_browser_browser_main_parts_impl_cc
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: weblayer/browser/browser_main_parts_impl.cc
---- weblayer/browser/browser_main_parts_impl.cc.orig
-+++ weblayer/browser/browser_main_parts_impl.cc
-@@ -82,7 +82,7 @@
- 
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
--#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
- #include "ui/base/ime/init/input_method_initializer.h"
- #endif
- 
-@@ -201,7 +201,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() {
- 
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
--#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
-   ui::InitializeInputMethodForTesting();
- #endif
- #if BUILDFLAG(IS_ANDROID)
diff --git a/www/ungoogled-chromium/patches/patch-weblayer_browser_content_browser_client_impl_cc b/www/ungoogled-chromium/patches/patch-weblayer_browser_content_browser_client_impl_cc
deleted file mode 100644
index 984ea4fe4..000000000
--- a/www/ungoogled-chromium/patches/patch-weblayer_browser_content_browser_client_impl_cc
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: weblayer/browser/content_browser_client_impl.cc
---- weblayer/browser/content_browser_client_impl.cc.orig
-+++ weblayer/browser/content_browser_client_impl.cc
-@@ -154,7 +154,7 @@
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include "content/public/common/content_descriptors.h"
- #endif
- 
-@@ -1025,7 +1025,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- void ContentBrowserClientImpl::GetAdditionalMappedFilesForChildProcess(
-     const base::CommandLine& command_line,
-     int child_process_id,
diff --git a/www/ungoogled-chromium/patches/patch-weblayer_browser_content_browser_client_impl_h b/www/ungoogled-chromium/patches/patch-weblayer_browser_content_browser_client_impl_h
deleted file mode 100644
index 5230f31e3..000000000
--- a/www/ungoogled-chromium/patches/patch-weblayer_browser_content_browser_client_impl_h
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: weblayer/browser/content_browser_client_impl.h
---- weblayer/browser/content_browser_client_impl.h.orig
-+++ weblayer/browser/content_browser_client_impl.h
-@@ -184,7 +184,7 @@ class ContentBrowserClientImpl : public content::Conte
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   void GetAdditionalMappedFilesForChildProcess(
-       const base::CommandLine& command_line,
-       int child_process_id,
diff --git a/www/ungoogled-chromium/patches/patch-weblayer_browser_system_network_context_manager_cc b/www/ungoogled-chromium/patches/patch-weblayer_browser_system_network_context_manager_cc
deleted file mode 100644
index 7d9ba1085..000000000
--- a/www/ungoogled-chromium/patches/patch-weblayer_browser_system_network_context_manager_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: weblayer/browser/system_network_context_manager.cc
---- weblayer/browser/system_network_context_manager.cc.orig
-+++ weblayer/browser/system_network_context_manager.cc
-@@ -69,7 +69,7 @@ void SystemNetworkContextManager::ConfigureDefaultNetw
-   network_context_params->user_agent = user_agent;
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   // We're not configuring the cookie encryption on these platforms yet.
-   network_context_params->enable_encrypted_cookies = false;
- #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ||
diff --git a/www/ungoogled-chromium/patches/patch-weblayer_common_weblayer_paths_cc b/www/ungoogled-chromium/patches/patch-weblayer_common_weblayer_paths_cc
deleted file mode 100644
index ac8cb1a43..000000000
--- a/www/ungoogled-chromium/patches/patch-weblayer_common_weblayer_paths_cc
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: weblayer/common/weblayer_paths.cc
---- weblayer/common/weblayer_paths.cc.orig
-+++ weblayer/common/weblayer_paths.cc
-@@ -18,7 +18,7 @@
- 
- #if BUILDFLAG(IS_WIN)
- #include "base/base_paths_win.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- #include "base/nix/xdg_util.h"
- #endif
- 
-@@ -36,7 +36,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul
-     return false;
-   *result = result->AppendASCII("weblayer");
-   return true;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<base::Environment> env(base::Environment::Create());
-   base::FilePath config_dir(base::nix::GetXDGDirectory(
-       env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir));
diff --git a/www/ungoogled-chromium/pkg/PFRAG.swiftshader b/www/ungoogled-chromium/pkg/PFRAG.swiftshader
index a9f343e4e..70aac5632 100644
--- a/www/ungoogled-chromium/pkg/PFRAG.swiftshader
+++ b/www/ungoogled-chromium/pkg/PFRAG.swiftshader
@@ -1 +1,2 @@
 @so ungoogled-chromium/libvk_swiftshader.so
+ungoogled-chromium/vk_swiftshader_icd.json
diff --git a/www/ungoogled-chromium/pkg/PLIST b/www/ungoogled-chromium/pkg/PLIST
index b1f957d0e..d1bc8f82e 100644
--- a/www/ungoogled-chromium/pkg/PLIST
+++ b/www/ungoogled-chromium/pkg/PLIST
@@ -11,7 +11,6 @@ ungoogled-chromium/headless_lib_strings.pak
 @so ungoogled-chromium/libGLESv2.so
 %%component%%
 @so ungoogled-chromium/libVkICD_mock_icd.so
-ungoogled-chromium/libudev.so.0
 @so ungoogled-chromium/libvulkan.so
 ungoogled-chromium/locales/
 ungoogled-chromium/locales/af.pak